diff --git a/src/am_map.cpp b/src/am_map.cpp
index 45d08e616..6b0c33a9d 100644
--- a/src/am_map.cpp
+++ b/src/am_map.cpp
@@ -40,6 +40,7 @@
 #include "i_system.h"
 #include "c_dispatch.h"
 #include "colormatcher.h"
+#include "d_netinf.h"
 
 // Needs access to LFB.
 #include "v_video.h"
diff --git a/src/b_bot.h b/src/b_bot.h
index 7c74d987c..d178a85fa 100644
--- a/src/b_bot.h
+++ b/src/b_bot.h
@@ -8,7 +8,6 @@
 #define __B_BOT_H__
 
 #include "c_cvars.h"
-#include "m_argv.h"
 #include "tables.h"
 #include "info.h"
 #include "doomdef.h"
diff --git a/src/b_func.cpp b/src/b_func.cpp
index 0d6bf52a5..8e16d38ce 100644
--- a/src/b_func.cpp
+++ b/src/b_func.cpp
@@ -20,7 +20,6 @@
 #include "stats.h"
 #include "i_system.h"
 #include "s_sound.h"
-#include "a_doomglobal.h"
 #include "d_event.h"
 
 static FRandom pr_botdofire ("BotDoFire");
diff --git a/src/b_game.cpp b/src/b_game.cpp
index 8844ce635..9a6b618fd 100644
--- a/src/b_game.cpp
+++ b/src/b_game.cpp
@@ -59,6 +59,7 @@ Everything that is changed is marked (maybe commented) with "Added by MC"
 #include "teaminfo.h"
 #include "i_system.h"
 #include "d_net.h"
+#include "d_netinf.h"
 
 static FRandom pr_botspawn ("BotSpawn");
 
diff --git a/src/d_dehacked.cpp b/src/d_dehacked.cpp
index c0af9e814..3d23baf04 100644
--- a/src/d_dehacked.cpp
+++ b/src/d_dehacked.cpp
@@ -63,7 +63,6 @@
 #include "v_palette.h"
 #include "a_sharedglobal.h"
 #include "thingdef/thingdef.h"
-#include "dobject.h"
 #include "r_translate.h"
 
 // [SO] Just the way Randy said to do it :)
diff --git a/src/d_main.cpp b/src/d_main.cpp
index 8a46f23ba..b59324d9f 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -83,7 +83,6 @@
 #include "gi.h"
 #include "b_bot.h"		//Added by MC:
 #include "stats.h"
-#include "a_doomglobal.h"
 #include "gameconfigfile.h"
 #include "sbar.h"
 #include "decallib.h"
@@ -98,6 +97,7 @@
 #include "d_net.h"
 #include "g_level.h"
 #include "d_event.h"
+#include "d_netinf.h"
 
 EXTERN_CVAR(Bool, hud_althud)
 void DrawHUD();
diff --git a/src/d_net.cpp b/src/d_net.cpp
index 376c70996..40916b527 100644
--- a/src/d_net.cpp
+++ b/src/d_net.cpp
@@ -56,6 +56,7 @@
 #include "p_conversation.h"
 #include "g_level.h"
 #include "d_event.h"
+#include "m_argv.h"
 
 int P_StartScript (AActor *who, line_t *where, int script, char *map, bool backSide,
 					int arg0, int arg1, int arg2, int always, bool wantResultCode, bool net);
diff --git a/src/d_netinf.h b/src/d_netinf.h
index e3989e247..c2d49630c 100644
--- a/src/d_netinf.h
+++ b/src/d_netinf.h
@@ -38,36 +38,11 @@
 
 EXTERN_CVAR (Float, autoaim)
 
-#define MAXPLAYERNAME	15
-
-enum
-{
-	GENDER_MALE,
-	GENDER_FEMALE,
-	GENDER_NEUTER
-};
-
 int D_GenderToInt (const char *gender);
 extern const char *GenderNames[3];
 
 int D_PlayerClassToInt (const char *classname);
 
