diff --git a/binding_generator.py b/binding_generator.py
index df3e299..fbeff55 100644
--- a/binding_generator.py
+++ b/binding_generator.py
@@ -66,7 +66,7 @@ def generate_class_header(used_classes, c):
     source.append("")
     source.append("")
     
-    source.append("#include <godot/gdnative.h>")
+    source.append("#include <gdnative/gdnative.h>")
     source.append("#include <stdint.h>")
     source.append("")
     
@@ -460,7 +460,7 @@ def generate_icall_header(icalls):
     
     source.append("")
     
-    source.append("#include <godot/gdnative.h>")
+    source.append("#include <gdnative/gdnative.h>")
     source.append("#include <stdint.h>")
     source.append("")
     
@@ -510,7 +510,7 @@ def generate_icall_implementation(icalls):
     
     source.append("")
     
-    source.append("#include <godot/gdnative.h>")
+    source.append("#include <gdnative/gdnative.h>")
     source.append("#include <stdint.h>")
     source.append("")
     
diff --git a/include/core/Array.hpp b/include/core/Array.hpp
index 6a64872..2005740 100644
--- a/include/core/Array.hpp
+++ b/include/core/Array.hpp
@@ -1,7 +1,7 @@
 #ifndef ARRAY_H
 #define ARRAY_H
 
-#include <godot/array.h>
+#include <gdnative/array.h>
 
 #include "String.hpp"
 
diff --git a/include/core/Color.hpp b/include/core/Color.hpp
index 5232573..5c3cd9e 100644
--- a/include/core/Color.hpp
+++ b/include/core/Color.hpp
@@ -1,7 +1,7 @@
 #ifndef COLOR_H
 #define COLOR_H
 
-#include <godot/color.h>
+#include <gdnative/color.h>
 
 #include <cmath>
 
diff --git a/include/core/Dictionary.hpp b/include/core/Dictionary.hpp
index 31744b7..238724d 100644
--- a/include/core/Dictionary.hpp
+++ b/include/core/Dictionary.hpp
@@ -5,7 +5,7 @@
 
 #include "Array.hpp"
 
