diff --git a/makefile b/makefile
index 1dca10bdcf..35ebf7abf9 100755
--- a/makefile
+++ b/makefile
@@ -180,7 +180,8 @@ ifneq ($(android),)
 		-DJNI_JARJAR_PREFIX= \
 		-D__DARWIN_UNIX03=1 \
 		-D__PROVIDE_FIXMES \
-		-g3
+		-g3 \
+		-Werror
 
 	luni-cpps := $(shell find $(luni-native) -name '*.cpp')
 
@@ -202,7 +203,7 @@ ifneq ($(android),)
 		icu-libs := $(android)/external/icu4c/lib/sicuin.a \
 			$(android)/external/icu4c/lib/sicuuc.a \
 			$(android)/external/icu4c/lib/sicudt.a
-		platform-lflags := -lgdi32 -lshell32
+		platform-lflags := -lgdi32
 	else
 		crypto-cpps := $(crypto-native)/org_conscrypt_NativeCrypto.cpp
 		android-cflags += -fPIC -DHAVE_SYS_UIO_H
@@ -775,10 +776,10 @@ ifeq ($(platform),windows)
 		endif
 		cxx = x86_64-w64-mingw32-g++ $(mflag)
 		cc = x86_64-w64-mingw32-gcc $(mflag)
-		dlltool = dlltool
-		ar = ar
-		ranlib = ranlib
-		strip = strip
+		dlltool = x86_64-w64-mingw32-dlltool
+		ar = x86_64-w64-mingw32-ar
+		ranlib = x86_64-w64-mingw32-ranlib
+		strip = x86_64-w64-mingw32-strip
 		inc = "$(win64)/include"
 		lib = "$(win64)/lib"
 	else
diff --git a/src/classpath-android.cpp b/src/classpath-android.cpp
index 854fd92ee8..c188439e5e 100644
--- a/src/classpath-android.cpp
+++ b/src/classpath-android.cpp
@@ -2336,9 +2336,6 @@ Avian_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8
 
 void register_java_io_Console(_JNIEnv*) { }
 void register_java_lang_ProcessManager(_JNIEnv*) { }
-//void register_libcore_io_OsConstants(_JNIEnv*) { }
-//void register_libcore_io_AsynchronousCloseMonitor(_JNIEnv*) { }
-//void register_libcore_io_Posix(_JNIEnv*) { }
 void register_libcore_net_RawSocket(_JNIEnv*) { }
 void register_org_apache_harmony_xnet_provider_jsse_NativeCrypto(_JNIEnv*) { }