diff --git a/common/base_screen.cpp b/common/base_screen.cpp
index 13e1dc3aaf..c7612766e9 100644
--- a/common/base_screen.cpp
+++ b/common/base_screen.cpp
@@ -26,7 +26,6 @@
 
 #include <base_screen.h>
 #include <base_struct.h>
-#include <fctsys.h>
 #include <trace_helpers.h>
 
 
diff --git a/common/base_struct.cpp b/common/base_struct.cpp
index 6b8bbabdd4..5751d8f0b5 100644
--- a/common/base_struct.cpp
+++ b/common/base_struct.cpp
@@ -28,10 +28,7 @@
 
 #include <deque>
 
-#include <fctsys.h>
 #include <trigo.h>
-#include <common.h>
-#include <macros.h>
 #include <base_screen.h>
 #include <bitmaps.h>
 #include <trace_helpers.h>
diff --git a/common/build_version.cpp b/common/build_version.cpp
index 66c4637b9e..4a8eda1873 100644
--- a/common/build_version.cpp
+++ b/common/build_version.cpp
@@ -23,7 +23,8 @@
  */
 
 // Date for KiCad build version
-#include <fctsys.h>
+#include <wx/wx.h>
+#include <config.h>
 #include <boost/version.hpp>
 
 // kicad_curl.h must be included before wx headers, to avoid
diff --git a/common/eda_dde.cpp b/common/eda_dde.cpp
index e125a01740..2a7f4bec27 100644
--- a/common/eda_dde.cpp
+++ b/common/eda_dde.cpp
@@ -26,12 +26,12 @@
  * @file eda_dde.cpp
  */
 
-#include <fctsys.h>
+//#include <fctsys.h>
 #include <eda_dde.h>
 #include <eda_draw_frame.h>
 #include <id.h>
-#include <common.h>
-#include <macros.h>
+//#include <common.h>
+//#include <macros.h>
 
 static const wxString HOSTNAME( wxT( "localhost" ) );
 
diff --git a/common/eda_doc.cpp b/common/eda_doc.cpp
index fc1f55b43e..dab3edb615 100644
--- a/common/eda_doc.cpp
+++ b/common/eda_doc.cpp
@@ -26,9 +26,7 @@
  * @file eda_doc.cpp
  */
 
-#include <fctsys.h>
 #include <pgm_base.h>
-#include <common.h>
 #include <confirm.h>
 #include <gestfich.h>
 #include <settings/common_settings.h>
@@ -37,7 +35,7 @@
 #include <wx/tokenzr.h>
 #include <wx/filename.h>
 #include <wx/uri.h>
-#include <macros.h>
+#include <wx/filedlg.h>
 
 
 void PGM_BASE::ReadPdfBrowserInfos()
diff --git a/common/eda_draw_frame.cpp b/common/eda_draw_frame.cpp
index 41fdfa28fd..9b45a54c8c 100644
--- a/common/eda_draw_frame.cpp
+++ b/common/eda_draw_frame.cpp
@@ -28,7 +28,6 @@
 #include <confirm.h>
 #include <dialog_shim.h>
 #include <eda_draw_frame.h>
-#include <fctsys.h>
 #include <filehistory.h>
 #include <id.h>
 #include <kiface_i.h>
diff --git a/common/eda_size_ctrl.cpp b/common/eda_size_ctrl.cpp
index 670dea294e..37e6aa59f1 100644
--- a/common/eda_size_ctrl.cpp
+++ b/common/eda_size_ctrl.cpp
@@ -21,11 +21,10 @@
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
-#include <fctsys.h>
+//#include <fctsys.h>
 #include <eda_base_frame.h>
 #include <dialog_helpers.h>
 #include <base_units.h>
-#include <macros.h>
 
 
 /********************************************************/
diff --git a/common/footprint_info.cpp b/common/footprint_info.cpp
index e8d0d722d4..f16667d5a2 100644
--- a/common/footprint_info.cpp
+++ b/common/footprint_info.cpp
@@ -28,8 +28,6 @@
  * and their documentation (comments and keywords)
  */
 
-#include <common.h>
-#include <fctsys.h>
 #include <footprint_info.h>
 #include <fp_lib_table.h>
 #include <html_messagebox.h>
@@ -37,7 +35,6 @@
 #include <kiface_ids.h>
 #include <kiway.h>
 #include <lib_id.h>
-#include <macros.h>
 #include <pgm_base.h>
 #include <thread>
 #include <utility>
diff --git a/common/fp_lib_table.cpp b/common/fp_lib_table.cpp
index 7cb12fe2da..8fbd21284d 100644
--- a/common/fp_lib_table.cpp
+++ b/common/fp_lib_table.cpp
@@ -24,7 +24,6 @@
  */
 
 