-struct userinfo_s
-{
-	char		netname[MAXPLAYERNAME+1];
-	BYTE		team;
-	int			aimdist;
-	int			color;
-	int			skin;
-	int			gender;
-	bool		neverswitch;
-	fixed_t		MoveBob, StillBob;
-	int			PlayerClass;
-};
-typedef struct userinfo_s userinfo_t;
-
-FArchive &operator<< (FArchive &arc, userinfo_t &info);
-
 void D_SetupUserInfo (void);
 
 void D_UserInfoChanged (FBaseCVar *info);
diff --git a/src/d_player.h b/src/d_player.h
index 824144538..4b271a7ff 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -40,8 +40,6 @@
 // case of the generic moving object/actor.
 #include "actor.h"
 
-#include "d_netinf.h"
-
 //Added by MC:
 #include "b_bot.h"
 
@@ -182,6 +180,32 @@ typedef enum
 
 #define WP_NOCHANGE ((AWeapon*)~0)
 
+
+#define MAXPLAYERNAME	15
+
+enum
+{
+	GENDER_MALE,
+	GENDER_FEMALE,
+	GENDER_NEUTER
+};
+
+struct userinfo_t
+{
+	char		netname[MAXPLAYERNAME+1];
+	BYTE		team;
+	int			aimdist;
+	int			color;
+	int			skin;
+	int			gender;
+	bool		neverswitch;
+	fixed_t		MoveBob, StillBob;
+	int			PlayerClass;
+};
+
+FArchive &operator<< (FArchive &arc, userinfo_t &info);
+
+
 //
 // Extended player object info: player_t
 //
diff --git a/src/dobjgc.cpp b/src/dobjgc.cpp
index e8520a957..b17fcc2aa 100644
--- a/src/dobjgc.cpp
+++ b/src/dobjgc.cpp
@@ -70,6 +70,7 @@
 #include "s_sndseq.h"
 #include "r_interpolate.h"
 #include "doomstat.h"
+#include "m_argv.h"
 
 // MACROS ------------------------------------------------------------------
 
diff --git a/src/dsectoreffect.h b/src/dsectoreffect.h
index 850af10df..95e1178aa 100644
--- a/src/dsectoreffect.h
+++ b/src/dsectoreffect.h
@@ -1,7 +1,6 @@
 #ifndef __DSECTOREFFECT_H__
 #define __DSECTOREFFECT_H__
 
-#include "dobject.h"
 #include "dthinker.h"
 #include "r_defs.h"
 
diff --git a/src/farchive.h b/src/farchive.h
index 11e08bb55..fefc3200b 100644
--- a/src/farchive.h
+++ b/src/farchive.h
@@ -35,7 +35,6 @@
 #define __FARCHIVE_H__
 
 #include <stdio.h>
-#include "doomtype.h"
 #include "dobject.h"
 
 class FFile
diff --git a/src/g_doom/a_arachnotron.cpp b/src/g_doom/a_arachnotron.cpp
index e7b1962e9..d92d0acba 100644
--- a/src/g_doom/a_arachnotron.cpp
+++ b/src/g_doom/a_arachnotron.cpp
@@ -2,7 +2,6 @@
 #include "s_sound.h"
 #include "p_local.h"
 #include "p_enemy.h"
-#include "a_doomglobal.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
 
diff --git a/src/g_doom/a_archvile.cpp b/src/g_doom/a_archvile.cpp
index 9602e413f..620e57260 100644
--- a/src/g_doom/a_archvile.cpp
+++ b/src/g_doom/a_archvile.cpp
@@ -3,7 +3,6 @@
 #include "p_local.h"
 #include "s_sound.h"
 #include "p_enemy.h"
-#include "a_doomglobal.h"
 #include "gstrings.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
diff --git a/src/g_doom/a_bossbrain.cpp b/src/g_doom/a_bossbrain.cpp
index d93ec4cda..77bfc3935 100644
--- a/src/g_doom/a_bossbrain.cpp
+++ b/src/g_doom/a_bossbrain.cpp
@@ -4,7 +4,6 @@
 #include "p_local.h"
 #include "p_enemy.h"
 #include "s_sound.h"
