Removed all superfluous #include's

Automatically optimized by CLion IDE with manual corrections

src/actorptrselect.cpp

@@ -34,7 +34,6 @@
 #include "actorptrselect.h"
 #include "actor.h"
 #include "d_player.h"
-#include "p_pspr.h"
 #include "p_local.h"
 
 //==========================================================================

src/am_map.cpp

@@ -30,14 +30,11 @@
 #include "doomdef.h"
 #include "templates.h"
 #include "g_level.h"
-#include "doomdef.h"
 #include "st_stuff.h"
 #include "p_local.h"
 #include "p_lnspec.h"
 #include "w_wad.h"
 #include "a_sharedglobal.h"
-#include "statnums.h"
-#include "r_data/r_translate.h"
 #include "d_event.h"
 #include "gi.h"
 #include "p_setup.h"
@@ -50,19 +47,10 @@
 #include "p_blockmap.h"
 
 #include "m_cheat.h"
-#include "i_system.h"
 #include "c_dispatch.h"
-#include "colormatcher.h"
 #include "d_netinf.h"
 
-// Needs access to LFB.
-#include "v_video.h"
-#include "v_palette.h"
-
-#include "v_text.h"
-
 // State.
-#include "doomstat.h"
 #include "r_state.h"
 #include "r_utility.h"
 
@@ -72,7 +60,6 @@
 #include "am_map.h"
 #include "po_man.h"
 #include "a_keys.h"
-#include "r_data/colormaps.h"
 #include "g_levellocals.h"
 #include "actorinlines.h"
 

src/b_bot.cpp

@@ -40,7 +40,6 @@
 #include "c_cvars.h"
 #include "c_dispatch.h"
 #include "b_bot.h"
-#include "m_argv.h"
 #include "doomstat.h"
 #include "p_local.h"
 #include "cmdlib.h"

src/b_func.cpp

@@ -48,12 +48,6 @@
 #include "p_maputl.h"
 #include "b_bot.h"
 #include "g_game.h"
-#include "m_random.h"
-#include "r_sky.h"
-#include "st_stuff.h"
-#include "stats.h"
-#include "i_system.h"
-#include "s_sound.h"
 #include "d_event.h"
 #include "d_player.h"
 #include "p_spec.h"

src/b_game.cpp

@@ -81,20 +81,15 @@ Everything that is changed is marked (maybe commented) with "Added by MC"
 #include "p_local.h"
 #include "b_bot.h"
 #include "g_game.h"
-#include "m_random.h"
 #include "doomstat.h"
 #include "cmdlib.h"
-#include "sc_man.h"
-#include "stats.h"
 #include "m_misc.h"
 #include "sbar.h"
 #include "p_acs.h"
 #include "teaminfo.h"
-#include "i_system.h"
 #include "d_net.h"
 #include "d_netinf.h"
 #include "d_player.h"
-#include "doomerrors.h"
 #include "events.h"
 #include "vm.h"
 

src/b_move.cpp

@@ -44,11 +44,7 @@
 #include "p_local.h"
 #include "b_bot.h"
 #include "g_game.h"
-#include "d_protocol.h"
-#include "m_random.h"
-#include "i_system.h"
 #include "p_lnspec.h"
-#include "gi.h"
 #include "a_keys.h"
 #include "d_event.h"
 #include "p_enemy.h"
@@ -56,7 +52,6 @@
 #include "p_spec.h"
 #include "p_checkposition.h"
 #include "actorinlines.h"
-#include "math/cmath.h"
 
 static FRandom pr_botopendoor ("BotOpenDoor");
 static FRandom pr_bottrywalk ("BotTryWalk");

src/b_think.cpp

@@ -47,14 +47,9 @@
 #include "p_local.h"
 #include "b_bot.h"
 #include "g_game.h"
-#include "m_random.h"
-#include "stats.h"
-#include "a_pickups.h"
-#include "statnums.h"
 #include "d_net.h"
 #include "d_event.h"
 #include "d_player.h"
-#include "vectors.h"
 #include "actorinlines.h"
 
 static FRandom pr_botmove ("BotMove");

src/bbannouncer.cpp

@@ -44,11 +44,7 @@
 
 #include "actor.h"
 #include "gstrings.h"
-#include "s_sound.h"
-#include "m_random.h"
 #include "d_player.h"
-#include "g_level.h"
-#include "doomstat.h"
 #include "g_levellocals.h"
 
 // MACROS ------------------------------------------------------------------

src/c_bind.cpp

@@ -34,14 +34,11 @@
 
 #include "doomtype.h"
 #include "doomdef.h"
-#include "cmdlib.h"
 #include "c_dispatch.h"
 #include "c_bind.h"
 #include "g_level.h"
 #include "hu_stuff.h"
-#include "gi.h"
 #include "configfile.h"
-#include "i_system.h"
 #include "d_event.h"
 #include "w_wad.h"
 #include "templates.h"
@@ -49,9 +46,6 @@
 #include "vm.h"
 #include "i_time.h"
 