-#include <fctsys.h>
 #include <kiface_i.h>
 #include <footprint_info.h>
 #include <lib_id.h>
diff --git a/common/gbr_metadata.cpp b/common/gbr_metadata.cpp
index d80d7a09d8..d9f56dc6b6 100644
--- a/common/gbr_metadata.cpp
+++ b/common/gbr_metadata.cpp
@@ -27,8 +27,9 @@
  * @brief helper functions to handle the gerber metadata in files,
  * related to the netlist info and aperture attribute.
  */
+#include <wx/string.h>
+#include <wx/datetime.h>
 
-#include <fctsys.h>
 #include <gbr_metadata.h>
 #include <utf8.h>
 
diff --git a/common/gestfich.cpp b/common/gestfich.cpp
index 35f1fee076..11f93998de 100644
--- a/common/gestfich.cpp
+++ b/common/gestfich.cpp
@@ -27,16 +27,15 @@
  * @file gestfich.cpp
  * @brief Functions for file management
  */
-
 #include <fctsys.h>
+
 #include <wx/mimetype.h>
 #include <wx/filename.h>
 #include <wx/dir.h>
+#include <wx/filedlg.h>
+
 #include <pgm_base.h>
 #include <confirm.h>
-#include <common.h>
-#include <macros.h>
-
 #include <gestfich.h>
 
 void AddDelimiterString( wxString& string )
diff --git a/common/grid_tricks.cpp b/common/grid_tricks.cpp
index 9f0be589bc..db89da29a4 100644
--- a/common/grid_tricks.cpp
+++ b/common/grid_tricks.cpp
@@ -22,8 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-
-#include <fctsys.h>
 #include <grid_tricks.h>
 #include <wx/tokenzr.h>
 #include <wx/clipbrd.h>
diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp
index 20dc67e394..1b4e7ace16 100644
--- a/common/hotkeys_basic.cpp
+++ b/common/hotkeys_basic.cpp
@@ -23,16 +23,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <kiface_i.h>
 #include <hotkeys_basic.h>
 #include <id.h>
-#include <confirm.h>
 #include <kicad_string.h>
-#include <gestfich.h>
 #include <eda_base_frame.h>
-#include <macros.h>
-#include <menus_helpers.h>
 #include <eda_draw_frame.h>
 #include <settings/settings_manager.h>
 
@@ -298,7 +293,7 @@ int KeyCodeFromKeyName( const wxString& keyname )
 }
 
 
-/* 
+/*
  * DisplayHotkeyList
  * Displays the hotkeys registered with the given tool manager.
  */
@@ -318,7 +313,7 @@ void ReadHotKeyConfig( wxString fileName, std::map<std::string, int>& aHotKeys )
         fn.SetPath( SETTINGS_MANAGER::GetUserSettingsPath() );
         fileName = fn.GetFullPath();
     }
-    
+
     if( !wxFile::Exists( fileName ) )
         return;
 
@@ -356,7 +351,7 @@ int WriteHotKeyConfig( const std::map<std::string, TOOL_ACTION*>& aActionMap )
     // Read the existing config (all hotkeys)
     //
     ReadHotKeyConfig( fn.GetFullPath(), hotkeys );
-   
+
     // Overlay the current app's hotkey definitions onto the map
     //
     for( const auto& ii : aActionMap )
@@ -365,7 +360,7 @@ int WriteHotKeyConfig( const std::map<std::string, TOOL_ACTION*>& aActionMap )
     // Write entire hotkey set
     //
     wxFile file( fn.GetFullPath(), wxFile::OpenMode::write );
-    
+
     for( const auto& ii : hotkeys )
         file.Write( wxString::Format( "%s\t%s\n", ii.first, KeyNameFromKeyCode( ii.second ) ) );
 
