diff --git a/app/core/gimpasync.c b/app/core/gimpasync.c
index 0ed2708e4d..4786b039c8 100644
--- a/app/core/gimpasync.c
+++ b/app/core/gimpasync.c
@@ -27,7 +27,6 @@
 
 #include "gimpasync.h"
 #include "gimpcancelable.h"
-#include "gimpmarshal.h"
 #include "gimpwaitable.h"
 
 
diff --git a/app/core/gimpcancelable.c b/app/core/gimpcancelable.c
index d695c3fa68..bb2c80cc94 100644
--- a/app/core/gimpcancelable.c
+++ b/app/core/gimpcancelable.c
@@ -27,7 +27,6 @@
 #include "core-types.h"
 
 #include "gimpcancelable.h"
-#include "gimpmarshal.h"
 
 
 enum
diff --git a/app/core/gimpchannel.c b/app/core/gimpchannel.c
index 1d97da764d..12bc985cd1 100644
--- a/app/core/gimpchannel.c
+++ b/app/core/gimpchannel.c
@@ -52,7 +52,6 @@
 #include "gimpcontext.h"
 #include "gimpdrawable-fill.h"
 #include "gimpdrawable-stroke.h"
-#include "gimpmarshal.h"
 #include "gimppaintinfo.h"
 #include "gimppickable.h"
 #include "gimpstrokeoptions.h"
diff --git a/app/core/gimpcontext.c b/app/core/gimpcontext.c
index 605d82caa9..86ea8c22c9 100644
--- a/app/core/gimpcontext.c
+++ b/app/core/gimpcontext.c
@@ -44,7 +44,6 @@
 #include "gimpimagefile.h"
 #include "gimpgradient.h"
 #include "gimpimage.h"
-#include "gimpmarshal.h"
 #include "gimpmybrush.h"
 #include "gimppaintinfo.h"
 #include "gimppalette.h"
diff --git a/app/core/gimpdata.c b/app/core/gimpdata.c
index 52e5bb53f0..6a9b1070dd 100644
--- a/app/core/gimpdata.c
+++ b/app/core/gimpdata.c
@@ -29,7 +29,6 @@
 
 #include "gimp-memsize.h"
 #include "gimpdata.h"
-#include "gimpmarshal.h"
 #include "gimptag.h"
 #include "gimptagged.h"
 
diff --git a/app/core/gimpfilter.c b/app/core/gimpfilter.c
index d0a6cf343a..1696ff8546 100644
--- a/app/core/gimpfilter.c
+++ b/app/core/gimpfilter.c
@@ -29,7 +29,6 @@
 #include "gimp.h"
 #include "gimp-memsize.h"
 #include "gimpfilter.h"
-#include "gimpmarshal.h"
 
 
 enum
diff --git a/app/core/gimpimage-merge.c b/app/core/gimpimage-merge.c
index 1a5cfd0224..f63e315fcc 100644
--- a/app/core/gimpimage-merge.c
+++ b/app/core/gimpimage-merge.c
@@ -45,7 +45,6 @@
 #include "gimplayer-floating-selection.h"
 #include "gimplayer-new.h"
 #include "gimplayermask.h"
-#include "gimpmarshal.h"
 #include "gimpparasitelist.h"
 #include "gimppickable.h"
 #include "gimpprogress.h"
diff --git a/app/core/gimpimagefile.c b/app/core/gimpimagefile.c
index d698b9f246..703d8ceaf3 100644
--- a/app/core/gimpimagefile.c
+++ b/app/core/gimpimagefile.c
@@ -42,7 +42,6 @@
 #include "gimpcontext.h"
 #include "gimpimage.h"
 #include "gimpimagefile.h"
-#include "gimpmarshal.h"
 #include "gimppickable.h"
 #include "gimpprogress.h"
 
diff --git a/app/core/gimpitem.c b/app/core/gimpitem.c
index 18b61439de..16d75b7dd2 100644
--- a/app/core/gimpitem.c
+++ b/app/core/gimpitem.c
@@ -41,7 +41,6 @@
 #include "gimpitem-preview.h"
 #include "gimpitemtree.h"
 #include "gimplist.h"
-#include "gimpmarshal.h"
 #include "gimpparasitelist.h"
 #include "gimpprogress.h"
 #include "gimpstrokeoptions.h"
diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c
index 59e4f7d5a8..19344e91b5 100644
--- a/app/core/gimplayer.c
+++ b/app/core/gimplayer.c
@@ -52,7 +52,6 @@
 #include "gimplayer-floating-selection.h"
 #include "gimplayer.h"
 #include "gimplayermask.h"
