diff --git a/docs/conf.py b/docs/conf.py
index c8463ba1349..af8b7e6f88b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -227,6 +227,7 @@ graphviz_output_format = 'svg'
 
 hawkmoth_root = os.path.abspath(os.pardir)
 mesa_root = os.path.join(os.path.dirname(__file__), os.pardir)
+mesa_build_root = os.environ.get('MESA_BUILD_ROOT')
 hawkmoth_clang = [
     '-I{}/docs/header-stubs/'.format(mesa_root),
     '-I{}/include/'.format(mesa_root),
@@ -234,6 +235,7 @@ hawkmoth_clang = [
     '-I{}/src/gallium/include/'.format(mesa_root),
     '-I{}/src/intel/'.format(mesa_root),
     '-I{}/src/mesa/'.format(mesa_root),
+    '-I{}/src/'.format(mesa_build_root),
     '-DHAVE_STRUCT_TIMESPEC',
     '-DHAVE_PTHREAD',
     '-DHAVE_ENDIAN_H',
diff --git a/docs/gitlab-ci.yml b/docs/gitlab-ci.yml
index 968c9ec5861..e3c19e5c8b5 100644
--- a/docs/gitlab-ci.yml
+++ b/docs/gitlab-ci.yml
@@ -13,7 +13,8 @@ deploy-docs:
       changes: &docs-or-ci
         - docs/**/*
         - .gitlab-ci.yml
-        # All the source files documentation is extracted from
+        - src/util/format/**/*
+        # All the following source files documentation is extracted from
         # git grep -h ":file: src/" -- docs | sort | uniq
         - src/compiler/nir/nir.h
         - src/intel/isl/**/*
diff --git a/docs/header-stubs/util/format/u_format_gen.h b/docs/header-stubs/util/format/u_format_gen.h
deleted file mode 100644
index 75a75aa76e1..00000000000
--- a/docs/header-stubs/util/format/u_format_gen.h
+++ /dev/null
@@ -1,7 +0,0 @@
-enum pipe_format {
-   PIPE_FORMAT_NONE,
-};
-
-enum pipe_video_chroma_format {
-   PIPE_VIDEO_CHROMA_FORMAT_NONE,
-};
diff --git a/docs/meson.build b/docs/meson.build
index dc8fd6979fa..09eaaa048e7 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -24,6 +24,12 @@ html_docs = custom_target(
             '-Ddepfile=@DEPFILE@',
             sphinx_args,
             meson.current_source_dir(), '@OUTPUT@'],
+  env: [
+    'MESA_BUILD_ROOT=' + meson.project_build_root()
+  ],
+  depends: [
+    u_format_gen_h,
+  ],
   output: 'html',
   build_by_default: get_option('html-docs').enabled(),
 )