diff --git a/binding_generator.py b/binding_generator.py
index e87d9637..239e6438 100644
--- a/binding_generator.py
+++ b/binding_generator.py
@@ -71,8 +71,8 @@ def generate_class_header(used_classes, c):
     source.append("")
     
     
-    source.append("#include <CoreTypes.hpp>")
-    source.append("#include <Ref.hpp>")
+    source.append("#include <core/CoreTypes.hpp>")
+    source.append("#include <core/Ref.hpp>")
 
     class_name = strip_name(c["name"])
 
@@ -240,11 +240,11 @@ def generate_class_implementation(icalls, used_classes, c):
     source.append("")
     source.append("")
     
-    source.append("#include <GodotGlobal.hpp>")
-    source.append("#include <CoreTypes.hpp>")
-    source.append("#include <Ref.hpp>")
+    source.append("#include <core/GodotGlobal.hpp>")
+    source.append("#include <core/CoreTypes.hpp>")
+    source.append("#include <core/Ref.hpp>")
     
-    source.append("#include <Godot.hpp>")
+    source.append("#include <core/Godot.hpp>")
     source.append("")
     
     
@@ -465,7 +465,7 @@ def generate_icall_header(icalls):
     source.append("#include <stdint.h>")
     source.append("")
     
-    source.append("#include <CoreTypes.hpp>")
+    source.append("#include <core/CoreTypes.hpp>")
     source.append("#include <Object.hpp>")
     source.append("")
     source.append("")
@@ -515,8 +515,8 @@ def generate_icall_implementation(icalls):
     source.append("#include <stdint.h>")
     source.append("")
     
-    source.append("#include <GodotGlobal.hpp>")
-    source.append("#include <CoreTypes.hpp>")
+    source.append("#include <core/GodotGlobal.hpp>")
+    source.append("#include <core/CoreTypes.hpp>")
     source.append("#include <Object.hpp>")
     source.append("")
     source.append("")
diff --git a/include/core/Godot.hpp b/include/core/Godot.hpp
index 972a00f7..0aed17b0 100644
--- a/include/core/Godot.hpp
+++ b/include/core/Godot.hpp
@@ -8,13 +8,13 @@
 #include <nativescript/godot_nativescript.h>
 
 
-#include <CoreTypes.hpp>
-#include <Variant.hpp>
-#include <Ref.hpp>
+#include <core/CoreTypes.hpp>
+#include <core/Variant.hpp>
+#include <core/Ref.hpp>
 
 #include <Object.hpp>
 
-#include <GodotGlobal.hpp>
+#include <core/GodotGlobal.hpp>
 
 
 namespace godot {