diff --git a/src/zxcvbn-c/makefile b/src/zxcvbn-c/makefile
index 5c3f5455..7d823aea 100644
--- a/src/zxcvbn-c/makefile
+++ b/src/zxcvbn-c/makefile
@@ -15,11 +15,12 @@ SONAME = libzxcvbn.so.0
 
 WORDS = words-eng_wiki.txt words-female.txt words-male.txt words-passwd.txt words-surname.txt words-tv_film.txt
 
-all: test-file test-inline test-c++inline test-c++file test-shlib test-statlib
+#all: test-file test-inline test-c++inline test-c++file test-shlib test-statlib
+all: test-statlib
 
 test-shlib: test.c $(TARGET_LIB)
 	if [ ! -e libzxcvbn.so ]; then ln -s $(TARGET_LIB) libzxcvbn.so; fi
-	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< -L. $(LDFLAGS) -lzxcvbn -lm
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< -L. $(LDFLAGS) libzxcvbn.so -lm
 
 $(TARGET_LIB): zxcvbn-inline-pic.o
 	$(CC) $(CPPFLAGS) $(CFLAGS) \
diff --git a/src/zxcvbn-c/test.c b/src/zxcvbn-c/test.c
index f2e48d56..2b6837c9 100644
--- a/src/zxcvbn-c/test.c
+++ b/src/zxcvbn-c/test.c
@@ -36,11 +36,6 @@
 #include <sys/time.h>
 #include <zxcvbn.h>
 
-/* For pre-compiled headers under windows */
-#ifdef _WIN32
-#include "stdafx.h"
-#endif
-
 const char *UsrDict[] =
 {
     "Onename.Twoname@example.com", "Onename", "Twoname", "example.com", "example",
diff --git a/src/zxcvbn-c/zxcvbn.c b/src/zxcvbn-c/zxcvbn.c
index ade7ab75..c739f620 100644
--- a/src/zxcvbn-c/zxcvbn.c
+++ b/src/zxcvbn-c/zxcvbn.c
@@ -45,11 +45,6 @@
 #endif
 #endif
 
-/* For pre-compiled headers under windows */
-#ifdef _WIN32
-#include "stdafx.h"
-#endif
-
 /* Minimum number of characters in a incrementing/decrementing sequence match */
 #define MIN_SEQUENCE_LEN 3