diff --git a/scripting/shavit-core.sp b/scripting/shavit-core.sp
index d286342e..bc146f7b 100644
--- a/scripting/shavit-core.sp
+++ b/scripting/shavit-core.sp
@@ -18,10 +18,6 @@
  *
 */
 
-#pragma newdecls required
-#pragma semicolon 1
-#pragma dynamic 131072
-
 #include <sourcemod>
 #include <sdktools>
 #include <geoip>
@@ -34,6 +30,10 @@
 #undef REQUIRE_PLUGIN
 #include <adminmenu>
 
+#pragma newdecls required
+#pragma semicolon 1
+#pragma dynamic 131072
+
 //#define DEBUG
 
 // game type (CS:S/CS:GO)
diff --git a/scripting/shavit-hud.sp b/scripting/shavit-hud.sp
index 7c388101..af060b98 100644
--- a/scripting/shavit-hud.sp
+++ b/scripting/shavit-hud.sp
@@ -18,10 +18,6 @@
  *
 */
 
-#pragma newdecls required
-#pragma semicolon 1
-#pragma dynamic 131072
-
 #include <sourcemod>
 
 #define USES_STYLE_NAMES
@@ -30,6 +26,10 @@
 #include <shavit>
 #include <clientprefs>
 
+#pragma newdecls required
+#pragma semicolon 1
+#pragma dynamic 131072
+
 #define HUD_NONE				(0)
 #define HUD_MASTER				(1 << 0) // master setting
 #define HUD_CENTER				(1 << 1) // show hud as hint text
diff --git a/scripting/shavit-misc.sp b/scripting/shavit-misc.sp
index 2059adc1..bd2f78f0 100644
--- a/scripting/shavit-misc.sp
+++ b/scripting/shavit-misc.sp
@@ -18,10 +18,6 @@
  *
 */
 
-#pragma newdecls required
-#pragma semicolon 1
-#pragma dynamic 131072
-
 #include <sourcemod>
 #include <cstrike>
 #include <sdktools>
@@ -34,6 +30,10 @@
 #undef REQUIRE_EXTENSIONS
 #include <dhooks>
 
+#pragma newdecls required
+#pragma semicolon 1
+#pragma dynamic 131072
+
 bool gB_Hide[MAXPLAYERS+1];
 bool gB_Late;
 int gF_LastFlags[MAXPLAYERS+1];
diff --git a/scripting/shavit-replay.sp b/scripting/shavit-replay.sp
index 7abc8af5..d868fd8e 100644
--- a/scripting/shavit-replay.sp
+++ b/scripting/shavit-replay.sp
@@ -18,12 +18,6 @@
  *
 */
 
-// I have no idea if this plugin will work with CS:S, sorry.
-
-#pragma semicolon 1
-#pragma dynamic 131072
-#pragma newdecls required
-
 #include <sourcemod>
 #include <cstrike>
 #include <sdktools>
@@ -33,6 +27,10 @@
 #define USES_STYLE_PROPERTIES
 #include <shavit>
 
+#pragma semicolon 1
+#pragma dynamic 131072
+#pragma newdecls required
+
 ServerGame gSG_Type = Game_Unknown;
 
 int gI_ReplayTick[MAX_STYLES];
diff --git a/scripting/shavit-sounds.sp b/scripting/shavit-sounds.sp
index fecc3001..84f3cdd9 100644
--- a/scripting/shavit-sounds.sp
+++ b/scripting/shavit-sounds.sp
@@ -18,14 +18,14 @@
  *
 */
 
-#pragma semicolon 1
-#pragma dynamic 131072
-#pragma newdecls required
-
 #include <sourcemod>
 #include <sdktools>
 #include <shavit>
 
+#pragma semicolon 1
+#pragma dynamic 131072
+#pragma newdecls required
+
 #define SOUNDS_LIMIT 64 // we really don't need more than that
 
 ServerGame gSG_Type = Game_Unknown;
diff --git a/scripting/shavit-stats.sp b/scripting/shavit-stats.sp
index 8c689b99..e160a440 100644
--- a/scripting/shavit-stats.sp
+++ b/scripting/shavit-stats.sp
@@ -18,10 +18,6 @@
  *
 */
 
-#pragma semicolon 1
-#pragma dynamic 131072
-#pragma newdecls required
-
 #include <sourcemod>
 
 #define USES_STYLE_NAMES
@@ -29,6 +25,10 @@
 #define USES_STYLE_PROPERTIES
 #include <shavit>
 
+#pragma semicolon 1
+#pragma dynamic 131072
+#pragma newdecls required
+
 // macros
 #define MAPSDONE 0
 #define MAPSLEFT 1
diff --git a/scripting/shavit-timelimit.sp b/scripting/shavit-timelimit.sp
index 8c566080..82661744 100644
--- a/scripting/shavit-timelimit.sp
+++ b/scripting/shavit-timelimit.sp
@@ -20,13 +20,13 @@
 
 // original idea from ckSurf.
 
+#include <sourcemod>
+#include <shavit>
+
 #pragma semicolon 1
 #pragma dynamic 131072
 #pragma newdecls required
 
-#include <sourcemod>
-#include <shavit>
-
 // #define DEBUG
 
 // database handle
diff --git a/scripting/shavit-wr.sp b/scripting/shavit-wr.sp
index 93e23450..879b3b2c 100644
--- a/scripting/shavit-wr.sp
+++ b/scripting/shavit-wr.sp
@@ -18,10 +18,6 @@
  *
 */
 
-#pragma semicolon 1
-#pragma dynamic 131072
-#pragma newdecls required
-
 #include <sourcemod>
 
 #define USES_STYLE_NAMES
@@ -31,6 +27,10 @@
 #undef REQUIRE_PLUGIN
 #include <adminmenu>
 
+#pragma semicolon 1
+#pragma dynamic 131072
+#pragma newdecls required
+
 //#define DEBUG
 
 bool gB_Late;
diff --git a/scripting/shavit-zones.sp b/scripting/shavit-zones.sp
index c9ca1ad3..a63d821e 100644
--- a/scripting/shavit-zones.sp
+++ b/scripting/shavit-zones.sp
@@ -18,10 +18,6 @@
  *
 */
 
-#pragma semicolon 1
-#pragma dynamic 131072
-#pragma newdecls required
-
 #include <sourcemod>
 #include <sdktools>
 #include <cstrike>
@@ -30,6 +26,10 @@
 #undef REQUIRE_PLUGIN
 #include <adminmenu>
 
+#pragma semicolon 1
+#pragma dynamic 131072
+#pragma newdecls required
+
 #define PLACEHOLDER 32767
 
 ServerGame gSG_Type = Game_Unknown;