diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c
index 6b5a609ed3d..4ad73280320 100644
--- a/src/gallium/drivers/panfrost/pan_cmdstream.c
+++ b/src/gallium/drivers/panfrost/pan_cmdstream.c
@@ -29,6 +29,8 @@
 #include "util/u_helpers.h"
 #include "util/u_draw.h"
 #include "util/u_memory.h"
+#include "pipe/p_defines.h"
+#include "pipe/p_state.h"
 #include "indices/u_primconvert.h"
 #include "gallium/auxiliary/util/u_blend.h"
 
@@ -36,7 +38,6 @@
 
 #include "pan_pool.h"
 #include "pan_bo.h"
-#include "pan_cmdstream.h"
 #include "pan_context.h"
 #include "pan_job.h"
 #include "pan_shader.h"
@@ -45,6 +46,8 @@
 #include "pan_indirect_draw.h"
 #include "pan_indirect_dispatch.h"
 
+#include "midgard_pack.h"
+
 /* Statically assert that PIPE_* enums match the hardware enums.
  * (As long as they match, we don't need to translate them.)
  */
diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.h b/src/gallium/drivers/panfrost/pan_cmdstream.h
deleted file mode 100644
index dd65bc9a8bc..00000000000
--- a/src/gallium/drivers/panfrost/pan_cmdstream.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2018 Alyssa Rosenzweig
- * Copyright (C) 2020 Collabora Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __PAN_CMDSTREAM_H__
-#define __PAN_CMDSTREAM_H__
-
-#include "pipe/p_defines.h"
-#include "pipe/p_state.h"
-
-#include "midgard_pack.h"
-
-#include "pan_job.h"
-
-#endif /* __PAN_CMDSTREAM_H__ */
diff --git a/src/gallium/drivers/panfrost/pan_compute.c b/src/gallium/drivers/panfrost/pan_compute.c
index ca5f2bd220f..246c467c066 100644
--- a/src/gallium/drivers/panfrost/pan_compute.c
+++ b/src/gallium/drivers/panfrost/pan_compute.c
@@ -27,7 +27,6 @@
  */
 
 #include "pan_context.h"
-#include "pan_cmdstream.h"
 #include "panfrost-quirks.h"
 #include "pan_bo.h"
 #include "pan_shader.h"
diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c
index 0c25590b681..d6c6b5d6e95 100644
--- a/src/gallium/drivers/panfrost/pan_context.c
+++ b/src/gallium/drivers/panfrost/pan_context.c
@@ -50,7 +50,6 @@
 #include "util/u_math.h"
 
 #include "pan_screen.h"
-#include "pan_cmdstream.h"
 #include "pan_util.h"
 #include "decode.h"
 #include "util/pan_lower_framebuffer.h"
diff --git a/src/gallium/drivers/panfrost/pan_job.c b/src/gallium/drivers/panfrost/pan_job.c
index 231c0b07868..a56e1560d45 100644
--- a/src/gallium/drivers/panfrost/pan_job.c
+++ b/src/gallium/drivers/panfrost/pan_job.c
@@ -38,7 +38,6 @@
 #include "util/rounding.h"
 #include "util/u_framebuffer.h"
 #include "pan_util.h"
-#include "pan_cmdstream.h"
 #include "decode.h"
 #include "panfrost-quirks.h"