diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index c9b36e1a66..c12b4a51ba 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -22,6 +22,7 @@ set(SRCS
 	Timer.cpp
 	x64Analyzer.cpp
 	x64Emitter.cpp
+    x86Disasm.cpp
 )
 
 # TODO
diff --git a/Common/FixedSizeQueue.h b/Common/FixedSizeQueue.h
index 9ebd0e32f6..260503baf0 100644
--- a/Common/FixedSizeQueue.h
+++ b/Common/FixedSizeQueue.h
@@ -18,6 +18,8 @@
 #ifndef _FIXED_SIZE_QUEUE_H_
 #define _FIXED_SIZE_QUEUE_H_
 
+#include <cstring>
+
 // STL-look-a-like interface, but name is mixed case to distinguish it clearly from the
 // real STL classes.
 
diff --git a/Common/x86Disasm.cpp b/Common/x86Disasm.cpp
index 1a20485cbf..42a8499c41 100644
--- a/Common/x86Disasm.cpp
+++ b/Common/x86Disasm.cpp
@@ -5,8 +5,10 @@
 #error DO NOT COMPILE THIS INTO ANDROID BUILDS
 #endif
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
+#include <cstdarg>
 #include "x86Disasm.h"
 
 /*==============================unasmt.h==============================*/
diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
index 159a6afa93..dc1a37e687 100644
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@ -76,8 +76,11 @@ set(SRCS
 set(SRCS ${SRCS})
 
 add_library(core STATIC ${SRCS})
+target_link_libraries(core general common)
+target_link_libraries(core general base)
 
 if(UNIX)
   add_definitions(-fPIC)
+  add_definitions(-std=gnu++0x)
 endif(UNIX)
 
diff --git a/Core/CoreTiming.cpp b/Core/CoreTiming.cpp
index e5391b9ba7..86a089fd7f 100644
--- a/Core/CoreTiming.cpp
+++ b/Core/CoreTiming.cpp
@@ -17,6 +17,7 @@
 
 
 #include <vector>
+#include <cstdio>
 
 #include "MsgHandler.h"
 #include "StdMutex.h"
diff --git a/Core/Debugger/Breakpoints.cpp b/Core/Debugger/Breakpoints.cpp
index a159ae6e85..52b7ddca17 100644
--- a/Core/Debugger/Breakpoints.cpp
+++ b/Core/Debugger/Breakpoints.cpp
@@ -19,6 +19,7 @@
 #include "Breakpoints.h"
 #include "SymbolMap.h"
 #include "FixedSizeUnorderedSet.h"
+#include <cstdio>
 
 #define MAX_BREAKPOINTS 16
 
diff --git a/Core/Debugger/DebugInterface.h b/Core/Debugger/DebugInterface.h
index af61141465..951e0055b2 100644
--- a/Core/Debugger/DebugInterface.h
+++ b/Core/Debugger/DebugInterface.h
@@ -16,6 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #pragma once
+#include <cstdio>
 
 struct MemMap;
 
diff --git a/Core/FileSystems/BlockDevices.cpp b/Core/FileSystems/BlockDevices.cpp
index 0c7a6242ff..01bbff2364 100644
--- a/Core/FileSystems/BlockDevices.cpp
+++ b/Core/FileSystems/BlockDevices.cpp
@@ -21,6 +21,8 @@ extern "C"
 };
 
 #include "BlockDevices.h"
+#include <cstdio>
+#include <cstring>
 
 FileBlockDevice::FileBlockDevice(std::string _filename)
 : filename(_filename)
diff --git a/Core/FileSystems/ISOFileSystem.cpp b/Core/FileSystems/ISOFileSystem.cpp
index 972554e137..976b3ddfa6 100644
--- a/Core/FileSystems/ISOFileSystem.cpp
+++ b/Core/FileSystems/ISOFileSystem.cpp
@@ -18,6 +18,8 @@
 #include "Globals.h"
 #include "Log.h"
 #include "ISOFileSystem.h"
