diff --git a/src/helper/binarybuffer.h b/src/helper/binarybuffer.h
index a8a5ef8f3f..3446296817 100644
--- a/src/helper/binarybuffer.h
+++ b/src/helper/binarybuffer.h
@@ -11,7 +11,8 @@
 #ifndef OPENOCD_HELPER_BINARYBUFFER_H
 #define OPENOCD_HELPER_BINARYBUFFER_H
 
-#include "list.h"
+#include <helper/list.h>
+#include <helper/types.h>
 
 /** @file
  * Support functions to access arbitrary bits in a byte array
diff --git a/src/helper/list.h b/src/helper/list.h
index eb8858e74b..47290c2602 100644
--- a/src/helper/list.h
+++ b/src/helper/list.h
@@ -35,7 +35,7 @@
 
 /* begin OpenOCD changes */
 
-#include <helper/types.h>
+#include <stddef.h>
 
 struct list_head {
 	struct list_head *next;
diff --git a/src/target/target.h b/src/target/target.h
index 1713448ce8..d5c0e0e8c7 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -23,6 +23,7 @@
 #include <helper/list.h>
 #include "helper/replacements.h"
 #include "helper/system.h"
+#include <helper/types.h>
 #include <jim.h>
 
 struct reg;