-#include "gimpmarshal.h"
 #include "gimpobjectqueue.h"
 #include "gimppickable.h"
 #include "gimpprogress.h"
diff --git a/app/core/gimplineart.c b/app/core/gimplineart.c
index 970672335a..b05d850e3e 100644
--- a/app/core/gimplineart.c
+++ b/app/core/gimplineart.c
@@ -39,7 +39,6 @@
 #include "gimpdrawable.h"
 #include "gimpimage.h"
 #include "gimplineart.h"
-#include "gimpmarshal.h"
 #include "gimppickable.h"
 #include "gimpprojection.h"
 #include "gimpviewable.h"
diff --git a/app/core/gimpobject.c b/app/core/gimpobject.c
index 33cf55fd9c..cedc2cb7c3 100644
--- a/app/core/gimpobject.c
+++ b/app/core/gimpobject.c
@@ -27,7 +27,6 @@
 #include "core-types.h"
 
 #include "gimp-memsize.h"
-#include "gimpmarshal.h"
 #include "gimpobject.h"
 
 #include "gimp-debug.h"
diff --git a/app/core/gimpparasitelist.c b/app/core/gimpparasitelist.c
index 60f162da2e..242c3fa3a9 100644
--- a/app/core/gimpparasitelist.c
+++ b/app/core/gimpparasitelist.c
@@ -27,7 +27,6 @@
 #include "core-types.h"
 
 #include "gimp-memsize.h"
-#include "gimpmarshal.h"
 #include "gimpparasitelist.h"
 
 
diff --git a/app/core/gimpprogress.c b/app/core/gimpprogress.c
index 881ef78a79..90a2ffc93a 100644
--- a/app/core/gimpprogress.c
+++ b/app/core/gimpprogress.c
@@ -28,7 +28,6 @@
 #include "core-types.h"
 
 #include "gimp.h"
-#include "gimpmarshal.h"
 #include "gimpprogress.h"
 
 #include "gimp-intl.h"
diff --git a/app/core/gimpstrokeoptions.c b/app/core/gimpstrokeoptions.c
index ffe23ea72e..dda73ead1c 100644
--- a/app/core/gimpstrokeoptions.c
+++ b/app/core/gimpstrokeoptions.c
@@ -34,7 +34,6 @@
 #include "gimp.h"
 #include "gimpcontext.h"
 #include "gimpdashpattern.h"
-#include "gimpmarshal.h"
 #include "gimppaintinfo.h"
 #include "gimpparamspecs.h"
 #include "gimpstrokeoptions.h"
diff --git a/app/core/gimptagged.c b/app/core/gimptagged.c
index 6edede712b..87e8c7ece9 100644
--- a/app/core/gimptagged.c
+++ b/app/core/gimptagged.c
@@ -24,7 +24,6 @@
 
 #include "core-types.h"
 
-#include "gimpmarshal.h"
 #include "gimptag.h"
 #include "gimptagged.h"
 
diff --git a/app/core/gimptaggedcontainer.c b/app/core/gimptaggedcontainer.c
index 2f3328a58b..5a7e93a48e 100644
--- a/app/core/gimptaggedcontainer.c
+++ b/app/core/gimptaggedcontainer.c
@@ -25,7 +25,6 @@
 #include "core-types.h"
 
 #include "gimp.h"
-#include "gimpmarshal.h"
 #include "gimptag.h"
 #include "gimptagged.h"
 #include "gimptaggedcontainer.h"
diff --git a/app/core/gimptoolgroup.c b/app/core/gimptoolgroup.c
index a0edce5683..20bd52bbcb 100644
--- a/app/core/gimptoolgroup.c
+++ b/app/core/gimptoolgroup.c
@@ -31,7 +31,6 @@
 #include "core-types.h"
 
 #include "gimplist.h"
-#include "gimpmarshal.h"
 #include "gimptoolgroup.h"
 #include "gimptoolinfo.h"
 
diff --git a/app/core/gimptoolitem.c b/app/core/gimptoolitem.c
index 3f6ce36de5..96c0b4858a 100644
--- a/app/core/gimptoolitem.c
+++ b/app/core/gimptoolitem.c
@@ -30,8 +30,6 @@
 
 #include "core-types.h"
 
-#include "core/gimpmarshal.h"
-
 #include "gimptoolitem.h"
 
 
diff --git a/app/core/gimpviewable.c b/app/core/gimpviewable.c
index 54583178ce..c1a08e1f75 100644
--- a/app/core/gimpviewable.c
+++ b/app/core/gimpviewable.c
@@ -36,7 +36,6 @@
 #include "gimp-memsize.h"
 #include "gimpcontainer.h"
 #include "gimpcontext.h"
