diff --git a/JGE/src/Qtmain.cpp b/JGE/src/Qtmain.cpp
index 559b48f2c..aa6573fb1 100644
--- a/JGE/src/Qtmain.cpp
+++ b/JGE/src/Qtmain.cpp
@@ -1,6 +1,6 @@
 #define GL_GLEXT_PROTOTYPES
-#include <QtOpenGL/QtOpenGL>
-#include <QtCore/QTime>
+#include <QtOpenGL>
+#include <QTime>
 
 #ifdef Q_WS_MAEMO_5
 // For volume buttons support
diff --git a/JGE/src/Xmain.cpp b/JGE/src/Xmain.cpp
index 3bc771f7c..4359eee6a 100644
--- a/JGE/src/Xmain.cpp
+++ b/JGE/src/Xmain.cpp
@@ -50,8 +50,8 @@ JGameLauncher* g_launcher = NULL;
 //------------------------------------------------------------------------
 
 Display* gXDisplay = NULL;
-Window gXWindow = (Window)0;
-GLXWindow glxWin = (GLXWindow)0;
+Window gXWindow = (Window)NULL;
+GLXWindow glxWin = (GLXWindow)NULL;
 
 static std::multiset<JButton> gControllerState;
 static std::multiset<JButton> gPrevControllerState;
@@ -173,7 +173,7 @@ void KillGLWindow(void) // Properly Kill The Window
 {
   if (gXWindow && gXDisplay)
     XDestroyWindow(gXDisplay, gXWindow);
-  gXWindow = (Window)0;
+  gXWindow = (Window)NULL;
 }