diff --git a/SConstruct b/SConstruct
index daf66d35..b45e29fc 100644
--- a/SConstruct
+++ b/SConstruct
@@ -33,7 +33,7 @@ if platform == "osx":
     env.Append(LINKFLAGS = ['-arch', 'x86_64', '-framework', 'Cocoa', '-Wl,-undefined,dynamic_lookup'])
 
 if platform == "linux":
-    env.Append(CCFLAGS = ['-g','-O3', '-std=c++14'])
+    env.Append(CCFLAGS = ['-g','-O3', '-std=c++14', '-fPIC'])
 
 env.Append(CPPPATH=['.', godot_headers_path, 'include', 'include/core'])
 
diff --git a/binding_generator.py b/binding_generator.py
index c376b425..bcdda657 100644
--- a/binding_generator.py
+++ b/binding_generator.py
@@ -64,7 +64,7 @@ def generate_class_header(used_classes, c):
     source.append("")
     source.append("")
     
-    source.append("#include <godot.h>")
+    source.append("#include <godot_nativescript.h>")
     source.append("#include <stdint.h>")
     source.append("")
     
@@ -419,7 +419,7 @@ def generate_icall_header(icalls):
     
     source.append("")
     
-    source.append("#include <godot.h>")
+    source.append("#include <godot_nativescript.h>")
     source.append("#include <stdint.h>")
     source.append("")
     
@@ -469,7 +469,7 @@ def generate_icall_implementation(icalls):
     
     source.append("")
     
-    source.append("#include <godot.h>")
+    source.append("#include <godot_nativescript.h>")
     source.append("#include <stdint.h>")
     source.append("")
     
diff --git a/include/core/Array.hpp b/include/core/Array.hpp
index 1b607888..6a648721 100644
--- a/include/core/Array.hpp
+++ b/include/core/Array.hpp
@@ -1,7 +1,7 @@
 #ifndef ARRAY_H
 #define ARRAY_H
 
-#include <godot/godot_array.h>
+#include <godot/array.h>
 
 #include "String.hpp"
 
diff --git a/include/core/Color.hpp b/include/core/Color.hpp
index 528e6744..5232573b 100644
--- a/include/core/Color.hpp
+++ b/include/core/Color.hpp
@@ -1,7 +1,7 @@
 #ifndef COLOR_H
 #define COLOR_H
 
-#include <godot/godot_color.h>
+#include <godot/color.h>
 
 #include <cmath>
 
diff --git a/include/core/Dictionary.hpp b/include/core/Dictionary.hpp
index 4c719f5f..31744b73 100644
--- a/include/core/Dictionary.hpp
+++ b/include/core/Dictionary.hpp
@@ -5,7 +5,7 @@
 
 #include "Array.hpp"
 
