diff --git a/common/textentry_tricks.cpp b/common/textentry_tricks.cpp
index d000c63e54..bcae728078 100644
--- a/common/textentry_tricks.cpp
+++ b/common/textentry_tricks.cpp
@@ -21,8 +21,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-
-#include <wx/wx.h>
+#include <wx/event.h>
+#include <wx/gdicmn.h>
 #include <textentry_tricks.h>
 #include <dialog_shim.h>
 
diff --git a/scripting/kipython_frame.cpp b/scripting/kipython_frame.cpp
index d344d07882..70361ae332 100644
--- a/scripting/kipython_frame.cpp
+++ b/scripting/kipython_frame.cpp
@@ -28,7 +28,6 @@
 
 #include <pybind11/embed.h>
 #include <sstream>
-#include <wx/wx.h>
 #include <pybind11/embed.h>
 
 void KIPYTHON_FRAME::SetupPythonEditor()
diff --git a/utils/kicad2step/kicad2step.cpp b/utils/kicad2step/kicad2step.cpp
index cca0f8cfa1..0120173e7c 100644
--- a/utils/kicad2step/kicad2step.cpp
+++ b/utils/kicad2step/kicad2step.cpp
@@ -21,10 +21,11 @@
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
-#include "wx/wx.h"
+
 #include <wx/app.h>
 #include <wx/cmdline.h>
 #include <wx/log.h>
+#include <wx/msgdlg.h>
 #include <wx/string.h>
 #include <wx/filename.h>
 #include <sstream>
diff --git a/utils/kicad2step/pcb/oce_utils.cpp b/utils/kicad2step/pcb/oce_utils.cpp
index 1c34845253..bab252d427 100644
--- a/utils/kicad2step/pcb/oce_utils.cpp
+++ b/utils/kicad2step/pcb/oce_utils.cpp
@@ -26,7 +26,6 @@
 #include <sstream>
 #include <string>
 #include <utility>
-#include <wx/wx.h>
 #include <wx/filename.h>
 #include <wx/filefn.h>
 #include <wx/stdpaths.h>