@@ -401,7 +396,7 @@ int ReadLegacyHotkeyConfigFile( const wxString& aFilename, std::map<std::string,
         return 0;
 
     wxFile cfgfile( fn.GetFullPath() );
-    
+
     if( !cfgfile.IsOpened() )       // There is a problem to open file
         return 0;
 
diff --git a/common/html_messagebox.cpp b/common/html_messagebox.cpp
index 21d6808371..521a045889 100644
--- a/common/html_messagebox.cpp
+++ b/common/html_messagebox.cpp
@@ -22,10 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <html_messagebox.h>
-#include <macros.h>
-#include <common.h>
 
 
 HTML_MESSAGE_BOX::HTML_MESSAGE_BOX( wxWindow* aParent, const wxString& aTitle,
diff --git a/common/lib_table_base.cpp b/common/lib_table_base.cpp
index 69308b1888..4e71752a01 100644
--- a/common/lib_table_base.cpp
+++ b/common/lib_table_base.cpp
@@ -29,12 +29,9 @@
 
 #include <set>
 
-#include <common.h>
-#include <fctsys.h>
 #include <kiface_i.h>
 #include <lib_table_base.h>
 #include <lib_table_lexer.h>
-#include <macros.h>
 #include <settings/app_settings.h>
 
 
diff --git a/common/marker_base.cpp b/common/marker_base.cpp
index 008f8d1473..9acdc03e62 100644
--- a/common/marker_base.cpp
+++ b/common/marker_base.cpp
@@ -30,9 +30,7 @@
  */
 
 
-#include "fctsys.h"
 #include "base_screen.h"
-#include "macros.h"
 #include "marker_base.h"
 #include <geometry/shape_line_chain.h>
 #include <render_settings.h>
diff --git a/common/netclass.cpp b/common/netclass.cpp
index 344a75acec..6ce1288509 100644
--- a/common/netclass.cpp
+++ b/common/netclass.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <netclass.h>
 #include <base_units.h>
 
diff --git a/common/pgm_base.cpp b/common/pgm_base.cpp
index 81eca3791f..440d5236a5 100644
--- a/common/pgm_base.cpp
+++ b/common/pgm_base.cpp
@@ -30,7 +30,6 @@
  *        (locale handling)
  */
 
-#include <fctsys.h>
 #include <wx/html/htmlwin.h>
 #include <wx/fs_zip.h>
 #include <wx/dir.h>
diff --git a/common/prependpath.cpp b/common/prependpath.cpp
index e0522dc036..cc2426e910 100644
--- a/common/prependpath.cpp
+++ b/common/prependpath.cpp
@@ -23,8 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <macros.h>
-#include <fctsys.h>
+#include <wx/string.h>
 #include <wx/filename.h>
 
 
diff --git a/common/project.cpp b/common/project.cpp
index 54a2e0a291..976d8e3a28 100644
--- a/common/project.cpp
+++ b/common/project.cpp
@@ -23,15 +23,12 @@
 
 #include <wx/stdpaths.h>
 
-#include <common.h> // NAMELESS_PROJECT
 #include <config_params.h>
 #include <confirm.h>
-#include <fctsys.h>
 #include <fp_lib_table.h>
 #include <kicad_string.h>
 #include <kiface_ids.h>
 #include <kiway.h>
-#include <macros.h>
 #include <pgm_base.h>
 #include <project.h>
 #include <project/project_file.h>
diff --git a/common/single_top.cpp b/common/single_top.cpp
index e1e4d7fe16..b19bac7067 100644
--- a/common/single_top.cpp
+++ b/common/single_top.cpp
@@ -35,8 +35,6 @@
 
 
 #include <typeinfo>
-#include <macros.h>
-#include <fctsys.h>
 #include <wx/cmdline.h>
 #include <wx/filename.h>
 #include <wx/stdpaths.h>
diff --git a/common/template_fieldnames.cpp b/common/template_fieldnames.cpp
index 0d8ed17217..9675ab56bc 100644
--- a/common/template_fieldnames.cpp
+++ b/common/template_fieldnames.cpp
@@ -23,8 +23,6 @@
  */
 
 #include <template_fieldnames.h>
-#include <fctsys.h>
-#include <macros.h>
 #include <pgm_base.h>
 
 using namespace TFIELD_T;
diff --git a/common/textentry_tricks.cpp b/common/textentry_tricks.cpp
index 3d089c86bb..d000c63e54 100644
--- a/common/textentry_tricks.cpp
+++ b/common/textentry_tricks.cpp
@@ -22,7 +22,7 @@
  */
 
 
-#include <fctsys.h>
+#include <wx/wx.h>
 #include <textentry_tricks.h>
 #include <dialog_shim.h>
 
diff --git a/common/undo_redo_container.cpp b/common/undo_redo_container.cpp
index 3940c33c75..c053674527 100644
--- a/common/undo_redo_container.cpp
+++ b/common/undo_redo_container.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <base_struct.h>
 #include <undo_redo_container.h>
 
diff --git a/include/grid_tricks.h b/include/grid_tricks.h
index 11e9e83361..7dffd38941 100644
--- a/include/grid_tricks.h
+++ b/include/grid_tricks.h
@@ -28,6 +28,7 @@
 
 #include <wx/grid.h>
 #include <wx/event.h>
+#include <wx/menu.h>
 #include <widgets/wx_grid.h>
 
 enum