-#include "a_doomglobal.h"
 #include "statnums.h"
 #include "a_specialspot.h"
 #include "thingdef/thingdef.h"
diff --git a/src/g_doom/a_cyberdemon.cpp b/src/g_doom/a_cyberdemon.cpp
index c89b3e3d6..a01709595 100644
--- a/src/g_doom/a_cyberdemon.cpp
+++ b/src/g_doom/a_cyberdemon.cpp
@@ -2,7 +2,6 @@
 #include "p_local.h"
 #include "s_sound.h"
 #include "p_enemy.h"
-#include "a_doomglobal.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
 
diff --git a/src/g_doom/a_doomglobal.h b/src/g_doom/a_doomglobal.h
index 1a50dfeae..cab9a9bcd 100644
--- a/src/g_doom/a_doomglobal.h
+++ b/src/g_doom/a_doomglobal.h
@@ -1,9 +1,7 @@
 #ifndef __A_DOOMGLOBAL_H__
 #define __A_DOOMGLOBAL_H__
 
-#include "dobject.h"
 #include "info.h"
-#include "d_player.h"
 
 class AScriptedMarine : public AActor
 {
diff --git a/src/g_doom/a_doommisc.cpp b/src/g_doom/a_doommisc.cpp
index 4c0d6b449..230d58a1c 100644
--- a/src/g_doom/a_doommisc.cpp
+++ b/src/g_doom/a_doommisc.cpp
@@ -2,7 +2,6 @@
 #include "info.h"
 #include "p_enemy.h"
 #include "p_local.h"
-#include "a_doomglobal.h"
 #include "a_sharedglobal.h"
 #include "m_random.h"
 #include "gi.h"
diff --git a/src/g_doom/a_doomweaps.cpp b/src/g_doom/a_doomweaps.cpp
index 2af614919..1ead3d7dd 100644
--- a/src/g_doom/a_doomweaps.cpp
+++ b/src/g_doom/a_doomweaps.cpp
@@ -3,7 +3,6 @@
 #include "s_sound.h"
 #include "m_random.h"
 #include "a_pickups.h"
-#include "a_doomglobal.h"
 #include "d_player.h"
 #include "p_pspr.h"
 #include "p_local.h"
diff --git a/src/g_doom/a_lostsoul.cpp b/src/g_doom/a_lostsoul.cpp
index 1005494b5..733467473 100644
--- a/src/g_doom/a_lostsoul.cpp
+++ b/src/g_doom/a_lostsoul.cpp
@@ -5,7 +5,6 @@
 #include "s_sound.h"
 #include "p_local.h"
 #include "p_enemy.h"
-#include "a_doomglobal.h"
 #include "gi.h"
 #include "gstrings.h"
 #include "a_action.h"
diff --git a/src/g_doom/a_painelemental.cpp b/src/g_doom/a_painelemental.cpp
index 33ed98694..23c5d5a6a 100644
--- a/src/g_doom/a_painelemental.cpp
+++ b/src/g_doom/a_painelemental.cpp
@@ -2,7 +2,6 @@
 #include "info.h"
 #include "p_enemy.h"
 #include "p_local.h"
-#include "a_doomglobal.h"
 #include "a_action.h"
 #include "templates.h"
 #include "m_bbox.h"
diff --git a/src/g_doom/a_possessed.cpp b/src/g_doom/a_possessed.cpp
index 4854ea2d5..395b485d1 100644
--- a/src/g_doom/a_possessed.cpp
+++ b/src/g_doom/a_possessed.cpp
@@ -6,7 +6,6 @@
 #include "p_enemy.h"
 #include "gstrings.h"
 #include "a_action.h"
-#include "a_doomglobal.h"
 #include "thingdef/thingdef.h"
 
 static FRandom pr_posattack ("PosAttack");
diff --git a/src/g_doom/a_revenant.cpp b/src/g_doom/a_revenant.cpp
index d34e123e7..ae18257a0 100644
--- a/src/g_doom/a_revenant.cpp
+++ b/src/g_doom/a_revenant.cpp
@@ -7,7 +7,6 @@
 #include "p_enemy.h"
 #include "gstrings.h"
 #include "a_action.h"
-#include "a_doomglobal.h"
 #include "thingdef/thingdef.h"
 #include "g_level.h"
 
diff --git a/src/g_heretic/a_hereticmisc.cpp b/src/g_heretic/a_hereticmisc.cpp
index a19e2185f..273403ab3 100644
--- a/src/g_heretic/a_hereticmisc.cpp
+++ b/src/g_heretic/a_hereticmisc.cpp
@@ -1,7 +1,6 @@
 #include "actor.h"
 #include "info.h"
 #include "p_enemy.h"
-#include "a_doomglobal.h"
 #include "a_pickups.h"
 #include "a_action.h"
 #include "m_random.h"
diff --git a/src/g_level.cpp b/src/g_level.cpp
index 8fcae13b8..ddeaec6c7 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -76,6 +76,7 @@
 #include "r_interpolate.h"
 #include "cmdlib.h"
 #include "d_net.h"
+#include "d_netinf.h"
 
 #include "gi.h"
 
diff --git a/src/g_shared/a_artifacts.h b/src/g_shared/a_artifacts.h
index ea716949a..3d16d6fe5 100644
--- a/src/g_shared/a_artifacts.h
+++ b/src/g_shared/a_artifacts.h
@@ -1,7 +1,6 @@
 #ifndef __A_ARTIFACTS_H__
 #define __A_ARTIFACTS_H__
 
-#include "farchive.h"
 #include "a_pickups.h"
 
 #define INVERSECOLOR 0x00345678
@@ -11,15 +10,6 @@
 #define REDCOLOR 0x00beefee
 #define GREENCOLOR 0x00beefad
 
-#define STREAM_ENUM(e) \
-	inline FArchive &operator<< (FArchive &arc, e &i) \
-	{ \
-		BYTE val = (BYTE)i; \
-		arc << val; \
-		i = (e)val; \
-		return arc; \
-	}
-
 class player_t;
 
 // A powerup is a pseudo-inventory item that applies an effect to its
diff --git a/src/g_shared/a_pickups.h b/src/g_shared/a_pickups.h
index 3eb16da46..8858ffd1a 100644
--- a/src/g_shared/a_pickups.h
+++ b/src/g_shared/a_pickups.h
@@ -1,7 +1,6 @@
 #ifndef __A_PICKUPS_H__
 #define __A_PICKUPS_H__
 
-#include "dobject.h"
 #include "actor.h"
 #include "info.h"
 #include "s_sound.h"
diff --git a/src/g_shared/a_randomspawner.cpp b/src/g_shared/a_randomspawner.cpp
index c35b09797..4581b9c99 100644
--- a/src/g_shared/a_randomspawner.cpp
+++ b/src/g_shared/a_randomspawner.cpp
@@ -9,7 +9,6 @@
 #include "p_local.h"
 #include "p_enemy.h"
 #include "s_sound.h"
-#include "a_doomglobal.h"
 #include "statnums.h"
 #include "gstrings.h"
 #include "a_action.h"
diff --git a/src/g_shared/a_sharedglobal.h b/src/g_shared/a_sharedglobal.h
index f88e50f78..c5f671a52 100644
--- a/src/g_shared/a_sharedglobal.h
+++ b/src/g_shared/a_sharedglobal.h
@@ -1,7 +1,6 @@
 #ifndef __A_SHAREDGLOBAL_H__
 #define __A_SHAREDGLOBAL_H__
 
-#include "dobject.h"
 #include "info.h"
 #include "actor.h"
 
diff --git a/src/g_shared/a_weaponpiece.cpp b/src/g_shared/a_weaponpiece.cpp
index 08ea113ac..4d4729e37 100644
--- a/src/g_shared/a_weaponpiece.cpp
+++ b/src/g_shared/a_weaponpiece.cpp
@@ -1,9 +1,17 @@
 #include "a_pickups.h"
 #include "a_weaponpiece.h"
 #include "doomstat.h"
+#include "farchive.h"
 
 IMPLEMENT_CLASS (AWeaponHolder)
 
+void AWeaponHolder::Serialize (FArchive &arc)
+{
+	Super::Serialize(arc);
+	arc << PieceMask << PieceWeapon;
+}
+
+
 IMPLEMENT_POINTY_CLASS (AWeaponPiece)
  DECLARE_POINTER (FullWeapon)
 END_POINTERS
diff --git a/src/g_shared/a_weaponpiece.h b/src/g_shared/a_weaponpiece.h
index cae3076be..b59c77f6e 100644
--- a/src/g_shared/a_weaponpiece.h
+++ b/src/g_shared/a_weaponpiece.h
@@ -27,9 +27,5 @@ public:
 	int PieceMask;
 	const PClass * PieceWeapon;
 
-	void Serialize (FArchive &arc)
-	{
-		Super::Serialize(arc);
-		arc << PieceMask << PieceWeapon;
-	}
+	void Serialize (FArchive &arc);
 };
