diff --git a/CMakeLists.txt b/CMakeLists.txt
index a70dea2fa3..b3999218ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -971,17 +971,6 @@ if(WIN32)
 	setup_target_project(PPSSPPWindows Windows)
 endif()
 
-if(HEADLESS)
-	add_executable(PPSSPPHeadless
-		headless/Headless.cpp
-		headless/StubHost.h
-		headless/Compare.cpp
-		headless/Compare.h)
-	target_link_libraries(PPSSPPHeadless ${CoreLibName}
-		${COCOA_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
-	setup_target_project(PPSSPPHeadless headless)
-endif()
-
 set(NativeAppSource
 	android/jni/NativeApp.cpp
 	android/jni/EmuScreen.cpp
@@ -998,6 +987,16 @@ set(NativeAssets
 	assets/ppge_atlas.zim)
 set(LinkCommon ${CoreLibName} ${CMAKE_THREAD_LIBS_INIT} ${nativeExtraLibs})
 
+if(HEADLESS)
+	add_executable(PPSSPPHeadless ${NativeAppSource}
+		headless/Headless.cpp
+		headless/StubHost.h
+		headless/Compare.cpp
+		headless/Compare.h)
+	target_link_libraries(PPSSPPHeadless ${LinkCommon})
+	setup_target_project(PPSSPPHeadless headless)
+endif()
+
 if (TargetBin)
 	if (IOS)
 		add_executable(${TargetBin} MACOSX_BUNDLE ${NativeAppSource})
diff --git a/headless/Headless.cpp b/headless/Headless.cpp
index 8fa9258f3e..c903348cb6 100644
--- a/headless/Headless.cpp
+++ b/headless/Headless.cpp
@@ -53,8 +53,6 @@ public:
 struct InputState;
 // Temporary hack around annoying linking error.
 void GL_SwapBuffers() { }
-void NativeUpdate(InputState &input_state) { }
-void NativeRender() { }
 
 void printUsage(const char *progname, const char *reason)
 {
diff --git a/native b/native
index 4ffc4f0415..abc38a90f6 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 4ffc4f0415c2b2efa79c900fa61da78d61411797
+Subproject commit abc38a90f6ec067090dbbc68ecd7f489732d54c0