7 files changed, 9 insertions, 7 deletions
diff --git a/platform/iphone/game_center.h b/platform/iphone/game_center.h
index 6705674ac6..10c8ef52fb 100644
--- a/platform/iphone/game_center.h
+++ b/platform/iphone/game_center.h
@@ -33,7 +33,7 @@
 #ifndef GAME_CENTER_H
 #define GAME_CENTER_H
 
-#include "core/object.h"
+#include "core/class_db.h"
 
 class GameCenter : public Object {
 	GDCLASS(GameCenter, Object);
diff --git a/platform/iphone/icloud.h b/platform/iphone/icloud.h
index 381edfa718..6ca1e6594a 100644
--- a/platform/iphone/icloud.h
+++ b/platform/iphone/icloud.h
@@ -33,7 +33,7 @@
 #ifndef ICLOUD_H
 #define ICLOUD_H
 
-#include "core/object.h"
+#include "core/class_db.h"
 
 class ICloud : public Object {
 	GDCLASS(ICloud, Object);
diff --git a/platform/iphone/in_app_store.h b/platform/iphone/in_app_store.h
index cede62ae25..1b8f84ec7b 100644
--- a/platform/iphone/in_app_store.h
+++ b/platform/iphone/in_app_store.h
@@ -33,7 +33,7 @@
 #ifndef IN_APP_STORE_H
 #define IN_APP_STORE_H
 
-#include "core/object.h"
+#include "core/class_db.h"
 
 #ifdef __OBJC__
 @class GodotProductsDelegate;
diff --git a/platform/iphone/ios.h b/platform/iphone/ios.h
index 2b29e6f268..6a89cd38cb 100644
--- a/platform/iphone/ios.h
+++ b/platform/iphone/ios.h
@@ -31,7 +31,7 @@
 #ifndef IOS_H
 #define IOS_H
 
-#include "core/object.h"
+#include "core/class_db.h"
 
 class iOS : public Object {
 	GDCLASS(iOS, Object);
diff --git a/platform/javascript/api/javascript_eval.h b/platform/javascript/api/javascript_eval.h
index 29229de8e3..26b5b9e484 100644
--- a/platform/javascript/api/javascript_eval.h
+++ b/platform/javascript/api/javascript_eval.h
@@ -31,7 +31,7 @@
 #ifndef JAVASCRIPT_EVAL_H
 #define JAVASCRIPT_EVAL_H
 
-#include "core/object.h"
+#include "core/class_db.h"
 
 class JavaScript : public Object {
 private:
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index 6fc1dc65af..50e9bd2653 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -139,7 +139,8 @@ def configure(env):
         env.Append(CPPDEFINES=["__MACPORTS__"])  # hack to fix libvpx MM256_BROADCASTSI128_SI256 define
 
     if env["CXX"] == "clang++":
-        env.Append(CPPDEFINES=["TYPED_METHOD_BIND"])
+        # This should now work with clang++, re-enable if there are issues
+        # env.Append(CPPDEFINES=["TYPED_METHOD_BIND"])
         env["CC"] = "clang"
         env["LINK"] = "clang++"
 
diff --git a/platform/uwp/export/export.cpp b/platform/uwp/export/export.cpp
index 219174b509..e9e536837f 100644
--- a/platform/uwp/export/export.cpp
+++ b/platform/uwp/export/export.cpp
@@ -29,11 +29,12 @@
 /*************************************************************************/
 
 #include "export.h"
+
 #include "core/bind/core_bind.h"
+#include "core/class_db.h"
 #include "core/crypto/crypto_core.h"
 #include "core/io/marshalls.h"
 #include "core/io/zip_io.h"
-#include "core/object.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
 #include "core/project_settings.h"