-#include <godot/godot_dictionary.h>
+#include <godot/dictionary.h>
 
 namespace godot {
 
diff --git a/include/core/Godot.hpp b/include/core/Godot.hpp
index 3754be76..74aeeda1 100644
--- a/include/core/Godot.hpp
+++ b/include/core/Godot.hpp
@@ -4,7 +4,7 @@
 #include <cstdlib>
 #include <cstring>
 
-#include <godot.h>
+#include <godot_nativescript.h>
 
 
 #include <CoreTypes.hpp>
diff --git a/include/core/NodePath.hpp b/include/core/NodePath.hpp
index 91cb1e19..f4b4b253 100644
--- a/include/core/NodePath.hpp
+++ b/include/core/NodePath.hpp
@@ -3,7 +3,7 @@
 
 #include "String.hpp"
 
-#include <godot/godot_node_path.h>
+#include <godot/node_path.h>
 
 namespace godot {
 
diff --git a/include/core/PoolArrays.hpp b/include/core/PoolArrays.hpp
index e2a51f12..6c07ae16 100644
--- a/include/core/PoolArrays.hpp
+++ b/include/core/PoolArrays.hpp
@@ -8,7 +8,7 @@
 #include "Vector2.hpp"
 #include "Vector3.hpp"
 
-#include <godot/godot_pool_arrays.h>
+#include <godot/pool_arrays.h>
 
 namespace godot {
 
diff --git a/include/core/RID.hpp b/include/core/RID.hpp
index 58550496..3f83e791 100644
--- a/include/core/RID.hpp
+++ b/include/core/RID.hpp
@@ -1,7 +1,7 @@
 #ifndef RID_H
 #define RID_H
 
-#include <godot/godot_rid.h>
+#include <godot/rid.h>
 
 namespace godot {
 
diff --git a/include/core/String.hpp b/include/core/String.hpp
index 0b4e4fb0..dec8104a 100644
--- a/include/core/String.hpp
+++ b/include/core/String.hpp
@@ -1,7 +1,7 @@
 #ifndef STRING_H
 #define STRING_H
 
-#include <godot/godot_string.h>
+#include <godot/string.h>
 
 namespace godot {
 
diff --git a/include/core/Variant.hpp b/include/core/Variant.hpp
index 670c5c26..9ffa3985 100644
--- a/include/core/Variant.hpp
+++ b/include/core/Variant.hpp
@@ -1,7 +1,7 @@
 #ifndef VARIANT_H
 #define VARIANT_H
 
-#include <godot/godot_variant.h>
+#include <godot/variant.h>
 
 #include "Defs.hpp"
 
diff --git a/include/core/Vector2.hpp b/include/core/Vector2.hpp
index 9cdde2a5..da45ccf0 100644
--- a/include/core/Vector2.hpp
+++ b/include/core/Vector2.hpp
@@ -1,7 +1,7 @@
 #ifndef VECTOR2_H
 #define VECTOR2_H
 
-#include <godot/godot_vector2.h>
+#include <godot/vector2.h>
 
 #include "Defs.hpp"
 
diff --git a/src/core/Array.cpp b/src/core/Array.cpp
index bb388c4e..5a630c15 100644
--- a/src/core/Array.cpp
+++ b/src/core/Array.cpp
@@ -2,7 +2,7 @@
 
 #include <cstdlib>
 
-#include <godot/godot_array.h>
+#include <godot/array.h>
 
 #include "Variant.hpp"
 
diff --git a/src/core/Color.cpp b/src/core/Color.cpp
index 985e04e3..a41615e3 100644
--- a/src/core/Color.cpp
+++ b/src/core/Color.cpp
@@ -1,6 +1,6 @@
 #include "Color.hpp"
 
-#include <godot/godot_color.h>
+#include <godot/color.h>
 
 #include <cmath>
 
diff --git a/src/core/Dictionary.cpp b/src/core/Dictionary.cpp
index 8ea2d17a..4282d24f 100644
--- a/src/core/Dictionary.cpp
+++ b/src/core/Dictionary.cpp
@@ -4,7 +4,7 @@
 
 #include "Array.hpp"
 
-#include <godot/godot_dictionary.h>
+#include <godot/dictionary.h>
 
 namespace godot {
 
diff --git a/src/core/GodotGlobal.cpp b/src/core/GodotGlobal.cpp
index cd910fff..1bfc5847 100644
--- a/src/core/GodotGlobal.cpp
+++ b/src/core/GodotGlobal.cpp
@@ -2,7 +2,7 @@
 
 #include "String.hpp"
 
-#include <godot.h>
+#include <godot_nativescript.h>
 
 namespace godot {
 
diff --git a/src/core/NodePath.cpp b/src/core/NodePath.cpp
index 08ec27a8..98c40c9a 100644
--- a/src/core/NodePath.cpp
+++ b/src/core/NodePath.cpp
@@ -2,7 +2,7 @@
 
 #include "String.hpp"
 
-#include <godot/godot_node_path.h>
+#include <godot/node_path.h>
 
 namespace godot {
 
diff --git a/src/core/PoolArrays.cpp b/src/core/PoolArrays.cpp
index 3e778142..e33ce0ef 100644
--- a/src/core/PoolArrays.cpp
+++ b/src/core/PoolArrays.cpp
@@ -7,7 +7,7 @@
 #include "Vector2.hpp"
 #include "Vector3.hpp"
 
-#include <godot/godot_pool_arrays.h>
+#include <godot/pool_arrays.h>
 
 namespace godot {
 
diff --git a/src/core/RID.cpp b/src/core/RID.cpp
index 1431a8a3..75419ba4 100644
--- a/src/core/RID.cpp
+++ b/src/core/RID.cpp
@@ -1,6 +1,6 @@
 #include "RID.hpp"
 
-#include <godot/godot_rid.h>
+#include <godot/rid.h>
 
 namespace godot {
 
diff --git a/src/core/String.cpp b/src/core/String.cpp
index 84c8ee80..846241e4 100644
--- a/src/core/String.cpp
+++ b/src/core/String.cpp
@@ -2,7 +2,7 @@
 
 #include "NodePath.hpp"
 
-#include <godot/godot_string.h>
+#include <godot/string.h>
 
 #include <string.h>
 
diff --git a/src/core/Variant.cpp b/src/core/Variant.cpp
index 1c6eef26..fa72b669 100644
--- a/src/core/Variant.cpp
+++ b/src/core/Variant.cpp
@@ -1,6 +1,6 @@
 #include "Variant.hpp"
 
-#include <godot/godot_variant.h>
+#include <godot/variant.h>
 
 #include "Defs.hpp"
 
diff --git a/src/core/Vector2.cpp b/src/core/Vector2.cpp
index d17f8287..46f11257 100644
--- a/src/core/Vector2.cpp
+++ b/src/core/Vector2.cpp
@@ -2,7 +2,7 @@
 
 #include <cmath>
 
-#include <godot/godot_vector2.h>
+#include <godot/vector2.h>
 
 #include "String.hpp"