diff --git a/Makefile b/Makefile
index f8ba6063..dcf2a902 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,8 @@ PORTS = 8080
 BUILD_DIRS = $(BUILD_DIR) $(BUILD_DIR)/src $(BUILD_DIR)/resources
 
 LIB_SOURCES =	src/libhttp.c						\
+		src/extern_md5.c					\
+		src/extern_sha1.c					\
 		src/httplib_accept_new_connection.c			\
 		src/httplib_addenv.c					\
 		src/httplib_atomic_dec.c				\
@@ -235,24 +237,22 @@ LIB_SOURCES =	src/libhttp.c						\
 		src/httplib_websocket_write_exec.c			\
 		src/httplib_worker_thread.c				\
 		src/httplib_write.c					\
-		src/md5.c						\
-		src/pthread_cond_broadcast.c				\
-		src/pthread_cond_destroy.c				\
-		src/pthread_cond_init.c					\
-		src/pthread_cond_signal.c				\
-		src/pthread_cond_timedwait.c				\
-		src/pthread_cond_wait.c					\
-		src/pthread_getspecific.c				\
-		src/pthread_key_create.c				\
-		src/pthread_key_delete.c				\
-		src/pthread_mutex_destroy.c				\
-		src/pthread_mutex_init.c				\
-		src/pthread_mutex_lock.c				\
-		src/pthread_mutex_trylock.c				\
-		src/pthread_mutex_unlock.c				\
-		src/pthread_self.c					\
-		src/pthread_setspecific.c				\
-		src/sha1.c
+		src/win32_pthread_cond_broadcast.c			\
+		src/win32_pthread_cond_destroy.c			\
+		src/win32_pthread_cond_init.c				\
+		src/win32_pthread_cond_signal.c				\
+		src/win32_pthread_cond_timedwait.c			\
+		src/win32_pthread_cond_wait.c				\
+		src/win32_pthread_getspecific.c				\
+		src/win32_pthread_key_create.c				\
+		src/win32_pthread_key_delete.c				\
+		src/win32_pthread_mutex_destroy.c			\
+		src/win32_pthread_mutex_init.c				\
+		src/win32_pthread_mutex_lock.c				\
+		src/win32_pthread_mutex_trylock.c			\
+		src/win32_pthread_mutex_unlock.c			\
+		src/win32_pthread_self.c				\
+		src/win32_pthread_setspecific.c	
 LIB_INLINE  = src/mod_lua.inl src/md5.inl
 APP_SOURCES = src/main.c
 WINDOWS_RESOURCES = resources/res.rc
diff --git a/src/md5.c b/src/extern_md5.c
similarity index 100%
rename from src/md5.c
rename to src/extern_md5.c
diff --git a/src/sha1.c b/src/extern_sha1.c
similarity index 100%
rename from src/sha1.c
rename to src/extern_sha1.c
diff --git a/src/pthread_cond_broadcast.c b/src/win32_pthread_cond_broadcast.c
similarity index 100%
rename from src/pthread_cond_broadcast.c
rename to src/win32_pthread_cond_broadcast.c
diff --git a/src/pthread_cond_destroy.c b/src/win32_pthread_cond_destroy.c
similarity index 100%
rename from src/pthread_cond_destroy.c
rename to src/win32_pthread_cond_destroy.c
diff --git a/src/pthread_cond_init.c b/src/win32_pthread_cond_init.c
similarity index 100%
rename from src/pthread_cond_init.c
rename to src/win32_pthread_cond_init.c
diff --git a/src/pthread_cond_signal.c b/src/win32_pthread_cond_signal.c
similarity index 100%
rename from src/pthread_cond_signal.c
rename to src/win32_pthread_cond_signal.c
diff --git a/src/pthread_cond_timedwait.c b/src/win32_pthread_cond_timedwait.c
similarity index 100%
rename from src/pthread_cond_timedwait.c
rename to src/win32_pthread_cond_timedwait.c
diff --git a/src/pthread_cond_wait.c b/src/win32_pthread_cond_wait.c
similarity index 100%
rename from src/pthread_cond_wait.c
rename to src/win32_pthread_cond_wait.c
diff --git a/src/pthread_getspecific.c b/src/win32_pthread_getspecific.c
similarity index 100%
rename from src/pthread_getspecific.c
rename to src/win32_pthread_getspecific.c
diff --git a/src/pthread_key_create.c b/src/win32_pthread_key_create.c
similarity index 100%
rename from src/pthread_key_create.c
rename to src/win32_pthread_key_create.c
diff --git a/src/pthread_key_delete.c b/src/win32_pthread_key_delete.c
similarity index 100%
rename from src/pthread_key_delete.c
rename to src/win32_pthread_key_delete.c
diff --git a/src/pthread_mutex_destroy.c b/src/win32_pthread_mutex_destroy.c
similarity index 100%
rename from src/pthread_mutex_destroy.c
rename to src/win32_pthread_mutex_destroy.c
diff --git a/src/pthread_mutex_init.c b/src/win32_pthread_mutex_init.c
similarity index 100%
rename from src/pthread_mutex_init.c
rename to src/win32_pthread_mutex_init.c
diff --git a/src/pthread_mutex_lock.c b/src/win32_pthread_mutex_lock.c
similarity index 100%
rename from src/pthread_mutex_lock.c
rename to src/win32_pthread_mutex_lock.c
diff --git a/src/pthread_mutex_trylock.c b/src/win32_pthread_mutex_trylock.c
similarity index 100%
rename from src/pthread_mutex_trylock.c
rename to src/win32_pthread_mutex_trylock.c
diff --git a/src/pthread_mutex_unlock.c b/src/win32_pthread_mutex_unlock.c
similarity index 100%
rename from src/pthread_mutex_unlock.c
rename to src/win32_pthread_mutex_unlock.c
diff --git a/src/pthread_self.c b/src/win32_pthread_self.c
similarity index 100%
rename from src/pthread_self.c
rename to src/win32_pthread_self.c
diff --git a/src/pthread_setspecific.c b/src/win32_pthread_setspecific.c
similarity index 100%
rename from src/pthread_setspecific.c
rename to src/win32_pthread_setspecific.c