diff --git a/libsel4/arch_include/arm/sel4/arch/deprecated.h b/libsel4/arch_include/arm/sel4/arch/deprecated.h
index 8d002f9e2e..62a2c29b47 100644
--- a/libsel4/arch_include/arm/sel4/arch/deprecated.h
+++ b/libsel4/arch_include/arm/sel4/arch/deprecated.h
@@ -6,8 +6,4 @@
 
 #pragma once
 
-#include <autoconf.h>
-#include <sel4/macros.h>
-#include <sel4/sel4_arch/deprecated.h>
-
-
+/* nothing here */
diff --git a/libsel4/arch_include/riscv/sel4/arch/deprecated.h b/libsel4/arch_include/riscv/sel4/arch/deprecated.h
index d55215b5dd..62a2c29b47 100644
--- a/libsel4/arch_include/riscv/sel4/arch/deprecated.h
+++ b/libsel4/arch_include/riscv/sel4/arch/deprecated.h
@@ -6,3 +6,4 @@
 
 #pragma once
 
+/* nothing here */
diff --git a/libsel4/arch_include/x86/sel4/arch/deprecated.h b/libsel4/arch_include/x86/sel4/arch/deprecated.h
index 01ab43cb88..62a2c29b47 100644
--- a/libsel4/arch_include/x86/sel4/arch/deprecated.h
+++ b/libsel4/arch_include/x86/sel4/arch/deprecated.h
@@ -6,7 +6,4 @@
 
 #pragma once
 
-#include <autoconf.h>
-#include <sel4/macros.h>
-#include <sel4/sel4_arch/deprecated.h>
-
+/* nothing here */
diff --git a/libsel4/include/sel4/deprecated.h b/libsel4/include/sel4/deprecated.h
index 71e8670cf8..d78563b13c 100644
--- a/libsel4/include/sel4/deprecated.h
+++ b/libsel4/include/sel4/deprecated.h
@@ -6,7 +6,9 @@
 
 #pragma once
 
-#include <sel4/macros.h>
+/* This header collects deprecated items that are no longer part of sel4.h. */
+
+#include <sel4/sel4.h>
 #include <sel4/arch/deprecated.h>
 #include <sel4/sel4_arch/deprecated.h>
 
@@ -126,5 +128,3 @@ static inline SEL4_DEPRECATED("Use seL4_CNode_CapData_new().words[0]") seL4_Word
 {
     return seL4_CNode_CapData_new(guard, bits).words[0];
 }
-
-
diff --git a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/deprecated.h b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/deprecated.h
index b17c4f64f1..62a2c29b47 100644
--- a/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/deprecated.h
+++ b/libsel4/sel4_arch_include/aarch64/sel4/sel4_arch/deprecated.h
@@ -4,4 +4,6 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#pragma once
\ No newline at end of file
+#pragma once
+
+/* nothing here */
diff --git a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/deprecated.h b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/deprecated.h
index 1d570993f9..62a2c29b47 100644
--- a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/deprecated.h
+++ b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/deprecated.h
@@ -3,4 +3,7 @@
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
-#pragma once
\ No newline at end of file
+
+#pragma once
+
+/* nothing here */
diff --git a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/deprecated.h b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/deprecated.h
index f31d9a92aa..62a2c29b47 100644
--- a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/deprecated.h
+++ b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/deprecated.h
@@ -5,3 +5,5 @@
  */
 
 #pragma once
+
+/* nothing here */
diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/deprecated.h b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/deprecated.h
index 1f9dc56986..62a2c29b47 100644
--- a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/deprecated.h
+++ b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/deprecated.h
@@ -6,7 +6,4 @@
 
 #pragma once
 
-#include <autoconf.h>
-#include <sel4/types.h>
-#include <sel4/arch/syscalls.h>
-
+/* nothing here */