diff --git a/common/config_params.cpp b/common/config_params.cpp
index b963c8dea4..502d104d5a 100644
--- a/common/config_params.cpp
+++ b/common/config_params.cpp
@@ -26,7 +26,6 @@
 
 #include <config_params.h>       // for PARAM_CFG_INT_WITH_SCALE, PARAM_CFG_...
 #include <locale_io.h>
-#include <gal/color4d.h>         // for COLOR4D
 #include <math/util.h>             // for KiROUND
 #include <wx/config.h>           // for wxConfigBase
 #include <wx/debug.h>            // for wxASSERT
diff --git a/include/config_params.h b/include/config_params.h
index feedd4d1e6..5368731147 100644
--- a/include/config_params.h
+++ b/include/config_params.h
@@ -32,9 +32,6 @@
 #include <wx/confbase.h>
 #include <wx/fileconf.h>
 #include <boost/ptr_container/ptr_vector.hpp>
-#include <gal/color4d.h>
-
-using KIGFX::COLOR4D;
 
 
 /**
diff --git a/include/eda_base_frame.h b/include/eda_base_frame.h
index 19e0f152a7..ef473b565c 100644
--- a/include/eda_base_frame.h
+++ b/include/eda_base_frame.h
@@ -65,7 +65,6 @@ class EDA_ITEM;
 class EDA_DRAW_PANEL_GAL;
 class EDA_MSG_PANEL;
 class BASE_SCREEN;
-class PARAM_CFG;
 class PAGE_INFO;
 class PLOTTER;
 class TITLE_BLOCK;
diff --git a/include/project.h b/include/project.h
index 0fd2eceb28..daee48328d 100644
--- a/include/project.h
+++ b/include/project.h
@@ -41,8 +41,6 @@
 /// default name for nameless projects
 #define NAMELESS_PROJECT _( "untitled" )
 
-class wxConfigBase;
-class PARAM_CFG;
 class FP_LIB_TABLE;
 class SYMBOL_LIBS;
 class SEARCH_STACK;
diff --git a/pcbnew/pad.h b/pcbnew/pad.h
index 7cc50717e0..ff02a99f39 100644
--- a/pcbnew/pad.h
+++ b/pcbnew/pad.h
@@ -36,7 +36,6 @@
 #include <core/arraydim.h>
 
 class PCB_SHAPE;
-class PARAM_CFG;
 class SHAPE;
 class SHAPE_SEGMENT;