diff --git a/plug-ins/gfig/Makefile.am b/plug-ins/gfig/Makefile.am
index 266ebbc323..bdbfe17cab 100644
--- a/plug-ins/gfig/Makefile.am
+++ b/plug-ins/gfig/Makefile.am
@@ -60,7 +60,9 @@ gfig_SOURCES = \
 	gfig-star.h		\
 	gfig-style.c		\
 	gfig-style.h    	\
-	gfig-types.h
+	gfig-types.h    	\
+	images/gfig-icon-images.c	\
+	images/gfig-icon-images.h
 
 EXTRA_DIST = README
 
diff --git a/plug-ins/gfig/gfig-icons.c b/plug-ins/gfig/gfig-icons.c
index 8bd32148cb..7adf6e00e5 100644
--- a/plug-ins/gfig/gfig-icons.c
+++ b/plug-ins/gfig/gfig-icons.c
@@ -29,7 +29,6 @@
 #include "gfig-icons.h"
 
 #include "images/gfig-icon-images.h"
-#include "images/gfig-icon-images.c"
 
 
 void
diff --git a/plug-ins/imagemap/Makefile.am b/plug-ins/imagemap/Makefile.am
index b270b210c8..ea9ee12fb5 100644
--- a/plug-ins/imagemap/Makefile.am
+++ b/plug-ins/imagemap/Makefile.am
@@ -129,7 +129,9 @@ imagemap_SOURCES = \
 	imap_ui_grid.c			\
 	imap_ui_grid.h			\
 	imap_taglist.c			\
-	imap_taglist.h
+	imap_taglist.h			\
+	images/imagemap-icon-images.h			\
+	images/imagemap-icon-images.c
 
 AM_CPPFLAGS = \
 	-DGIMP_DEPRECATED_REPLACE_NEW_API \
diff --git a/plug-ins/imagemap/imap_icons.c b/plug-ins/imagemap/imap_icons.c
index 3b97228f0d..d8c3868d31 100644
--- a/plug-ins/imagemap/imap_icons.c
+++ b/plug-ins/imagemap/imap_icons.c
@@ -27,7 +27,6 @@
 #include "imap_icons.h"
 
 #include "images/imagemap-icon-images.h"
-#include "images/imagemap-icon-images.c"
 
 void
 init_icons (void)
diff --git a/plug-ins/lighting/Makefile.am b/plug-ins/lighting/Makefile.am
index 578d6a0bcd..fe505dd79d 100644
--- a/plug-ins/lighting/Makefile.am
+++ b/plug-ins/lighting/Makefile.am
@@ -41,7 +41,9 @@ lighting_SOURCES = \
 	lighting-shade.c	\
 	lighting-shade.h	\
 	lighting-ui.c		\
-	lighting-ui.h
+	lighting-ui.h		\
+	images/lighting-icon-images.h		\
+	images/lighting-icon-images.c
 
 AM_CPPFLAGS = \
 	-DGIMP_DEPRECATED_REPLACE_NEW_API \
diff --git a/plug-ins/lighting/lighting-icons.c b/plug-ins/lighting/lighting-icons.c
index 0d46aace6e..86df53123d 100644
--- a/plug-ins/lighting/lighting-icons.c
+++ b/plug-ins/lighting/lighting-icons.c
@@ -22,7 +22,6 @@
 #include "lighting-icons.h"
 
 #include "images/lighting-icon-images.h"
-#include "images/lighting-icon-images.c"
 
 
 void
diff --git a/plug-ins/map-object/Makefile.am b/plug-ins/map-object/Makefile.am
index f94871311d..bc35651e0b 100644
--- a/plug-ins/map-object/Makefile.am
+++ b/plug-ins/map-object/Makefile.am
@@ -41,7 +41,9 @@ map_object_SOURCES = \
 	map-object-shade.c	\
 	map-object-shade.h	\
 	map-object-ui.c		\
-	map-object-ui.h
+	map-object-ui.h		\
+	../lighting/images/lighting-icon-images.h		\
+	../lighting/images/lighting-icon-images.c
 
 AM_CPPFLAGS = \
 	-DGIMP_DEPRECATED_REPLACE_NEW_API \
diff --git a/plug-ins/map-object/map-object-icons.c b/plug-ins/map-object/map-object-icons.c
index be2bfc64f1..57e758266c 100644
--- a/plug-ins/map-object/map-object-icons.c
+++ b/plug-ins/map-object/map-object-icons.c
@@ -22,7 +22,6 @@
 #include "map-object-icons.h"
 
 #include "../lighting/images/lighting-icon-images.h"
-#include "../lighting/images/lighting-icon-images.c"
 
 
 void