diff --git a/brcm/common/list.h b/brcm/common/list.h
index bda55e2..42b4fe7 100644
--- a/brcm/common/list.h
+++ b/brcm/common/list.h
@@ -41,10 +41,10 @@
 #include <stdbool.h>
 #include <stddef.h>
 //#include "c99_compat.h"
-//#include "../../driver/CustomAssert.h"
+#include "../../driver/CustomAssert.h"
 
 
-typedef struct list_head
+struct list_head
 {
     struct list_head *prev;
     struct list_head *next;
diff --git a/brcm/qpu/qpu_instr.c b/brcm/qpu/qpu_instr.c
index 08df0a3..46c4597 100644
--- a/brcm/qpu/qpu_instr.c
+++ b/brcm/qpu/qpu_instr.c
@@ -22,6 +22,7 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 #include "../common/macros.h"
 #include "../common/v3d_device_info.h"
 #include "qpu_instr.h"
@@ -207,6 +208,7 @@ v3d_qpu_cond_name(enum v3d_qpu_cond cond)
                 return ".ifnb";
         default:
                 unreachable("bad cond value");
+				return 0;
         }
 }
 
@@ -230,6 +232,7 @@ v3d_qpu_branch_cond_name(enum v3d_qpu_branch_cond cond)
                 return ".allna";
         default:
                 unreachable("bad branch cond value");
+				return 0;
         }
 }
 
@@ -245,6 +248,7 @@ v3d_qpu_msfign_name(enum v3d_qpu_msfign msfign)
                 return "q";
         default:
                 unreachable("bad branch cond value");
+				return 0;
         }
 }
 
@@ -262,6 +266,7 @@ v3d_qpu_pf_name(enum v3d_qpu_pf pf)
                 return ".pushc";
         default:
                 unreachable("bad pf value");
+				return 0;
         }
 }
 
@@ -297,6 +302,7 @@ v3d_qpu_uf_name(enum v3d_qpu_uf uf)
                 return ".nornc";
         default:
                 unreachable("bad pf value");
+				return 0;
         }
 }
 
@@ -312,6 +318,7 @@ v3d_qpu_pack_name(enum v3d_qpu_output_pack pack)
                 return ".h";
         default:
                 unreachable("bad pack value");
+				return 0;
         }
 }
 
@@ -337,6 +344,7 @@ v3d_qpu_unpack_name(enum v3d_qpu_input_unpack unpack)
                 return ".swp";
         default:
                 unreachable("bad unpack value");
+				return 0;
         }
 }
 
diff --git a/brcm/qpu/qpu_pack.c b/brcm/qpu/qpu_pack.c
index f1827ab..b05432d 100644
--- a/brcm/qpu/qpu_pack.c
+++ b/brcm/qpu/qpu_pack.c
@@ -22,6 +22,7 @@
  */
 
 #include <string.h>
+#include <strings.h>
 #include "../common/macros.h"
 
 #include "../common/v3d_device_info.h"
diff --git a/driver/CustomAssert.h b/driver/CustomAssert.h
index da51ee9..3284664 100644
--- a/driver/CustomAssert.h
+++ b/driver/CustomAssert.h
@@ -5,6 +5,7 @@ extern "C" {
 #endif
 
 #include <signal.h>
+#include <stdio.h>
 
 enum { HAVE_TRAP_INSTRUCTION = 1, };
 __attribute__((gnu_inline, always_inline))