diff --git a/gdk/gdkvulkancontext.h b/gdk/gdkvulkancontext.h
index 55a347861b..3bc9f50961 100644
--- a/gdk/gdkvulkancontext.h
+++ b/gdk/gdkvulkancontext.h
@@ -44,37 +44,6 @@ GQuark gdk_vulkan_error_quark (void);
 GDK_AVAILABLE_IN_ALL
 GType gdk_vulkan_context_get_type (void) G_GNUC_CONST;
 
-#ifndef __GI_SCANNER__
-#ifdef GDK_RENDERING_VULKAN
-
-GDK_AVAILABLE_IN_ALL
-const char *            gdk_vulkan_strerror                         (VkResult           result);
-
-GDK_AVAILABLE_IN_ALL
-VkInstance              gdk_vulkan_context_get_instance             (GdkVulkanContext  *context);
-GDK_AVAILABLE_IN_ALL
-VkPhysicalDevice        gdk_vulkan_context_get_physical_device      (GdkVulkanContext  *context);
-GDK_AVAILABLE_IN_ALL
-VkDevice                gdk_vulkan_context_get_device               (GdkVulkanContext  *context);
-GDK_AVAILABLE_IN_ALL
-VkQueue                 gdk_vulkan_context_get_queue                (GdkVulkanContext  *context);
-GDK_AVAILABLE_IN_ALL
-uint32_t                gdk_vulkan_context_get_queue_family_index   (GdkVulkanContext  *context);
-GDK_AVAILABLE_IN_ALL
-VkFormat                gdk_vulkan_context_get_image_format         (GdkVulkanContext  *context);
-GDK_AVAILABLE_IN_ALL
-uint32_t                gdk_vulkan_context_get_n_images             (GdkVulkanContext  *context);
-GDK_AVAILABLE_IN_ALL
-VkImage                 gdk_vulkan_context_get_image                (GdkVulkanContext  *context,
-                                                                     guint              id);
-GDK_AVAILABLE_IN_ALL
-uint32_t                gdk_vulkan_context_get_draw_index           (GdkVulkanContext  *context);
-GDK_AVAILABLE_IN_ALL
-VkSemaphore             gdk_vulkan_context_get_draw_semaphore       (GdkVulkanContext  *context);
-
-#endif /* GDK_RENDERING_VULKAN */
-#endif /* __GI_SCANNER__ */
-
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkVulkanContext, g_object_unref)
 
 G_END_DECLS
diff --git a/gdk/gdkvulkancontextprivate.h b/gdk/gdkvulkancontextprivate.h
index 904c44d661..a68a821321 100644
--- a/gdk/gdkvulkancontextprivate.h
+++ b/gdk/gdkvulkancontextprivate.h
@@ -57,6 +57,8 @@ struct _GdkVulkanContextClass
 
 #ifdef GDK_RENDERING_VULKAN
 
+const char *            gdk_vulkan_strerror                         (VkResult           result);
+
 static inline VkResult
 gdk_vulkan_handle_result (VkResult    res,
                           const char *called_function)
@@ -84,6 +86,18 @@ VkShaderModule          gdk_display_get_vk_shader_module                (GdkDisp
 
 void                    gdk_display_vulkan_pipeline_cache_updated       (GdkDisplay            *display);
 
+VkInstance              gdk_vulkan_context_get_instance                 (GdkVulkanContext      *context);
+VkPhysicalDevice        gdk_vulkan_context_get_physical_device          (GdkVulkanContext      *context);
+VkDevice                gdk_vulkan_context_get_device                   (GdkVulkanContext      *context);
+VkQueue                 gdk_vulkan_context_get_queue                    (GdkVulkanContext      *context);
+uint32_t                gdk_vulkan_context_get_queue_family_index       (GdkVulkanContext      *context);
+VkFormat                gdk_vulkan_context_get_image_format             (GdkVulkanContext      *context);
+uint32_t                gdk_vulkan_context_get_n_images                 (GdkVulkanContext      *context);
+VkImage                 gdk_vulkan_context_get_image                    (GdkVulkanContext      *context,
+                                                                         guint                  id);
+uint32_t                gdk_vulkan_context_get_draw_index               (GdkVulkanContext      *context);
+VkSemaphore             gdk_vulkan_context_get_draw_semaphore           (GdkVulkanContext      *context);
+
 GdkMemoryFormat         gdk_vulkan_context_get_offscreen_format         (GdkVulkanContext      *context,
                                                                          GdkMemoryDepth         depth);
 
diff --git a/gsk/gpu/gskvulkandeviceprivate.h b/gsk/gpu/gskvulkandeviceprivate.h
index 6e79a04a6e..564cb54051 100644
--- a/gsk/gpu/gskvulkandeviceprivate.h
+++ b/gsk/gpu/gskvulkandeviceprivate.h
@@ -6,8 +6,8 @@
 #include "gskgpuclipprivate.h"
 #include "gskvulkanmemoryprivate.h"
 
-#include <gdk/gdkvulkancontext.h>
 #include "gdk/gdkdisplayprivate.h"
+#include "gdk/gdkvulkancontextprivate.h"
 
 G_BEGIN_DECLS