diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 10bee608c2..8c9cde5b76 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1108,7 +1108,7 @@
 	block_slowdown = 2
 	// no attacking while blocking
 	block_lock_attacking = TRUE
-	
+
 	parry_time_windup = 1
 	parry_time_active = 5
 	parry_time_spindown = 0
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 808dcb09df..dc6c8be884 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -406,7 +406,7 @@
 		if(PROJECTILE_RICOCHET_YES)
 			var/chance = ricochet_chance * A.ricochet_chance_mod
 			if(firer && HAS_TRAIT(firer, TRAIT_NICE_SHOT))
-			chance += NICE_SHOT_RICOCHET_BONUS
+				chance += NICE_SHOT_RICOCHET_BONUS
 			if(prob(chance))
 				return TRUE
 		else
diff --git a/tgstation.dme b/tgstation.dme
index 4e8b060faf..7651276145 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -48,7 +48,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"
@@ -77,7 +76,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"
@@ -85,6 +83,7 @@
 #include "code\__DEFINES\preferences.dm"
 #include "code\__DEFINES\procpath.dm"
 #include "code\__DEFINES\profile.dm"
+#include "code\__DEFINES\projectiles.dm"
 #include "code\__DEFINES\qdel.dm"
 #include "code\__DEFINES\radiation.dm"
 #include "code\__DEFINES\radio.dm"
@@ -119,10 +118,17 @@
 #include "code\__DEFINES\vv.dm"
 #include "code\__DEFINES\wall_dents.dm"
 #include "code\__DEFINES\wires.dm"
+#include "code\__DEFINES\_flags\_flags.dm"
+#include "code\__DEFINES\_flags\item_flags.dm"
+#include "code\__DEFINES\_flags\obj_flags.dm"
 #include "code\__DEFINES\admin\keybindings.dm"
+#include "code\__DEFINES\combat\attack_types.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\do_after.dm"
 #include "code\__DEFINES\flags\shields.dm"
 #include "code\__DEFINES\mapping\maploader.dm"
 #include "code\__DEFINES\material\worth.dm"
@@ -144,6 +150,7 @@
 #include "code\__HELPERS\custom_holoforms.dm"
 #include "code\__HELPERS\dates.dm"
 #include "code\__HELPERS\dna.dm"
+#include "code\__HELPERS\do_after.dm"
 #include "code\__HELPERS\donator_groupings.dm"
 #include "code\__HELPERS\files.dm"
 #include "code\__HELPERS\game.dm"
@@ -2316,7 +2323,10 @@
 #include "code\modules\mob\living\emote.dm"
 #include "code\modules\mob\living\life.dm"
 #include "code\modules\mob\living\living.dm"
+#include "code\modules\mob\living\living_active_block.dm"
+#include "code\modules\mob\living\living_active_parry.dm"
 #include "code\modules\mob\living\living_block.dm"
+#include "code\modules\mob\living\living_blocking_parrying.dm"
 #include "code\modules\mob\living\living_defense.dm"
 #include "code\modules\mob\living\living_defines.dm"
 #include "code\modules\mob\living\living_mobility.dm"