-#include <math.h>
-#include <stdlib.h>
-
 const char *KeyNames[NUM_KEYS] =
 {
 	// This array is dependant on the particular keyboard input

src/c_cmds.cpp

@@ -35,7 +35,6 @@
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <time.h>
 
 #ifdef _WIN32
 #include <direct.h>
@@ -56,11 +55,9 @@
 #include "g_game.h"
 #include "g_level.h"
 #include "w_wad.h"
-#include "g_level.h"
 #include "gi.h"
 #include "r_defs.h"
 #include "d_player.h"
-#include "templates.h"
 #include "p_local.h"
 #include "r_sky.h"
 #include "p_setup.h"
@@ -68,9 +65,7 @@
 #include "d_net.h"
 #include "v_text.h"
 #include "p_lnspec.h"
-#include "v_video.h"
 #include "r_utility.h"
-#include "r_data/r_interpolate.h"
 #include "c_functions.h"
 #include "g_levellocals.h"
 

src/c_console.cpp

@@ -34,10 +34,6 @@
 
 #include "templates.h"
 #include "p_setup.h"
-#include <stdarg.h>
-#include <string.h>
-#include <math.h>
-#include <stdlib.h>
 
 #include "version.h"
 #include "g_game.h"
@@ -49,27 +45,22 @@
 #include "i_system.h"
 #include "i_video.h"
 #include "g_input.h"
-#include "m_swap.h"
 #include "v_palette.h"
 #include "v_video.h"
 #include "v_text.h"
 #include "w_wad.h"
 #include "sbar.h"
 #include "s_sound.h"
-#include "s_sndseq.h"
 #include "doomstat.h"
 #include "d_gui.h"
-#include "v_video.h"
 #include "cmdlib.h"
 #include "d_net.h"
-#include "g_level.h"
 #include "d_event.h"
 #include "d_player.h"
 #include "gstrings.h"
 #include "c_consolebuffer.h"
 #include "g_levellocals.h"
 #include "vm.h"
-#include "i_time.h"
 
 FString FStringFormat(VM_ARGS); // extern from thingdef_data.cpp
 

src/c_cvars.cpp

@@ -33,7 +33,6 @@
 */
 
 #include <string.h>
-#include <stdio.h>
 #include <assert.h>
 
 #include "cmdlib.h"
@@ -42,18 +41,12 @@
 #include "c_dispatch.h"
 
 #include "doomstat.h"
-#include "c_cvars.h"
 #include "d_player.h"
 
 #include "d_netinf.h"
 
-#include "i_system.h"
-#include "v_palette.h"
-#include "v_video.h"
-#include "colormatcher.h"
 #include "menu/menu.h"
 #include "vm.h"
-#include "v_text.h"
 
 struct FLatchedValue
 {

src/c_dispatch.cpp

@@ -38,7 +38,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <assert.h>
 
 #include "templates.h"
 #include "doomtype.h"
@@ -49,7 +48,6 @@
 #include "doomstat.h"
 #include "d_player.h"
 #include "configfile.h"
-#include "m_crc32.h"
 #include "v_text.h"
 #include "d_net.h"
 #include "d_main.h"

src/c_expr.cpp

@@ -35,7 +35,6 @@
 // HEADER FILES ------------------------------------------------------------
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <math.h>
 #include <string.h>
 

src/colormatcher.cpp

@@ -39,7 +39,6 @@
 */
 
 #include <stdlib.h>
-#include <string.h>
 
 #include "doomtype.h"
 #include "colormatcher.h"

src/compatibility.cpp

@@ -41,16 +41,12 @@
 
 #include "compatibility.h"
 #include "sc_man.h"
-#include "cmdlib.h"
-#include "doomdef.h"
-#include "doomdata.h"
 #include "doomstat.h"
 #include "c_dispatch.h"
 #include "gi.h"
 #include "g_level.h"
 #include "p_lnspec.h"
 #include "p_tags.h"
-#include "r_state.h"
 #include "w_wad.h"
 #include "textures.h"
 #include "g_levellocals.h"

src/ct_chat.cpp

@@ -26,20 +26,15 @@
 #include "doomdef.h"
 #include "m_swap.h"
 #include "hu_stuff.h"
-#include "w_wad.h"
 #include "s_sound.h"
 #include "doomstat.h"
 #include "st_stuff.h"
 #include "c_console.h"
 #include "c_dispatch.h"
-#include "c_cvars.h"
 #include "d_player.h"
 #include "v_text.h"
-#include "v_video.h"
-#include "gi.h"
 #include "d_gui.h"
 #include "g_input.h"
-#include "templates.h"
 #include "d_net.h"
 #include "d_event.h"
 #include "sbar.h"

src/d_dehacked.cpp

@@ -48,30 +48,19 @@
 #include "doomstat.h"
 #include "info.h"
 #include "d_dehacked.h"
-#include "s_sound.h"
 #include "g_level.h"
 #include "cmdlib.h"
 #include "gstrings.h"
-#include "m_alloc.h"
-#include "m_misc.h"
 #include "w_wad.h"
 #include "d_player.h"
 #include "r_state.h"
-#include "gi.h"
 #include "c_dispatch.h"
 #include "decallib.h"
-#include "v_palette.h"
 #include "a_sharedglobal.h"
-#include "vectors.h"
-#include "dobject.h"
-#include "r_data/r_translate.h"
-#include "sc_man.h"
-#include "i_system.h"
 #include "doomerrors.h"
 #include "p_effect.h"
 #include "serializer.h"
 #include "thingdef.h"
-#include "info.h"
 #include "v_text.h"
 #include "backend/vmbuilder.h"
 #include "types.h"

src/d_iwad.cpp

@@ -38,11 +38,8 @@
 #include "doomstat.h"
 #include "i_system.h"
 #include "w_wad.h"
-#include "w_zip.h"
-#include "v_palette.h"
 #include "m_argv.h"
 #include "m_misc.h"
-#include "c_cvars.h"
 #include "sc_man.h"
 #include "v_video.h"
 #include "gameconfigfile.h"

src/d_main.cpp

@@ -38,16 +38,13 @@
 #ifdef HAVE_FPU_CONTROL
 #include <fpu_control.h>
 #endif
-#include <float.h>
 
 #if defined(__unix__) || defined(__APPLE__)
 #include <unistd.h>
 #endif
 
-#include <time.h>
 #include <math.h>
 #include <assert.h>
-#include <sys/stat.h>
 
 #include "doomerrors.h"
 
@@ -67,7 +64,6 @@
 #include "menu/menu.h"
 #include "c_console.h"
 #include "c_dispatch.h"
-#include "i_system.h"
 #include "i_sound.h"
 #include "i_video.h"
 #include "g_game.h"
@@ -81,40 +77,29 @@
 #include "d_main.h"
 #include "d_dehacked.h"
 #include "cmdlib.h"
-#include "s_sound.h"
-#include "m_swap.h"
 #include "v_text.h"
 #include "gi.h"
-#include "b_bot.h"		//Added by MC:
-#include "stats.h"
 #include "gameconfigfile.h"
 #include "sbar.h"
 #include "decallib.h"
 #include "version.h"
-#include "v_text.h"
 #include "st_start.h"
-#include "templates.h"
 #include "teaminfo.h"
 #include "hardware.h"
 #include "sbarinfo.h"
 #include "d_net.h"
-#include "g_level.h"
 #include "d_event.h"
 #include "d_netinf.h"
-#include "v_palette.h"
 #include "m_cheat.h"
 #include "compatibility.h"
 #include "m_joy.h"
-#include "sc_man.h"
 #include "po_man.h"
-#include "resourcefiles/resourcefile.h"
 #include "r_renderer.h"
 #include "p_local.h"
 #include "autosegs.h"
 #include "fragglescript/t_fs.h"
 #include "g_levellocals.h"
 #include "events.h"
-#include "r_utility.h"
 #include "vm.h"
 #include "types.h"
 #include "r_data/r_vanillatrans.h"

src/d_net.cpp

@@ -30,18 +30,13 @@
 
 #include "version.h"
 #include "menu/menu.h"
-#include "m_random.h"
-#include "i_system.h"
 #include "i_video.h"
 #include "i_net.h"
 #include "g_game.h"
-#include "doomdef.h"
-#include "doomstat.h"
 #include "c_console.h"
 #include "d_netinf.h"
 #include "d_net.h"
 #include "cmdlib.h"
-#include "s_sound.h"
 #include "m_cheat.h"
 #include "p_local.h"
 #include "c_dispatch.h"
@@ -49,19 +44,15 @@
 #include "gi.h"
 #include "m_misc.h"
 #include "gameconfigfile.h"
-#include "d_gui.h"
-#include "templates.h"
 #include "p_acs.h"
 #include "p_trace.h"
 #include "a_sharedglobal.h"
 #include "st_start.h"
 #include "teaminfo.h"
 #include "p_conversation.h"
-#include "g_level.h"
 #include "d_event.h"
 #include "m_argv.h"
 #include "p_lnspec.h"
-#include "v_video.h"
 #include "p_spec.h"
 #include "hardware.h"
 #include "r_utility.h"

src/d_netinfo.cpp

@@ -35,26 +35,17 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 #include "doomtype.h"
 #include "doomdef.h"
 #include "doomstat.h"
 #include "d_netinf.h"
 #include "d_net.h"
-#include "d_protocol.h"
 #include "d_player.h"
 #include "c_dispatch.h"
-#include "v_palette.h"
-#include "v_video.h"
-#include "i_system.h"
 #include "r_state.h"
 #include "sbar.h"
-#include "gi.h"
-#include "m_random.h"
 #include "teaminfo.h"
-#include "r_data/r_translate.h"
-#include "templates.h"
 #include "cmdlib.h"
 #include "serializer.h"
 #include "vm.h"

src/d_protocol.cpp

@@ -35,7 +35,6 @@
 #include "i_system.h"
 #include "d_protocol.h"
 #include "d_net.h"
-#include "doomdef.h"
 #include "doomstat.h"
 #include "cmdlib.h"
 #include "serializer.h"
@@ -408,7 +407,6 @@ int SkipTicCmd (uint8_t **stream, int count)
 	return skip;
 }
 
-#include <assert.h>
 extern short consistancy[MAXPLAYERS][BACKUPTICS];
 void ReadTicCmd (uint8_t **stream, int player, int tic)
 {

src/decallib.cpp

@@ -36,17 +36,13 @@
 #include "sc_man.h"
 #include "w_wad.h"
 #include "v_video.h"
-#include "v_palette.h"
 #include "cmdlib.h"
 #include "m_random.h"
 #include "weightedlist.h"
 #include "statnums.h"
 #include "templates.h"
 #include "a_sharedglobal.h"
-#include "r_data/r_translate.h"
 #include "gi.h"
-#include "g_level.h"
-#include "colormatcher.h"
 #include "b_bot.h"
 #include "serializer.h"
 #include "g_levellocals.h"

src/dobject.cpp

@@ -33,19 +33,13 @@
 */
 
 #include <stdlib.h>
-#include <string.h>
 
 #include "cmdlib.h"
 #include "actor.h"
-#include "dobject.h"
 #include "doomstat.h"		// Ideally, DObjects can be used independant of Doom.
 #include "d_player.h"		// See p_user.cpp to find out why this doesn't work.
 #include "g_game.h"			// Needed for bodyque.
 #include "c_dispatch.h"
-#include "i_system.h"
-#include "r_state.h"
-#include "stats.h"
-#include "a_sharedglobal.h"
 #include "dsectoreffect.h"
 #include "serializer.h"
 #include "vm.h"

src/dobjgc.cpp

@@ -63,16 +63,11 @@
 #include "g_game.h"
 #include "a_sharedglobal.h"
 #include "sbar.h"
-#include "stats.h"
 #include "c_dispatch.h"
 #include "s_sndseq.h"
 #include "r_data/r_interpolate.h"
 #include "doomstat.h"
-#include "m_argv.h"
 #include "po_man.h"
-#include "autosegs.h"
-#include "v_video.h"
-#include "textures/textures.h"
 #include "r_utility.h"
 #include "menu/menu.h"
 #include "intermission/intermission.h"

src/dobjtype.cpp

@@ -35,19 +35,15 @@
 
 // HEADER FILES ------------------------------------------------------------
 
-#include <float.h>
 #include <limits>
 
 #include "dobject.h"
-#include "i_system.h"
 #include "serializer.h"
 #include "actor.h"
-#include "templates.h"
 #include "autosegs.h"
 #include "v_text.h"
 #include "a_pickups.h"
 #include "d_player.h"
-#include "doomerrors.h"
 #include "fragglescript/t_fs.h"
 #include "a_keys.h"
 #include "vm.h"

src/doomstat.cpp

@@ -28,10 +28,8 @@
 
 #include "stringtable.h"
 #include "doomstat.h"
-#include "c_cvars.h"
 #include "i_system.h"
 #include "g_level.h"
-#include "p_local.h"
 #include "g_levellocals.h"
 
 int SaveVersion;

src/dsectoreffect.cpp

@@ -26,12 +26,10 @@
 //-----------------------------------------------------------------------------
 
 #include "dsectoreffect.h"
-#include "gi.h"
 #include "p_local.h"
 #include "g_levellocals.h"
 #include "p_3dmidtex.h"
 #include "r_data/r_interpolate.h"
-#include "statnums.h"
 #include "serializer.h"
 #include "doomstat.h"
 #include "vm.h"

src/dthinker.cpp

@@ -35,9 +35,6 @@
 #include "dthinker.h"
 #include "stats.h"
 #include "p_local.h"
-#include "statnums.h"
-#include "i_system.h"
-#include "doomerrors.h"
 #include "serializer.h"
 #include "d_player.h"
 #include "vm.h"

src/edata.cpp

@@ -36,7 +36,6 @@
 
 #include "w_wad.h"
 #include "m_argv.h"
-#include "zstring.h"
 #include "sc_man.h"
 #include "g_level.h"
 #include "doomdata.h"
@@ -46,9 +45,7 @@
 #include "p_setup.h"
 #include "p_tags.h"
 #include "p_terrain.h"
-#include "v_palette.h"
 #include "p_acs.h"
-#include "r_data/colormaps.h"
 #include "g_levellocals.h"
 
 

src/events.cpp

@@ -35,7 +35,6 @@
 #include "r_utility.h"
 #include "g_levellocals.h"
 #include "gi.h"
-#include "v_text.h"
 #include "actor.h"
 #include "c_dispatch.h"
 #include "d_net.h"

src/f_wipe.cpp

@@ -23,14 +23,10 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "i_video.h"
 #include "v_video.h"
 #include "m_random.h"
-#include "doomdef.h"
 #include "f_wipe.h"
-#include "c_cvars.h"
 #include "templates.h"
-#include "v_palette.h"
 
 int wipe_CalcBurn (uint8_t *burnarray, int width, int height, int density)
 {

src/files.cpp

@@ -34,9 +34,7 @@
 */
 
 #include "files.h"
-#include "i_system.h"
 #include "templates.h"
-#include "m_misc.h"
 
 
 

src/fragglescript/t_cmd.cpp

@@ -27,7 +27,6 @@
 
 
 #include <string.h>
-#include <stdio.h>
 #include "p_local.h"
 #include "doomdef.h"
 #include "doomstat.h"

src/fragglescript/t_func.cpp

@@ -37,26 +37,15 @@
 #include "templates.h"
 #include "p_local.h"
 #include "t_script.h"
-#include "s_sound.h"
-#include "p_lnspec.h"
-#include "m_random.h"
 #include "c_console.h"
 #include "c_dispatch.h"
 #include "d_player.h"
 #include "w_wad.h"
 #include "gi.h"
-#include "zstring.h"
-#include "i_system.h"
-#include "doomstat.h"
-#include "g_level.h"
-#include "v_palette.h"
 #include "v_font.h"
-#include "r_data/colormaps.h"
 #include "serializer.h"
-#include "p_setup.h"
 #include "p_spec.h"
 #include "r_utility.h"
-#include "math/cmath.h"
 #include "g_levellocals.h"
 #include "actorinlines.h"
 

src/fragglescript/t_load.cpp

@@ -25,14 +25,11 @@
 
 
 #include "w_wad.h"
-#include "tarray.h"
 #include "g_level.h"
-#include "sc_man.h"
 #include "s_sound.h"
 #include "r_sky.h"
 #include "t_script.h"
 #include "cmdlib.h"
-#include "p_lnspec.h"
 #include "gi.h"
 #include "g_levellocals.h"
 #include "xlat/xlat.h"

src/fragglescript/t_parse.cpp

@@ -33,10 +33,7 @@
 /* includes ************************/
 #include <stdarg.h>
 #include "t_script.h"
-#include "s_sound.h"
 #include "v_text.h"
-#include "c_cvars.h"
-#include "i_system.h"
 
 
 CVAR(Bool, script_debug, false, 0)

src/fragglescript/t_prepro.cpp

@@ -41,7 +41,6 @@
 /* includes ************************/
 
 #include "t_script.h"
-#include "i_system.h"
 #include "w_wad.h"
 #include "serializer.h"
 

src/fragglescript/t_script.cpp

@@ -33,14 +33,10 @@
 //
 
 #include "t_script.h"
-#include "p_lnspec.h"
 #include "a_keys.h"
 #include "d_player.h"
 #include "p_spec.h"
 #include "c_dispatch.h"
-#include "i_system.h"
-#include "doomerrors.h"
-#include "doomstat.h"
 #include "serializer.h"
 #include "g_levellocals.h"
 

src/g_doomedmap.cpp

@@ -36,13 +36,8 @@
 #include "info.h"
 #include "actor.h"
 #include "p_lnspec.h"
-#include "m_fixed.h"
 #include "c_dispatch.h"
-#include "templates.h"
-#include "cmdlib.h"
-#include "g_level.h"
 #include "v_text.h"
-#include "i_system.h"
 
 
 const char *SpecialMapthingNames[] = {

src/g_game.cpp

@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stddef.h>
-#include <time.h>
 #include <memory>
 #ifdef __APPLE__
 #include <CoreServices/CoreServices.h>
@@ -43,9 +42,7 @@
 #include "m_argv.h"
 #include "m_misc.h"
 #include "menu/menu.h"
-#include "m_random.h"
 #include "m_crc32.h"
-#include "i_system.h"
 #include "p_saveg.h"
 #include "p_tick.h"
 #include "d_main.h"
@@ -54,24 +51,16 @@
 #include "st_stuff.h"
 #include "am_map.h"
 #include "c_console.h"
-#include "c_cvars.h"
 #include "c_bind.h"
 #include "c_dispatch.h"
-#include "v_video.h"
 #include "w_wad.h"
 #include "p_local.h" 
-#include "s_sound.h"
 #include "gstrings.h"
 #include "r_sky.h"
 #include "g_game.h"
-#include "g_level.h"
-#include "b_bot.h"			//Added by MC:
 #include "sbar.h"
-#include "m_swap.h"
 #include "m_png.h"
-#include "gi.h"
 #include "a_keys.h"
-#include "r_data/r_translate.h"
 #include "cmdlib.h"
 #include "d_net.h"
 #include "d_event.h"
@@ -82,18 +71,12 @@
 #include "r_utility.h"
 #include "a_morph.h"
 #include "p_spec.h"
-#include "r_data/colormaps.h"
 #include "serializer.h"
-#include "w_zip.h"
-#include "resourcefiles/resourcefile.h"
 #include "vm.h"
 
-#include <zlib.h>
-
 #include "g_hub.h"
 #include "g_levellocals.h"
 #include "events.h"
-#include "d_main.h"
 
 
 static FRandom pr_dmspawn ("DMSpawn");

src/g_hub.cpp

@@ -35,11 +35,8 @@
 
 #include "doomstat.h"
 #include "g_hub.h"
-#include "tarray.h"
 #include "g_level.h"
 #include "g_game.h"
-#include "gi.h"
-#include "files.h"
 #include "m_png.h"
 #include "gstrings.h"
 #include "wi_stuff.h"

src/g_inventory/a_keys.cpp

@@ -37,11 +37,7 @@
 #include "gstrings.h"
 #include "d_player.h"
 #include "c_console.h"
-#include "s_sound.h"
-#include "sc_man.h"
-#include "v_palette.h"
 #include "w_wad.h"
-#include "doomstat.h"
 #include "v_font.h"
 #include "vm.h"
 

src/g_inventory/a_pickups.cpp

@@ -36,28 +36,21 @@
 #include <assert.h>
 
 #include "info.h"
-#include "m_random.h"
 #include "p_local.h"
-#include "s_sound.h"
-#include "gi.h"
 #include "p_lnspec.h"
 #include "sbar.h"
 #include "statnums.h"
 #include "c_dispatch.h"
 #include "gstrings.h"
-#include "templates.h"
 #include "a_morph.h"
 #include "a_specialspot.h"
-#include "g_level.h"
 #include "g_game.h"
 #include "doomstat.h"
 #include "d_player.h"
-#include "p_spec.h"
 #include "serializer.h"
 #include "vm.h"
 #include "c_functions.h"
 #include "g_levellocals.h"
-#include "vm.h"
 
 EXTERN_CVAR(Bool, sv_unlimited_pickup)
 

src/g_inventory/a_weapons.cpp

@@ -38,18 +38,11 @@
 #include "a_pickups.h"
 #include "gi.h"
 #include "d_player.h"
-#include "s_sound.h"
-#include "i_system.h"
-#include "r_state.h"
-#include "p_pspr.h"
 #include "c_dispatch.h"
 #include "m_misc.h"
 #include "gameconfigfile.h"
 #include "cmdlib.h"
-#include "templates.h"
 #include "sbar.h"
-#include "doomstat.h"
-#include "g_level.h"
 #include "d_net.h"
 #include "serializer.h"
 #include "vm.h"

src/g_level.cpp

@@ -52,7 +52,6 @@
 #include "r_sky.h"
 #include "c_console.h"
 #include "intermission/intermission.h"
-#include "gstrings.h"
 #include "v_video.h"
 #include "st_stuff.h"
 #include "hu_stuff.h"
@@ -62,31 +61,22 @@
 #include "v_text.h"
 #include "s_sndseq.h"
 #include "b_bot.h"
-#include "sc_man.h"
 #include "sbar.h"
 #include "a_lightning.h"
-#include "m_png.h"
-#include "m_random.h"
 #include "version.h"
-#include "statnums.h"
 #include "sbarinfo.h"
-#include "r_data/r_translate.h"
 #include "p_lnspec.h"
-#include "r_data/r_interpolate.h"
 #include "cmdlib.h"
 #include "d_net.h"
 #include "d_netinf.h"
-#include "v_palette.h"
 #include "menu/menu.h"
 #include "a_sharedglobal.h"
-#include "r_data/colormaps.h"
 #include "r_renderer.h"
 #include "r_utility.h"
 #include "p_spec.h"
 #include "serializer.h"
 #include "vm.h"
 #include "events.h"
-#include "dobjgc.h"
 #include "i_music.h"
 
 #include "gi.h"
@@ -94,11 +84,8 @@
 #include "g_hub.h"
 #include "g_levellocals.h"
 #include "actorinlines.h"
-#include "vm.h"
 #include "i_time.h"
 
-#include <string.h>
-
 void STAT_StartNewGame(const char *lev);
 void STAT_ChangeLevel(const char *newl);
 

src/g_mapinfo.cpp

@@ -36,21 +36,17 @@
 #include <assert.h>
 #include "templates.h"
 #include "g_level.h"
-#include "sc_man.h"
 #include "w_wad.h"
 #include "cmdlib.h"
 #include "v_video.h"
 #include "p_lnspec.h"
 #include "p_setup.h"
-#include "i_system.h"
 #include "gi.h"
 #include "gstrings.h"
 #include "p_acs.h"
 #include "doomstat.h"
 #include "d_player.h"
 #include "autosegs.h"
-#include "version.h"
-#include "v_text.h"
 #include "g_levellocals.h"
 #include "events.h"
 

src/g_shared/a_action.cpp

@@ -24,16 +24,11 @@
 #include "actor.h"
 #include "p_conversation.h"
 #include "p_lnspec.h"
-#include "m_random.h"
-#include "s_sound.h"
 #include "d_player.h"
 #include "p_local.h"
 #include "p_terrain.h"
 #include "p_enemy.h"
-#include "statnums.h"
-#include "templates.h"
 #include "serializer.h"
-#include "r_data/r_translate.h"
 #include "vm.h"
 
 //----------------------------------------------------------------------------

src/g_shared/a_decals.cpp

@@ -36,17 +36,12 @@
 #include "a_sharedglobal.h"
 #include "r_defs.h"
 #include "p_local.h"
-#include "v_video.h"
 #include "p_trace.h"
 #include "decallib.h"
-#include "statnums.h"
 #include "c_dispatch.h"
 #include "d_net.h"
-#include "colormatcher.h"
-#include "v_palette.h"
 #include "serializer.h"
 #include "doomdata.h"
-#include "r_state.h"
 #include "g_levellocals.h"
 
 static double DecalWidth, DecalLeft, DecalRight;

src/g_shared/a_flashfader.cpp

@@ -33,7 +33,6 @@
 */
 
 #include "a_sharedglobal.h"
-#include "g_level.h"
 #include "d_player.h"
 #include "serializer.h"
 #include "g_levellocals.h"

src/g_shared/a_lightning.cpp

@@ -25,7 +25,6 @@
 #include "a_lightning.h"
 #include "doomstat.h"
 #include "p_lnspec.h"
-#include "statnums.h"
 #include "m_random.h"
 #include "templates.h"
 #include "s_sound.h"

src/g_shared/a_morph.cpp

@@ -23,23 +23,18 @@
 
 #include "info.h"
 #include "a_pickups.h"
-#include "gstrings.h"
 #include "p_local.h"
 #include "gi.h"
-#include "s_sound.h"
-#include "m_random.h"
 #include "a_sharedglobal.h"
 #include "sbar.h"
 #include "a_morph.h"
 #include "doomstat.h"
-#include "g_level.h"
 #include "serializer.h"
 #include "p_enemy.h"
 #include "d_player.h"
 #include "r_data/sprites.h"
 #include "g_levellocals.h"
 #include "vm.h"
-#include "vm.h"
 
 static FRandom pr_morphmonst ("MorphMonster");
 

src/g_shared/a_quake.cpp

@@ -27,11 +27,7 @@
 #include "doomstat.h"
 #include "p_local.h"
 #include "actor.h"
-#include "m_bbox.h"
-#include "m_random.h"
-#include "s_sound.h"
 #include "a_sharedglobal.h"
-#include "statnums.h"
 #include "serializer.h"
 #include "d_player.h"
 #include "r_utility.h"

src/g_shared/a_specialspot.cpp

@@ -33,10 +33,7 @@
 **
 */
 #include "a_specialspot.h"
-#include "m_random.h"
 #include "p_local.h"
-#include "statnums.h"
-#include "i_system.h"
 #include "doomstat.h"
 #include "serializer.h"
 #include "a_pickups.h"

src/g_shared/hudmessages.cpp

@@ -38,7 +38,6 @@
 #include "c_cvars.h"
 #include "v_video.h"
 #include "cmdlib.h"
-#include "doomstat.h"
 #include "serializer.h"
 #include "vm.h"
 

src/g_shared/shared_hud.cpp

@@ -40,12 +40,10 @@
 #include "doomdef.h"
 #include "v_video.h"
 #include "gi.h"
-#include "c_cvars.h"
 #include "w_wad.h"
 #include "a_keys.h"
 #include "sbar.h"
 #include "sc_man.h"
-#include "templates.h"
 #include "p_local.h"
 #include "doomstat.h"
 #include "g_level.h"

src/g_skill.cpp

@@ -36,12 +36,9 @@
 #include <ctype.h>
 #include "doomstat.h"
 #include "d_player.h"
-#include "g_level.h"
 #include "g_game.h"
 #include "gi.h"
-#include "templates.h"
 #include "v_font.h"
-#include "m_fixed.h"
 #include "gstrings.h"
 #include "g_levellocals.h"
 #include "vm.h"

src/g_statusbar/sbar_mugshot.cpp

@@ -36,10 +36,7 @@
 #include "r_defs.h"
 #include "m_random.h"
 #include "d_player.h"
-#include "d_event.h"
 #include "sbar.h"
-#include "sbarinfo.h"
-#include "templates.h"
 #include "r_utility.h"
 #include "actorinlines.h"
 

src/g_statusbar/sbarinfo.cpp

@@ -38,24 +38,13 @@
 #include "v_font.h"
 #include "v_video.h"
 #include "sbar.h"
-#include "r_defs.h"
 #include "w_wad.h"
-#include "m_random.h"
 #include "d_player.h"
-#include "st_stuff.h"
-#include "m_swap.h"
 #include "a_keys.h"
-#include "templates.h"
-#include "i_system.h"
-#include "sbar.h"
 #include "sbarinfo.h"
 #include "gi.h"
-#include "r_data/r_translate.h"
-#include "g_level.h"
-#include "v_palette.h"
 #include "p_acs.h"
 #include "gstrings.h"
-#include "cmdlib.h"
 #include "g_levellocals.h"
 #include "vm.h"
 

src/g_statusbar/shared_sbar.cpp

@@ -41,25 +41,19 @@
 #include "c_dispatch.h"
 #include "c_console.h"
 #include "v_video.h"
-#include "m_swap.h"
 #include "w_wad.h"
-#include "v_text.h"
 #include "s_sound.h"
 #include "gi.h"
 #include "doomstat.h"
 #include "g_level.h"
 #include "d_net.h"
-#include "colormatcher.h"
-#include "v_palette.h"
 #include "d_player.h"
 #include "serializer.h"
-#include "gstrings.h"
 #include "r_utility.h"
 #include "cmdlib.h"
 #include "g_levellocals.h"
 #include "vm.h"
 #include "p_acs.h"
-#include "r_data/r_translate.h"
 #include "sbarinfo.h"
 #include "events.h"
 

src/gameconfigfile.cpp

@@ -33,18 +33,15 @@
 */
 
 #include <stdio.h>
-#include <time.h>
 
 #ifdef __APPLE__
 #include <CoreServices/CoreServices.h>
 #endif
 
-#include "doomdef.h"
 #include "gameconfigfile.h"
 #include "c_cvars.h"
 #include "c_dispatch.h"
 #include "c_bind.h"
-#include "gstrings.h"
 #include "m_argv.h"
 #include "cmdlib.h"
 #include "version.h"
@@ -52,7 +49,6 @@
 #include "v_font.h"
 #include "a_pickups.h"
 #include "doomstat.h"
-#include "i_system.h"
 #include "gi.h"
 #include "d_main.h"
 

src/gi.cpp

@@ -35,11 +35,8 @@
 #include <stdlib.h>
 #include "info.h"
 #include "gi.h"
-#include "m_fixed.h"
-#include "v_palette.h"
 #include "sc_man.h"
 #include "w_wad.h"
-#include "i_system.h"
 #include "v_video.h"
 #include "g_level.h"
 #include "vm.h"

src/gl/compatibility/gl_20.cpp

@@ -30,16 +30,9 @@
 
 #include "gl/system/gl_system.h"
 #include "menu/menu.h"
-#include "tarray.h"
-#include "doomtype.h"
-#include "m_argv.h"
-#include "zstring.h"
-#include "i_system.h"
-#include "v_text.h"
 #include "r_utility.h"
 #include "g_levellocals.h"
 #include "actorinlines.h"
-#include "g_levellocals.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 
 #include "gl/renderer/gl_renderer.h"

src/gl/compatibility/gl_swshader20.cpp

@@ -30,15 +30,10 @@
 #include "gl/system/gl_system.h"
 #include "tarray.h"
 #include "doomtype.h"
-#include "zstring.h"
-#include "i_system.h"
 #include "r_utility.h"
 #include "w_wad.h"
-#include "hwrenderer/dynlights/hw_dynlightdata.h"
 
 #include "gl/renderer/gl_renderer.h"
-#include "gl/system/gl_interface.h"
-#include "gl/renderer/gl_renderstate.h"
 
 
 class LegacyShader

src/gl/data/gl_vertexbuffer.cpp

@@ -29,9 +29,6 @@
 #include "doomtype.h"
 #include "p_local.h"
 #include "r_state.h"
-#include "m_argv.h"
-#include "c_cvars.h"
-#include "g_levellocals.h"
 #include "gl/system/gl_interface.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/shaders/gl_shader.h"

src/gl/dynlights/gl_lightbuffer.cpp

@@ -28,7 +28,6 @@
 #include "gl/system/gl_system.h"
 #include "gl/shaders/gl_shader.h"
 #include "gl/dynlights/gl_lightbuffer.h"
-#include "gl/system/gl_interface.h"
 #include "gl/utility//gl_clock.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 

src/gl/dynlights/gl_shadowmap.cpp

@@ -23,7 +23,6 @@
 #include "gl/system/gl_system.h"
 #include "gl/shaders/gl_shader.h"
 #include "gl/dynlights/gl_shadowmap.h"
-#include "gl/system/gl_interface.h"
 #include "gl/system/gl_debug.h"
 #include "gl/system/gl_cvars.h"
 #include "gl/renderer/gl_renderer.h"
@@ -31,8 +30,6 @@
 #include "gl/renderer/gl_renderbuffers.h"
 #include "gl/shaders/gl_shadowmapshader.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
-#include "r_state.h"
-#include "g_levellocals.h"
 #include "stats.h"
 
 /*

src/gl/models/gl_models.cpp

@@ -28,20 +28,13 @@
 
 #include "gl/system/gl_system.h"
 #include "w_wad.h"
-#include "cmdlib.h"
-#include "sc_man.h"
-#include "m_crc32.h"
-#include "c_console.h"
 #include "g_game.h"
 #include "doomstat.h"
 #include "g_level.h"
 #include "r_state.h"
 #include "d_player.h"
 #include "g_levellocals.h"
-#include "r_utility.h"
 #include "i_time.h"
-//#include "resources/voxels.h"
-//#include "gl/gl_intern.h"
 
 #include "gl/system/gl_interface.h"
 #include "gl/renderer/gl_renderer.h"

src/gl/renderer/gl_lightdata.cpp

@@ -33,11 +33,8 @@
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/shaders/gl_shader.h"
 #include "gl/scene/gl_portal.h"
-#include "c_dispatch.h"
 #include "p_local.h"
-#include "g_level.h"
 #include "r_sky.h"
-#include "g_levellocals.h"
 
 // externally settable lighting properties
 static float distfogtable[2][256];	// light to fog conversion table for black fog

src/gl/renderer/gl_postprocess.cpp

@@ -28,21 +28,8 @@
 #include "gl/system/gl_system.h"
 #include "gi.h"
 #include "m_png.h"
-#include "m_random.h"
-#include "st_stuff.h"
-#include "dobject.h"
-#include "doomstat.h"
-#include "g_level.h"
-#include "r_data/r_interpolate.h"
 #include "r_utility.h"
 #include "d_player.h"
-#include "p_effect.h"
-#include "sbar.h"
-#include "po_man.h"
-#include "r_utility.h"
-#include "p_local.h"
-#include "colormatcher.h"
-#include "gl/system/gl_interface.h"
 #include "gl/system/gl_framebuffer.h"
 #include "gl/system/gl_cvars.h"
 #include "gl/system/gl_debug.h"
@@ -60,7 +47,6 @@
 #include "gl/shaders/gl_lensshader.h"
 #include "gl/shaders/gl_fxaashader.h"
 #include "gl/shaders/gl_presentshader.h"
-#include "gl/shaders/gl_postprocessshader.h"
 #include "gl/shaders/gl_postprocessshaderinstance.h"
 #include "gl/stereo3d/gl_stereo3d.h"
 #include "r_videoscale.h"

src/gl/renderer/gl_postprocessstate.cpp

@@ -29,9 +29,6 @@
 #include "gl/system/gl_system.h"
 #include "gl/system/gl_interface.h"
 #include "gl/data/gl_vertexbuffer.h"
-#include "gl/system/gl_cvars.h"
-#include "gl/shaders/gl_shader.h"
-#include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_postprocessstate.h"
 
 //-----------------------------------------------------------------------------

src/gl/renderer/gl_quaddrawer.cpp

@@ -23,9 +23,7 @@
 #include "gl/system/gl_system.h"
 #include "gl/shaders/gl_shader.h"
 #include "gl/renderer/gl_renderer.h"
-#include "gl/renderer/gl_renderstate.h"
 #include "gl/renderer/gl_quaddrawer.h"
-#include "r_data/matrix.h"
 
 /*
 ** For handling of dynamically created quads when no persistently mapped

src/gl/renderer/gl_renderbuffers.cpp

@@ -26,18 +26,12 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
 #include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
 #include "gl/system/gl_cvars.h"
 #include "gl/system/gl_debug.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderbuffers.h"
-#include "w_wad.h"
-#include "i_system.h"
-#include "doomerrors.h"
 #include <random>
 
 CVAR(Int, gl_multisample, 1, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);

src/gl/renderer/gl_renderer.cpp

@@ -27,13 +27,9 @@
 
 #include "gl/system/gl_system.h"
 #include "files.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "r_data/r_translate.h"
 #include "m_png.h"
-#include "m_crc32.h"
 #include "w_wad.h"
-#include "vectors.h"
 #include "doomstat.h"
 #include "i_time.h"
 #include "p_effect.h"
@@ -52,8 +48,6 @@
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_scenedrawer.h"
 #include "gl/scene/gl_swscene.h"
-#include "gl/scene/gl_portal.h"
-#include "gl/shaders/gl_shader.h"
 #include "gl/shaders/gl_ambientshader.h"
 #include "gl/shaders/gl_bloomshader.h"
 #include "gl/shaders/gl_blurshader.h"
@@ -64,13 +58,9 @@
 #include "gl/shaders/gl_presentshader.h"
 #include "gl/shaders/gl_present3dRowshader.h"
 #include "gl/shaders/gl_shadowmapshader.h"
-#include "gl/shaders/gl_postprocessshader.h"
 #include "gl/shaders/gl_postprocessshaderinstance.h"
 #include "gl/stereo3d/gl_stereo3d.h"
-#include "gl/textures/gl_material.h"
 #include "gl/textures/gl_samplers.h"
-#include "gl/utility/gl_clock.h"
-#include "gl/models/gl_models.h"
 #include "gl/dynlights/gl_lightbuffer.h"
 #include "r_videoscale.h"
 

src/gl/renderer/gl_renderstate.cpp

@@ -33,11 +33,8 @@
 #include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_shader.h"
 #include "gl/renderer/gl_renderer.h"
-#include "gl/renderer/gl_renderstate.h"
-#include "gl/renderer/gl_colormap.h"
 #include "gl/dynlights//gl_lightbuffer.h"
 #include "gl/renderer/gl_renderbuffers.h"
-#include "g_levellocals.h"
 
 void gl_SetTextureMode(int type);
 

src/gl/scene/gl_bsp.cpp

@@ -29,18 +29,12 @@
 #include "p_local.h"
 #include "a_sharedglobal.h"
 #include "g_levellocals.h"
-#include "r_sky.h"
 #include "p_effect.h"
 #include "po_man.h"
-#include "doomdata.h"
-#include "g_levellocals.h"
 
 #include "gl/renderer/gl_renderer.h"
 #include "gl/data/gl_vertexbuffer.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/scene/gl_portal.h"
-#include "gl/scene/gl_wall.h"
-#include "gl/utility/gl_clock.h"
 
 EXTERN_CVAR(Bool, gl_render_segs)
 

src/gl/scene/gl_decal.cpp

@@ -38,9 +38,6 @@
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/shaders/gl_shader.h"
-#include "gl/textures/gl_material.h"
-#include "gl/utility/gl_clock.h"
 #include "gl/renderer/gl_quaddrawer.h"
 
 struct DecalVertex

src/gl/scene/gl_drawinfo.cpp

@@ -30,21 +30,14 @@
 #include "gl/system/gl_system.h"
 #include "r_sky.h"
 #include "r_utility.h"
-#include "r_state.h"
 #include "doomstat.h"
 #include "g_levellocals.h"
-#include "memarena.h"
 
-#include "gl/system/gl_cvars.h"
 #include "gl/data/gl_vertexbuffer.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/renderer/gl_lightdata.h"
 #include "gl/renderer/gl_renderstate.h"
-#include "gl/textures/gl_material.h"
-#include "gl/utility/gl_clock.h"
-#include "gl/shaders/gl_shader.h"
 #include "gl/stereo3d/scoped_color_mask.h"
 #include "gl/renderer/gl_quaddrawer.h"
 

src/gl/scene/gl_flats.cpp

@@ -30,11 +30,8 @@
 #include "r_defs.h"
 #include "r_sky.h"
 #include "r_utility.h"
-#include "g_level.h"
 #include "doomstat.h"
 #include "d_player.h"
-#include "portal.h"
-#include "templates.h"
 #include "g_levellocals.h"
 #include "actorinlines.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
@@ -47,10 +44,7 @@
 #include "gl/data/gl_vertexbuffer.h"
 #include "gl/dynlights/gl_lightbuffer.h"
 #include "gl/scene/gl_drawinfo.h"
-#include "gl/shaders/gl_shader.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/textures/gl_material.h"
-#include "gl/utility/gl_clock.h"
 #include "gl/renderer/gl_quaddrawer.h"
 
 #ifdef _DEBUG

src/gl/scene/gl_portal.cpp

@@ -27,33 +27,24 @@
 
 #include "gl/system/gl_system.h"
 #include "p_local.h"
-#include "vectors.h"
 #include "c_dispatch.h"
 #include "doomstat.h"
 #include "a_sharedglobal.h"
 #include "r_sky.h"
-#include "portal.h"
 #include "p_maputl.h"
 #include "d_player.h"
 #include "g_levellocals.h"
-#include "actorinlines.h"
 
 #include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/renderer/gl_quaddrawer.h"
-#include "gl/data/gl_vertexbuffer.h"
 #include "gl/scene/gl_clipper.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/shaders/gl_shader.h"
 #include "gl/stereo3d/scoped_color_mask.h"
-#include "gl/textures/gl_material.h"
-#include "gl/utility/gl_clock.h"
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

src/gl/scene/gl_scene.cpp

@@ -26,12 +26,8 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "i_time.h"
 #include "gi.h"
 #include "m_png.h"
-#include "m_random.h"
-#include "st_stuff.h"
-#include "dobject.h"
 #include "doomstat.h"
 #include "g_level.h"
 #include "r_data/r_interpolate.h"
@@ -40,11 +36,9 @@
 #include "p_effect.h"
 #include "sbar.h"
 #include "po_man.h"
-#include "r_utility.h"
 #include "p_local.h"
 #include "serializer.h"
 #include "g_levellocals.h"
-#include "events.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 
 #include "gl/dynlights/gl_lightbuffer.h"
@@ -55,15 +49,11 @@
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/renderer/gl_renderbuffers.h"
 #include "gl/data/gl_vertexbuffer.h"
-#include "gl/scene/gl_clipper.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/shaders/gl_shader.h"
 #include "gl/stereo3d/gl_stereo3d.h"
 #include "gl/stereo3d/scoped_view_shifter.h"
-#include "gl/textures/gl_material.h"
-#include "gl/utility/gl_clock.h"
 
 //==========================================================================
 //

src/gl/scene/gl_sky.cpp

@@ -22,12 +22,10 @@
 
 #include "gl/system/gl_system.h"
 #include "a_sharedglobal.h"
-#include "g_level.h"
 #include "r_sky.h"
 #include "r_state.h"
 #include "r_utility.h"
 #include "doomdata.h"
-#include "portal.h"
 #include "g_levellocals.h"
 
 #include "gl/renderer/gl_lightdata.h"

src/gl/scene/gl_skydome.cpp

@@ -56,7 +56,6 @@
 #include "gl/system/gl_system.h"
 #include "doomtype.h"
 #include "g_level.h"
-#include "sc_man.h"
 #include "w_wad.h"
 #include "r_state.h"
 #include "r_utility.h"
@@ -69,9 +68,7 @@
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/scene/gl_portal.h"
 #include "gl/shaders/gl_shader.h"
-#include "gl/textures/gl_material.h"
 
 
 //-----------------------------------------------------------------------------

src/gl/scene/gl_sprite.cpp

@@ -39,22 +39,15 @@
 #include "events.h"
 #include "actorinlines.h"
 #include "r_data/r_vanillatrans.h"
-#include "i_time.h"
 
 #include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
 #include "gl/system/gl_cvars.h"
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/renderer/gl_renderstate.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/scene/gl_portal.h"
 #include "gl/models/gl_models.h"
-#include "gl/shaders/gl_shader.h"
-#include "gl/textures/gl_material.h"
-#include "gl/utility/gl_clock.h"
-#include "gl/data/gl_vertexbuffer.h"
 #include "gl/renderer/gl_quaddrawer.h"
 
 CVAR(Bool, gl_usecolorblending, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)

src/gl/scene/gl_spritelight.cpp

@@ -29,19 +29,15 @@
 #include "c_dispatch.h"
 #include "p_local.h"
 #include "p_effect.h"
-#include "vectors.h"
 #include "g_level.h"
 #include "g_levellocals.h"
 #include "actorinlines.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 
-#include "gl/system/gl_cvars.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_lightdata.h"
 #include "gl/scene/gl_drawinfo.h"
-#include "gl/scene/gl_portal.h"
 #include "gl/shaders/gl_shader.h"
-#include "gl/textures/gl_material.h"
 #include "gl/dynlights/gl_lightbuffer.h"
 
 

src/gl/scene/gl_swscene.cpp

@@ -26,13 +26,9 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "gl/system/gl_interface.h"
 #include "gl/system/gl_debug.h"
 #include "gl/data/gl_vertexbuffer.h"
 #include "gl/shaders/gl_shader.h"
-#include "gl/renderer/gl_renderstate.h"
-#include "v_palette.h"
-#include "v_video.h"
 #include "gl_swscene.h"
 #include "w_wad.h"
 #include "d_player.h"

src/gl/scene/gl_vertex.cpp

@@ -25,12 +25,8 @@
 #include "gl/system/gl_system.h"
 
 #include "gl/renderer/gl_renderer.h"
-#include "gl/renderer/gl_lightdata.h"
 #include "gl/data/gl_vertexbuffer.h"
 #include "gl/scene/gl_drawinfo.h"
-#include "gl/scene/gl_portal.h"
-#include "gl/shaders/gl_shader.h"
-#include "gl/textures/gl_material.h"
 
 EXTERN_CVAR(Bool, gl_seamless)
 

src/gl/scene/gl_walls.cpp

@@ -24,15 +24,11 @@
 #include "p_local.h"
 #include "p_lnspec.h"
 #include "a_sharedglobal.h"
-#include "g_level.h"
-#include "templates.h"
-#include "vectors.h"
 #include "r_defs.h"
 #include "r_sky.h"
 #include "r_utility.h"
 #include "p_maputl.h"
 #include "doomdata.h"
-#include "portal.h"
 #include "g_levellocals.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 
@@ -43,7 +39,6 @@
 #include "gl/scene/gl_scenedrawer.h"
 #include "gl/textures/gl_material.h"
 #include "gl/utility/gl_clock.h"
-#include "gl/shaders/gl_shader.h"
 
 
 void FDrawInfo::AddWall(GLWall *wall)

src/gl/scene/gl_walls_draw.cpp

@@ -25,7 +25,6 @@
 #include "p_lnspec.h"
 #include "a_sharedglobal.h"
 #include "g_levellocals.h"
-#include "actor.h"
 #include "actorinlines.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 
@@ -39,9 +38,6 @@
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"
 #include "gl/scene/gl_scenedrawer.h"
-#include "gl/shaders/gl_shader.h"
-#include "gl/textures/gl_material.h"
-#include "gl/utility/gl_clock.h"
 #include "gl/renderer/gl_quaddrawer.h"
 
 EXTERN_CVAR(Bool, gl_seamless)

src/gl/scene/gl_weapon.cpp

@@ -31,7 +31,6 @@
 #include "v_video.h"
 #include "doomstat.h"
 #include "d_player.h"
-#include "g_level.h"
 #include "g_levellocals.h"
 
 #include "gl/system/gl_interface.h"
@@ -43,8 +42,6 @@
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_scenedrawer.h"
 #include "gl/models/gl_models.h"
-#include "gl/shaders/gl_shader.h"
-#include "gl/textures/gl_material.h"
 #include "gl/renderer/gl_quaddrawer.h"
 #include "gl/stereo3d/gl_stereo3d.h"
 

src/gl/shaders/gl_ambientshader.cpp

@@ -21,11 +21,7 @@
 //
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
-#include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
 #include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_ambientshader.h"
 

src/gl/shaders/gl_ambientshader.h

@@ -1,6 +1,8 @@
 #ifndef __GL_AMBIENTSHADER_H
 #define __GL_AMBIENTSHADER_H
 
+#include <memory>
+
 #include "gl_shaderprogram.h"
 
 class FLinearDepthShader
@@ -90,4 +92,4 @@ private:
 	bool mMultisample = false;
 };
 
-#endif
+#endif

src/gl/shaders/gl_bloomshader.cpp

@@ -26,12 +26,7 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
-#include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_bloomshader.h"
 
 void FBloomExtractShader::Bind()

src/gl/shaders/gl_blurshader.cpp

@@ -26,12 +26,7 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
-#include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_blurshader.h"
 #include "gl/data/gl_vertexbuffer.h"
 #include "gl/renderer/gl_renderer.h"

src/gl/shaders/gl_colormapshader.cpp

@@ -26,12 +26,7 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
-#include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_colormapshader.h"
 
 void FColormapShader::Bind()

src/gl/shaders/gl_lensshader.cpp

@@ -26,12 +26,7 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
-#include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_lensshader.h"
 
 void FLensShader::Bind()

src/gl/shaders/gl_postprocessshader.cpp

@@ -21,20 +21,15 @@
 //
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
 #include "w_wad.h"
 #include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
 #include "gl/system/gl_debug.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_postprocessstate.h"
 #include "gl/renderer/gl_renderbuffers.h"
 #include "gl/shaders/gl_postprocessshader.h"
 #include "gl/shaders/gl_postprocessshaderinstance.h"
-#include "textures/textures.h"
 #include "textures/bitmap.h"
 
 CVAR(Bool, gl_custompost, true, 0)

src/gl/shaders/gl_present3dRowshader.cpp

@@ -28,12 +28,6 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
-#include "v_video.h"
-#include "vectors.h"
-#include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_present3dRowshader.h"
 
 void FPresentStereoShaderBase::Init(const char * vtx_shader_name, const char * program_name)

src/gl/shaders/gl_presentshader.cpp

@@ -26,12 +26,7 @@
 */
 
 #include "gl/system/gl_system.h"
-#include "m_swap.h"
 #include "v_video.h"
-#include "vectors.h"
-#include "gl/system/gl_interface.h"
-#include "gl/system/gl_framebuffer.h"
-#include "gl/system/gl_cvars.h"
 #include "gl/shaders/gl_presentshader.h"
 
 void FPresentShaderBase::Init(const char * vtx_shader_name, const char * program_name)