diff --git a/JGE/src/JGfx-fake.cpp b/JGE/src/JGfx-fake.cpp
index 9e02c51c7..80a1b8c32 100644
--- a/JGE/src/JGfx-fake.cpp
+++ b/JGE/src/JGfx-fake.cpp
@@ -118,10 +118,10 @@ void JRenderer::Destroy()
 }
 
 JRenderer::JRenderer() :
-mLeft(0.0f),
-mRight(SCREEN_WIDTH_F),
-mTop(0.0f),
-mBottom(SCREEN_HEIGHT_F)
+    mLeft(0.0f),
+    mTop(0.0f),
+    mRight(SCREEN_WIDTH_F),
+    mBottom(SCREEN_HEIGHT_F)
 {
 }
 
diff --git a/JGE/src/pc/JSocket.cpp b/JGE/src/pc/JSocket.cpp
index 696ec0094..d2a66614c 100644
--- a/JGE/src/pc/JSocket.cpp
+++ b/JGE/src/pc/JSocket.cpp
@@ -10,12 +10,13 @@
 #pragma comment(lib,"ws2_32.lib")
 #include <winsock2.h>
 #endif
-#elif LINUX
+#elif (defined LINUX)
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <fcntl.h>
+#include <unistd.h>
 #endif //WINDOWS
 #include <errno.h>
 
diff --git a/projects/mtg/wagic-qt.pro b/projects/mtg/wagic-qt.pro
index 0b200776a..f5dc46a98 100644
--- a/projects/mtg/wagic-qt.pro
+++ b/projects/mtg/wagic-qt.pro
@@ -306,7 +306,6 @@ HEADERS  += \
 
 # JGE, could probably be moved outside
 SOURCES += \
-        ../../JGE/src/corewrapper.cpp\
         ../../JGE/src/Encoding.cpp\
         ../../JGE/src/JAnimator.cpp\
         ../../JGE/src/JApp.cpp\
@@ -345,6 +344,7 @@ SOURCES += \
 
 CONFIG(graphics, graphics|console){
     SOURCES += \
+        ../../JGE/src/corewrapper.cpp\
         ../../JGE/src/qt/filedownloader.cpp\
         ../../JGE/src/qt/qtcorewrapper.cpp\
         ../../JGE/src/Qtmain.cpp\
@@ -352,6 +352,7 @@ CONFIG(graphics, graphics|console){
         ../../JGE/src/pc/JGfx.cpp
 
     HEADERS += \
+        ../../JGE/include/corewrapper.h\
         ../../JGE/include/qt/filedownloader.h\
         ../../JGE/include/qt/qtcorewrapper.h
 }
@@ -364,7 +365,6 @@ else:CONFIG(console, graphics|console){
 
 HEADERS += \
         ../../JGE/include/Threading.h\
-        ../../JGE/include/corewrapper.h\
         ../../JGE/include/decoder_prx.h\
         ../../JGE/include/DebugRoutines.h\
         ../../JGE/include/Encoding.h\