diff --git a/src/g_shared/hudmessages.cpp b/src/g_shared/hudmessages.cpp
index 1660acc29..933b60bf3 100644
--- a/src/g_shared/hudmessages.cpp
+++ b/src/g_shared/hudmessages.cpp
@@ -54,6 +54,14 @@ IMPLEMENT_CLASS (DHUDMessageTypeOnFadeOut)
  * Basic HUD message. Appears and disappears without any special effects *
  *************************************************************************/
 
+inline FArchive &operator<< (FArchive &arc, EColorRange &i)
+{
+	BYTE val = (BYTE)i;
+	arc << val;
+	i = (EColorRange)val;
+	return arc;
+}
+
 //============================================================================
 //
 // DHUDMessage Constructor
diff --git a/src/g_strife/a_strifeglobal.h b/src/g_strife/a_strifeglobal.h
index 72d0cf306..d501485ba 100644
--- a/src/g_strife/a_strifeglobal.h
+++ b/src/g_strife/a_strifeglobal.h
@@ -1,7 +1,6 @@
 #ifndef __A_STRIFEGLOBAL_H__
 #define __A_STRIFEGLOBAL_H__
 
-#include "dobject.h"
 #include "info.h"
 #include "a_pickups.h"
 
diff --git a/src/g_strife/a_strifestuff.cpp b/src/g_strife/a_strifestuff.cpp
index 06d99a69d..2bd4685ff 100644
--- a/src/g_strife/a_strifestuff.cpp
+++ b/src/g_strife/a_strifestuff.cpp
@@ -6,7 +6,6 @@
 #include "d_player.h"
 #include "a_action.h"
 #include "p_local.h"