+#include <cstring>
+#include <cstdio>
 
 const int sectorSize = 2048;
 
diff --git a/Core/HLE/sceKernel.h b/Core/HLE/sceKernel.h
index 9501d64648..999b6beca5 100644
--- a/Core/HLE/sceKernel.h
+++ b/Core/HLE/sceKernel.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include "../../Globals.h"
+#include <cstring>
 
 enum 
 {
diff --git a/Core/Host.h b/Core/Host.h
index a67062186f..1cb1fedc22 100644
--- a/Core/Host.h
+++ b/Core/Host.h
@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include <cstring>
 #include <string>
 #include "../Globals.h"
 
diff --git a/Core/MIPS/x86/Asm.cpp b/Core/MIPS/x86/Asm.cpp
index cfb3920c68..9141400476 100644
--- a/Core/MIPS/x86/Asm.cpp
+++ b/Core/MIPS/x86/Asm.cpp
@@ -18,7 +18,7 @@
 #include "ABI.h"
 #include "x64Emitter.h"
 
-#include "../../Memmap.h"
+#include "../../MemMap.h"
 
 #include "../MIPS.h"
 #include "../../CoreTiming.h"
diff --git a/Core/MemMap.cpp b/Core/MemMap.cpp
index 76a47e09e3..79bc5903ab 100644
--- a/Core/MemMap.cpp
+++ b/Core/MemMap.cpp
@@ -20,7 +20,7 @@
 #include "MemArena.h"
 #include "ChunkFile.h"
 
-#include "Memmap.h"
+#include "MemMap.h"
 #include "Core.h"
 #include "MIPS/MIPS.h"
 #include "MIPS/JitCommon/JitCommon.h"
diff --git a/Core/Util/BlockAllocator.h b/Core/Util/BlockAllocator.h
index ec2f564807..7974b67331 100644
--- a/Core/Util/BlockAllocator.h
+++ b/Core/Util/BlockAllocator.h
@@ -5,6 +5,7 @@
 
 #include <vector>
 #include <list>
+#include <cstring>
 
 
 // Generic allocator thingy
diff --git a/GPU/CMakeLists.txt b/GPU/CMakeLists.txt
index 062cb34f12..d898bc3a04 100644
--- a/GPU/CMakeLists.txt
+++ b/GPU/CMakeLists.txt
@@ -14,6 +14,8 @@ set(SRCS
 set(SRCS ${SRCS})
 
 add_library(gpu STATIC ${SRCS})
+target_link_libraries(gpu general gfx_es2)
+target_link_libraries(gpu general lin)
 
 if(UNIX)
   add_definitions(-fPIC)
diff --git a/GPU/GLES/FragmentShaderGenerator.cpp b/GPU/GLES/FragmentShaderGenerator.cpp
index 01641b8f23..ae24e3e246 100644
--- a/GPU/GLES/FragmentShaderGenerator.cpp
+++ b/GPU/GLES/FragmentShaderGenerator.cpp
@@ -25,6 +25,7 @@
 #include "FragmentShaderGenerator.h"
 #include "../ge_constants.h"
 #include "../GPUState.h"
+#include <cstdio>
 
 // TODO: remove
 static char buffer[16384];
diff --git a/GPU/GPUState.h b/GPU/GPUState.h
index 2078cd7ac9..df3a4ac093 100644
--- a/GPU/GPUState.h
+++ b/GPU/GPUState.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include "../Globals.h"
+#include <cstring>
 
 // TODO: this doesn't belong here
 struct Color4
diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
index abded4515c..6b699c99d4 100644
--- a/SDL/CMakeLists.txt
+++ b/SDL/CMakeLists.txt
@@ -25,7 +25,9 @@ add_definitions(-fno-strict-aliasing)
 add_definitions(-DUSE_PROFILER)
 
 #Damn MacOSX
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+if (UNIX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+endif()
 
 include_directories(..)
 include_directories(../Common)