diff --git a/src/display.c b/src/display.c
index 5b5853a3cb8..df32f261568 100644
--- a/src/display.c
+++ b/src/display.c
@@ -32,7 +32,7 @@
 
 #ifdef _WIN32
 
-#include "libImaging/ImDib.h"
+#include "libImaging/ImagingDib.h"
 
 #if SIZEOF_VOID_P == 8
 #define F_HANDLE "K"
diff --git a/src/libImaging/Dib.c b/src/libImaging/Dib.c
index 2afe71d4ac9..b3d9a50d51e 100644
--- a/src/libImaging/Dib.c
+++ b/src/libImaging/Dib.c
@@ -23,7 +23,7 @@
 
 #ifdef _WIN32
 
-#include "ImDib.h"
+#include "ImagingDib.h"
 
 ModeID
 ImagingGetModeDIB(int size_out[2]) {
diff --git a/src/libImaging/Imaging.h b/src/libImaging/Imaging.h
index f7049c8925c..89a23e1be42 100644
--- a/src/libImaging/Imaging.h
+++ b/src/libImaging/Imaging.h
@@ -10,7 +10,7 @@
  * See the README file for information on usage and redistribution.
  */
 
-#include "ImPlatform.h"
+#include "ImagingPlatform.h"
 #include "Mode.h"
 
 #if defined(__cplusplus)
diff --git a/src/libImaging/ImDib.h b/src/libImaging/ImagingDib.h
similarity index 97%
rename from src/libImaging/ImDib.h
rename to src/libImaging/ImagingDib.h
index 65f090f928a..dadaeb28369 100644
--- a/src/libImaging/ImDib.h
+++ b/src/libImaging/ImagingDib.h
@@ -12,7 +12,7 @@
 
 #ifdef _WIN32
 
-#include "ImPlatform.h"
+#include "ImagingPlatform.h"
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/src/libImaging/ImPlatform.h b/src/libImaging/ImagingPlatform.h
similarity index 100%
rename from src/libImaging/ImPlatform.h
rename to src/libImaging/ImagingPlatform.h