-#include "a_doomglobal.h"
 #include "a_strifeglobal.h"
 #include "p_enemy.h"
 #include "p_lnspec.h"
diff --git a/src/hu_scores.cpp b/src/hu_scores.cpp
index 558007341..eaf667862 100644
--- a/src/hu_scores.cpp
+++ b/src/hu_scores.cpp
@@ -42,6 +42,7 @@
 #include "v_video.h"
 #include "doomstat.h"
 #include "g_level.h"
+#include "d_netinf.h"
 
 // MACROS ------------------------------------------------------------------
 
diff --git a/src/info.h b/src/info.h
index 8ed3f95ad..f7e9212d3 100644
--- a/src/info.h
+++ b/src/info.h
@@ -73,8 +73,6 @@
 #endif
 
 #include "dobject.h"
-#include "dthinker.h"
-#include "farchive.h"
 #include "doomdef.h"
 
 const BYTE SF_FULLBRIGHT = 0x40;
@@ -82,6 +80,7 @@ const BYTE SF_FULLBRIGHT = 0x40;
 struct Baggage;
 class FScanner;
 struct FActorInfo;
+class FArchive;
 
 struct FState
 {
diff --git a/src/m_cheat.cpp b/src/m_cheat.cpp
index b427cdd08..cac837b6e 100644
--- a/src/m_cheat.cpp
+++ b/src/m_cheat.cpp
@@ -30,7 +30,6 @@
 #include "doomstat.h"
 #include "gstrings.h"
 #include "p_local.h"
-#include "a_doomglobal.h"
 #include "a_strifeglobal.h"
 #include "gi.h"
 #include "p_enemy.h"
diff --git a/src/m_menu.cpp b/src/m_menu.cpp
index 6a5e43408..e7d97544f 100644
--- a/src/m_menu.cpp
+++ b/src/m_menu.cpp
@@ -70,6 +70,7 @@
 #include "g_level.h"
 #include "d_event.h"
 #include "colormatcher.h"
+#include "d_netinf.h"
 
 // MACROS ------------------------------------------------------------------
 
diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp
index 447dd428d..72b8257a3 100644
--- a/src/p_conversation.cpp
+++ b/src/p_conversation.cpp
@@ -55,6 +55,7 @@
 #include "d_net.h"
 #include "g_level.h"
 #include "d_event.h"
+#include "doomstat.h"
 
 // The conversations as they exist inside a SCRIPTxx lump.
 struct Response
diff --git a/src/p_enemy.cpp b/src/p_enemy.cpp
index 756f61af2..951fd1669 100644
--- a/src/p_enemy.cpp
+++ b/src/p_enemy.cpp
@@ -41,7 +41,6 @@
 #include "c_cvars.h"
 #include "p_enemy.h"
 #include "a_sharedglobal.h"
-#include "a_doomglobal.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
 #include "d_dehacked.h"
diff --git a/src/p_enemy_a_lookex.cpp b/src/p_enemy_a_lookex.cpp
index d4bb52831..fadf3ffd3 100644
--- a/src/p_enemy_a_lookex.cpp
+++ b/src/p_enemy_a_lookex.cpp
@@ -14,7 +14,6 @@
 #include "c_cvars.h"
 #include "p_enemy.h"
 #include "a_sharedglobal.h"
-#include "a_doomglobal.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
 #include "g_level.h"
diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp
index a4f598f9d..e8420b2c2 100644
--- a/src/p_interaction.cpp
+++ b/src/p_interaction.cpp
@@ -47,7 +47,6 @@
 
 #include "b_bot.h"	//Added by MC:
 
-#include "a_doomglobal.h"
 #include "ravenshared.h"
 #include "a_hexenglobal.h"
 #include "a_sharedglobal.h"
@@ -58,6 +57,7 @@
 #include "s_sound.h"
 #include "g_level.h"
 #include "d_net.h"
+#include "d_netinf.h"
 
 static FRandom pr_obituary ("Obituary");
 static FRandom pr_botrespawn ("BotRespawn");
diff --git a/src/p_map.cpp b/src/p_map.cpp
index 2e4e70280..77ef763b1 100644
--- a/src/p_map.cpp
+++ b/src/p_map.cpp
@@ -49,7 +49,6 @@
 #include "gi.h"
 
 #include "a_sharedglobal.h"
-#include "a_doomglobal.h"
 #include "p_conversation.h"
 #include "r_translate.h"
 #include "g_level.h"
diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 7c0b6f3ed..39c556d3d 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -39,7 +39,6 @@
 #include "c_cvars.h"
 #include "b_bot.h"	//Added by MC:
 #include "stats.h"
-#include "a_doomglobal.h"
 #include "a_hexenglobal.h"
 #include "a_sharedglobal.h"
 #include "gi.h"
diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp
index 7ceca6030..47d9f54ed 100644
--- a/src/p_pspr.cpp
+++ b/src/p_pspr.cpp
@@ -24,7 +24,6 @@
 #include "gi.h"
 #include "p_pspr.h"
 #include "p_effect.h"
-#include "a_doomglobal.h"
 #include "templates.h"
 #include "thingdef/thingdef.h"
 #include "g_level.h"
diff --git a/src/p_pspr.h b/src/p_pspr.h
index 531f427c3..49e6c469a 100644
--- a/src/p_pspr.h
+++ b/src/p_pspr.h
@@ -62,6 +62,7 @@ typedef enum
 
 } psprnum_t;
 
