diff --git a/Demos/OpenGL/GLDebugFont.cpp b/Demos/OpenGL/GLDebugFont.cpp
index d1c8c60f1..de880c3af 100644
--- a/Demos/OpenGL/GLDebugFont.cpp
+++ b/Demos/OpenGL/GLDebugFont.cpp
@@ -88,7 +88,7 @@ void	GLDebugDrawString(int x,int y,const char* string)
 
 		for (int i=0;i<strlen(string);i++)
 		{
-			unsigned char ch = string[i]-32;
+			char ch = string[i]-32;
 			if (ch>=0)
 			{
 				cx=float(ch%16) * 1./16.f;
diff --git a/Demos/OpenGL/GLDebugFont.h b/Demos/OpenGL/GLDebugFont.h
index 4fb462c6e..1468c337b 100644
--- a/Demos/OpenGL/GLDebugFont.h
+++ b/Demos/OpenGL/GLDebugFont.h
@@ -20,4 +20,5 @@ subject to the following restrictions:
 void	GLDebugDrawString(int x,int y,const char* string);
 void	GLDebugResetFont(int screenWidth,int screenHeight);
 
-#endif //BT_DEBUG_FONT_H
\ No newline at end of file
+#endif //BT_DEBUG_FONT_H
+
diff --git a/Demos/OpenGL/GL_ShapeDrawer.h b/Demos/OpenGL/GL_ShapeDrawer.h
index c61507a6a..65bf29de4 100644
--- a/Demos/OpenGL/GL_ShapeDrawer.h
+++ b/Demos/OpenGL/GL_ShapeDrawer.h
@@ -66,4 +66,5 @@ public:
 void OGL_displaylist_register_shape(btCollisionShape * shape);
 void OGL_displaylist_clean();
 
-#endif //GL_SHAPE_DRAWER_H
\ No newline at end of file
+#endif //GL_SHAPE_DRAWER_H
+
diff --git a/Demos/OpenGL/GlutDemoApplication.cpp b/Demos/OpenGL/GlutDemoApplication.cpp
index 151d97bc5..ffafabf7e 100644
--- a/Demos/OpenGL/GlutDemoApplication.cpp
+++ b/Demos/OpenGL/GlutDemoApplication.cpp
@@ -81,4 +81,5 @@ void GlutDemoApplication::swapBuffers()
 
 }
 
-#endif //_WINDOWS
\ No newline at end of file
+#endif //_WINDOWS
+
diff --git a/Demos/OpenGL/GlutDemoApplication.h b/Demos/OpenGL/GlutDemoApplication.h
index 40efcf74d..427cf021f 100644
--- a/Demos/OpenGL/GlutDemoApplication.h
+++ b/Demos/OpenGL/GlutDemoApplication.h
@@ -30,4 +30,5 @@ public:
 	virtual	void	updateModifierKeys();
 
 };
-#endif //GLUT_DEMO_APPLICATION_H
\ No newline at end of file
+#endif //GLUT_DEMO_APPLICATION_H
+
diff --git a/Demos/OpenGL/GlutStuff.h b/Demos/OpenGL/GlutStuff.h
index c9e4651f8..1a1fca3a7 100644
--- a/Demos/OpenGL/GlutStuff.h
+++ b/Demos/OpenGL/GlutStuff.h
@@ -27,7 +27,7 @@ subject to the following restrictions:
 #else
 
 #include <GL/glut.h>
-#ifndef _WINDOWS
+#ifdef _WINDOWS
 #include <windows.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
diff --git a/src/BulletDynamics/Dynamics/btActionInterface.h b/src/BulletDynamics/Dynamics/btActionInterface.h
index f8acca2a7..1a986ce9b 100644
--- a/src/BulletDynamics/Dynamics/btActionInterface.h
+++ b/src/BulletDynamics/Dynamics/btActionInterface.h
@@ -36,4 +36,5 @@ class btActionInterface
 
 };
 
-#endif //_BT_ACTION_INTERFACE_H
\ No newline at end of file
+#endif //_BT_ACTION_INTERFACE_H
+