diff --git a/src/path.c b/src/path.c
index 8317aaaa7..9ce5d2978 100644
--- a/src/path.c
+++ b/src/path.c
@@ -10,7 +10,7 @@
 #include "repository.h"
 #ifdef GIT_WIN32
 #include "win32/posix.h"
-#include "win32/buffer.h"
+#include "win32/w32_buffer.h"
 #include "win32/w32_util.h"
 #include "win32/version.h"
 #else
diff --git a/src/util.c b/src/util.c
index b08b2b884..b3929bca2 100644
--- a/src/util.c
+++ b/src/util.c
@@ -11,7 +11,7 @@
 #include "posix.h"
 
 #ifdef GIT_WIN32
-# include "win32/buffer.h"
+# include "win32/w32_buffer.h"
 #endif
 
 #ifdef _MSC_VER
diff --git a/src/win32/buffer.c b/src/win32/w32_buffer.c
similarity index 98%
rename from src/win32/buffer.c
rename to src/win32/w32_buffer.c
index 74950189e..9122baaa6 100644
--- a/src/win32/buffer.c
+++ b/src/win32/w32_buffer.c
@@ -6,7 +6,7 @@
  */
 
 #include "common.h"
-#include "buffer.h"
+#include "w32_buffer.h"
 #include "../buffer.h"
 #include "utf-conv.h"
 
@@ -52,4 +52,3 @@ int git_buf_put_w(git_buf *buf, const wchar_t *string_w, size_t len_w)
 	buf->ptr[buf->size] = '\0';
 	return 0;
 }
-
diff --git a/src/win32/buffer.h b/src/win32/w32_buffer.h
similarity index 100%
rename from src/win32/buffer.h
rename to src/win32/w32_buffer.h