+/*
 inline FArchive &operator<< (FArchive &arc, psprnum_t &i)
 {
 	BYTE val = (BYTE)i;
@@ -69,6 +70,7 @@ inline FArchive &operator<< (FArchive &arc, psprnum_t &i)
 	i = (psprnum_t)val;
 	return arc;
 }
+*/
 
 typedef struct pspdef_s
 {
diff --git a/src/p_saveg.h b/src/p_saveg.h
index 09f5f28e2..3002800bb 100644
--- a/src/p_saveg.h
+++ b/src/p_saveg.h
@@ -34,7 +34,8 @@
 #ifndef __P_SAVEG_H__
 #define __P_SAVEG_H__
 
-#include "farchive.h"
+class FArchive;
+struct PNGHandle;
 
 // Persistent storage/archiving.
 // These are the load / save game routines.
diff --git a/src/p_terrain.h b/src/p_terrain.h
index 336c2a632..087087afe 100644
--- a/src/p_terrain.h
+++ b/src/p_terrain.h
@@ -34,10 +34,11 @@
 #ifndef __P_TERRAIN_H__
 #define __P_TERRAIN_H__
 
-#include "dobject.h"
 #include "s_sound.h"
 #include "textures/textures.h"
 
+struct PClass;
+
 // This is just a wrapper class so that I don't have to expose FTextureID's implementation
 // to anything that doesn't really need it.
 class FTerrainTypeArray
diff --git a/src/r_defs.h b/src/r_defs.h
index bcd852bd1..9f23ce2ec 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -35,6 +35,7 @@
 #include "actor.h"
 
 #include "dthinker.h"
+#include "farchive.h"
 
 #define MAXWIDTH 2560
 #define MAXHEIGHT 1600
diff --git a/src/r_things.cpp b/src/r_things.cpp
index 52216314b..c558d788b 100644
--- a/src/r_things.cpp
+++ b/src/r_things.cpp
@@ -47,6 +47,7 @@
 #include "g_level.h"
 #include "d_net.h"
 #include "colormatcher.h"
+#include "d_netinf.h"
 
 extern FTexture *CrosshairImage;
 extern fixed_t globaluclip, globaldclip;
diff --git a/src/r_translate.cpp b/src/r_translate.cpp
index f5ace0f87..9e060f83a 100644
--- a/src/r_translate.cpp
+++ b/src/r_translate.cpp
@@ -40,6 +40,7 @@
 #include "v_video.h"
 #include "g_game.h"
 #include "colormatcher.h"
+#include "d_netinf.h"
 
 #include "gi.h"
 #include "stats.h"
diff --git a/src/sdl/hardware.cpp b/src/sdl/hardware.cpp
index 856110033..992e88b60 100644
--- a/src/sdl/hardware.cpp
+++ b/src/sdl/hardware.cpp
@@ -42,6 +42,8 @@
 #include "c_dispatch.h"
 #include "sdlvideo.h"
 #include "v_text.h"
+#include "doomstat.h"
+#include "m_argv.h"
 
 EXTERN_CVAR (Bool, ticker)
 EXTERN_CVAR (Bool, fullscreen)
diff --git a/src/sdl/i_system.h b/src/sdl/i_system.h
index c89ed78f0..b6c9a35ce 100644
--- a/src/sdl/i_system.h
+++ b/src/sdl/i_system.h
@@ -26,9 +26,10 @@
 #include <dirent.h>
 #include <ctype.h>
 
-#include "d_main.h"
-#include "d_ticcmd.h"
-#include "d_event.h"
+#include "doomtype.h"
+
+struct ticcmd_t;
+struct WadStuff;
 
 #ifndef SHARE_DIR
 #define SHARE_DIR "/usr/local/share/"
diff --git a/src/sound/i_music.h b/src/sound/i_music.h
index d5a9eeae0..12a26e71d 100644
--- a/src/sound/i_music.h
+++ b/src/sound/i_music.h
@@ -35,7 +35,6 @@
 #define __I_MUSIC_H__
 
 #include "doomdef.h"
-#include "doomstat.h"
 
 class FileReader;
 
diff --git a/src/thingdef/thingdef.cpp b/src/thingdef/thingdef.cpp
index 79bca2be1..72e4d5bdd 100644
--- a/src/thingdef/thingdef.cpp
+++ b/src/thingdef/thingdef.cpp
@@ -60,7 +60,6 @@
 #include "p_effect.h"
 #include "v_palette.h"
 #include "doomerrors.h"
-#include "a_doomglobal.h"
 #include "a_hexenglobal.h"
 #include "a_weaponpiece.h"
 #include "p_conversation.h"
diff --git a/src/thingdef/thingdef_codeptr.cpp b/src/thingdef/thingdef_codeptr.cpp
index 4a9d5b18e..45145a5fb 100644
--- a/src/thingdef/thingdef_codeptr.cpp
+++ b/src/thingdef/thingdef_codeptr.cpp
@@ -61,7 +61,6 @@
 #include "c_console.h"
 #include "doomerrors.h"
 #include "a_sharedglobal.h"
-#include "a_doomglobal.h"
 #include "thingdef/thingdef.h"
 #include "v_video.h"
 #include "doomstat.h"
diff --git a/src/thingdef/thingdef_properties.cpp b/src/thingdef/thingdef_properties.cpp
index f5ebb5b97..6213aa61d 100644
--- a/src/thingdef/thingdef_properties.cpp
+++ b/src/thingdef/thingdef_properties.cpp
@@ -60,7 +60,6 @@
 #include "p_effect.h"
 #include "v_palette.h"
 #include "doomerrors.h"
-#include "a_doomglobal.h"
 #include "a_hexenglobal.h"
 #include "a_weaponpiece.h"
 #include "p_conversation.h"
diff --git a/src/v_font.cpp b/src/v_font.cpp
index 1aa07bb66..14150d05a 100644
--- a/src/v_font.cpp
+++ b/src/v_font.cpp
@@ -2117,3 +2117,4 @@ void V_InitFonts()
 		ConFont = new FSingleLumpFont ("ConsoleFont", Wads.GetNumForName ("CONFONT"));
 	}
 }
