diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 27339536a8..80b3217f79 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1124,7 +1124,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dialup.h
     wx/dirctrl.h
     wx/display.h
-    wx/display_impl.h
     wx/dnd.h
     wx/docmdi.h
     wx/docview.h
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index 7749731579..5af3d5ac77 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -1032,7 +1032,6 @@ set(GUI_CMN_HDR
     wx/dialup.h
     wx/dirctrl.h
     wx/display.h
-    wx/display_impl.h
     wx/dnd.h
     wx/docmdi.h
     wx/docview.h
diff --git a/build/files b/build/files
index ef98625be1..abe00f1361 100644
--- a/build/files
+++ b/build/files
@@ -967,7 +967,6 @@ GUI_CMN_HDR =
     wx/dirctrl.h
     wx/dirdlg.h
     wx/display.h
-    wx/display_impl.h
     wx/dnd.h
     wx/docmdi.h
     wx/docview.h
diff --git a/build/msw/wx_core.vcxproj b/build/msw/wx_core.vcxproj
index 6c83436a0b..bf3ea86b5a 100644
--- a/build/msw/wx_core.vcxproj
+++ b/build/msw/wx_core.vcxproj
@@ -1280,7 +1280,6 @@
     <ClInclude Include="..\..\include\wx\dirctrl.h" />
     <ClInclude Include="..\..\include\wx\dirdlg.h" />
     <ClInclude Include="..\..\include\wx\display.h" />
-    <ClInclude Include="..\..\include\wx\display_impl.h" />
     <ClInclude Include="..\..\include\wx\dnd.h" />
     <ClInclude Include="..\..\include\wx\docmdi.h" />
     <ClInclude Include="..\..\include\wx\docview.h" />
diff --git a/build/msw/wx_core.vcxproj.filters b/build/msw/wx_core.vcxproj.filters
index d83e645ce5..7e17bd7ad0 100644
--- a/build/msw/wx_core.vcxproj.filters
+++ b/build/msw/wx_core.vcxproj.filters
@@ -1267,9 +1267,6 @@
     <ClInclude Include="..\..\include\wx\display.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\display_impl.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\wx\dnd.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 558ebba9fc..f64feb56e0 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -2270,9 +2270,6 @@
 			<File
 				RelativePath="..\..\include\wx\display.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\display_impl.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\dnd.h">
 			</File>
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 59890d3916..b734aa02bd 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -3528,10 +3528,6 @@
 				RelativePath="..\..\include\wx\display.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\display_impl.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\dnd.h"
 				>
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 0443a4194b..0b33c64c19 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -3524,10 +3524,6 @@
 				RelativePath="..\..\include\wx\display.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\display_impl.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\dnd.h"
 				>
diff --git a/include/wx/display_impl.h b/include/wx/private/display.h
similarity index 96%
rename from include/wx/display_impl.h
rename to include/wx/private/display.h
index 40b4827885..cbaa3a2690 100644
--- a/include/wx/display_impl.h
+++ b/include/wx/private/display.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/display_impl.h
+// Name:        wx/private/display.h
 // Purpose:     wxDisplayImpl class declaration
 // Author:      Vadim Zeitlin
 // Created:     2006-03-15
@@ -7,8 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_DISPLAY_IMPL_H_BASE_
-#define _WX_DISPLAY_IMPL_H_BASE_
+#ifndef _WX_PRIVATE_DISPLAY_H_
+#define _WX_PRIVATE_DISPLAY_H_
 
 #include "wx/gdicmn.h"      // for wxRect
 
@@ -105,5 +105,4 @@ public:
     virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE;
 };
 
-#endif // _WX_DISPLAY_IMPL_H_BASE_
-
+#endif // _WX_PRIVATE_DISPLAY_H_
diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp
index ecc744d4aa..ca4b1377a9 100644
--- a/src/common/dpycmn.cpp
+++ b/src/common/dpycmn.cpp
@@ -30,7 +30,7 @@
 #endif //WX_PRECOMP
 
 #include "wx/display.h"
-#include "wx/display_impl.h"
+#include "wx/private/display.h"
 
 #if wxUSE_DISPLAY
 
diff --git a/src/gtk/display.cpp b/src/gtk/display.cpp
index d3fc6e465c..cc00c499dd 100644
--- a/src/gtk/display.cpp
+++ b/src/gtk/display.cpp
@@ -10,7 +10,7 @@
 
 #if wxUSE_DISPLAY
     #include "wx/display.h"
-    #include "wx/display_impl.h"
+    #include "wx/private/display.h"
 #endif
 #include "wx/utils.h" // wxClientDisplayRect
 
diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index 3256c65cbc..b096d1895d 100644
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -39,7 +39,7 @@
 #include "wx/dynlib.h"
 #include "wx/sysopt.h"
 
-#include "wx/display_impl.h"
+#include "wx/private/display.h"
 #include "wx/msw/missing.h"
 #include "wx/msw/private.h"
 #include "wx/msw/private/hiddenwin.h"
diff --git a/src/osx/core/display.cpp b/src/osx/core/display.cpp
index fa4fec60a8..679312274b 100644
--- a/src/osx/core/display.cpp
+++ b/src/osx/core/display.cpp
@@ -33,7 +33,7 @@
     #include "wx/gdicmn.h"
 #endif
 
-#include "wx/display_impl.h"
+#include "wx/private/display.h"
 #include "wx/scopedarray.h"
 #include "wx/osx/private.h"
 
diff --git a/src/qt/display.cpp b/src/qt/display.cpp
index 28cc87358f..5b5dc228b9 100644
--- a/src/qt/display.cpp
+++ b/src/qt/display.cpp
@@ -9,7 +9,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/display.h"
-#include "wx/display_impl.h"
+#include "wx/private/display.h"
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QDesktopWidget>
 #include "wx/qt/private/converter.h"
diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index 5b709ca0ff..41ab88060b 100644
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -40,7 +40,7 @@
 #if wxUSE_DISPLAY
 
 #include "wx/display.h"
-#include "wx/display_impl.h"
+#include "wx/private/display.h"
 
 #ifndef __WXGTK20__