diff --git a/include/arch/arm/arch/32/mode/types.h b/include/arch/arm/arch/32/mode/types.h
index f6cc464b4..34100551f 100644
--- a/include/arch/arm/arch/32/mode/types.h
+++ b/include/arch/arm/arch/32/mode/types.h
@@ -10,4 +10,3 @@
 #define wordBits (1 << wordRadix)
 
 typedef uint32_t timestamp_t;
-
diff --git a/include/arch/arm/arch/64/mode/types.h b/include/arch/arm/arch/64/mode/types.h
index f24f868d7..7e348cba7 100644
--- a/include/arch/arm/arch/64/mode/types.h
+++ b/include/arch/arm/arch/64/mode/types.h
@@ -10,5 +10,3 @@
 #define wordBits (1 << wordRadix)
 
 typedef uint64_t timestamp_t;
-
-
diff --git a/include/arch/arm/arch/types.h b/include/arch/arm/arch/types.h
index d4512ceff..031f9d8f9 100644
--- a/include/arch/arm/arch/types.h
+++ b/include/arch/arm/arch/types.h
@@ -52,4 +52,3 @@ typedef struct kernel_frame {
     int armExecuteNever;
     int userAvailable;
 } kernel_frame_t;
-
diff --git a/include/arch/riscv/arch/32/mode/types.h b/include/arch/riscv/arch/32/mode/types.h
index db45e149c..6650777f1 100644
--- a/include/arch/riscv/arch/32/mode/types.h
+++ b/include/arch/riscv/arch/32/mode/types.h
@@ -13,4 +13,3 @@
 compile_assert(long_is_32bits, sizeof(unsigned long) == 4)
 
 #define wordRadix 5
-
diff --git a/include/arch/riscv/arch/64/mode/types.h b/include/arch/riscv/arch/64/mode/types.h
index dc4766e9e..9cd52d7a7 100644
--- a/include/arch/riscv/arch/64/mode/types.h
+++ b/include/arch/riscv/arch/64/mode/types.h
@@ -13,5 +13,3 @@
 compile_assert(long_is_64bits, sizeof(unsigned long) == 8)
 
 #define wordRadix 6
-
-
diff --git a/include/arch/riscv/arch/types.h b/include/arch/riscv/arch/types.h
index 954b6c695..ddf9d3366 100644
--- a/include/arch/riscv/arch/types.h
+++ b/include/arch/riscv/arch/types.h
@@ -7,7 +7,6 @@
 
 #pragma once
 
-
 #include <config.h>
 #include <assert.h>
 #include <stdint.h>
@@ -45,4 +44,3 @@ typedef struct kernel_frame {
     pptr_t pptr;
     int userAvailable;
 } kernel_frame_t;
-
diff --git a/include/arch/x86/arch/32/mode/types.h b/include/arch/x86/arch/32/mode/types.h
index 916367669..c779e7e78 100644
--- a/include/arch/x86/arch/32/mode/types.h
+++ b/include/arch/x86/arch/32/mode/types.h
@@ -8,4 +8,3 @@
 
 #define wordRadix 5
 #define wordBits (1 << wordRadix)
-
diff --git a/include/arch/x86/arch/64/mode/types.h b/include/arch/x86/arch/64/mode/types.h
index a6f06c7a2..e0f791541 100644
--- a/include/arch/x86/arch/64/mode/types.h
+++ b/include/arch/x86/arch/64/mode/types.h
@@ -8,4 +8,3 @@
 
 #define wordRadix 6
 #define wordBits (1 << wordRadix)
-
diff --git a/include/arch/x86/arch/types.h b/include/arch/x86/arch/types.h
index ecece340d..eb28aef33 100644
--- a/include/arch/x86/arch/types.h
+++ b/include/arch/x86/arch/types.h
@@ -42,4 +42,3 @@ typedef paddr_t seL4_PAddr;
 typedef dom_t seL4_Domain;
 
 typedef uint64_t timestamp_t;
-
diff --git a/include/assert.h b/include/assert.h
index b2941cb5e..62b0eada3 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -53,4 +53,3 @@ void _assert_fail(
 #else
 #define unverified_compile_assert compile_assert
 #endif
-
diff --git a/include/compound_types.h b/include/compound_types.h
index ec2e6c29b..032bd54c7 100644
--- a/include/compound_types.h
+++ b/include/compound_types.h
@@ -29,4 +29,3 @@ struct extra_caps {
     cte_ptr_t excaprefs[seL4_MsgMaxExtraCaps];
 };
 typedef struct extra_caps extra_caps_t;
-
diff --git a/include/object.h b/include/object.h
index 49f7ddddb..290b2649d 100644
--- a/include/object.h
+++ b/include/object.h
@@ -16,4 +16,3 @@
 #include <object/structures.h>
 #include <object/tcb.h>
 #include <object/untyped.h>
-
diff --git a/include/stdarg.h b/include/stdarg.h
index fc1a0af1b..54bbef51e 100644
--- a/include/stdarg.h
+++ b/include/stdarg.h
@@ -11,4 +11,3 @@
 #define va_end(v) __builtin_va_end(v)
 #define va_arg(v,l) __builtin_va_arg(v,l)
 typedef __builtin_va_list va_list;
-
diff --git a/include/string.h b/include/string.h
index 3a222b327..8786e12e0 100644
--- a/include/string.h
+++ b/include/string.h
@@ -11,4 +11,3 @@
 word_t strnlen(const char *s, word_t maxlen);
 word_t strlcpy(char *dest, const char *src, word_t size);
 word_t strlcat(char *dest, const char *src, word_t size);
-
diff --git a/include/types.h b/include/types.h
index b69b8160f..c5a2ba67f 100644
--- a/include/types.h
+++ b/include/types.h
@@ -8,4 +8,3 @@
 
 #include <basic_types.h>
 #include <compound_types.h>
-