diff --git a/core/SCsub b/core/SCsub
index a4f4fba..4ab1681 100644
--- a/core/SCsub
+++ b/core/SCsub
@@ -50,7 +50,7 @@ env_thirdparty.disable_warnings()
 
 # Misc thirdparty code: header paths are hardcoded, we don't need to append
 # to the include path (saves a few chars on the compiler invocation for touchy MSVC...)
-thirdparty_misc_dir = "#thirdparty/misc/"
+thirdparty_misc_dir = "thirdparty/misc/"
 thirdparty_misc_sources = [
     # C sources
     "fastlz.c",
diff --git a/core/io/compression.cpp b/core/io/compression.cpp
index 8103fec..b29185d 100644
--- a/core/io/compression.cpp
+++ b/core/io/compression.cpp
@@ -33,7 +33,7 @@
 #include "core/io/zip_io.h"
 #include "core/config/project_settings.h"
 
-#include "thirdparty/misc/fastlz.h"
+#include "core/thirdparty/misc/fastlz.h"
 
 #include <zlib.h>
 #include <zstd.h>
diff --git a/core/io/image.cpp b/core/io/image.cpp
index 6001fad..2c8125c 100644
--- a/core/io/image.cpp
+++ b/core/io/image.cpp
@@ -37,7 +37,7 @@
 #include "core/math/math_funcs.h"
 #include "core/string/print_string.h"
 
-#include "thirdparty/misc/hq2x.h"
+#include "core/thirdparty/misc/hq2x.h"
 
 #include <stdio.h>
 
diff --git a/core/math/geometry.cpp b/core/math/geometry.cpp
index 4d650c2..80f1dec 100644
--- a/core/math/geometry.cpp
+++ b/core/math/geometry.cpp
@@ -33,8 +33,8 @@
 #include "core/containers/local_vector.h"
 #include "core/string/print_string.h"
 
-#include "thirdparty/misc/clipper.hpp"
-#include "thirdparty/misc/triangulator.h"
+#include "core/thirdparty/misc/clipper.hpp"
+#include "core/thirdparty/misc/triangulator.h"
 #define STB_RECT_PACK_IMPLEMENTATION
 #include "thirdparty/stb_rect_pack/stb_rect_pack.h"
 
diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h
index d42bfe2..6b6b5a2 100644
--- a/core/math/math_funcs.h
+++ b/core/math/math_funcs.h
@@ -35,7 +35,7 @@
 #include "core/math/random_pcg.h"
 #include "core/typedefs.h"
 
-#include "thirdparty/misc/pcg.h"
+#include "core/thirdparty/misc/pcg.h"
 
 #include <float.h>
 #include <math.h>
diff --git a/core/math/random_pcg.h b/core/math/random_pcg.h
index b579deb..0ecd3b3 100644
--- a/core/math/random_pcg.h
+++ b/core/math/random_pcg.h
@@ -34,7 +34,7 @@
 
 #include "core/math/math_defs.h"
 
-#include "thirdparty/misc/pcg.h"
+#include "core/thirdparty/misc/pcg.h"
 
 #if defined(__GNUC__) || (_llvm_has_builtin(__builtin_clz))
 #define CLZ32(x) __builtin_clz(x)
diff --git a/core/string/compressed_translation.cpp b/core/string/compressed_translation.cpp
index dfa64a5..b4b908f 100644
--- a/core/string/compressed_translation.cpp
+++ b/core/string/compressed_translation.cpp
@@ -33,7 +33,7 @@
 #include "core/containers/pair.h"
 
 extern "C" {
-#include "thirdparty/misc/smaz.h"
+#include "core/thirdparty/misc/smaz.h"
 }
 
 struct _PHashTranslationCmp {
diff --git a/thirdparty/misc/clipper-exceptions.patch b/core/thirdparty/misc/clipper-exceptions.patch
similarity index 100%
rename from thirdparty/misc/clipper-exceptions.patch
rename to core/thirdparty/misc/clipper-exceptions.patch
diff --git a/thirdparty/misc/clipper.cpp b/core/thirdparty/misc/clipper.cpp
similarity index 100%
rename from thirdparty/misc/clipper.cpp
rename to core/thirdparty/misc/clipper.cpp
diff --git a/thirdparty/misc/clipper.hpp b/core/thirdparty/misc/clipper.hpp
similarity index 100%
rename from thirdparty/misc/clipper.hpp
rename to core/thirdparty/misc/clipper.hpp
diff --git a/thirdparty/misc/fastlz.c b/core/thirdparty/misc/fastlz.c
similarity index 100%
rename from thirdparty/misc/fastlz.c
rename to core/thirdparty/misc/fastlz.c
diff --git a/thirdparty/misc/fastlz.h b/core/thirdparty/misc/fastlz.h
similarity index 100%
rename from thirdparty/misc/fastlz.h
rename to core/thirdparty/misc/fastlz.h
diff --git a/thirdparty/misc/hq2x.cpp b/core/thirdparty/misc/hq2x.cpp
similarity index 100%
rename from thirdparty/misc/hq2x.cpp
rename to core/thirdparty/misc/hq2x.cpp
diff --git a/thirdparty/misc/hq2x.h b/core/thirdparty/misc/hq2x.h
similarity index 100%
rename from thirdparty/misc/hq2x.h
rename to core/thirdparty/misc/hq2x.h
diff --git a/thirdparty/misc/pcg.cpp b/core/thirdparty/misc/pcg.cpp
similarity index 100%
rename from thirdparty/misc/pcg.cpp
rename to core/thirdparty/misc/pcg.cpp
diff --git a/thirdparty/misc/pcg.h b/core/thirdparty/misc/pcg.h
similarity index 100%
rename from thirdparty/misc/pcg.h
rename to core/thirdparty/misc/pcg.h
diff --git a/thirdparty/misc/smaz.c b/core/thirdparty/misc/smaz.c
similarity index 100%
rename from thirdparty/misc/smaz.c
rename to core/thirdparty/misc/smaz.c
diff --git a/thirdparty/misc/smaz.h b/core/thirdparty/misc/smaz.h
similarity index 100%
rename from thirdparty/misc/smaz.h
rename to core/thirdparty/misc/smaz.h
diff --git a/thirdparty/misc/triangulator.cpp b/core/thirdparty/misc/triangulator.cpp
similarity index 100%
rename from thirdparty/misc/triangulator.cpp
rename to core/thirdparty/misc/triangulator.cpp
diff --git a/thirdparty/misc/triangulator.h b/core/thirdparty/misc/triangulator.h
similarity index 100%
rename from thirdparty/misc/triangulator.h
rename to core/thirdparty/misc/triangulator.h
diff --git a/scene/2d/collision_polygon_2d.cpp b/scene/2d/collision_polygon_2d.cpp
index ba5a94f..4704c34 100644
--- a/scene/2d/collision_polygon_2d.cpp
+++ b/scene/2d/collision_polygon_2d.cpp
@@ -37,7 +37,7 @@
 #include "scene/resources/shapes_2d/convex_polygon_shape_2d.h"
 #include "scene/resources/shapes_2d/shape_2d.h"
 
-#include "thirdparty/misc/triangulator.h"
+#include "core/thirdparty/misc/triangulator.h"
 
 void CollisionPolygon2D::_build_polygon() {
 	parent->shape_owner_clear_shapes(owner_id);
diff --git a/scene/resources/mesh/primitive_meshes.cpp b/scene/resources/mesh/primitive_meshes.cpp
index b44e766..71c8a5a 100644
--- a/scene/resources/mesh/primitive_meshes.cpp
+++ b/scene/resources/mesh/primitive_meshes.cpp
@@ -34,8 +34,8 @@
 #include "core/core_string_names.h"
 #include "core/os/main_loop.h"
 #include "scene/resources/theme.h"
-#include "thirdparty/misc/clipper.hpp"
-#include "thirdparty/misc/triangulator.h"
+#include "core/thirdparty/misc/clipper.hpp"
+#include "core/thirdparty/misc/triangulator.h"
 
 /**
   PrimitiveMesh
diff --git a/scu_builders.py b/scu_builders.py
index 74792b2..1d11173 100644
--- a/scu_builders.py
+++ b/scu_builders.py
@@ -292,11 +292,14 @@ def generate_scu_files(verbose, is_release_build, env):
                         "os", "string", "variant", "io", "crypto"])
     else:
         process_folder(["core", "bind", "config", "containers", "error", "input", "log", "math", "object",
-                        "os", "string", "variant", "io", "crypto", "crypto/mbedtls/library"], [], 0, "cpp c")
+                        "os", "string", "variant", "io", "crypto", "crypto/mbedtls/library", "thirdparty/misc"], [], 0, "cpp c")
 
-    process_folder(["drivers/gles2"])
-    process_folder(["drivers/unix"])
-    process_folder(["drivers/png"])
+    #process_folder(["drivers/gles2"], [], 0, "cpp c")
+    #process_folder(["drivers/unix"], [], 0, "cpp c")
+    #process_folder(["drivers/png"], [], 0, "cpp c")
+
+    process_folder(["drivers", "alsa", "coreaudio", "dummy", "gl_context", "gles_common", "gles2",
+                    "png", "pulseaudio", "unix", "wasapi", "windows", "xaudio2"], [], 0, "cpp c")
 
     #process_folder(["drivers", "alsa", "coreaudio", "dummy", "gl_context", "gles2", "gles_common", "png", "pulseaudio", "unix", 
     #                    "wasapi", "windows", "xaudio2" ], [], 0, "cpp c")
@@ -309,10 +312,10 @@ def generate_scu_files(verbose, is_release_build, env):
             #"android/export",
             #"iphone/export",
             #"javascript/export",
-            #"osx/export",
+            "osx/export",
             #"uwp/export",
-            #"windows/export",
-            #"x11/export",
+            "windows/export",
+            "x11/export",
         ]
     )