diff --git a/Demos/OpenGL/GLDebugFont.cpp b/Demos/OpenGL/GLDebugFont.cpp
index 0ac269e19..233473aca 100644
--- a/Demos/OpenGL/GLDebugFont.cpp
+++ b/Demos/OpenGL/GLDebugFont.cpp
@@ -22,8 +22,8 @@ subject to the following restrictions:
 
 //think different
 #if defined(__APPLE__) && !defined (VMDMESA)
-#include "TargetConditionals.h"
-#if defined (TARGET_OS_IPHONE) || defined (TARGET_IPHONE_SIMULATOR)
+#include <TargetConditionals.h>
+#if (defined (TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || (defined (TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR)
 #import <OpenGLES/ES1/gl.h>
 #define glOrtho glOrthof
 #else
diff --git a/Demos/OpenGL/GL_DialogWindow.h b/Demos/OpenGL/GL_DialogWindow.h
index b687a0a2b..02504a0a7 100644
--- a/Demos/OpenGL/GL_DialogWindow.h
+++ b/Demos/OpenGL/GL_DialogWindow.h
@@ -19,14 +19,10 @@ subject to the following restrictions:
 class btCollisionObject;
 
 
-#ifdef WIN32//for glut.h
-#include <windows.h>
-#endif
-
 //think different
 #if defined(__APPLE__) && !defined (VMDMESA)
-#include "TargetConditionals.h"
-#if defined (TARGET_OS_IPHONE) || defined (TARGET_IPHONE_SIMULATOR)
+#include <TargetConditionals.h>
+#if (defined (TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || (defined (TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR)
 #import <OpenGLES/ES1/gl.h>
 #define glOrtho glOrthof
 #else
@@ -43,6 +39,8 @@ class btCollisionObject;
 #include <GL/glu.h>
 #endif
 #endif
+
+
 #include "LinearMath/btScalar.h"
 #include "LinearMath/btAlignedObjectArray.h"
 class btTypedConstraint;
@@ -280,4 +278,4 @@ public:
 	}
 };
 
-#endif //GL_DIALOG_WINDOW_H
\ No newline at end of file
+#endif //GL_DIALOG_WINDOW_H
diff --git a/src/BulletMultiThreaded/PpuAddressSpace.h b/src/BulletMultiThreaded/PpuAddressSpace.h
index 62553a7ce..b96b84d63 100644
--- a/src/BulletMultiThreaded/PpuAddressSpace.h
+++ b/src/BulletMultiThreaded/PpuAddressSpace.h
@@ -11,7 +11,9 @@
 #if defined(_WIN64) || defined(__LP64__) || defined(__x86_64__) || defined(USE_ADDR64)
 typedef uint64_t ppu_address_t;
 #else
+
 typedef uint32_t ppu_address_t;
+
 #endif
 
 #endif