diff --git a/crap/eq.hpp b/crap/eq.hpp
index e3b1777..ca1f02b 100644
--- a/crap/eq.hpp
+++ b/crap/eq.hpp
@@ -1,17 +1,16 @@
-#include <stdio.h>
-#include <string.h>
-
-#define BANDS 4
-
 #define ID 0x000CAFED
 #define LABEL "crap_eq"
 #define NAME "crap Parametric Equalizer"
 #define AUTHOR "Connor Olding"
 #define COPYRIGHT "MIT"
+#define BANDS 4
 #define PARAMETERS (BANDS*3)
 
 #define BLOCK_SIZE 256
 
+#include <stdio.h>
+#include <string.h>
+
 #include "util.hpp"
 #include "param.hpp"
 #include "biquad.hpp"
diff --git a/crap/eq_const.hpp b/crap/eq_const.hpp
index 22c2323..30f803f 100644
--- a/crap/eq_const.hpp
+++ b/crap/eq_const.hpp
@@ -1,5 +1,3 @@
-#include <string.h>
-
 #define ID 0x0DEFACED
 #define LABEL "crap_eq_const"
 #define NAME "crap Constant Equalizer"
@@ -9,6 +7,8 @@
 
 #define BLOCK_SIZE 256
 
+#include <string.h>
+
 #include "util.hpp"
 #include "biquad.hpp"
 
diff --git a/crap/eq_const_T420.hpp b/crap/eq_const_T420.hpp
index a0b989a..0f7bc51 100644
--- a/crap/eq_const_T420.hpp
+++ b/crap/eq_const_T420.hpp
@@ -1,5 +1,3 @@
-#include <string.h>
-
 #define ID (0x0DEFACED+420)
 #define LABEL "crap_eq_const_T420"
 #define NAME "crap T420 Speaker Compensation"
@@ -9,6 +7,8 @@
 
 #define BLOCK_SIZE 256
 
+#include <string.h>
+
 #include "util.hpp"
 #include "biquad.hpp"
 
diff --git a/crap/eq_const_T420_svf.hpp b/crap/eq_const_T420_svf.hpp
index f3fee98..80afd43 100644
--- a/crap/eq_const_T420_svf.hpp
+++ b/crap/eq_const_T420_svf.hpp
@@ -1,7 +1,3 @@
-#include <string.h>
-#include <stdio.h>
-#include <assert.h>
-
 #define ID (0x0DEFACED+420+1337)
 #define LABEL "crap_eq_const_T420_svf"
 #define NAME "crap T420 Speaker Compensation (SVF)"
@@ -11,6 +7,10 @@
 
 #define BLOCK_SIZE 256
 
+#include <string.h>
+#include <stdio.h>
+#include <assert.h>
+
 #include "util.hpp"
 #include "svf.hpp"
 
diff --git a/crap/noise.hpp b/crap/noise.hpp
index 3969b4b..9d72728 100644
--- a/crap/noise.hpp
+++ b/crap/noise.hpp
@@ -1,5 +1,3 @@
-#include "util.hpp"
-
 #define ID 0xEC57A71C
 #define LABEL "crap_noise"
 #define NAME "crap noise generator"
@@ -7,6 +5,8 @@
 #define COPYRIGHT "MIT"
 #define PARAMETERS 0
 
+#include "util.hpp"
+
 typedef struct {
 } personal;
 
diff --git a/crap/tube.hpp b/crap/tube.hpp
index 4b8a40c..53c0f90 100644
--- a/crap/tube.hpp
+++ b/crap/tube.hpp
@@ -1,6 +1,3 @@
-#include <string.h>
-#include <stdio.h>
-
 #define ID 0x50F7BA11
 #define LABEL "crap_tube"
 #define NAME "crap Tube Distortion"
@@ -12,6 +9,9 @@
 #define BLOCK_SIZE 256
 #define FULL_SIZE (BLOCK_SIZE*OVERSAMPLING)
 
+#include <string.h>
+#include <stdio.h>
+
 #include "util.hpp"
 #include "param.hpp"
 #include "os2piir.hpp"