diff --git a/src/common.h b/src/common.h
index 9abd605cb..51fb9186e 100644
--- a/src/common.h
+++ b/src/common.h
@@ -45,7 +45,7 @@
 # include "win32/error.h"
 # include "win32/version.h"
 # ifdef GIT_THREADS
-#	include "win32/pthread.h"
+#	include "win32/thread.h"
 # endif
 # if defined(GIT_MSVC_CRTDBG)
 #   include "win32/w32_stack.h"
diff --git a/src/thread-utils.h b/src/thread-utils.h
index f75e44087..f0161989f 100644
--- a/src/thread-utils.h
+++ b/src/thread-utils.h
@@ -41,7 +41,7 @@ typedef git_atomic git_atomic_ssize;
 #ifdef GIT_THREADS
 
 #ifdef GIT_WIN32
-#   include "win32/pthread.h"
+#   include "win32/thread.h"
 #else
 #   include "unix/pthread.h"
 #endif
diff --git a/src/win32/precompiled.h b/src/win32/precompiled.h
index 33ce106d3..10ca0b80c 100644
--- a/src/win32/precompiled.h
+++ b/src/win32/precompiled.h
@@ -16,7 +16,7 @@
 #include <io.h>
 #include <direct.h>
 #ifdef GIT_THREADS
- #include "win32/pthread.h"
+ #include "win32/thread.h"
 #endif
 
 #include "git2.h"
diff --git a/src/win32/pthread.c b/src/win32/thread.c
similarity index 99%
rename from src/win32/pthread.c
rename to src/win32/thread.c
index 80329b2b0..8222c65fe 100644
--- a/src/win32/pthread.c
+++ b/src/win32/thread.c
@@ -5,7 +5,7 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "pthread.h"
+#include "thread.h"
 #include "../global.h"
 
 #define CLEAN_THREAD_EXIT 0x6F012842
diff --git a/src/win32/pthread.h b/src/win32/thread.h
similarity index 92%
rename from src/win32/pthread.h
rename to src/win32/thread.h
index 977d2dfab..f5dd41ba3 100644
--- a/src/win32/pthread.h
+++ b/src/win32/thread.h
@@ -5,8 +5,8 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#ifndef GIT_PTHREAD_H
-#define GIT_PTHREAD_H
+#ifndef INCLUDE_win32_thread_h__
+#define INCLUDE_win32_thread_h__
 
 #include "../common.h"
 
@@ -59,4 +59,4 @@ int git_rwlock_free(git_rwlock *);
 
 extern int win32_pthread_initialize(void);
 
-#endif
+#endif /* INCLUDE_win32_thread_h__ */