diff --git a/common/common.cpp b/common/common.cpp
index 3aab225f7c..50c219bab1 100644
--- a/common/common.cpp
+++ b/common/common.cpp
@@ -34,7 +34,10 @@
 #include <wx/utils.h>
 #include <wx/stdpaths.h>
 #include <wx/url.h>
-#include <wx/wx.h>
+
+#ifdef _WIN32
+#include <Windows.h>
+#endif
 
 
 int ProcessExecute( const wxString& aCommandLine, int aFlags, wxProcess *callback )
diff --git a/common/config_params.cpp b/common/config_params.cpp
index 81650033d2..fcf02e5a3c 100644
--- a/common/config_params.cpp
+++ b/common/config_params.cpp
@@ -30,7 +30,6 @@
 #include <math/util.h>             // for KiROUND
 #include <wx/config.h>           // for wxConfigBase
 #include <wx/debug.h>            // for wxASSERT
-#include <wx/wx.h>               // for wxString, operator!=, operator==
 
 void wxConfigLoadParams( wxConfigBase* aCfg, const std::vector<PARAM_CFG*>& aList,
                          const wxString& aGroup )
diff --git a/common/eda_dde.cpp b/common/eda_dde.cpp
index f7d59a481f..fb31b37c94 100644
--- a/common/eda_dde.cpp
+++ b/common/eda_dde.cpp
@@ -30,7 +30,8 @@
 #include <kiway_player.h>
 #include <id.h>
 
-#include <wx/wx.h>
+#include <wx/crt.h>
+
 
 static const wxString HOSTNAME( wxT( "localhost" ) );
 
diff --git a/common/kiway_express.cpp b/common/kiway_express.cpp
index 38c7485d0a..c5e1bcba08 100644
--- a/common/kiway_express.cpp
+++ b/common/kiway_express.cpp
@@ -23,8 +23,8 @@
  */
 
 #include <kiway_express.h>
-#include <wx/wx.h>
 
+#include <wx/window.h>
 
 //IMPLEMENT_DYNAMIC_CLASS( KIWAY_EXPRESS, wxEvent )
 
diff --git a/common/launch_ext.cpp b/common/launch_ext.cpp
index a23a1c77f7..a708e6baed 100644
--- a/common/launch_ext.cpp
+++ b/common/launch_ext.cpp
@@ -20,7 +20,6 @@
 
 #include <gestfich.h>
 #include <launch_ext.h>
-#include <wx/wx.h>
 
 
 void LaunchExternal( const wxString& aPath )
diff --git a/common/layer_id.cpp b/common/layer_id.cpp
index 67803fff36..02c1b01346 100644
--- a/common/layer_id.cpp
+++ b/common/layer_id.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <layers_id_colors_and_visibility.h>
-#include <wx/wx.h>
+#include <wx/translation.h>
 
 /**
  * Returns the default display name for a given layer.  These are not the same as the canonical
diff --git a/common/lset.cpp b/common/lset.cpp
index 1a00952b6b..9ddb79a186 100644
--- a/common/lset.cpp
+++ b/common/lset.cpp
@@ -33,7 +33,7 @@
 #include <layers_id_colors_and_visibility.h>  // for LSET, PCB_LAYER_ID, LSEQ
 #include <macros.h>                           // for arrayDim
 #include <wx/debug.h>                         // for wxASSERT, wxASSERT_MSG
-#include <wx/wx.h>                            // for wxT, wxChar
+#include <wx/string.h>
 
 
 LSET::LSET( const PCB_LAYER_ID* aArray, unsigned aCount ) :
diff --git a/common/plugins/altium/altium_parser.cpp b/common/plugins/altium/altium_parser.cpp
index 4bd5568ae1..44fe0685ad 100644
--- a/common/plugins/altium/altium_parser.cpp
+++ b/common/plugins/altium/altium_parser.cpp
@@ -28,8 +28,7 @@
 #include <math/util.h>
 #include <sstream>
 #include <utf.h>
-#include <wx/wx.h>
-
+#include <wx/log.h>
 
 const CFB::COMPOUND_FILE_ENTRY* FindStream(
         const CFB::CompoundFileReader& aReader, const char* aStreamName )
diff --git a/common/widgets/layer_box_selector.cpp b/common/widgets/layer_box_selector.cpp
index 0559f9fda1..88fa346db7 100644
--- a/common/widgets/layer_box_selector.cpp
+++ b/common/widgets/layer_box_selector.cpp
@@ -25,7 +25,7 @@
 #include <layers_id_colors_and_visibility.h>
 #include <bitmaps.h>
 
-#include <wx/wx.h>
+#include <wx/dcmemory.h>
 #include <wx/odcombo.h>
 #include <wx/menuitem.h>
 
diff --git a/common/widgets/ui_common.cpp b/common/widgets/ui_common.cpp
index 44db2e3e6a..df495ff693 100644
--- a/common/widgets/ui_common.cpp
+++ b/common/widgets/ui_common.cpp
@@ -17,7 +17,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <wx/wx.h>
+#include <wx/dcclient.h>
+#include <wx/listbox.h>
 #include <wx/dataview.h>
 #include <wx/stc/stc.h>
 #include <widgets/ui_common.h>
diff --git a/common/widgets/wx_grid.cpp b/common/widgets/wx_grid.cpp
index 2745578048..33e1a121ee 100644
--- a/common/widgets/wx_grid.cpp
+++ b/common/widgets/wx_grid.cpp
@@ -23,7 +23,6 @@
 
 #include <wx/tokenzr.h>
 #include <wx/dc.h>
-#include <wx/wx.h>
 #include <widgets/wx_grid.h>
 
 #include <algorithm>
diff --git a/common/wildcards_and_files_ext.cpp b/common/wildcards_and_files_ext.cpp
index 9339cf70bd..61d8e31127 100644
--- a/common/wildcards_and_files_ext.cpp
+++ b/common/wildcards_and_files_ext.cpp
@@ -29,9 +29,9 @@
  */
 #include <regex>
 #include <wildcards_and_files_ext.h>
+#include <wx/filedlg.h>
 #include <wx/regex.h>
-#include <wx/wx.h>
-
+#include <wx/translation.h>
 
 bool compareFileExtensions( const std::string& aExtension,
         const std::vector<std::string>& aReference, bool aCaseSensitive )