-#include <godot/dictionary.h>
+#include <gdnative/dictionary.h>
 
 namespace godot {
 
diff --git a/include/core/Godot.hpp b/include/core/Godot.hpp
index 90a73aa..98bcf62 100644
--- a/include/core/Godot.hpp
+++ b/include/core/Godot.hpp
@@ -4,8 +4,8 @@
 #include <cstdlib>
 #include <cstring>
 
-#include <godot/gdnative.h>
-#include <godot_nativescript.h>
+#include <gdnative/gdnative.h>
+#include <nativescript/godot_nativescript.h>
 
 
 #include <CoreTypes.hpp>
diff --git a/include/core/NodePath.hpp b/include/core/NodePath.hpp
index f4b4b25..235c95e 100644
--- a/include/core/NodePath.hpp
+++ b/include/core/NodePath.hpp
@@ -3,7 +3,7 @@
 
 #include "String.hpp"
 
-#include <godot/node_path.h>
+#include <gdnative/node_path.h>
 
 namespace godot {
 
diff --git a/include/core/PoolArrays.hpp b/include/core/PoolArrays.hpp
index 6c07ae1..e10d8e9 100644
--- a/include/core/PoolArrays.hpp
+++ b/include/core/PoolArrays.hpp
@@ -8,7 +8,7 @@
 #include "Vector2.hpp"
 #include "Vector3.hpp"
 
-#include <godot/pool_arrays.h>
+#include <gdnative/pool_arrays.h>
 
 namespace godot {
 
diff --git a/include/core/RID.hpp b/include/core/RID.hpp
index 3f83e79..3a968bf 100644
--- a/include/core/RID.hpp
+++ b/include/core/RID.hpp
@@ -1,7 +1,7 @@
 #ifndef RID_H
 #define RID_H
 
-#include <godot/rid.h>
+#include <gdnative/rid.h>
 
 namespace godot {
 
diff --git a/include/core/String.hpp b/include/core/String.hpp
index dec8104..ea28778 100644
--- a/include/core/String.hpp
+++ b/include/core/String.hpp
@@ -1,7 +1,7 @@
 #ifndef STRING_H
 #define STRING_H
 
-#include <godot/string.h>
+#include <gdnative/string.h>
 
 namespace godot {
 
diff --git a/include/core/Variant.hpp b/include/core/Variant.hpp
index 6d9b1a7..b4741f9 100644
--- a/include/core/Variant.hpp
+++ b/include/core/Variant.hpp
@@ -1,7 +1,7 @@
 #ifndef VARIANT_H
 #define VARIANT_H
 
-#include <godot/variant.h>
+#include <gdnative/variant.h>
 
 #include "Defs.hpp"
 
@@ -259,7 +259,7 @@ public:
 
 	bool hash_compare(const Variant& b) const;
 
-	bool booleanize(bool &valid) const;
+	bool booleanize() const;
 
 	~Variant();
 
diff --git a/include/core/Vector2.hpp b/include/core/Vector2.hpp
index da45ccf..3372f99 100644
--- a/include/core/Vector2.hpp
+++ b/include/core/Vector2.hpp
@@ -1,7 +1,7 @@
 #ifndef VECTOR2_H
 #define VECTOR2_H
 
-#include <godot/vector2.h>
+#include <gdnative/vector2.h>
 
 #include "Defs.hpp"
 
diff --git a/src/core/Color.cpp b/src/core/Color.cpp
index a41615e..aa356e2 100644
--- a/src/core/Color.cpp
+++ b/src/core/Color.cpp
@@ -1,6 +1,6 @@
 #include "Color.hpp"
 
-#include <godot/color.h>
+#include <gdnative/color.h>
 
 #include <cmath>
 
diff --git a/src/core/GodotGlobal.cpp b/src/core/GodotGlobal.cpp
index 96a5fa6..823c2c1 100644
--- a/src/core/GodotGlobal.cpp
+++ b/src/core/GodotGlobal.cpp
@@ -2,7 +2,7 @@
 
 #include "String.hpp"
 
-#include <godot/gdnative.h>
+#include <gdnative/gdnative.h>
 
 namespace godot {
 
diff --git a/src/core/NodePath.cpp b/src/core/NodePath.cpp
index 98c40c9..5681036 100644
--- a/src/core/NodePath.cpp
+++ b/src/core/NodePath.cpp
@@ -2,7 +2,7 @@
 
 #include "String.hpp"
 
-#include <godot/node_path.h>
+#include <gdnative/node_path.h>
 
 namespace godot {
 
diff --git a/src/core/PoolArrays.cpp b/src/core/PoolArrays.cpp
index e33ce0e..fbd4d69 100644
--- a/src/core/PoolArrays.cpp
+++ b/src/core/PoolArrays.cpp
@@ -7,7 +7,7 @@
 #include "Vector2.hpp"
 #include "Vector3.hpp"
 
-#include <godot/pool_arrays.h>
+#include <gdnative/pool_arrays.h>
 
 namespace godot {
 
diff --git a/src/core/RID.cpp b/src/core/RID.cpp
index 75419ba..12b4a2e 100644
--- a/src/core/RID.cpp
+++ b/src/core/RID.cpp
@@ -1,6 +1,6 @@
 #include "RID.hpp"
 
-#include <godot/rid.h>
+#include <gdnative/rid.h>
 
 namespace godot {
 
diff --git a/src/core/String.cpp b/src/core/String.cpp
index 846241e..85a7b5f 100644
--- a/src/core/String.cpp
+++ b/src/core/String.cpp
@@ -2,7 +2,7 @@
 
 #include "NodePath.hpp"
 
-#include <godot/string.h>
+#include <gdnative/string.h>
 
 #include <string.h>
 
diff --git a/src/core/Variant.cpp b/src/core/Variant.cpp
index fa72b66..24109dd 100644
--- a/src/core/Variant.cpp
+++ b/src/core/Variant.cpp
@@ -1,6 +1,6 @@
 #include "Variant.hpp"
 
-#include <godot/variant.h>
+#include <gdnative/variant.h>
 
 #include "Defs.hpp"
 
@@ -199,9 +199,7 @@ Variant &Variant::operator =(const Variant& v)
 
 Variant::operator bool() const
 {
-	bool valid = false;
-	bool result = booleanize(valid);
-	return valid && result;
+	return booleanize();
 }
 Variant::operator signed int() const
 {
@@ -423,9 +421,9 @@ bool Variant::hash_compare(const Variant& b) const
 	return godot_variant_hash_compare(&_godot_variant, &b._godot_variant);
 }
 
-bool Variant::booleanize(bool &valid) const
+bool Variant::booleanize() const
 {
-	return godot_variant_booleanize(&_godot_variant, &valid);
+	return godot_variant_booleanize(&_godot_variant);
 }
 
 Variant::~Variant()
diff --git a/src/core/Vector2.cpp b/src/core/Vector2.cpp
index 46f1125..7dc78b6 100644
--- a/src/core/Vector2.cpp
+++ b/src/core/Vector2.cpp
@@ -2,7 +2,7 @@
 
 #include <cmath>
 
-#include <godot/vector2.h>
+#include <gdnative/vector2.h>
 
 #include "String.hpp"