-#include "gimpmarshal.h"
 #include "gimptempbuf.h"
 #include "gimpviewable.h"
 
diff --git a/app/display/gimptoolgui.c b/app/display/gimptoolgui.c
index 3ecdb5a73a..0bc7ac6ff4 100644
--- a/app/display/gimptoolgui.c
+++ b/app/display/gimptoolgui.c
@@ -28,7 +28,6 @@
 #include "display-types.h"
 
 #include "core/gimpcontext.h"
-#include "core/gimpmarshal.h"
 #include "core/gimptoolinfo.h"
 
 #include "widgets/gimpdialogfactory.h"
diff --git a/app/display/gimptoolpolygon.c b/app/display/gimptoolpolygon.c
index ba4508090d..ae5295b7c9 100644
--- a/app/display/gimptoolpolygon.c
+++ b/app/display/gimptoolpolygon.c
@@ -37,7 +37,6 @@
 #include "display-types.h"
 
 #include "core/gimp-utils.h"
-#include "core/gimpmarshal.h"
 
 #include "widgets/gimpwidgets-utils.h"
 
diff --git a/app/display/gimptoolrectangle.c b/app/display/gimptoolrectangle.c
index 1c39e37b90..5552b49e10 100644
--- a/app/display/gimptoolrectangle.c
+++ b/app/display/gimptoolrectangle.c
@@ -36,7 +36,6 @@
 #include "core/gimpcontext.h"
 #include "core/gimpimage.h"
 #include "core/gimpitem.h"
-#include "core/gimpmarshal.h"
 #include "core/gimppickable.h"
 #include "core/gimppickable-auto-shrink.h"
 
diff --git a/app/paint/gimpbrushcore.c b/app/paint/gimpbrushcore.c
index bb08c729ba..4b1e8cd3a8 100644
--- a/app/paint/gimpbrushcore.c
+++ b/app/paint/gimpbrushcore.c
@@ -38,7 +38,6 @@
 #include "core/gimpdynamicsoutput.h"
 #include "core/gimperror.h"
 #include "core/gimpimage.h"
-#include "core/gimpmarshal.h"
 #include "core/gimpsymmetry.h"
 #include "core/gimptempbuf.h"
 
diff --git a/app/plug-in/gimppluginprocedure.c b/app/plug-in/gimppluginprocedure.c
index 41c77fff4d..7f5138ec01 100644
--- a/app/plug-in/gimppluginprocedure.c
+++ b/app/plug-in/gimppluginprocedure.c
@@ -34,7 +34,6 @@
 #include "core/gimp-memsize.h"
 #include "core/gimpdrawable.h"
 #include "core/gimpimage.h"
-#include "core/gimpmarshal.h"
 #include "core/gimpparamspecs.h"
 
 #include "file/file-utils.h"
diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c
index 1472a04837..2d7fc4f2e8 100644
--- a/app/tools/gimptexttool.c
+++ b/app/tools/gimptexttool.c
@@ -42,7 +42,6 @@
 #include "core/gimpimage-undo.h"
 #include "core/gimpimage-undo-push.h"
 #include "core/gimplayer-floating-selection.h"
-#include "core/gimpmarshal.h"
 #include "core/gimptoolinfo.h"
 #include "core/gimpundostack.h"
 
diff --git a/app/vectors/gimpvectors.c b/app/vectors/gimpvectors.c
index 10b764f29f..0716537d5e 100644
--- a/app/vectors/gimpvectors.c
+++ b/app/vectors/gimpvectors.c
@@ -40,7 +40,6 @@
 #include "core/gimperror.h"
 #include "core/gimpimage.h"
 #include "core/gimpimage-undo-push.h"
-#include "core/gimpmarshal.h"
 #include "core/gimppaintinfo.h"
 #include "core/gimpstrokeoptions.h"
 
diff --git a/app/widgets/gimpactionimpl.c b/app/widgets/gimpactionimpl.c
index e697285cee..12f5809ac1 100644
--- a/app/widgets/gimpactionimpl.c
+++ b/app/widgets/gimpactionimpl.c
@@ -33,7 +33,6 @@
 
 #include "core/gimp.h"
 #include "core/gimpcontext.h"
-#include "core/gimpmarshal.h"
 #include "core/gimpimagefile.h"  /* eek */
 
 #include "gimpaction.h"
