diff --git a/Makefile b/Makefile
index 06959adf..c9b6b908 100644
--- a/Makefile
+++ b/Makefile
@@ -128,6 +128,7 @@ EXT = dll
 AR_EXT = lib
 BIN_EXT = .exe
 UNICORN_QEMU_FLAGS += --disable-stack-protector
+UNICORN_CFLAGS := $(UNICORN_CFLAGS:-fPIC=)
 
 # Linux, Darwin
 else
diff --git a/uc.c b/uc.c
index 5e7c4022..10ebdb6a 100644
--- a/uc.c
+++ b/uc.c
@@ -1,9 +1,6 @@
 /* Unicorn Emulator Engine */
 /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2015 */
 
-#if defined (WIN32) || defined (WIN64) || defined (_WIN32) || defined (_WIN64)
-#pragma warning(disable:4996)
-#endif
 #if defined(UNICORN_HAS_OSXKERNEL)
 #include <libkern/libkern.h>
 #else