diff --git a/src/Android.mk b/src/Android.mk
index 2f5d8e2..99ea4cd 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -109,6 +109,7 @@
 LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
 LOCAL_CFLAGS := $(COMMON_CFLAGS) -fomit-frame-pointer -ffunction-sections -fdata-sections -DANGLE_DISABLE_TRACE
 LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
+LOCAL_SHARED_LIBRARIES := libnativewindow
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -118,6 +119,7 @@
 LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
 LOCAL_CFLAGS := $(COMMON_CFLAGS) -UNDEBUG -g -O0 -DDEFAULT_THREAD_COUNT=1
 LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
+LOCAL_SHARED_LIBRARIES := libnativewindow
 include $(BUILD_STATIC_LIBRARY)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/src/Main/FrameBufferAndroid.cpp b/src/Main/FrameBufferAndroid.cpp
index e574d82..69fd771 100644
--- a/src/Main/FrameBufferAndroid.cpp
+++ b/src/Main/FrameBufferAndroid.cpp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "FrameBufferAndroid.hpp"
+#include <system/window.h>
 
 #include <cutils/log.h>
 
diff --git a/src/Main/FrameBufferAndroid.hpp b/src/Main/FrameBufferAndroid.hpp
index 4995ecb..1e5ef69 100644
--- a/src/Main/FrameBufferAndroid.hpp
+++ b/src/Main/FrameBufferAndroid.hpp
@@ -19,7 +19,9 @@
 #include "Common/Debug.hpp"
 
 #include <hardware/gralloc.h>
-#include <system/window.h>
+
+struct ANativeWindow;
+struct ANativeWindowBuffer;
 
 namespace sw
 {
diff --git a/src/OpenGL/libGLES_CM/Android.mk b/src/OpenGL/libGLES_CM/Android.mk
index 75f1ca4..b78a867 100644
--- a/src/OpenGL/libGLES_CM/Android.mk
+++ b/src/OpenGL/libGLES_CM/Android.mk
@@ -49,7 +49,9 @@
 	$(LOCAL_PATH)/../../Shader/ \
 	$(LOCAL_PATH)/../../Main/
 
-COMMON_STATIC_LIBRARIES := libLLVM_swiftshader
+COMMON_STATIC_LIBRARIES := \
+	libLLVM_swiftshader \
+	libnativewindow
 
 COMMON_SHARED_LIBRARIES := \
 	libdl \
diff --git a/src/OpenGL/libGLESv2/Android.mk b/src/OpenGL/libGLESv2/Android.mk
index 379af99..0093047 100644
--- a/src/OpenGL/libGLESv2/Android.mk
+++ b/src/OpenGL/libGLESv2/Android.mk
@@ -56,7 +56,8 @@
 	$(LOCAL_PATH)/../../Main/
 
 COMMON_STATIC_LIBRARIES := \
-	libLLVM_swiftshader
+	libLLVM_swiftshader \
+	libnativewindow
 
 COMMON_SHARED_LIBRARIES := \
 	libdl \