diff --git a/binding_generator.py b/binding_generator.py
index 80ea0742..61610ca0 100644
--- a/binding_generator.py
+++ b/binding_generator.py
@@ -83,7 +83,7 @@ def generate_class_header(used_classes, c):
     if class_name != "Object" and class_name != "Reference":
         source.append("#include <core/Ref.hpp>")
     else:
-        source.append("#include <TagDB.hpp>")
+        source.append("#include <core/TagDB.hpp>")
 
 
     included = []
diff --git a/src/core/GodotGlobal.cpp b/src/core/GodotGlobal.cpp
index 0ea1ce12..980aa5d9 100644
--- a/src/core/GodotGlobal.cpp
+++ b/src/core/GodotGlobal.cpp
@@ -98,7 +98,6 @@ void Godot::gdnative_init(godot_gdnative_init_options *options)
 		}
 	}
 
-	___register_types();
 }
 
 void Godot::gdnative_terminate(godot_gdnative_terminate_options *options)
@@ -116,6 +115,7 @@ void Godot::nativescript_init(void *handle)
 
 	godot::_RegisterState::language_index = godot::nativescript_1_1_api->godot_nativescript_register_instance_binding_data_functions(binding_funcs);
 
+	___register_types();
 }
 
 void Godot::nativescript_terminate(void *handle)