diff --git a/app/widgets/gimpcolorpanel.c b/app/widgets/gimpcolorpanel.c
index 6f28749f99..59e2dacf0d 100644
--- a/app/widgets/gimpcolorpanel.c
+++ b/app/widgets/gimpcolorpanel.c
@@ -29,7 +29,6 @@
 
 #include "core/gimp.h"
 #include "core/gimpcontext.h"
-#include "core/gimpmarshal.h"
 
 #include "gimpaction.h"
 #include "gimpactiongroup.h"
diff --git a/app/widgets/gimpcontainertreeview.c b/app/widgets/gimpcontainertreeview.c
index 522b3c88ba..a87245d591 100644
--- a/app/widgets/gimpcontainertreeview.c
+++ b/app/widgets/gimpcontainertreeview.c
@@ -32,7 +32,6 @@
 
 #include "core/gimpcontainer.h"
 #include "core/gimpcontext.h"
-#include "core/gimpmarshal.h"
 #include "core/gimpviewable.h"
 
 #include "gimpcellrendererbutton.h"
diff --git a/app/widgets/gimpdatafactoryview.c b/app/widgets/gimpdatafactoryview.c
index 1318112f0f..08a143a91c 100644
--- a/app/widgets/gimpdatafactoryview.c
+++ b/app/widgets/gimpdatafactoryview.c
@@ -36,7 +36,6 @@
 #include "core/gimpdata.h"
 #include "core/gimpdatafactory.h"
 #include "core/gimplist.h"
-#include "core/gimpmarshal.h"
 #include "core/gimptaggedcontainer.h"
 
 #include "gimpcombotagentry.h"
diff --git a/app/widgets/gimpdeviceeditor.c b/app/widgets/gimpdeviceeditor.c
index 0d78bfd615..41ec62e0b3 100644
--- a/app/widgets/gimpdeviceeditor.c
+++ b/app/widgets/gimpdeviceeditor.c
@@ -32,7 +32,6 @@
 #include "core/gimpcontext.h"
 #include "core/gimpfilteredcontainer.h"
 #include "core/gimplist.h"
-#include "core/gimpmarshal.h"
 
 #include "gimpcontainerview.h"
 #include "gimpcontainertreestore.h"
diff --git a/app/widgets/gimpdeviceinfo.c b/app/widgets/gimpdeviceinfo.c
index b4455abc8a..449e04fa7a 100644
--- a/app/widgets/gimpdeviceinfo.c
+++ b/app/widgets/gimpdeviceinfo.c
@@ -34,7 +34,6 @@
 #include "core/gimpcurve.h"
 #include "core/gimpcurve-map.h"
 #include "core/gimpdatafactory.h"
-#include "core/gimpmarshal.h"
 #include "core/gimpparamspecs.h"
 #include "core/gimptoolinfo.h"
 
diff --git a/app/widgets/gimpdevicemanager.c b/app/widgets/gimpdevicemanager.c
index 00b2758f28..9247c01f3e 100644
--- a/app/widgets/gimpdevicemanager.c
+++ b/app/widgets/gimpdevicemanager.c
@@ -33,7 +33,6 @@
 #include "core/gimp.h"
 #include "core/gimpcontext.h"
 #include "core/gimpcurve.h"
-#include "core/gimpmarshal.h"
 #include "core/gimptoolinfo.h"
 
 #include "gimpdeviceinfo.h"
diff --git a/app/widgets/gimpenumaction.c b/app/widgets/gimpenumaction.c
index 598d7e10b9..b1b8cc83da 100644
--- a/app/widgets/gimpenumaction.c
+++ b/app/widgets/gimpenumaction.c
@@ -26,8 +26,6 @@
 
 #include "widgets-types.h"
 
-#include "core/gimpmarshal.h"
-
 #include "gimpaction.h"
 #include "gimpaction-history.h"
 #include "gimpenumaction.h"
diff --git a/app/widgets/gimpfgbgview.c b/app/widgets/gimpfgbgview.c
index fe0d0d6ea8..9c60418211 100644
--- a/app/widgets/gimpfgbgview.c
+++ b/app/widgets/gimpfgbgview.c
@@ -35,7 +35,6 @@
 
 #include "core/gimp.h"
 #include "core/gimpcontext.h"
-#include "core/gimpmarshal.h"
 
 #include "gimpdnd.h"
 #include "gimpfgbgview.h"
diff --git a/app/widgets/gimpfileprocview.c b/app/widgets/gimpfileprocview.c
index e508d7d229..83142ef8e1 100644
--- a/app/widgets/gimpfileprocview.c
+++ b/app/widgets/gimpfileprocview.c
@@ -28,7 +28,6 @@
 #include "widgets-types.h"
 
 #include "core/gimp.h"
