diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index 954b1d3939..2f423cb9ae 100644
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -35,6 +35,7 @@
 #include "gtkprivate.h"
 #include "gtkrender.h"
 #include "gtksizerequest.h"
+#include "gtksnapshot.h"
 #include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcssnodeprivate.h"
diff --git a/gtk/gtkbuiltinicon.c b/gtk/gtkbuiltinicon.c
index 547fc35a2a..4102dd95ee 100644
--- a/gtk/gtkbuiltinicon.c
+++ b/gtk/gtkbuiltinicon.c
@@ -24,6 +24,7 @@
 #include "gtkcssnodeprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkrendericonprivate.h"
+#include "gtksnapshot.h"
 
 /* GtkBuiltinIcon is a gadget implementation that is meant to replace
  * all calls to gtk_render_ functions to render arrows, expanders, checks
diff --git a/gtk/gtkdebugupdates.c b/gtk/gtkdebugupdates.c
index 7aa80b871a..b1d0cf3b52 100644
--- a/gtk/gtkdebugupdates.c
+++ b/gtk/gtkdebugupdates.c
@@ -19,6 +19,8 @@
 
 #include "gtkdebugupdatesprivate.h"
 
+#include "gtksnapshot.h"
+
 /* duration before we start fading in us */
 #define GDK_DRAW_REGION_MIN_DURATION 50 * 1000
 /* duration when fade is finished in us */
diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c
index 1a5849e294..7d4f2ef87d 100644
--- a/gtk/gtkdrawingarea.c
+++ b/gtk/gtkdrawingarea.c
@@ -26,6 +26,7 @@
 #include "gtkdrawingarea.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
+#include "gtksnapshot.h"
 #include "gtkstylecontext.h"
 
 typedef struct _GtkDrawingAreaPrivate GtkDrawingAreaPrivate;
diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index 98b0362200..f3b66216a6 100644
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -31,6 +31,7 @@
 #include "gtkcsstransientnodeprivate.h"
 #include "gtkiconthemeprivate.h"
 #include "gtkrendericonprivate.h"
+#include "gtksnapshot.h"
 
 struct _GtkIconHelperPrivate {
   GtkImageDefinition *def;
diff --git a/gtk/gtkrenderbackgroundprivate.h b/gtk/gtkrenderbackgroundprivate.h
index ed931ab52a..e4bf2ba599 100644
--- a/gtk/gtkrenderbackgroundprivate.h
+++ b/gtk/gtkrenderbackgroundprivate.h
@@ -24,7 +24,6 @@
 #include <cairo.h>
 
 #include "gtkcsstypesprivate.h"
-#include "gtksnapshot.h"
 #include "gtktypes.h"
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkrenderborderprivate.h b/gtk/gtkrenderborderprivate.h
index e05a664c7d..214560b35a 100644
--- a/gtk/gtkrenderborderprivate.h
+++ b/gtk/gtkrenderborderprivate.h
@@ -25,7 +25,7 @@
 #include "gtkborder.h"
 #include "gtkcssimageprivate.h"
 #include "gtkcssvalueprivate.h"
-#include "gtksnapshot.h"
+#include "gtktypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtkrendericonprivate.h b/gtk/gtkrendericonprivate.h
index 8b12d135bb..6a3ca4b911 100644
--- a/gtk/gtkrendericonprivate.h
+++ b/gtk/gtkrendericonprivate.h
@@ -25,7 +25,6 @@
 #include <gsk/gsk.h>
 
 #include "gtkcsstypesprivate.h"
-#include "gtksnapshot.h"
 #include "gtktypes.h"
 
 G_BEGIN_DECLS
diff --git a/gtk/gtksnapshot.h b/gtk/gtksnapshot.h
index 0bfaa54967..e981132550 100644
--- a/gtk/gtksnapshot.h
+++ b/gtk/gtksnapshot.h
@@ -36,9 +36,6 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GtkSnapshot GtkSnapshot;
-
-
 GDK_AVAILABLE_IN_3_90
 GskRenderer *   gtk_snapshot_get_renderer               (const GtkSnapshot      *snapshot);
 
diff --git a/gtk/gtktypes.h b/gtk/gtktypes.h
index 72bc9f6f06..07b8f4e152 100644
--- a/gtk/gtktypes.h
+++ b/gtk/gtktypes.h
@@ -37,6 +37,7 @@ typedef struct _GtkClipboard	       GtkClipboard;
 typedef struct _GtkRequisition	       GtkRequisition;
 typedef struct _GtkSelectionData       GtkSelectionData;
 typedef struct _GtkSettings            GtkSettings;
+typedef struct _GtkSnapshot            GtkSnapshot;
 typedef struct _GtkStyleContext        GtkStyleContext;
 typedef struct _GtkTooltip             GtkTooltip;
 typedef struct _GtkWidget              GtkWidget;
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 911f3ba839..25d6de49c1 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -33,7 +33,6 @@
 #include <gsk/gsk.h>
 #include <gtk/gtkaccelgroup.h>
 #include <gtk/gtkborder.h>
-#include <gtk/gtksnapshot.h>
 #include <gtk/gtktypes.h>
 #include <atk/atk.h>
 
diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index 971dc1fd52..7fcbbb4796 100644
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -31,7 +31,6 @@
 #include "gtkeventcontroller.h"
 #include "gtkactionmuxer.h"
 #include "gtksizerequestcacheprivate.h"
-#include "gtksnapshot.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtk/inspector/rendernodeview.c b/gtk/inspector/rendernodeview.c
index c1bd18675a..7757fb511c 100644
--- a/gtk/inspector/rendernodeview.c
+++ b/gtk/inspector/rendernodeview.c
@@ -23,8 +23,9 @@
 #include <glib/gi18n-lib.h>
 #include <math.h>
 
+#include <gtk/gtksnapshot.h>
+
 #include "gsk/gskrendernodeprivate.h"
-#include "gtkwidgetprivate.h"
 
 #include "fallback-c89.c"