diff --git a/common/pgm_base.cpp b/common/pgm_base.cpp
index 9e8978f48d..52d61623dc 100644
--- a/common/pgm_base.cpp
+++ b/common/pgm_base.cpp
@@ -37,26 +37,18 @@
 #include <wx/snglinst.h>
 #include <wx/stdpaths.h>
 #include <wx/sysopt.h>
-#include <wx/richmsgdlg.h>
 #include <wx/filedlg.h>
 #include <wx/tooltip.h>
 
-#include <build_version.h>
 #include <config_params.h>
 #include <confirm.h>
 #include <core/arraydim.h>
-#include <dialogs/dialog_configure_paths.h>
 #include <eda_base_frame.h>
 #include <eda_draw_frame.h>
-#include <gal/gal_display_options.h>
 #include <gestfich.h>
-#include <hotkeys_basic.h>
 #include <id.h>
-#include <kiplatform/environment.h>
 #include <lockfile.h>
-#include <macros.h>
 #include <menus_helpers.h>
-#include <paths.h>
 #include <pgm_base.h>
 #include <settings/common_settings.h>
 #include <settings/settings_manager.h>
diff --git a/common/tool/tool_manager.cpp b/common/tool/tool_manager.cpp
index 0053029913..191fb1b763 100644
--- a/common/tool/tool_manager.cpp
+++ b/common/tool/tool_manager.cpp
@@ -33,6 +33,7 @@
 
 #include <wx/event.h>
 #include <wx/clipbrd.h>
+#include <wx/app.h>
 
 #include <view/view.h>
 #include <eda_base_frame.h>