diff --git a/tgstation.dme b/tgstation.dme
index 593a6b3141..05bc4b848a 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -47,7 +47,6 @@
 #include "code\__DEFINES\events.dm"
 #include "code\__DEFINES\exports.dm"
 #include "code\__DEFINES\fantasy_affixes.dm"
-#include "code\__DEFINES\flags.dm"
 #include "code\__DEFINES\food.dm"
 #include "code\__DEFINES\footsteps.dm"
 #include "code\__DEFINES\hud.dm"
@@ -75,7 +74,6 @@
 #include "code\__DEFINES\movespeed_modification.dm"
 #include "code\__DEFINES\nanites.dm"
 #include "code\__DEFINES\networks.dm"
-#include "code\__DEFINES\obj_flags.dm"
 #include "code\__DEFINES\pinpointers.dm"
 #include "code\__DEFINES\pipe_construction.dm"
 #include "code\__DEFINES\pool.dm"
@@ -117,10 +115,14 @@
 #include "code\__DEFINES\vv.dm"
 #include "code\__DEFINES\wall_dents.dm"
 #include "code\__DEFINES\wires.dm"
+#include "code\__DEFINES\combat\block.dm"
 #include "code\__DEFINES\combat\block_parry.dm"
 #include "code\__DEFINES\dcs\flags.dm"
 #include "code\__DEFINES\dcs\helpers.dm"
 #include "code\__DEFINES\dcs\signals.dm"
+#include "code\__DEFINES\flags\flags.dm"
+#include "code\__DEFINES\flags\item_flags.dm"
+#include "code\__DEFINES\flags\obj_flags.dm"
 #include "code\__HELPERS\_cit_helpers.dm"
 #include "code\__HELPERS\_lists.dm"
 #include "code\__HELPERS\_logging.dm"