+
diff --git a/src/v_font.h b/src/v_font.h
index 0d373da3e..3db032c23 100644
--- a/src/v_font.h
+++ b/src/v_font.h
@@ -71,14 +71,6 @@ enum EColorRange
 
 extern int NumTextColors;
 
-inline FArchive &operator<< (FArchive &arc, EColorRange &i)
-{
-	BYTE val = (BYTE)i;
-	arc << val;
-	i = (EColorRange)val;
-	return arc;
-}
-
 class FFont
 {
 public:
diff --git a/src/win32/hardware.cpp b/src/win32/hardware.cpp
index 06804006d..7afce9587 100644
--- a/src/win32/hardware.cpp
+++ b/src/win32/hardware.cpp
@@ -45,6 +45,7 @@
 #include "c_dispatch.h"
 #include "v_text.h"
 #include "doomstat.h"
+#include "m_argv.h"
 
 EXTERN_CVAR (Bool, ticker)
 EXTERN_CVAR (Bool, fullscreen)
diff --git a/src/win32/i_system.cpp b/src/win32/i_system.cpp
index d46467a4e..85cc2361e 100644
--- a/src/win32/i_system.cpp
+++ b/src/win32/i_system.cpp
@@ -65,6 +65,7 @@
 #include "gameconfigfile.h"
 #include "v_font.h"
 #include "g_level.h"
+#include "doomstat.h"
 
 #include "stats.h"
 
diff --git a/src/win32/win32video.cpp b/src/win32/win32video.cpp
index acbc5d8d6..c6cc23b3d 100644
--- a/src/win32/win32video.cpp
+++ b/src/win32/win32video.cpp
@@ -63,6 +63,7 @@
 #include "v_pfx.h"
 #include "stats.h"
 #include "doomerrors.h"
+#include "m_argv.h"
 
 #include "win32iface.h"