diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 56ffe44c3e..b94503a4ae 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -576,7 +576,7 @@ OBJS-$(CONFIG_SHARED)                        += log2_tab.o
 SKIPHEADERS-$(CONFIG_QSVVPP)                 += qsvvpp.h
 SKIPHEADERS-$(CONFIG_OPENCL)                 += opencl.h
 SKIPHEADERS-$(CONFIG_VAAPI)                  += vaapi_vpp.h
-SKIPHEADERS-$(CONFIG_VULKAN)                 += vulkan.h
+SKIPHEADERS-$(CONFIG_VULKAN)                 += vulkan.h vulkan_filter.h
 
 TOOLS     = graph2dot
 TESTPROGS = drawutils filtfmts formats integral
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 410ac636f7..529046dbc8 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -205,7 +205,9 @@ SKIPHEADERS-$(CONFIG_OPENCL)           += hwcontext_opencl.h
 SKIPHEADERS-$(CONFIG_VAAPI)            += hwcontext_vaapi.h
 SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX)     += hwcontext_videotoolbox.h
 SKIPHEADERS-$(CONFIG_VDPAU)            += hwcontext_vdpau.h
-SKIPHEADERS-$(CONFIG_VULKAN)           += hwcontext_vulkan.h
+SKIPHEADERS-$(CONFIG_VULKAN)           += hwcontext_vulkan.h vulkan.h   \
+                                          vulkan_functions.h            \
+                                          vulkan_loader.h
 
 TESTPROGS = adler32                                                     \
             aes                                                         \
diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h
index 9706fd5ccb..d1ea1e24fb 100644
--- a/libavutil/vulkan.h
+++ b/libavutil/vulkan.h
@@ -19,14 +19,11 @@
 #ifndef AVUTIL_VULKAN_H
 #define AVUTIL_VULKAN_H
 
-#define VK_NO_PROTOTYPES
-#define VK_ENABLE_BETA_EXTENSIONS
-
 #include "pixdesc.h"
 #include "bprint.h"
 #include "hwcontext.h"
-#include "hwcontext_vulkan.h"
 #include "vulkan_functions.h"
+#include "hwcontext_vulkan.h"
 #include "vulkan_loader.h"
 
 #define FF_VK_DEFAULT_USAGE_FLAGS (VK_IMAGE_USAGE_SAMPLED_BIT      |           \
diff --git a/libavutil/vulkan_functions.h b/libavutil/vulkan_functions.h
index f6881d8959..85a9f943c8 100644
--- a/libavutil/vulkan_functions.h
+++ b/libavutil/vulkan_functions.h
@@ -19,6 +19,12 @@
 #ifndef AVUTIL_VULKAN_FUNCTIONS_H
 #define AVUTIL_VULKAN_FUNCTIONS_H
 
+#define VK_NO_PROTOTYPES
+#define VK_ENABLE_BETA_EXTENSIONS
+
+#include "hwcontext.h"
+#include "hwcontext_vulkan.h"
+
 /* An enum of bitflags for every optional extension we need */
 typedef enum FFVulkanExtensions {
     FF_VK_EXT_EXTERNAL_DMABUF_MEMORY = 1ULL <<  0, /* VK_EXT_external_memory_dma_buf */