diff --git a/app/display/meson.build b/app/display/meson.build
index e410e0a8da..c734b9340e 100644
--- a/app/display/meson.build
+++ b/app/display/meson.build
@@ -107,7 +107,7 @@ libappdisplay_sources = [
   appdisplayenums,
   gitversion_h,
 
-  appcoremarshal,
+  appcoremarshal[1],
 ]
 
 libappdisplay = static_library('appdisplay',
diff --git a/app/gegl/gimptilehandlervalidate.c b/app/gegl/gimptilehandlervalidate.c
index 6d71011dde..2718bd1ee2 100644
--- a/app/gegl/gimptilehandlervalidate.c
+++ b/app/gegl/gimptilehandlervalidate.c
@@ -26,7 +26,6 @@
 #include "gimp-gegl-types.h"
 
 #include "core/gimpchunkiterator.h"
-#include "core/gimpmarshal.h"
 
 #include "gimp-gegl-loops.h"
 #include "gimp-gegl-utils.h"
diff --git a/app/paint/meson.build b/app/paint/meson.build
index 23c168d465..da029900af 100644
--- a/app/paint/meson.build
+++ b/app/paint/meson.build
@@ -54,7 +54,7 @@ libapppaint_sources = [
   'gimpsourceoptions.c',
   apppaintenums,
 
-  appcoremarshal,
+  appcoremarshal[1],
 ]
 
 libapppaint = static_library('apppaint',
diff --git a/app/pdb/meson.build b/app/pdb/meson.build
index 4cdc638147..6ba5b1c562 100644
--- a/app/pdb/meson.build
+++ b/app/pdb/meson.build
@@ -62,7 +62,7 @@ libappinternalprocs_sources = [
   'unit-cmds.c',
   'vectors-cmds.c',
 
-  appcoremarshal,
+  appcoremarshal[1],
 ]
 
 libapppdb = static_library('apppdb',
diff --git a/app/plug-in/meson.build b/app/plug-in/meson.build
index 8713bd32a5..43c9facc21 100644
--- a/app/plug-in/meson.build
+++ b/app/plug-in/meson.build
@@ -46,7 +46,7 @@ libappplugin_sources = [
   'plug-in-rc.c',
   apppluginenums,
 
-  appcoremarshal,
+  appcoremarshal[1],
 ]
 
 libappplugin = static_library('appplug-in',
diff --git a/app/tools/meson.build b/app/tools/meson.build
index 7e05777657..0c08b97c42 100644
--- a/app/tools/meson.build
+++ b/app/tools/meson.build
@@ -130,7 +130,7 @@ libapptools_sources = [
   'tool_manager.c',
   apptoolsenums,
 
-  appcoremarshal,
+  appcoremarshal[1],
 ]
 
 libapptools = static_library('apptools',
diff --git a/app/vectors/meson.build b/app/vectors/meson.build
index d517bee916..3b649b0ed7 100644
--- a/app/vectors/meson.build
+++ b/app/vectors/meson.build
@@ -13,7 +13,7 @@ libappvectors_sources = [
   'gimpvectorspropundo.c',
   'gimpvectorsundo.c',
 
-  appcoremarshal,
+  appcoremarshal[1],
 ]
 
 libappvectors = static_library('appvectors',
diff --git a/app/widgets/meson.build b/app/widgets/meson.build
index 667766c3d6..cd363e6d16 100644
--- a/app/widgets/meson.build
+++ b/app/widgets/meson.build
@@ -236,7 +236,7 @@ libappwidgets_sources = [
   'gimpwindowstrategy.c',
   appwidgetsenums,
 
-  appcoremarshal,
+  appcoremarshal[1],
 ]