diff --git a/common/pgm_base.cpp b/common/pgm_base.cpp
index 2aa397413c..76a4b49a76 100644
--- a/common/pgm_base.cpp
+++ b/common/pgm_base.cpp
@@ -46,7 +46,6 @@
 #include <background_jobs_monitor.h>
 #include <bitmaps.h>
 #include <common.h>
-#include <config_params.h>
 #include <confirm.h>
 #include <core/arraydim.h>
 #include <eda_base_frame.h>
diff --git a/common/project/project_file.cpp b/common/project/project_file.cpp
index dcde3e3191..01f90a19e7 100644
--- a/common/project/project_file.cpp
+++ b/common/project/project_file.cpp
@@ -19,7 +19,6 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config_params.h>
 #include <project.h>
 #include <project/net_settings.h>
 #include <settings/json_settings_internals.h>
diff --git a/cvpcb/cvpcb_mainframe.h b/cvpcb/cvpcb_mainframe.h
index 42233ab02a..22be91e639 100644
--- a/cvpcb/cvpcb_mainframe.h
+++ b/cvpcb/cvpcb_mainframe.h
@@ -25,7 +25,6 @@
 #ifndef _CVPCB_MAINFRAME_H_
 #define _CVPCB_MAINFRAME_H_
 
-#include <config_params.h>
 #include <kiway_player.h>
 #include <netlist_reader/pcb_netlist.h>
 
diff --git a/eeschema/sch_edit_frame.h b/eeschema/sch_edit_frame.h
index fd1706fb74..ccab77f577 100644
--- a/eeschema/sch_edit_frame.h
+++ b/eeschema/sch_edit_frame.h
@@ -35,7 +35,6 @@
 #include <wx/treectrl.h>
 #include <wx/utils.h>
 
-#include <config_params.h>
 #include <core/typeinfo.h>
 #include <eda_base_frame.h>
 #include <eeschema_settings.h>
diff --git a/eeschema/sch_plugins/easyeda/sch_easyeda_parser.cpp b/eeschema/sch_plugins/easyeda/sch_easyeda_parser.cpp
index 9ea5333778..e9322a70ac 100644
--- a/eeschema/sch_plugins/easyeda/sch_easyeda_parser.cpp
+++ b/eeschema/sch_plugins/easyeda/sch_easyeda_parser.cpp
@@ -39,6 +39,7 @@
 #include <sch_bus_entry.h>
 #include <string_utils.h>
 #include <bezier_curves.h>
+#include <wx/base64.h>
 #include <wx/url.h>
 #include <wx/mstream.h>
 #include <gfx_import_utils.h>
diff --git a/eeschema/sch_plugins/easyedapro/sch_easyedapro_parser.cpp b/eeschema/sch_plugins/easyedapro/sch_easyedapro_parser.cpp
index 50941648e3..61c06af285 100644
--- a/eeschema/sch_plugins/easyedapro/sch_easyedapro_parser.cpp
+++ b/eeschema/sch_plugins/easyedapro/sch_easyedapro_parser.cpp
@@ -41,6 +41,7 @@
 #include <sch_bus_entry.h>
 #include <string_utils.h>
 #include <bezier_curves.h>
+#include <wx/base64.h>
 #include <wx/url.h>
 #include <wx/mstream.h>
 #include <gfx_import_utils.h>
diff --git a/eeschema/symbol_library.cpp b/eeschema/symbol_library.cpp
index 2fa454ff44..6dd2f66373 100644
--- a/eeschema/symbol_library.cpp
+++ b/eeschema/symbol_library.cpp
@@ -30,7 +30,6 @@
 #include <string_utils.h>
 #include <macros.h>
 #include <richio.h>
-#include <config_params.h>
 #include <wildcards_and_files_ext.h>
 #include <project/project_file.h>
 #include <project_rescue.h>
diff --git a/gerbview/gerber_file_image_list.cpp b/gerbview/gerber_file_image_list.cpp
index 2389fc4806..6b302f8faa 100644
--- a/gerbview/gerber_file_image_list.cpp
+++ b/gerbview/gerber_file_image_list.cpp
@@ -32,6 +32,7 @@
 #include <gerber_file_image.h>
 #include <gerber_file_image_list.h>
 #include <X2_gerber_attributes.h>
+#include <wx/filename.h>
 
 #include <map>
 
diff --git a/gerbview/gerbview_frame.h b/gerbview/gerbview_frame.h
index ddffc862a5..c639cf8666 100644
--- a/gerbview/gerbview_frame.h
+++ b/gerbview/gerbview_frame.h
@@ -23,7 +23,6 @@
 #define  WX_GERBER_STRUCT_H
 
 #include <file_history.h>
-#include <config_params.h>
 #include <eda_draw_frame.h>
 #include <layer_ids.h>
 #include <gerbview.h>
diff --git a/include/board_design_settings.h b/include/board_design_settings.h
index 9a4f8eb796..4d79504701 100644
--- a/include/board_design_settings.h
+++ b/include/board_design_settings.h
@@ -29,7 +29,6 @@
 
 #include <netclass.h>
 #include <project/net_settings.h>
-#include <config_params.h>
 #include <board_stackup_manager/board_stackup.h>
 #include <drc/drc_engine.h>
 #include <settings/nested_settings.h>
diff --git a/pagelayout_editor/pl_editor_frame.h b/pagelayout_editor/pl_editor_frame.h
index edf34da090..6c68ab749c 100644
--- a/pagelayout_editor/pl_editor_frame.h
+++ b/pagelayout_editor/pl_editor_frame.h
@@ -27,7 +27,6 @@
 #define  _PL_EDITOR_FRAME_H
 
 
-#include <config_params.h>
 #include <eda_draw_frame.h>
 #include <base_screen.h>
 #include "pl_editor_layout.h"
diff --git a/pcbnew/footprint_edit_frame.h b/pcbnew/footprint_edit_frame.h
index 43dc2dd29d..243057ed9f 100644
--- a/pcbnew/footprint_edit_frame.h
+++ b/pcbnew/footprint_edit_frame.h
@@ -23,7 +23,6 @@
 #include <pcb_base_frame.h>
 #include <pcb_base_edit_frame.h>
 #include <io_mgr.h>
-#include <config_params.h>
 #include <fp_tree_synchronizing_adapter.h>
 
 class PCB_LAYER_BOX_SELECTOR;
diff --git a/pcbnew/pcbnew_config.h b/pcbnew/pcbnew_config.h
index 823d18ef9f..87f7485ac1 100644
--- a/pcbnew/pcbnew_config.h
+++ b/pcbnew/pcbnew_config.h
@@ -6,7 +6,6 @@
 #ifndef _PCBNEW_CONFIG_H_
 #define _PCBNEW_CONFIG_H_
 
-#include <config_params.h>
 
 /* Useful macro : */