diff --git a/eeschema/erc.cpp b/eeschema/erc.cpp
index 538dd69944..b4c8c57bf3 100644
--- a/eeschema/erc.cpp
+++ b/eeschema/erc.cpp
@@ -12,9 +12,7 @@
 
 #include "protos.h"
 
-#include "../bitmaps/ercgreen.xpm"
-#include "../bitmaps/ercwarn.xpm"
-#include "../bitmaps/ercerr.xpm"
+#include "bitmaps.h"
 
 #include "dialog_erc.h"
 
diff --git a/eeschema/libedit_onrightclick.cpp b/eeschema/libedit_onrightclick.cpp
index 55c221c1d5..eb6de89982 100644
--- a/eeschema/libedit_onrightclick.cpp
+++ b/eeschema/libedit_onrightclick.cpp
@@ -19,12 +19,6 @@
 #include "id.h"
 #include "hotkeys.h"
 
-#include "Pin_to.xpm"
-#include "Pin_Size_to.xpm"
-#include "Pin_Name_to.xpm"
-#include "Pin_Number_to.xpm"
-#include "Delete_Pin.xpm"
-
 /* functions to add commands and submenus depending on the item */
 static void AddMenusForBlock(wxMenu * PopMenu, WinEDA_LibeditFrame * frame);
 static void AddMenusForPin(wxMenu * PopMenu, LibDrawPin* Pin, WinEDA_LibeditFrame * frame);
diff --git a/eeschema/libframe.cpp b/eeschema/libframe.cpp
index b9ba47ea24..3175309639 100644
--- a/eeschema/libframe.cpp
+++ b/eeschema/libframe.cpp
@@ -18,8 +18,6 @@
 
 #include "id.h"
 
-#include "libedit.xpm"
-
 /*****************************/
 /* class WinEDA_LibeditFrame */
 /*****************************/
diff --git a/eeschema/onrightclick.cpp b/eeschema/onrightclick.cpp
index 93dbe84ca1..460ca649a5 100644
--- a/eeschema/onrightclick.cpp
+++ b/eeschema/onrightclick.cpp
@@ -20,31 +20,6 @@
 
 #include "bitmaps.h"
 
-#include "Enter_Sheet.xpm"
-#include "Leave_Sheet.xpm"
-#include "Delete_Sheet.xpm"
-#include "Resize_Sheet.xpm"
-#include "Edit_Sheet.xpm"
-#include "Move_Sheet.xpm"
-#include "Options_Pinsheet.xpm"
-#include "Delete_Pinsheet.xpm"
-#include "Delete_Bus.xpm"
-#include "Delete_Node.xpm"
-#include "Delete_Connection.xpm"
-#include "Label2Text.xpm"
-#include "Label2GLabel.xpm"
-#include "GLabel2Text.xpm"
-#include "GLabel2Label.xpm"
-#include "Rotate_GLabel.xpm"
-#include "GL_Change.xpm"
-#include "Edit_Component.xpm"
-#include "Break_Line.xpm"
-#include "Break_Bus.xpm"
-#include "Normal.xpm"
-#include "Edit_Comp_Ref.xpm"
-#include "Edit_Comp_Value.xpm"
-#include "Edit_Comp_Footprint.xpm"
-
 /* functions to add commands and submenus depending on the item */
 static void AddMenusForBlock( wxMenu* PopMenu, WinEDA_SchematicFrame* frame );
 static void AddMenusForWire( wxMenu* PopMenu, EDA_DrawLineStruct* Wire,
diff --git a/eeschema/tool_lib.cpp b/eeschema/tool_lib.cpp
index 35d949fcf2..c816289e20 100644
--- a/eeschema/tool_lib.cpp
+++ b/eeschema/tool_lib.cpp
@@ -27,9 +27,6 @@
 
 // USE_XPM_BITMAPS
 #include "bitmaps.h"
-#include "part_properties.xpm"
-#include "pin2pin.xpm"
-#include "new_component.xpm"
 
 #include "id.h"
 
diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp
index b52bf5cf87..72bfa3d36c 100644
--- a/eeschema/tool_sch.cpp
+++ b/eeschema/tool_sch.cpp
@@ -15,16 +15,7 @@
 
 #define BITMAP wxBitmap
 
-#include "bitmaps.h" /* general bitmaps */
-
-/* Specific bitmaps */
-#include "cvpcb.xpm"
-#include "Hierarchy_Nav.xpm"
-#include "Hierarchy_cursor.xpm"
-#include "library_browse.xpm"
-#include "libedit.xpm"
-#include "Lines90.xpm"
-#include "Hidden_Pin.xpm"
+#include "bitmaps.h"
 
 #include "id.h"
 
diff --git a/eeschema/tool_viewlib.cpp b/eeschema/tool_viewlib.cpp
index aba3be4ab4..ce0f74fd2c 100644
--- a/eeschema/tool_viewlib.cpp
+++ b/eeschema/tool_viewlib.cpp
@@ -20,9 +20,6 @@
 
 #include "id.h"
 
-#include "Lib_previous.xpm"
-#include "Lib_next.xpm"
-
 /****************************************************/
 void WinEDA_ViewlibFrame::ReCreateHToolbar()
 /****************************************************/
diff --git a/eeschema/viewlib_frame.cpp b/eeschema/viewlib_frame.cpp
index 06ae1bc3fb..ebb052a5e7 100644
--- a/eeschema/viewlib_frame.cpp
+++ b/eeschema/viewlib_frame.cpp
@@ -19,8 +19,6 @@
 
 #include "id.h"
 
-#include "library_browse.xpm"
-
 /*****************************/
 /* class WinEDA_ViewlibFrame */
 /*****************************/