diff --git a/sfw/core/old/directory.h b/sfw/core/old/directory.h
index 77de115..3bf320e 100644
--- a/sfw/core/old/directory.h
+++ b/sfw/core/old/directory.h
@@ -8,7 +8,7 @@
 #include "core/reference.h"
 
 class Directory : public Reference {
-	RCPP_OBJECT(Directory, Reference);
+	SFW_OBJECT(Directory, Reference);
 public:
 	Error open_dir(const String &path, bool skip_specials = true);
 	Error open_dir(const char *path, bool skip_specials = true);
diff --git a/sfw/core/old/old/string.cpp b/sfw/core/old/old/string.cpp
index ef69c5d..696e018 100644
--- a/sfw/core/old/old/string.cpp
+++ b/sfw/core/old/old/string.cpp
@@ -1,6 +1,6 @@
 #include "string.h"
 
-#include "core/math/math.h"
+#include "math.h"
 #include "error_macros.h"
 #include "variant.h"
 #include <stdlib.h>
diff --git a/sfw/object/variant.cpp b/sfw/object/variant.cpp
index 4dafbb5..146c9a8 100644
--- a/sfw/object/variant.cpp
+++ b/sfw/object/variant.cpp
@@ -1,6 +1,6 @@
 #include "variant.h"
 
-#include "core/math/math.h"
+#include "math.h"
 #include "core/reference.h"
 
 Variant::Type Variant::get_type() const {