diff --git a/hpvm/test/hpvm-cava/src/load_cam_model.c b/hpvm/test/hpvm-cava/src/load_cam_model.c
index 3ef24cf429e31ac8f35744005d82b57ac0200611..baec19ad4963e68ddfe2360e53f58dc436fd0da6 100644
--- a/hpvm/test/hpvm-cava/src/load_cam_model.c
+++ b/hpvm/test/hpvm-cava/src/load_cam_model.c
@@ -1,9 +1,10 @@
 #include "load_cam_model.h"
-#include "pipe_stages.h"
 #include "utility.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+// clang-format: pipe_stages.h must come after stdlib.h
+#include "pipe_stages.h"
 #include <string.h>
 
 // Get color space transform
diff --git a/hpvm/test/hpvm-cava/src/pipe_stages.h b/hpvm/test/hpvm-cava/src/pipe_stages.h
index f960822a03326638189c8d294938452ba2670b41..4fa24354c73a5792c9d6c344dbee5236f3379aa7 100644
--- a/hpvm/test/hpvm-cava/src/pipe_stages.h
+++ b/hpvm/test/hpvm-cava/src/pipe_stages.h
@@ -2,6 +2,7 @@
 #define _PIPE_STAGES_H_
 
 #include "defs.h"
+#include <stddef.h>
 
 #define CHAN_SIZE 3