-#include "core/gimpmarshal.h"
 
 #include "plug-in/gimppluginprocedure.h"
 
diff --git a/app/widgets/gimpgrideditor.c b/app/widgets/gimpgrideditor.c
index 7bc5d17b35..1a26835167 100644
--- a/app/widgets/gimpgrideditor.c
+++ b/app/widgets/gimpgrideditor.c
@@ -30,7 +30,6 @@
 
 #include "core/gimpcontext.h"
 #include "core/gimpgrid.h"
-#include "core/gimpmarshal.h"
 
 #include "gimpcolorpanel.h"
 #include "gimpgrideditor.h"
diff --git a/app/widgets/gimppanedbox.c b/app/widgets/gimppanedbox.c
index 6ba73c8c9e..078bee76b7 100644
--- a/app/widgets/gimppanedbox.c
+++ b/app/widgets/gimppanedbox.c
@@ -31,7 +31,6 @@
 
 #include "core/gimp.h"
 #include "core/gimpcontext.h"
-#include "core/gimpmarshal.h"
 
 #include "gimpdialogfactory.h"
 #include "gimpdnd.h"
diff --git a/app/widgets/gimppivotselector.c b/app/widgets/gimppivotselector.c
index b7319f47d3..b15b6bf474 100644
--- a/app/widgets/gimppivotselector.c
+++ b/app/widgets/gimppivotselector.c
@@ -29,8 +29,6 @@
 
 #include "widgets-types.h"
 
-#include "core/gimpmarshal.h"
-
 #include "gimppivotselector.h"
 
 
diff --git a/app/widgets/gimppluginview.c b/app/widgets/gimppluginview.c
index 86ae14368f..8e83db931b 100644
--- a/app/widgets/gimppluginview.c
+++ b/app/widgets/gimppluginview.c
@@ -28,8 +28,6 @@
 
 #include "widgets-types.h"
 
-#include "core/gimpmarshal.h"
-
 #include "plug-in/gimppluginprocedure.h"
 
 #include "gimppluginview.h"
diff --git a/app/widgets/gimppopup.c b/app/widgets/gimppopup.c
index 2514e9e286..a6a74d0486 100644
--- a/app/widgets/gimppopup.c
+++ b/app/widgets/gimppopup.c
@@ -28,8 +28,6 @@
 
 #include "widgets-types.h"
 
-#include "core/gimpmarshal.h"
-
 #include "gimppopup.h"
 
 
diff --git a/app/widgets/gimptextproxy.c b/app/widgets/gimptextproxy.c
index 5d1c5cb9e5..eeab3b237c 100644
--- a/app/widgets/gimptextproxy.c
+++ b/app/widgets/gimptextproxy.c
@@ -25,8 +25,6 @@
 
 #include "widgets-types.h"
 
-#include "core/gimpmarshal.h"
-
 #include "gimptextproxy.h"
 
 
diff --git a/app/widgets/gimpviewrenderer.c b/app/widgets/gimpviewrenderer.c
index f43637f3a4..53e91e7d4e 100644
--- a/app/widgets/gimpviewrenderer.c
+++ b/app/widgets/gimpviewrenderer.c
@@ -41,7 +41,6 @@
 #include "core/gimp.h"
 #include "core/gimpcontext.h"
 #include "core/gimpimage.h"
-#include "core/gimpmarshal.h"
 #include "core/gimptempbuf.h"
 #include "core/gimpviewable.h"
 
diff --git a/libgimpwidgets/gimpcolornotebook.c b/libgimpwidgets/gimpcolornotebook.c
index 839a06fe41..2973704304 100644
--- a/libgimpwidgets/gimpcolornotebook.c
+++ b/libgimpwidgets/gimpcolornotebook.c
@@ -34,7 +34,6 @@
 #include "gimpcolornotebook.h"
 #include "gimpcolorscales.h"
 #include "gimphelpui.h"
-#include "gimpwidgetsmarshal.h"
 
 #include "libgimp/libgimp-intl.h"
 
diff --git a/libgimpwidgets/gimpcolorselection.c b/libgimpwidgets/gimpcolorselection.c
index 6f239de2bb..ae489269ec 100644
--- a/libgimpwidgets/gimpcolorselection.c
+++ b/libgimpwidgets/gimpcolorselection.c
@@ -39,8 +39,6 @@
 #include "gimpwidgets.h"
 #include "gimpwidgets-private.h"
 
-#include "gimpwidgetsmarshal.h"
-
 #include "libgimp/libgimp-intl.h"