diff --git a/src/gallium/drivers/panfrost/pan_blend_cso.h b/src/gallium/drivers/panfrost/pan_blend_cso.h
index 59e80dec02a..dd6c4a58c12 100644
--- a/src/gallium/drivers/panfrost/pan_blend_cso.h
+++ b/src/gallium/drivers/panfrost/pan_blend_cso.h
@@ -28,9 +28,10 @@
 #ifndef __PAN_BLEND_CSO_H
 #define __PAN_BLEND_CSO_H
 
-#include "pan_blend.h"
 #include "util/hash_table.h"
 #include "nir.h"
+#include "pan_blend.h"
+#include "pan_job.h"
 
 struct panfrost_bo;
 
diff --git a/src/panfrost/lib/pan_indirect_dispatch.h b/src/panfrost/lib/pan_indirect_dispatch.h
index e996c76551f..f39e5f9fce4 100644
--- a/src/panfrost/lib/pan_indirect_dispatch.h
+++ b/src/panfrost/lib/pan_indirect_dispatch.h
@@ -24,6 +24,7 @@
 #ifndef __PAN_INDIRECT_DISPATCH_SHADERS_H__
 #define __PAN_INDIRECT_DISPATCH_SHADERS_H__
 
+#include "pan_scoreboard.h"
 #include "genxml/gen_macros.h"
 
 struct pan_device;
diff --git a/src/panfrost/midgard/disassemble.h b/src/panfrost/midgard/disassemble.h
index 0faeedb7850..6aaaf8c6bc5 100644
--- a/src/panfrost/midgard/disassemble.h
+++ b/src/panfrost/midgard/disassemble.h
@@ -1,3 +1,6 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
 #include <stddef.h>
 
 void
diff --git a/src/panfrost/midgard/helpers.h b/src/panfrost/midgard/helpers.h
index a4d993ab3e4..436641b5201 100644
--- a/src/panfrost/midgard/helpers.h
+++ b/src/panfrost/midgard/helpers.h
@@ -23,9 +23,10 @@
 #ifndef __MDG_HELPERS_H
 #define __MDG_HELPERS_H
 
-#include "util/macros.h"
 #include <stdio.h>
 #include <string.h>
+#include "midgard.h"
+#include "util/macros.h"
 
 #define OP_IS_LOAD_VARY_F(op) (\
                 op == midgard_op_ld_vary_16 || \