diff --git a/src/panfrost/midgard/helpers.h b/src/panfrost/midgard/helpers.h
index ac062e0be07..5cc63e705fb 100644
--- a/src/panfrost/midgard/helpers.h
+++ b/src/panfrost/midgard/helpers.h
@@ -389,13 +389,13 @@ midgard_unpack_varying_params(midgard_load_store_word word);
  * displacement bitsize. */
 
 #define UNPACK_LDST_ATTRIB_OFS(a)   ((a) >> 9)
-#define UNPACK_LDST_VERTEX_OFS(a)   util_sign_extend((a)&0x1FF, 9)
+#define UNPACK_LDST_VERTEX_OFS(a)   util_sign_extend((a) & 0x1FF, 9)
 #define UNPACK_LDST_SELECTOR_OFS(a) ((a) >> 9)
 #define UNPACK_LDST_UBO_OFS(a)      ((a) >> 2)
 #define UNPACK_LDST_MEM_OFS(a)      ((a))
 
 #define PACK_LDST_ATTRIB_OFS(a)   ((a) << 9)
-#define PACK_LDST_VERTEX_OFS(a)   ((a)&0x1FF)
+#define PACK_LDST_VERTEX_OFS(a)   ((a) & 0x1FF)
 #define PACK_LDST_SELECTOR_OFS(a) ((a) << 9)
 #define PACK_LDST_UBO_OFS(a)      ((a) << 2)
 #define PACK_LDST_MEM_OFS(a)      ((a))
diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c
index d7504ae381c..ee1350c86b5 100644
--- a/src/panfrost/midgard/midgard_compile.c
+++ b/src/panfrost/midgard/midgard_compile.c
@@ -31,8 +31,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "compiler/glsl_types.h"
 #include "compiler/glsl/glsl_to_nir.h"
+#include "compiler/glsl_types.h"
 #include "compiler/nir/nir_builder.h"
 #include "util/half_float.h"
 #include "util/list.h"