diff --git a/src/gallium/drivers/panfrost/pan_csf.c b/src/gallium/drivers/panfrost/pan_csf.c
index f2633b157d5..9cf97d3db23 100644
--- a/src/gallium/drivers/panfrost/pan_csf.c
+++ b/src/gallium/drivers/panfrost/pan_csf.c
@@ -26,7 +26,6 @@
 #include "drm-uapi/panthor_drm.h"
 
 #include "genxml/cs_builder.h"
-#include "panfrost/lib/genxml/cs_builder.h"
 
 #include "gen_macros.h"
 #include "pan_cmdstream.h"
diff --git a/src/panfrost/ci/gitlab-ci-inc.yml b/src/panfrost/ci/gitlab-ci-inc.yml
index bcff3ed4bb0..1d4ec04e528 100644
--- a/src/panfrost/ci/gitlab-ci-inc.yml
+++ b/src/panfrost/ci/gitlab-ci-inc.yml
@@ -16,9 +16,9 @@
         - src/panfrost/ci/$GPU_VERSION-skips.txt
         - src/panfrost/ci/$DRIVER_NAME-skips.txt
         - src/panfrost/ci/$PIGLIT_TRACES_FILE
+        - src/panfrost/genxml/*
         - src/panfrost/include/*
         - src/panfrost/lib/*
-        - src/panfrost/lib/genxml/*
         - src/panfrost/lib/kmod/*
         - src/panfrost/shared/*
         - src/panfrost/util/*
diff --git a/src/panfrost/lib/genxml/common.xml b/src/panfrost/genxml/common.xml
similarity index 100%
rename from src/panfrost/lib/genxml/common.xml
rename to src/panfrost/genxml/common.xml
diff --git a/src/panfrost/lib/genxml/cs_builder.h b/src/panfrost/genxml/cs_builder.h
similarity index 100%
rename from src/panfrost/lib/genxml/cs_builder.h
rename to src/panfrost/genxml/cs_builder.h
diff --git a/src/panfrost/lib/genxml/decode.c b/src/panfrost/genxml/decode.c
similarity index 100%
rename from src/panfrost/lib/genxml/decode.c
rename to src/panfrost/genxml/decode.c
diff --git a/src/panfrost/lib/genxml/decode.h b/src/panfrost/genxml/decode.h
similarity index 100%
rename from src/panfrost/lib/genxml/decode.h
rename to src/panfrost/genxml/decode.h
diff --git a/src/panfrost/lib/genxml/decode_common.c b/src/panfrost/genxml/decode_common.c
similarity index 100%
rename from src/panfrost/lib/genxml/decode_common.c
rename to src/panfrost/genxml/decode_common.c
diff --git a/src/panfrost/lib/genxml/decode_csf.c b/src/panfrost/genxml/decode_csf.c
similarity index 100%
rename from src/panfrost/lib/genxml/decode_csf.c
rename to src/panfrost/genxml/decode_csf.c
diff --git a/src/panfrost/lib/genxml/decode_jm.c b/src/panfrost/genxml/decode_jm.c
similarity index 100%
rename from src/panfrost/lib/genxml/decode_jm.c
rename to src/panfrost/genxml/decode_jm.c
diff --git a/src/panfrost/lib/genxml/gen_macros.h b/src/panfrost/genxml/gen_macros.h
similarity index 100%
rename from src/panfrost/lib/genxml/gen_macros.h
rename to src/panfrost/genxml/gen_macros.h
diff --git a/src/panfrost/lib/genxml/gen_pack.py b/src/panfrost/genxml/gen_pack.py
similarity index 100%
rename from src/panfrost/lib/genxml/gen_pack.py
rename to src/panfrost/genxml/gen_pack.py
diff --git a/src/panfrost/lib/genxml/meson.build b/src/panfrost/genxml/meson.build
similarity index 100%
rename from src/panfrost/lib/genxml/meson.build
rename to src/panfrost/genxml/meson.build
diff --git a/src/panfrost/lib/genxml/pan_pack_helpers.h b/src/panfrost/genxml/pan_pack_helpers.h
similarity index 100%
rename from src/panfrost/lib/genxml/pan_pack_helpers.h
rename to src/panfrost/genxml/pan_pack_helpers.h
diff --git a/src/panfrost/lib/genxml/v10.xml b/src/panfrost/genxml/v10.xml
similarity index 100%
rename from src/panfrost/lib/genxml/v10.xml
rename to src/panfrost/genxml/v10.xml
diff --git a/src/panfrost/lib/genxml/v12.xml b/src/panfrost/genxml/v12.xml
similarity index 100%
rename from src/panfrost/lib/genxml/v12.xml
rename to src/panfrost/genxml/v12.xml
diff --git a/src/panfrost/lib/genxml/v13.xml b/src/panfrost/genxml/v13.xml
similarity index 100%
rename from src/panfrost/lib/genxml/v13.xml
rename to src/panfrost/genxml/v13.xml
diff --git a/src/panfrost/lib/genxml/v4.xml b/src/panfrost/genxml/v4.xml
similarity index 100%
rename from src/panfrost/lib/genxml/v4.xml
rename to src/panfrost/genxml/v4.xml
diff --git a/src/panfrost/lib/genxml/v5.xml b/src/panfrost/genxml/v5.xml
similarity index 100%
rename from src/panfrost/lib/genxml/v5.xml
rename to src/panfrost/genxml/v5.xml
diff --git a/src/panfrost/lib/genxml/v6.xml b/src/panfrost/genxml/v6.xml
similarity index 100%
rename from src/panfrost/lib/genxml/v6.xml
rename to src/panfrost/genxml/v6.xml
diff --git a/src/panfrost/lib/genxml/v7.xml b/src/panfrost/genxml/v7.xml
similarity index 100%
rename from src/panfrost/lib/genxml/v7.xml
rename to src/panfrost/genxml/v7.xml
diff --git a/src/panfrost/lib/genxml/v9.xml b/src/panfrost/genxml/v9.xml
similarity index 100%
rename from src/panfrost/lib/genxml/v9.xml
rename to src/panfrost/genxml/v9.xml
diff --git a/src/panfrost/lib/meson.build b/src/panfrost/lib/meson.build
index 57093d83a8d..b5cb30bce30 100644
--- a/src/panfrost/lib/meson.build
+++ b/src/panfrost/lib/meson.build
@@ -2,7 +2,6 @@
 # Copyright © 2019 Collabora
 # SPDX-License-Identifier: MIT
 
-subdir('genxml')
 subdir('kmod')
 
 pixel_format_versions = ['5', '6', '7', '9', '10', '12', '13']
@@ -14,7 +13,7 @@ foreach ver : pixel_format_versions
   libpanfrost_pixel_format += static_library(
     'pan-format-v' + ver,
     ['pan_format.c', pan_packers],
-    include_directories : [inc_src, inc_include],
+    include_directories : [inc_src, inc_include, inc_panfrost],
     c_args : ['-DPAN_ARCH=' + ver],
     gnu_symbol_visibility : 'hidden',
     dependencies : [deps_for_libpanfrost, dep_valgrind],
@@ -32,7 +31,7 @@ foreach ver : ['4', '5', '6', '7', '9', '10', '12', '13']
       'pan_shader.c',
       'pan_texture.c',
     ],
-    include_directories : [inc_include, inc_src],
+    include_directories : [inc_include, inc_src, inc_panfrost],
     c_args : ['-DPAN_ARCH=' + ver],
     gnu_symbol_visibility : 'hidden',
     dependencies : [deps_for_libpanfrost, idep_nir],
@@ -43,7 +42,7 @@ foreach ver : ['7']
   libpanfrost_per_arch += static_library(
     'pan-arch-indirect-v' + ver,
     'pan_indirect_dispatch.c',
-    include_directories : [inc_include, inc_src],
+    include_directories : [inc_include, inc_src, inc_panfrost],
     c_args : ['-DPAN_ARCH=' + ver],
     gnu_symbol_visibility : 'hidden',
     dependencies : [deps_for_libpanfrost, idep_nir],
@@ -70,7 +69,7 @@ libpanfrost_lib_files = files(
 libpanfrost_lib = static_library(
   'panfrost_lib',
   [libpanfrost_lib_files, pan_packers],
-  include_directories : [inc_include, inc_src],
+  include_directories : [inc_include, inc_src, inc_panfrost],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
   dependencies: [dep_libdrm, idep_nir, idep_mesautil],
diff --git a/src/panfrost/libpan/meson.build b/src/panfrost/libpan/meson.build
index 50bba67d148..6909a790d5f 100644
--- a/src/panfrost/libpan/meson.build
+++ b/src/panfrost/libpan/meson.build
@@ -20,8 +20,8 @@ foreach ver : ['4', '5', '6', '7', '9', '10', '12', '13']
         '-I' + join_paths(meson.project_source_root(), 'src/compiler/libcl'),
         '-I' + join_paths(meson.current_source_dir(), '.'),
         '-I' + join_paths(meson.current_source_dir(), '../../'),
-        '-I' + join_paths(meson.current_source_dir(), '../lib/'),
-        '-I' + join_paths(meson.current_build_dir(), '../lib/'),
+        '-I' + join_paths(meson.current_source_dir(), '../'),
+        '-I' + join_paths(meson.current_build_dir(), '../'),
         cl_args,
         ],
     depends : [pan_packers],
diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build
index a8e00d2b82a..5ac1ffbff31 100644
--- a/src/panfrost/meson.build
+++ b/src/panfrost/meson.build
@@ -16,6 +16,7 @@ subdir('midgard')
 subdir('compiler')
 
 if with_gallium_panfrost or with_panfrost_vk or with_tools.contains('panfrost')
+   subdir('genxml')
    subdir('lib')
    subdir('clc')
 endif