diff --git a/src/actorptrselect.cpp b/src/actorptrselect.cpp index 4be3330c944..da36e449459 100644 --- a/src/actorptrselect.cpp +++ b/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" //========================================================================== diff --git a/src/am_map.cpp b/src/am_map.cpp index 7e6e7546d0b..e1126212513 100644 --- a/src/am_map.cpp +++ b/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" diff --git a/src/b_bot.cpp b/src/b_bot.cpp index d1848fc6a05..24a1bfe0375 100644 --- a/src/b_bot.cpp +++ b/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" diff --git a/src/b_func.cpp b/src/b_func.cpp index 3014e1bdd46..3c6425116bd 100644 --- a/src/b_func.cpp +++ b/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" diff --git a/src/b_game.cpp b/src/b_game.cpp index 661d09c6eee..d21c736e51e 100644 --- a/src/b_game.cpp +++ b/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" diff --git a/src/b_move.cpp b/src/b_move.cpp index 730c628b72e..3d3e67ed2c6 100644 --- a/src/b_move.cpp +++ b/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"); diff --git a/src/b_think.cpp b/src/b_think.cpp index 696af9c15f9..2c41bcda36c 100644 --- a/src/b_think.cpp +++ b/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"); diff --git a/src/bbannouncer.cpp b/src/bbannouncer.cpp index 6fbf314793c..144528cd7b5 100644 --- a/src/bbannouncer.cpp +++ b/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 ------------------------------------------------------------------ diff --git a/src/c_bind.cpp b/src/c_bind.cpp index 62d497f8002..1e4f7355db0 100644 --- a/src/c_bind.cpp +++ b/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 -#include - const char *KeyNames[NUM_KEYS] = { // This array is dependant on the particular keyboard input diff --git a/src/c_cmds.cpp b/src/c_cmds.cpp index 8e8612dec55..a143e55e074 100644 --- a/src/c_cmds.cpp +++ b/src/c_cmds.cpp @@ -35,7 +35,6 @@ #include #include #include -#include #ifdef _WIN32 #include @@ -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" diff --git a/src/c_console.cpp b/src/c_console.cpp index 3cddf416040..da38a25e926 100644 --- a/src/c_console.cpp +++ b/src/c_console.cpp @@ -34,10 +34,6 @@ #include "templates.h" #include "p_setup.h" -#include -#include -#include -#include #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 diff --git a/src/c_cvars.cpp b/src/c_cvars.cpp index 5f030293849..2e8e22eccd0 100644 --- a/src/c_cvars.cpp +++ b/src/c_cvars.cpp @@ -33,7 +33,6 @@ */ #include -#include #include #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 { diff --git a/src/c_dispatch.cpp b/src/c_dispatch.cpp index 6ebc0be997b..cbca6acb836 100644 --- a/src/c_dispatch.cpp +++ b/src/c_dispatch.cpp @@ -38,7 +38,6 @@ #include #include #include -#include #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" diff --git a/src/c_expr.cpp b/src/c_expr.cpp index 4d1668266d8..0f5cb9c4fa9 100644 --- a/src/c_expr.cpp +++ b/src/c_expr.cpp @@ -35,7 +35,6 @@ // HEADER FILES ------------------------------------------------------------ #include -#include #include #include diff --git a/src/colormatcher.cpp b/src/colormatcher.cpp index a93192fe237..aa98e54d0de 100644 --- a/src/colormatcher.cpp +++ b/src/colormatcher.cpp @@ -39,7 +39,6 @@ */ #include -#include #include "doomtype.h" #include "colormatcher.h" diff --git a/src/compatibility.cpp b/src/compatibility.cpp index 40d7bfbe201..752c91143c7 100644 --- a/src/compatibility.cpp +++ b/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" diff --git a/src/ct_chat.cpp b/src/ct_chat.cpp index baaa34db56e..85e8f0c234f 100644 --- a/src/ct_chat.cpp +++ b/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" diff --git a/src/d_dehacked.cpp b/src/d_dehacked.cpp index a3e2773afbf..25b42632e78 100644 --- a/src/d_dehacked.cpp +++ b/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" diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp index 67f15a60cdc..dd673ebe883 100644 --- a/src/d_iwad.cpp +++ b/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" diff --git a/src/d_main.cpp b/src/d_main.cpp index 92086e18b9e..d9bc8920680 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -38,16 +38,13 @@ #ifdef HAVE_FPU_CONTROL #include #endif -#include #if defined(__unix__) || defined(__APPLE__) #include #endif -#include #include #include -#include #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" diff --git a/src/d_net.cpp b/src/d_net.cpp index ec26da5847b..453a1ff3226 100644 --- a/src/d_net.cpp +++ b/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" diff --git a/src/d_netinfo.cpp b/src/d_netinfo.cpp index 2928568d0d6..2bc59fe7190 100644 --- a/src/d_netinfo.cpp +++ b/src/d_netinfo.cpp @@ -35,26 +35,17 @@ #include #include #include -#include #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" diff --git a/src/d_protocol.cpp b/src/d_protocol.cpp index 06caca46cd2..1a0ebcc023e 100644 --- a/src/d_protocol.cpp +++ b/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 extern short consistancy[MAXPLAYERS][BACKUPTICS]; void ReadTicCmd (uint8_t **stream, int player, int tic) { diff --git a/src/decallib.cpp b/src/decallib.cpp index 6950b1967aa..3b5daef5a01 100644 --- a/src/decallib.cpp +++ b/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" diff --git a/src/dobject.cpp b/src/dobject.cpp index df8bb1acbf6..6644c90b31c 100644 --- a/src/dobject.cpp +++ b/src/dobject.cpp @@ -33,19 +33,13 @@ */ #include -#include #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" diff --git a/src/dobjgc.cpp b/src/dobjgc.cpp index 3631c36ed1c..38eed8fb47a 100644 --- a/src/dobjgc.cpp +++ b/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" diff --git a/src/dobjtype.cpp b/src/dobjtype.cpp index 275c3814ebe..1415e15d1e2 100644 --- a/src/dobjtype.cpp +++ b/src/dobjtype.cpp @@ -35,19 +35,15 @@ // HEADER FILES ------------------------------------------------------------ -#include #include #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" diff --git a/src/doomstat.cpp b/src/doomstat.cpp index 01cfea36a63..edca955e148 100644 --- a/src/doomstat.cpp +++ b/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; diff --git a/src/dsectoreffect.cpp b/src/dsectoreffect.cpp index 38fd548bd3a..3c33268e8cc 100644 --- a/src/dsectoreffect.cpp +++ b/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" diff --git a/src/dthinker.cpp b/src/dthinker.cpp index 39de2e9d687..518bc464e16 100644 --- a/src/dthinker.cpp +++ b/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" diff --git a/src/edata.cpp b/src/edata.cpp index ee5f1fe840e..15f3241cf0f 100644 --- a/src/edata.cpp +++ b/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" diff --git a/src/events.cpp b/src/events.cpp index e9c76a7bb06..c520359a532 100755 --- a/src/events.cpp +++ b/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" diff --git a/src/f_wipe.cpp b/src/f_wipe.cpp index f47106839ff..31edce0fd05 100644 --- a/src/f_wipe.cpp +++ b/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) { diff --git a/src/files.cpp b/src/files.cpp index 93a2f45870f..1e7f83bd6c3 100644 --- a/src/files.cpp +++ b/src/files.cpp @@ -34,9 +34,7 @@ */ #include "files.h" -#include "i_system.h" #include "templates.h" -#include "m_misc.h" diff --git a/src/fragglescript/t_cmd.cpp b/src/fragglescript/t_cmd.cpp index 0fbb5a146f9..3579d704a19 100644 --- a/src/fragglescript/t_cmd.cpp +++ b/src/fragglescript/t_cmd.cpp @@ -27,7 +27,6 @@ #include -#include #include "p_local.h" #include "doomdef.h" #include "doomstat.h" diff --git a/src/fragglescript/t_func.cpp b/src/fragglescript/t_func.cpp index 2bda23ec8f1..85b6e726de7 100644 --- a/src/fragglescript/t_func.cpp +++ b/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" diff --git a/src/fragglescript/t_load.cpp b/src/fragglescript/t_load.cpp index bb3e84f1de7..1d13118a818 100644 --- a/src/fragglescript/t_load.cpp +++ b/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" diff --git a/src/fragglescript/t_parse.cpp b/src/fragglescript/t_parse.cpp index 6b9af077329..d7747b1bc24 100644 --- a/src/fragglescript/t_parse.cpp +++ b/src/fragglescript/t_parse.cpp @@ -33,10 +33,7 @@ /* includes ************************/ #include #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) diff --git a/src/fragglescript/t_prepro.cpp b/src/fragglescript/t_prepro.cpp index 4b00a3177df..d9d09f22154 100644 --- a/src/fragglescript/t_prepro.cpp +++ b/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" diff --git a/src/fragglescript/t_script.cpp b/src/fragglescript/t_script.cpp index 3c62d4d3a80..59a0605e510 100644 --- a/src/fragglescript/t_script.cpp +++ b/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" diff --git a/src/g_doomedmap.cpp b/src/g_doomedmap.cpp index 38feaaf76bc..5bf2b34f672 100644 --- a/src/g_doomedmap.cpp +++ b/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[] = { diff --git a/src/g_game.cpp b/src/g_game.cpp index 3fdf5510052..97034ada20e 100644 --- a/src/g_game.cpp +++ b/src/g_game.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #ifdef __APPLE__ #include @@ -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 - #include "g_hub.h" #include "g_levellocals.h" #include "events.h" -#include "d_main.h" static FRandom pr_dmspawn ("DMSpawn"); diff --git a/src/g_hub.cpp b/src/g_hub.cpp index ecf3106ce43..3cac5b17f77 100644 --- a/src/g_hub.cpp +++ b/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" diff --git a/src/g_inventory/a_keys.cpp b/src/g_inventory/a_keys.cpp index 8b2ac54c938..c3edfd60ff6 100644 --- a/src/g_inventory/a_keys.cpp +++ b/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" diff --git a/src/g_inventory/a_pickups.cpp b/src/g_inventory/a_pickups.cpp index 2ed33954b16..705a2539ff8 100644 --- a/src/g_inventory/a_pickups.cpp +++ b/src/g_inventory/a_pickups.cpp @@ -36,28 +36,21 @@ #include #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) diff --git a/src/g_inventory/a_weapons.cpp b/src/g_inventory/a_weapons.cpp index e0d98529bed..25c3918c475 100644 --- a/src/g_inventory/a_weapons.cpp +++ b/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" diff --git a/src/g_level.cpp b/src/g_level.cpp index 095e8cd2cf5..48440baa900 100644 --- a/src/g_level.cpp +++ b/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 - void STAT_StartNewGame(const char *lev); void STAT_ChangeLevel(const char *newl); diff --git a/src/g_mapinfo.cpp b/src/g_mapinfo.cpp index 914dad912fa..72fab5071ca 100644 --- a/src/g_mapinfo.cpp +++ b/src/g_mapinfo.cpp @@ -36,21 +36,17 @@ #include #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" diff --git a/src/g_shared/a_action.cpp b/src/g_shared/a_action.cpp index d85792b169a..f48830b3551 100644 --- a/src/g_shared/a_action.cpp +++ b/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" //---------------------------------------------------------------------------- diff --git a/src/g_shared/a_decals.cpp b/src/g_shared/a_decals.cpp index 29807f5b367..19216ecd248 100644 --- a/src/g_shared/a_decals.cpp +++ b/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; diff --git a/src/g_shared/a_flashfader.cpp b/src/g_shared/a_flashfader.cpp index ed0e0220286..7bc774da752 100644 --- a/src/g_shared/a_flashfader.cpp +++ b/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" diff --git a/src/g_shared/a_lightning.cpp b/src/g_shared/a_lightning.cpp index 625059993ed..76fdb5de17e 100644 --- a/src/g_shared/a_lightning.cpp +++ b/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" diff --git a/src/g_shared/a_morph.cpp b/src/g_shared/a_morph.cpp index d8b4b373b08..a630eff01fb 100644 --- a/src/g_shared/a_morph.cpp +++ b/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"); diff --git a/src/g_shared/a_quake.cpp b/src/g_shared/a_quake.cpp index 10010c3f9b4..39ffd3c792e 100644 --- a/src/g_shared/a_quake.cpp +++ b/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" diff --git a/src/g_shared/a_specialspot.cpp b/src/g_shared/a_specialspot.cpp index dc6829d2dd4..25cb0cd8a2c 100644 --- a/src/g_shared/a_specialspot.cpp +++ b/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" diff --git a/src/g_shared/hudmessages.cpp b/src/g_shared/hudmessages.cpp index 0299a0b9326..14c6cd53aee 100644 --- a/src/g_shared/hudmessages.cpp +++ b/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" diff --git a/src/g_shared/shared_hud.cpp b/src/g_shared/shared_hud.cpp index da66b9205ef..a3b7c2a6de1 100644 --- a/src/g_shared/shared_hud.cpp +++ b/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" diff --git a/src/g_skill.cpp b/src/g_skill.cpp index 90ed9f723dc..287d862f7b2 100644 --- a/src/g_skill.cpp +++ b/src/g_skill.cpp @@ -36,12 +36,9 @@ #include #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" diff --git a/src/g_statusbar/sbar_mugshot.cpp b/src/g_statusbar/sbar_mugshot.cpp index 4bec24f1b9b..950438f2173 100644 --- a/src/g_statusbar/sbar_mugshot.cpp +++ b/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" diff --git a/src/g_statusbar/sbarinfo.cpp b/src/g_statusbar/sbarinfo.cpp index 277684a6a52..7e7ace6a35e 100644 --- a/src/g_statusbar/sbarinfo.cpp +++ b/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" diff --git a/src/g_statusbar/shared_sbar.cpp b/src/g_statusbar/shared_sbar.cpp index 83347c2f4b5..511449abd34 100644 --- a/src/g_statusbar/shared_sbar.cpp +++ b/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" diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp index c2655c35900..acde9137628 100644 --- a/src/gameconfigfile.cpp +++ b/src/gameconfigfile.cpp @@ -33,18 +33,15 @@ */ #include -#include #ifdef __APPLE__ #include #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" diff --git a/src/gi.cpp b/src/gi.cpp index 19cfd3ee7f3..87c8b68cf90 100644 --- a/src/gi.cpp +++ b/src/gi.cpp @@ -35,11 +35,8 @@ #include #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" diff --git a/src/gl/compatibility/gl_20.cpp b/src/gl/compatibility/gl_20.cpp index 39e9578771e..0d13607278d 100644 --- a/src/gl/compatibility/gl_20.cpp +++ b/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" diff --git a/src/gl/compatibility/gl_swshader20.cpp b/src/gl/compatibility/gl_swshader20.cpp index 17adec972c3..be965bee9e0 100644 --- a/src/gl/compatibility/gl_swshader20.cpp +++ b/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 diff --git a/src/gl/data/gl_vertexbuffer.cpp b/src/gl/data/gl_vertexbuffer.cpp index cb6a3a74863..4c5f0144a54 100644 --- a/src/gl/data/gl_vertexbuffer.cpp +++ b/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" diff --git a/src/gl/dynlights/gl_lightbuffer.cpp b/src/gl/dynlights/gl_lightbuffer.cpp index 56009798738..b9a477a0328 100644 --- a/src/gl/dynlights/gl_lightbuffer.cpp +++ b/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" diff --git a/src/gl/dynlights/gl_shadowmap.cpp b/src/gl/dynlights/gl_shadowmap.cpp index 0d8f9ebbef6..48847cd5c69 100644 --- a/src/gl/dynlights/gl_shadowmap.cpp +++ b/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" /* diff --git a/src/gl/models/gl_models.cpp b/src/gl/models/gl_models.cpp index 390664c3d86..364c3abcd7e 100644 --- a/src/gl/models/gl_models.cpp +++ b/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" diff --git a/src/gl/renderer/gl_lightdata.cpp b/src/gl/renderer/gl_lightdata.cpp index 0e994abf91d..cb3f3373ffc 100644 --- a/src/gl/renderer/gl_lightdata.cpp +++ b/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 diff --git a/src/gl/renderer/gl_postprocess.cpp b/src/gl/renderer/gl_postprocess.cpp index 72e30f27ae6..3a34a7cbccd 100644 --- a/src/gl/renderer/gl_postprocess.cpp +++ b/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" diff --git a/src/gl/renderer/gl_postprocessstate.cpp b/src/gl/renderer/gl_postprocessstate.cpp index 4fbe04a768c..8363183852b 100644 --- a/src/gl/renderer/gl_postprocessstate.cpp +++ b/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" //----------------------------------------------------------------------------- diff --git a/src/gl/renderer/gl_quaddrawer.cpp b/src/gl/renderer/gl_quaddrawer.cpp index 3a31fe62b96..a3cc3838045 100644 --- a/src/gl/renderer/gl_quaddrawer.cpp +++ b/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 diff --git a/src/gl/renderer/gl_renderbuffers.cpp b/src/gl/renderer/gl_renderbuffers.cpp index 0d594dbbb86..9f4790360f7 100644 --- a/src/gl/renderer/gl_renderbuffers.cpp +++ b/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 CVAR(Int, gl_multisample, 1, CVAR_ARCHIVE|CVAR_GLOBALCONFIG); diff --git a/src/gl/renderer/gl_renderer.cpp b/src/gl/renderer/gl_renderer.cpp index 6f89d176f0f..ea647e9704d 100644 --- a/src/gl/renderer/gl_renderer.cpp +++ b/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" diff --git a/src/gl/renderer/gl_renderstate.cpp b/src/gl/renderer/gl_renderstate.cpp index a24210678e9..64556b2878b 100644 --- a/src/gl/renderer/gl_renderstate.cpp +++ b/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); diff --git a/src/gl/scene/gl_bsp.cpp b/src/gl/scene/gl_bsp.cpp index f77cfbf0856..1de94c671b1 100644 --- a/src/gl/scene/gl_bsp.cpp +++ b/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) diff --git a/src/gl/scene/gl_decal.cpp b/src/gl/scene/gl_decal.cpp index 64f91b7fe3c..cc4d315a216 100644 --- a/src/gl/scene/gl_decal.cpp +++ b/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 diff --git a/src/gl/scene/gl_drawinfo.cpp b/src/gl/scene/gl_drawinfo.cpp index 2385730e815..7f512ad94ac 100644 --- a/src/gl/scene/gl_drawinfo.cpp +++ b/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" diff --git a/src/gl/scene/gl_flats.cpp b/src/gl/scene/gl_flats.cpp index 888cc189bf1..34e78480577 100644 --- a/src/gl/scene/gl_flats.cpp +++ b/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 diff --git a/src/gl/scene/gl_portal.cpp b/src/gl/scene/gl_portal.cpp index 798e9c972ba..7d5c4fa634f 100644 --- a/src/gl/scene/gl_portal.cpp +++ b/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" //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/src/gl/scene/gl_scene.cpp b/src/gl/scene/gl_scene.cpp index 3e9083037c2..c6e956c138b 100644 --- a/src/gl/scene/gl_scene.cpp +++ b/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" //========================================================================== // diff --git a/src/gl/scene/gl_sky.cpp b/src/gl/scene/gl_sky.cpp index 9abd693980f..c14356903b2 100644 --- a/src/gl/scene/gl_sky.cpp +++ b/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" diff --git a/src/gl/scene/gl_skydome.cpp b/src/gl/scene/gl_skydome.cpp index e40c59468a1..11be0365ed9 100644 --- a/src/gl/scene/gl_skydome.cpp +++ b/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" //----------------------------------------------------------------------------- diff --git a/src/gl/scene/gl_sprite.cpp b/src/gl/scene/gl_sprite.cpp index cc3e5be6075..a73b59f9f22 100644 --- a/src/gl/scene/gl_sprite.cpp +++ b/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) diff --git a/src/gl/scene/gl_spritelight.cpp b/src/gl/scene/gl_spritelight.cpp index d037cd72823..af58d037ebc 100644 --- a/src/gl/scene/gl_spritelight.cpp +++ b/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" diff --git a/src/gl/scene/gl_swscene.cpp b/src/gl/scene/gl_swscene.cpp index 2015ed4d2bb..5a67324b1b4 100644 --- a/src/gl/scene/gl_swscene.cpp +++ b/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" diff --git a/src/gl/scene/gl_vertex.cpp b/src/gl/scene/gl_vertex.cpp index ea1fe007cc9..e0ca18b2bd6 100644 --- a/src/gl/scene/gl_vertex.cpp +++ b/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) diff --git a/src/gl/scene/gl_walls.cpp b/src/gl/scene/gl_walls.cpp index 43687f523f0..b89cea40ec7 100644 --- a/src/gl/scene/gl_walls.cpp +++ b/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) diff --git a/src/gl/scene/gl_walls_draw.cpp b/src/gl/scene/gl_walls_draw.cpp index 05e12ed086d..2f7ad330d50 100644 --- a/src/gl/scene/gl_walls_draw.cpp +++ b/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) diff --git a/src/gl/scene/gl_weapon.cpp b/src/gl/scene/gl_weapon.cpp index 3915c25e6a3..673e1fce15a 100644 --- a/src/gl/scene/gl_weapon.cpp +++ b/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" diff --git a/src/gl/shaders/gl_ambientshader.cpp b/src/gl/shaders/gl_ambientshader.cpp index e433ebd002f..b91a6024add 100644 --- a/src/gl/shaders/gl_ambientshader.cpp +++ b/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" diff --git a/src/gl/shaders/gl_ambientshader.h b/src/gl/shaders/gl_ambientshader.h index d3310c3d64a..c0f86365633 100644 --- a/src/gl/shaders/gl_ambientshader.h +++ b/src/gl/shaders/gl_ambientshader.h @@ -1,6 +1,8 @@ #ifndef __GL_AMBIENTSHADER_H #define __GL_AMBIENTSHADER_H +#include + #include "gl_shaderprogram.h" class FLinearDepthShader @@ -90,4 +92,4 @@ class FSSAOCombineShader bool mMultisample = false; }; -#endif \ No newline at end of file +#endif diff --git a/src/gl/shaders/gl_bloomshader.cpp b/src/gl/shaders/gl_bloomshader.cpp index 9dbc4ff6ca0..2623723dfd7 100644 --- a/src/gl/shaders/gl_bloomshader.cpp +++ b/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() diff --git a/src/gl/shaders/gl_blurshader.cpp b/src/gl/shaders/gl_blurshader.cpp index 71cf6ffa3d0..970b0ebf344 100644 --- a/src/gl/shaders/gl_blurshader.cpp +++ b/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" diff --git a/src/gl/shaders/gl_colormapshader.cpp b/src/gl/shaders/gl_colormapshader.cpp index 2036599e94b..f02150c0a09 100644 --- a/src/gl/shaders/gl_colormapshader.cpp +++ b/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() diff --git a/src/gl/shaders/gl_lensshader.cpp b/src/gl/shaders/gl_lensshader.cpp index a92b2dece3c..611d31a28b0 100644 --- a/src/gl/shaders/gl_lensshader.cpp +++ b/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() diff --git a/src/gl/shaders/gl_postprocessshader.cpp b/src/gl/shaders/gl_postprocessshader.cpp index 1eae66ec2f5..a1b50f24fc0 100644 --- a/src/gl/shaders/gl_postprocessshader.cpp +++ b/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) diff --git a/src/gl/shaders/gl_present3dRowshader.cpp b/src/gl/shaders/gl_present3dRowshader.cpp index 0b689f5e81a..9162d95af38 100644 --- a/src/gl/shaders/gl_present3dRowshader.cpp +++ b/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) diff --git a/src/gl/shaders/gl_presentshader.cpp b/src/gl/shaders/gl_presentshader.cpp index b3044b7bc35..503d758030a 100644 --- a/src/gl/shaders/gl_presentshader.cpp +++ b/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) diff --git a/src/gl/shaders/gl_shader.cpp b/src/gl/shaders/gl_shader.cpp index c174215e97f..ea8003d0ad4 100644 --- a/src/gl/shaders/gl_shader.cpp +++ b/src/gl/shaders/gl_shader.cpp @@ -29,12 +29,8 @@ #include "gl/system/gl_system.h" #include "c_cvars.h" #include "v_video.h" -#include "name.h" #include "w_wad.h" -#include "i_system.h" #include "doomerrors.h" -#include "v_palette.h" -#include "sc_man.h" #include "cmdlib.h" #include "vm.h" #include "d_player.h" @@ -44,11 +40,8 @@ #include "r_data/matrix.h" #include "gl/renderer/gl_renderer.h" #include "gl/renderer/gl_renderstate.h" -#include "gl/system/gl_cvars.h" #include "gl/shaders/gl_shader.h" -#include "gl/shaders/gl_shaderprogram.h" #include "gl/shaders/gl_postprocessshader.h" -#include "gl/textures/gl_material.h" #include "gl/dynlights/gl_lightbuffer.h" static bool IsGlslWhitespace(char c) diff --git a/src/gl/shaders/gl_shaderprogram.cpp b/src/gl/shaders/gl_shaderprogram.cpp index 5db66840dad..667f9c78f2c 100644 --- a/src/gl/shaders/gl_shaderprogram.cpp +++ b/src/gl/shaders/gl_shaderprogram.cpp @@ -26,16 +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_cvars.h" #include "gl/system/gl_debug.h" #include "gl/shaders/gl_shaderprogram.h" #include "w_wad.h" -#include "i_system.h" -#include "doomerrors.h" FShaderProgram::FShaderProgram() { diff --git a/src/gl/shaders/gl_shadowmapshader.cpp b/src/gl/shaders/gl_shadowmapshader.cpp index 41921ef876c..684d4433930 100644 --- a/src/gl/shaders/gl_shadowmapshader.cpp +++ b/src/gl/shaders/gl_shadowmapshader.cpp @@ -22,12 +22,6 @@ #include "gl/system/gl_system.h" #include "files.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_shadowmapshader.h" void FShadowMapShader::Bind() diff --git a/src/gl/shaders/gl_tonemapshader.cpp b/src/gl/shaders/gl_tonemapshader.cpp index eede7e9150a..7a50a54297e 100644 --- a/src/gl/shaders/gl_tonemapshader.cpp +++ b/src/gl/shaders/gl_tonemapshader.cpp @@ -26,11 +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_tonemapshader.h" diff --git a/src/gl/stereo3d/gl_anaglyph.cpp b/src/gl/stereo3d/gl_anaglyph.cpp index 0eb994bafd0..8aaa0e72dd9 100644 --- a/src/gl/stereo3d/gl_anaglyph.cpp +++ b/src/gl/stereo3d/gl_anaglyph.cpp @@ -26,7 +26,6 @@ */ #include "gl_anaglyph.h" -#include "gl/renderer/gl_renderer.h" #include "gl/renderer/gl_renderbuffers.h" namespace s3d { diff --git a/src/gl/stereo3d/gl_interleaved3d.cpp b/src/gl/stereo3d/gl_interleaved3d.cpp index bc6a7acd609..9cb9be870c8 100644 --- a/src/gl/stereo3d/gl_interleaved3d.cpp +++ b/src/gl/stereo3d/gl_interleaved3d.cpp @@ -34,9 +34,7 @@ */ #include "gl_interleaved3d.h" -#include "gl/renderer/gl_renderer.h" #include "gl/renderer/gl_renderbuffers.h" -#include "gl/renderer/gl_renderer.h" #include "gl/renderer/gl_postprocessstate.h" #include "gl/system/gl_framebuffer.h" #include "gl/shaders/gl_present3dRowshader.h" diff --git a/src/gl/stereo3d/gl_quadstereo.cpp b/src/gl/stereo3d/gl_quadstereo.cpp index 769f289069e..545dded2018 100644 --- a/src/gl/stereo3d/gl_quadstereo.cpp +++ b/src/gl/stereo3d/gl_quadstereo.cpp @@ -26,7 +26,6 @@ */ #include "gl_quadstereo.h" -#include "gl/renderer/gl_renderer.h" #include "gl/renderer/gl_renderbuffers.h" namespace s3d { diff --git a/src/gl/stereo3d/gl_sidebyside3d.cpp b/src/gl/stereo3d/gl_sidebyside3d.cpp index ecb3ec1ccf1..e6c25e99ba9 100644 --- a/src/gl/stereo3d/gl_sidebyside3d.cpp +++ b/src/gl/stereo3d/gl_sidebyside3d.cpp @@ -34,7 +34,6 @@ */ #include "gl_sidebyside3d.h" -#include "gl/renderer/gl_renderer.h" #include "gl/renderer/gl_renderbuffers.h" namespace s3d { diff --git a/src/gl/stereo3d/gl_stereo3d.cpp b/src/gl/stereo3d/gl_stereo3d.cpp index 6b1623ba697..1453394c374 100644 --- a/src/gl/stereo3d/gl_stereo3d.cpp +++ b/src/gl/stereo3d/gl_stereo3d.cpp @@ -27,9 +27,6 @@ #include "gl/system/gl_system.h" #include "gl/stereo3d/gl_stereo3d.h" -#include "gl/renderer/gl_renderer.h" -#include "vectors.h" // RAD2DEG -#include "doomtype.h" // M_PI namespace s3d { diff --git a/src/gl/stereo3d/gl_stereo_cvars.cpp b/src/gl/stereo3d/gl_stereo_cvars.cpp index e7ce699f550..fc170d324ba 100644 --- a/src/gl/stereo3d/gl_stereo_cvars.cpp +++ b/src/gl/stereo3d/gl_stereo_cvars.cpp @@ -31,7 +31,6 @@ #include "gl/stereo3d/gl_quadstereo.h" #include "gl/stereo3d/gl_sidebyside3d.h" #include "gl/stereo3d/gl_interleaved3d.h" -#include "gl/system/gl_cvars.h" #include "version.h" // Set up 3D-specific console variables: diff --git a/src/gl/stereo3d/gl_stereo_leftright.cpp b/src/gl/stereo3d/gl_stereo_leftright.cpp index f2b1ba3fc40..b3b677fb71d 100644 --- a/src/gl/stereo3d/gl_stereo_leftright.cpp +++ b/src/gl/stereo3d/gl_stereo_leftright.cpp @@ -33,7 +33,6 @@ #include "gl/renderer/gl_renderstate.h" #include "gl/renderer/gl_renderer.h" #include "gl/renderer/gl_renderbuffers.h" -#include EXTERN_CVAR(Float, vr_screendist) EXTERN_CVAR(Float, vr_hunits_per_meter) diff --git a/src/gl/system/gl_debug.cpp b/src/gl/system/gl_debug.cpp index 7aa425349ad..deb4cb6339f 100644 --- a/src/gl/system/gl_debug.cpp +++ b/src/gl/system/gl_debug.cpp @@ -27,17 +27,12 @@ #include "templates.h" #include "gl/system/gl_system.h" -#include "gl/system/gl_interface.h" #include "gl/system/gl_debug.h" #include "stats.h" #include #include #include -#ifndef _MSC_VER -#include -#endif - CUSTOM_CVAR(Int, gl_debug_level, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) { if (!FGLDebug::HasDebugApi()) diff --git a/src/gl/system/gl_framebuffer.cpp b/src/gl/system/gl_framebuffer.cpp index bdebfff5060..36e6343bd15 100644 --- a/src/gl/system/gl_framebuffer.cpp +++ b/src/gl/system/gl_framebuffer.cpp @@ -27,23 +27,14 @@ */ #include "gl/system/gl_system.h" -#include "m_swap.h" #include "v_video.h" -#include "doomstat.h" #include "m_png.h" -#include "m_crc32.h" -#include "vectors.h" -#include "v_palette.h" #include "templates.h" -#include "textures/skyboxtexture.h" #include "gl/system/gl_interface.h" #include "gl/system/gl_framebuffer.h" #include "gl/renderer/gl_renderer.h" #include "gl/renderer/gl_renderbuffers.h" -#include "gl/renderer/gl_renderstate.h" -#include "gl/renderer/gl_lightdata.h" -#include "gl/textures/gl_hwtexture.h" #include "gl/textures/gl_samplers.h" #include "gl/utility/gl_clock.h" #include "gl/data/gl_vertexbuffer.h" diff --git a/src/gl/system/gl_interface.cpp b/src/gl/system/gl_interface.cpp index 94b28712dc4..ea1cb2eed59 100644 --- a/src/gl/system/gl_interface.cpp +++ b/src/gl/system/gl_interface.cpp @@ -30,11 +30,7 @@ #include "tarray.h" #include "doomtype.h" #include "m_argv.h" -#include "zstring.h" #include "version.h" -#include "i_system.h" -#include "v_text.h" -#include "r_data/r_translate.h" #include "gl/system/gl_interface.h" #include "gl/system/gl_cvars.h" diff --git a/src/gl/system/gl_menu.cpp b/src/gl/system/gl_menu.cpp index 489ad4a9d25..1d6a64cd08c 100644 --- a/src/gl/system/gl_menu.cpp +++ b/src/gl/system/gl_menu.cpp @@ -23,12 +23,8 @@ #include "gl/system/gl_system.h" #include "c_cvars.h" -#include "c_dispatch.h" #include "v_video.h" -#include "version.h" -#include "gl/system/gl_interface.h" #include "gl/system/gl_cvars.h" -#include "gl/renderer/gl_renderer.h" #include "menu/menu.h" diff --git a/src/gl/system/gl_wipe.cpp b/src/gl/system/gl_wipe.cpp index 289a3edb75b..bcd0183d88c 100644 --- a/src/gl/system/gl_wipe.cpp +++ b/src/gl/system/gl_wipe.cpp @@ -30,16 +30,12 @@ #include "w_wad.h" #include "v_palette.h" #include "templates.h" -#include "vectors.h" #include "gl/system/gl_interface.h" #include "gl/renderer/gl_renderer.h" #include "gl/renderer/gl_renderstate.h" #include "gl/renderer/gl_renderbuffers.h" #include "gl/system/gl_framebuffer.h" -#include "gl/system/gl_cvars.h" -#include "gl/shaders/gl_shader.h" -#include "gl/textures/gl_material.h" #include "gl/textures/gl_samplers.h" #include "gl/data/gl_vertexbuffer.h" diff --git a/src/gl/textures/gl_hwtexture.cpp b/src/gl/textures/gl_hwtexture.cpp index 551f628f063..3881da78fe4 100644 --- a/src/gl/textures/gl_hwtexture.cpp +++ b/src/gl/textures/gl_hwtexture.cpp @@ -28,10 +28,7 @@ #include "gl/system/gl_system.h" #include "templates.h" -#include "m_crc32.h" #include "c_cvars.h" -#include "c_dispatch.h" -#include "v_palette.h" #include "gl/system/gl_interface.h" #include "gl/system/gl_cvars.h" diff --git a/src/gl/textures/gl_material.cpp b/src/gl/textures/gl_material.cpp index ed1c86e4626..92b648c9ed2 100644 --- a/src/gl/textures/gl_material.cpp +++ b/src/gl/textures/gl_material.cpp @@ -24,23 +24,12 @@ #include "w_wad.h" #include "m_png.h" #include "sbar.h" -#include "gi.h" -#include "cmdlib.h" -#include "c_dispatch.h" #include "stats.h" #include "r_utility.h" -#include "templates.h" -#include "sc_man.h" -#include "r_data/renderstyle.h" -#include "colormatcher.h" #include "textures/warpbuffer.h" -#include "textures/bitmap.h" - -//#include "gl/gl_intern.h" #include "gl/system/gl_interface.h" #include "gl/system/gl_framebuffer.h" -#include "gl/renderer/gl_lightdata.h" #include "gl/renderer/gl_renderer.h" #include "gl/textures/gl_material.h" #include "gl/textures/gl_samplers.h" diff --git a/src/gl/textures/gl_samplers.cpp b/src/gl/textures/gl_samplers.cpp index ef6d9f3f457..f3169610c8a 100644 --- a/src/gl/textures/gl_samplers.cpp +++ b/src/gl/textures/gl_samplers.cpp @@ -21,9 +21,7 @@ // #include "gl/system/gl_system.h" -#include "templates.h" #include "c_cvars.h" -#include "c_dispatch.h" #include "gl/system/gl_interface.h" #include "gl/system/gl_cvars.h" diff --git a/src/gl/textures/gl_texture.cpp b/src/gl/textures/gl_texture.cpp index e6dafc4c513..15ba58dc0f0 100644 --- a/src/gl/textures/gl_texture.cpp +++ b/src/gl/textures/gl_texture.cpp @@ -27,15 +27,10 @@ #include "gl/system/gl_system.h" #include "c_cvars.h" #include "w_wad.h" -#include "templates.h" -#include "colormatcher.h" #include "r_data/r_translate.h" #include "c_dispatch.h" #include "r_state.h" #include "actor.h" -#include "cmdlib.h" -#include "v_palette.h" -#include "sc_man.h" #include "textures/skyboxtexture.h" #include "gl/system/gl_interface.h" diff --git a/src/hu_scores.cpp b/src/hu_scores.cpp index 91c3dacfc69..fd4c4123bef 100644 --- a/src/hu_scores.cpp +++ b/src/hu_scores.cpp @@ -36,7 +36,6 @@ // HEADER FILES ------------------------------------------------------------ #include "c_console.h" -#include "st_stuff.h" #include "teaminfo.h" #include "templates.h" #include "v_video.h" @@ -44,7 +43,6 @@ #include "g_level.h" #include "d_netinf.h" #include "v_font.h" -#include "v_palette.h" #include "d_player.h" #include "hu_stuff.h" #include "gstrings.h" diff --git a/src/hwrenderer/data/flatvertices.cpp b/src/hwrenderer/data/flatvertices.cpp index fab732d0668..86bf782619f 100644 --- a/src/hwrenderer/data/flatvertices.cpp +++ b/src/hwrenderer/data/flatvertices.cpp @@ -28,7 +28,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 "flatvertices.h" diff --git a/src/hwrenderer/scene/hw_renderhacks.cpp b/src/hwrenderer/scene/hw_renderhacks.cpp index 2ae37e37b44..6a1b5ceeac6 100644 --- a/src/hwrenderer/scene/hw_renderhacks.cpp +++ b/src/hwrenderer/scene/hw_renderhacks.cpp @@ -28,7 +28,6 @@ #include "a_sharedglobal.h" #include "r_utility.h" #include "r_sky.h" -#include "g_level.h" #include "g_levellocals.h" #include "hwrenderer/scene/hw_drawinfo.h" diff --git a/src/i_net.cpp b/src/i_net.cpp index 48160373cfb..5c74c87aeda 100644 --- a/src/i_net.cpp +++ b/src/i_net.cpp @@ -34,7 +34,6 @@ #include #include -#include /* [Petteri] Use Winsock for Win32: */ #ifdef __WIN32__ @@ -56,17 +55,12 @@ #include "doomtype.h" #include "i_system.h" -#include "d_event.h" #include "d_net.h" #include "m_argv.h" -#include "m_swap.h" #include "m_crc32.h" #include "d_player.h" -#include "templates.h" -#include "c_console.h" #include "st_start.h" #include "m_misc.h" -#include "doomstat.h" #include "i_net.h" diff --git a/src/i_time.cpp b/src/i_time.cpp index 8fd05872364..6bd18502e99 100644 --- a/src/i_time.cpp +++ b/src/i_time.cpp @@ -35,7 +35,6 @@ #include #include -#include #include "i_time.h" #include "doomdef.h" #include "c_cvars.h" diff --git a/src/info.cpp b/src/info.cpp index 28feeb826e4..dd87e85f609 100644 --- a/src/info.cpp +++ b/src/info.cpp @@ -37,7 +37,6 @@ #include "doomstat.h" #include "info.h" -#include "m_fixed.h" #include "c_dispatch.h" #include "d_net.h" #include "v_text.h" @@ -45,18 +44,12 @@ #include "gi.h" #include "actor.h" #include "r_state.h" -#include "i_system.h" #include "p_local.h" -#include "templates.h" -#include "cmdlib.h" -#include "g_level.h" #include "stats.h" #include "thingdef.h" #include "d_player.h" -#include "doomerrors.h" #include "events.h" #include "types.h" -#include "vm.h" extern void LoadActors (); extern void InitBotStuff(); diff --git a/src/intermission/intermission.cpp b/src/intermission/intermission.cpp index 25750a58e88..615f79fae8d 100644 --- a/src/intermission/intermission.cpp +++ b/src/intermission/intermission.cpp @@ -38,16 +38,13 @@ #include "w_wad.h" #include "gi.h" #include "v_video.h" -#include "v_palette.h" #include "d_main.h" #include "gstrings.h" #include "intermission/intermission.h" #include "actor.h" #include "d_player.h" #include "r_state.h" -#include "r_data/r_translate.h" #include "c_bind.h" -#include "g_level.h" #include "p_conversation.h" #include "menu/menu.h" #include "d_net.h" diff --git a/src/intermission/intermission_parse.cpp b/src/intermission/intermission_parse.cpp index c3fb7b53e5b..c0fa4a337ae 100644 --- a/src/intermission/intermission_parse.cpp +++ b/src/intermission/intermission_parse.cpp @@ -37,7 +37,6 @@ #include "intermission/intermission.h" #include "g_level.h" #include "w_wad.h" -#include "gi.h" static void ReplaceIntermission(FName intname,FIntermissionDescriptor *desc) diff --git a/src/keysections.cpp b/src/keysections.cpp index 88ca7b6336f..29b6b53d501 100644 --- a/src/keysections.cpp +++ b/src/keysections.cpp @@ -35,8 +35,6 @@ #include "menu/menu.h" -#include "g_level.h" -#include "d_player.h" #include "gi.h" #include "c_bind.h" #include "c_dispatch.h" diff --git a/src/m_argv.cpp b/src/m_argv.cpp index aac5771d631..0a2744e5d20 100644 --- a/src/m_argv.cpp +++ b/src/m_argv.cpp @@ -34,8 +34,6 @@ #include #include "m_argv.h" -#include "cmdlib.h" -#include "i_system.h" //=========================================================================== // diff --git a/src/m_cheat.cpp b/src/m_cheat.cpp index ffba7a806d7..768802693e7 100644 --- a/src/m_cheat.cpp +++ b/src/m_cheat.cpp @@ -37,34 +37,22 @@ #include -#include #include "m_cheat.h" #include "d_player.h" -#include "doomstat.h" #include "gstrings.h" #include "p_local.h" #include "gi.h" #include "p_enemy.h" #include "sbar.h" #include "c_dispatch.h" -#include "v_video.h" -#include "w_wad.h" #include "a_keys.h" -#include "templates.h" -#include "c_console.h" -#include "r_data/r_translate.h" -#include "g_level.h" #include "d_net.h" -#include "d_dehacked.h" -#include "gi.h" #include "serializer.h" #include "r_utility.h" #include "a_morph.h" #include "g_levellocals.h" #include "vm.h" -#include "events.h" -#include "p_acs.h" // [RH] Actually handle the cheat. The cheat code in st_stuff.c now just // writes some bytes to the network data stream, and the network code diff --git a/src/m_misc.cpp b/src/m_misc.cpp index ea55a906c22..e0eb5d16513 100644 --- a/src/m_misc.cpp +++ b/src/m_misc.cpp @@ -28,28 +28,20 @@ #include #include -#include #include #include -#include #include #include "r_defs.h" -#include "doomtype.h" #include "version.h" #if defined(_WIN32) #include #else -#include #endif -#include - -#include "doomdef.h" - #include "m_swap.h" #include "m_argv.h" @@ -59,15 +51,9 @@ #include "c_dispatch.h" #include "c_bind.h" -#include "i_system.h" #include "i_video.h" #include "v_video.h" -#include "hu_stuff.h" - -// State. -#include "doomstat.h" - // Data. #include "m_misc.h" #include "m_png.h" diff --git a/src/m_png.cpp b/src/m_png.cpp index ac2035ee671..06cf4ce2e7a 100644 --- a/src/m_png.cpp +++ b/src/m_png.cpp @@ -35,7 +35,6 @@ // HEADER FILES ------------------------------------------------------------ #include -#include #include #ifdef _MSC_VER #include // for alloca() @@ -47,8 +46,6 @@ #include "r_defs.h" #include "v_video.h" #include "m_png.h" -#include "templates.h" -#include "files.h" // MACROS ------------------------------------------------------------------ diff --git a/src/m_random.cpp b/src/m_random.cpp index ecb2bfe9e7f..5b77bccaf3c 100644 --- a/src/m_random.cpp +++ b/src/m_random.cpp @@ -63,11 +63,8 @@ #include "m_random.h" #include "serializer.h" #include "b_bot.h" -#include "m_png.h" #include "m_crc32.h" -#include "i_system.h" #include "c_dispatch.h" -#include "files.h" // MACROS ------------------------------------------------------------------ diff --git a/src/memarena.cpp b/src/memarena.cpp index af59c81c7c7..d19521edf37 100644 --- a/src/memarena.cpp +++ b/src/memarena.cpp @@ -38,10 +38,8 @@ */ #include "doomtype.h" -#include "m_alloc.h" #include "memarena.h" #include "c_dispatch.h" -#include "zstring.h" struct FMemArena::Block { diff --git a/src/menu/joystickmenu.cpp b/src/menu/joystickmenu.cpp index fb50834c068..388c012dfec 100644 --- a/src/menu/joystickmenu.cpp +++ b/src/menu/joystickmenu.cpp @@ -32,23 +32,7 @@ ** */ -#include - #include "menu/menu.h" -#include "c_dispatch.h" -#include "w_wad.h" -#include "sc_man.h" -#include "v_font.h" -#include "g_level.h" -#include "d_player.h" -#include "v_video.h" -#include "gi.h" -#include "i_system.h" -#include "c_bind.h" -#include "v_palette.h" -#include "d_event.h" -#include "d_gui.h" -#include "i_music.h" #include "m_joy.h" #include "vm.h" diff --git a/src/menu/loadsavemenu.cpp b/src/menu/loadsavemenu.cpp index d43a2e42c47..8d49ddc2d49 100644 --- a/src/menu/loadsavemenu.cpp +++ b/src/menu/loadsavemenu.cpp @@ -34,20 +34,13 @@ */ #include "menu/menu.h" -#include "i_system.h" #include "version.h" #include "g_game.h" #include "m_png.h" #include "w_wad.h" #include "v_text.h" -#include "d_event.h" #include "gstrings.h" -#include "v_palette.h" -#include "doomstat.h" -#include "gi.h" -#include "d_gui.h" #include "serializer.h" -#include "resourcefiles/resourcefile.h" #include "vm.h" // Save name length limit for old binary formats. diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp index 915449e4565..f95285c51e5 100644 --- a/src/menu/menu.cpp +++ b/src/menu/menu.cpp @@ -37,24 +37,18 @@ #include "c_dispatch.h" #include "d_gui.h" #include "d_player.h" -#include "g_level.h" #include "c_console.h" #include "c_bind.h" -#include "s_sound.h" #include "p_tick.h" #include "g_game.h" -#include "c_cvars.h" #include "d_event.h" -#include "v_video.h" #include "hu_stuff.h" #include "gi.h" -#include "v_palette.h" #include "g_input.h" #include "gameconfigfile.h" #include "gstrings.h" #include "r_utility.h" #include "menu/menu.h" -#include "textures/textures.h" #include "vm.h" #include "events.h" #include "gl/renderer/gl_renderer.h" // for menu blur diff --git a/src/menu/menudef.cpp b/src/menu/menudef.cpp index 840c0fce2c7..ac8d68fc6f5 100644 --- a/src/menu/menudef.cpp +++ b/src/menu/menudef.cpp @@ -34,20 +34,9 @@ #include #include "menu/menu.h" -#include "c_dispatch.h" #include "w_wad.h" -#include "sc_man.h" -#include "v_font.h" -#include "g_level.h" -#include "d_player.h" -#include "v_video.h" -#include "i_system.h" #include "c_bind.h" -#include "v_palette.h" -#include "d_event.h" -#include "d_gui.h" #include "i_music.h" -#include "m_joy.h" #include "gi.h" #include "i_sound.h" #include "cmdlib.h" diff --git a/src/menu/messagebox.cpp b/src/menu/messagebox.cpp index bf5f4410ff7..f2a2453ea19 100644 --- a/src/menu/messagebox.cpp +++ b/src/menu/messagebox.cpp @@ -34,10 +34,6 @@ #include #include "menu/menu.h" -#include "d_event.h" -#include "d_gui.h" -#include "v_video.h" -#include "v_text.h" #include "d_main.h" #include "gstrings.h" #include "gi.h" diff --git a/src/menu/optionmenu.cpp b/src/menu/optionmenu.cpp index 87f0adcf12a..ebe27800baf 100644 --- a/src/menu/optionmenu.cpp +++ b/src/menu/optionmenu.cpp @@ -33,19 +33,6 @@ */ #include "v_video.h" -#include "v_font.h" -#include "cmdlib.h" -#include "gstrings.h" -#include "g_level.h" -#include "gi.h" -#include "v_palette.h" -#include "d_gui.h" -#include "d_event.h" -#include "c_dispatch.h" -#include "c_console.h" -#include "c_cvars.h" -#include "c_bind.h" -#include "gameconfigfile.h" #include "menu/menu.h" diff --git a/src/menu/playermenu.cpp b/src/menu/playermenu.cpp index 55f85c22109..507470e5799 100644 --- a/src/menu/playermenu.cpp +++ b/src/menu/playermenu.cpp @@ -34,19 +34,10 @@ */ #include "menu/menu.h" -#include "v_video.h" -#include "v_font.h" #include "gi.h" -#include "gstrings.h" -#include "d_player.h" -#include "d_event.h" -#include "d_gui.h" #include "c_dispatch.h" #include "teaminfo.h" -#include "v_palette.h" #include "r_state.h" -#include "r_data/r_translate.h" -#include "v_text.h" #include "vm.h" EXTERN_CVAR(Int, team) diff --git a/src/menu/videomenu.cpp b/src/menu/videomenu.cpp index d3ba14e9255..ebd16151667 100644 --- a/src/menu/videomenu.cpp +++ b/src/menu/videomenu.cpp @@ -33,28 +33,10 @@ ** */ -#include - #include "menu/menu.h" -#include "c_dispatch.h" -#include "w_wad.h" -#include "sc_man.h" -#include "v_font.h" -#include "g_level.h" -#include "d_player.h" -#include "v_video.h" -#include "gi.h" -#include "i_system.h" -#include "c_bind.h" -#include "v_palette.h" -#include "d_event.h" -#include "d_gui.h" -#include "i_music.h" -#include "m_joy.h" #include "sbar.h" #include "hardware.h" #include "vm.h" -#include "r_videoscale.h" #include "i_time.h" /*======================================= diff --git a/src/nodebuild.cpp b/src/nodebuild.cpp index 5b849687c63..a352a8f0ab7 100644 --- a/src/nodebuild.cpp +++ b/src/nodebuild.cpp @@ -37,20 +37,12 @@ ** */ -#include -#include #include #include -#include #include #include "doomdata.h" #include "nodebuild.h" -#include "templates.h" -#include "tarray.h" -#include "m_bbox.h" -#include "c_console.h" -#include "r_state.h" const int MaxSegs = 64; const int SplitCost = 8; diff --git a/src/nodebuild_extract.cpp b/src/nodebuild_extract.cpp index 089303fbe34..4d7aaf586ef 100644 --- a/src/nodebuild_extract.cpp +++ b/src/nodebuild_extract.cpp @@ -42,7 +42,6 @@ #include #include "nodebuild.h" -#include "templates.h" #include "g_levellocals.h" #if 0 diff --git a/src/nodebuild_utility.cpp b/src/nodebuild_utility.cpp index 9dd3c7786f3..a6e724ed46e 100644 --- a/src/nodebuild_utility.cpp +++ b/src/nodebuild_utility.cpp @@ -42,16 +42,11 @@ #include #endif #include -#include #include "nodebuild.h" -#include "templates.h" -#include "m_bbox.h" #include "i_system.h" #include "po_man.h" -#include "r_state.h" #include "g_levellocals.h" -#include "math/cmath.h" static const int PO_LINE_START = 1; static const int PO_LINE_EXPLICIT = 5; diff --git a/src/p_3dfloors.cpp b/src/p_3dfloors.cpp index 376a1b060a1..4254c92d498 100644 --- a/src/p_3dfloors.cpp +++ b/src/p_3dfloors.cpp @@ -40,13 +40,10 @@ #include "p_lnspec.h" #include "p_maputl.h" #include "w_wad.h" -#include "sc_man.h" #include "g_level.h" #include "p_terrain.h" #include "d_player.h" -#include "r_utility.h" #include "p_spec.h" -#include "r_data/colormaps.h" #include "g_levellocals.h" #include "actorinlines.h" diff --git a/src/p_acs.cpp b/src/p_acs.cpp index fe96415ac53..445c8125ff5 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -42,31 +42,21 @@ #include "p_local.h" #include "d_player.h" #include "p_spec.h" -#include "g_level.h" -#include "s_sound.h" #include "p_acs.h" #include "p_saveg.h" #include "p_lnspec.h" #include "p_enemy.h" -#include "m_random.h" -#include "doomstat.h" #include "c_console.h" #include "c_dispatch.h" #include "s_sndseq.h" -#include "i_system.h" #include "sbar.h" -#include "m_swap.h" #include "a_sharedglobal.h" -#include "v_video.h" #include "w_wad.h" #include "r_sky.h" #include "gstrings.h" #include "gi.h" #include "g_game.h" -#include "sc_man.h" #include "c_bind.h" -#include "info.h" -#include "r_data/r_translate.h" #include "cmdlib.h" #include "m_png.h" #include "p_setup.h" @@ -80,15 +70,10 @@ #include "r_utility.h" #include "a_morph.h" #include "i_music.h" -#include "serializer.h" #include "thingdef.h" -#include "a_pickups.h" -#include "r_data/colormaps.h" #include "g_levellocals.h" #include "actorinlines.h" -#include "stats.h" #include "types.h" -#include "vm.h" // P-codes for ACS scripts enum diff --git a/src/p_actionfunctions.cpp b/src/p_actionfunctions.cpp index 0cb4e984934..2af237b8a01 100644 --- a/src/p_actionfunctions.cpp +++ b/src/p_actionfunctions.cpp @@ -41,48 +41,33 @@ #include "gi.h" #include "g_level.h" #include "actor.h" -#include "info.h" -#include "sc_man.h" -#include "tarray.h" -#include "w_wad.h" -#include "templates.h" #include "r_defs.h" #include "a_pickups.h" -#include "s_sound.h" #include "cmdlib.h" #include "p_lnspec.h" #include "p_effect.h" #include "p_enemy.h" #include "decallib.h" -#include "m_random.h" -#include "i_system.h" #include "p_local.h" #include "c_console.h" #include "doomerrors.h" #include "a_sharedglobal.h" -#include "v_video.h" #include "v_font.h" #include "doomstat.h" -#include "v_palette.h" #include "g_shared/a_specialspot.h" #include "actorptrselect.h" -#include "m_bbox.h" -#include "r_data/r_translate.h" #include "p_trace.h" #include "p_setup.h" #include "gstrings.h" #include "d_player.h" #include "p_maputl.h" #include "p_spec.h" -#include "templates.h" #include "v_text.h" #include "thingdef.h" -#include "math/cmath.h" #include "g_levellocals.h" #include "r_utility.h" #include "sbar.h" #include "actorinlines.h" -#include "vm.h" #include "types.h" AActor *SingleActorFromTID(int tid, AActor *defactor); diff --git a/src/p_ceiling.cpp b/src/p_ceiling.cpp index fb324b54a36..5eb8157f55b 100644 --- a/src/p_ceiling.cpp +++ b/src/p_ceiling.cpp @@ -34,11 +34,9 @@ #include "s_sndseq.h" #include "doomstat.h" #include "r_state.h" -#include "gi.h" #include "serializer.h" #include "p_spec.h" #include "g_levellocals.h" -#include "textures.h" #include "vm.h" //============================================================================ diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp index 073d5ff9d18..7dc82923035 100644 --- a/src/p_conversation.cpp +++ b/src/p_conversation.cpp @@ -38,26 +38,19 @@ #include "p_conversation.h" #include "w_wad.h" #include "cmdlib.h" -#include "s_sound.h" #include "v_text.h" -#include "v_video.h" -#include "m_random.h" #include "gi.h" -#include "templates.h" #include "a_keys.h" #include "p_enemy.h" #include "gstrings.h" #include "sound/i_music.h" #include "p_setup.h" #include "d_net.h" -#include "g_level.h" #include "d_event.h" -#include "d_gui.h" #include "doomstat.h" #include "c_console.h" #include "sbar.h" #include "p_lnspec.h" -#include "r_utility.h" #include "p_local.h" #include "menu/menu.h" #include "g_levellocals.h" diff --git a/src/p_doors.cpp b/src/p_doors.cpp index abfe81722c0..be9b067af6c 100644 --- a/src/p_doors.cpp +++ b/src/p_doors.cpp @@ -32,12 +32,8 @@ #include "s_sndseq.h" #include "doomstat.h" #include "r_state.h" -#include "c_console.h" #include "gi.h" #include "a_keys.h" -#include "i_system.h" -#include "sc_man.h" -#include "cmdlib.h" #include "serializer.h" #include "d_player.h" #include "p_spec.h" diff --git a/src/p_effect.cpp b/src/p_effect.cpp index 7163b7548dc..527436b6b40 100644 --- a/src/p_effect.cpp +++ b/src/p_effect.cpp @@ -37,20 +37,12 @@ #include "doomtype.h" #include "doomstat.h" #include "i_system.h" -#include "c_cvars.h" #include "actor.h" #include "m_argv.h" #include "p_effect.h" #include "p_local.h" -#include "g_level.h" -#include "v_video.h" -#include "m_random.h" #include "r_defs.h" -#include "s_sound.h" -#include "templates.h" #include "gi.h" -#include "v_palette.h" -#include "colormatcher.h" #include "d_player.h" #include "r_utility.h" #include "g_levellocals.h" diff --git a/src/p_enemy.cpp b/src/p_enemy.cpp index 86bd5c8c339..9298495ebe1 100644 --- a/src/p_enemy.cpp +++ b/src/p_enemy.cpp @@ -38,24 +38,14 @@ #include "p_local.h" #include "p_maputl.h" #include "d_player.h" -#include "m_bbox.h" #include "p_lnspec.h" -#include "s_sound.h" #include "g_game.h" -#include "doomstat.h" -#include "r_state.h" -#include "c_cvars.h" #include "p_enemy.h" #include "a_sharedglobal.h" -#include "d_dehacked.h" -#include "g_level.h" -#include "r_utility.h" #include "p_blockmap.h" -#include "r_data/r_translate.h" #include "teaminfo.h" #include "p_spec.h" #include "p_checkposition.h" -#include "math/cmath.h" #include "g_levellocals.h" #include "vm.h" #include "actorinlines.h" diff --git a/src/p_glnodes.cpp b/src/p_glnodes.cpp index 7d0e3733976..1e7ce6505ae 100644 --- a/src/p_glnodes.cpp +++ b/src/p_glnodes.cpp @@ -47,26 +47,18 @@ #include #include "templates.h" -#include "m_alloc.h" #include "m_argv.h" #include "c_dispatch.h" #include "m_swap.h" -#include "g_game.h" -#include "i_system.h" #include "w_wad.h" -#include "doomdef.h" #include "p_local.h" #include "nodebuild.h" #include "doomstat.h" -#include "vectors.h" -#include "stats.h" #include "doomerrors.h" #include "p_setup.h" -#include "x86.h" #include "version.h" #include "md5.h" #include "m_misc.h" -#include "r_utility.h" #include "cmdlib.h" #include "g_levellocals.h" #include "i_time.h" diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp index 4de850900db..2a28c305f92 100644 --- a/src/p_interaction.cpp +++ b/src/p_interaction.cpp @@ -52,13 +52,8 @@ #include "b_bot.h" //Added by MC: #include "d_player.h" -#include "a_sharedglobal.h" -#include "a_pickups.h" #include "gi.h" -#include "templates.h" #include "sbar.h" -#include "s_sound.h" -#include "g_level.h" #include "d_net.h" #include "d_netinf.h" #include "a_morph.h" diff --git a/src/p_lights.cpp b/src/p_lights.cpp index 2a52692b50c..86dfbb8cb5d 100644 --- a/src/p_lights.cpp +++ b/src/p_lights.cpp @@ -39,8 +39,6 @@ #include "g_levellocals.h" // State. -#include "r_state.h" -#include "statnums.h" #include "serializer.h" static FRandom pr_flicker ("Flicker"); diff --git a/src/p_lnspec.cpp b/src/p_lnspec.cpp index 001b39be838..acf99d5d1bc 100644 --- a/src/p_lnspec.cpp +++ b/src/p_lnspec.cpp @@ -40,17 +40,11 @@ #include "p_enemy.h" #include "g_level.h" #include "v_palette.h" -#include "i_system.h" #include "a_sharedglobal.h" #include "a_lightning.h" -#include "statnums.h" -#include "s_sound.h" -#include "templates.h" #include "a_keys.h" #include "gi.h" -#include "m_random.h" #include "p_conversation.h" -#include "r_data/r_translate.h" #include "p_3dmidtex.h" #include "d_net.h" #include "d_event.h" @@ -58,7 +52,6 @@ #include "po_man.h" #include "d_player.h" #include "r_utility.h" -#include "r_data/colormaps.h" #include "fragglescript/t_fs.h" #include "p_spec.h" #include "g_levellocals.h" diff --git a/src/p_map.cpp b/src/p_map.cpp index e9ba84132d1..f01e55dcde1 100644 --- a/src/p_map.cpp +++ b/src/p_map.cpp @@ -65,9 +65,7 @@ #include "m_bbox.h" #include "m_random.h" -#include "i_system.h" #include "c_dispatch.h" -#include "math/cmath.h" #include "doomdef.h" #include "p_local.h" @@ -85,19 +83,12 @@ #include "p_3dmidtex.h" #include "vm.h" -#include "s_sound.h" #include "decallib.h" // State. -#include "doomstat.h" -#include "r_state.h" - -#include "gi.h" #include "a_sharedglobal.h" #include "p_conversation.h" -#include "r_data/r_translate.h" -#include "g_level.h" #include "r_sky.h" #include "g_levellocals.h" #include "actorinlines.h" diff --git a/src/p_maputl.cpp b/src/p_maputl.cpp index 40af00067ac..c94d80073fa 100644 --- a/src/p_maputl.cpp +++ b/src/p_maputl.cpp @@ -77,10 +77,7 @@ #include "actorinlines.h" // State. -#include "r_state.h" -#include "templates.h" #include "po_man.h" -#include "g_levellocals.h" #include "vm.h" sector_t *P_PointInSectorBuggy(double x, double y); diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index e10a430d04a..25d846e0171 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -67,15 +67,10 @@ #include "p_lnspec.h" #include "p_effect.h" #include "p_terrain.h" -#include "st_stuff.h" #include "hu_stuff.h" -#include "s_sound.h" -#include "doomstat.h" #include "v_video.h" -#include "c_cvars.h" #include "c_dispatch.h" #include "b_bot.h" //Added by MC: -#include "stats.h" #include "a_sharedglobal.h" #include "gi.h" #include "sbar.h" @@ -86,15 +81,10 @@ #include "p_conversation.h" #include "g_game.h" #include "teaminfo.h" -#include "r_data/r_translate.h" #include "r_sky.h" -#include "g_level.h" #include "d_event.h" -#include "colormatcher.h" -#include "v_palette.h" #include "p_enemy.h" #include "gstrings.h" -#include "r_data/colormaps.h" #include "r_renderer.h" #include "po_man.h" #include "p_spec.h" @@ -103,7 +93,6 @@ #include "r_utility.h" #include "thingdef.h" #include "d_player.h" -#include "vm.h" #include "g_levellocals.h" #include "a_morph.h" #include "events.h" diff --git a/src/p_plats.cpp b/src/p_plats.cpp index c43a74b1ec5..e05363d419d 100644 --- a/src/p_plats.cpp +++ b/src/p_plats.cpp @@ -28,13 +28,11 @@ #include "i_system.h" #include "m_random.h" -#include "doomdef.h" #include "p_local.h" #include "p_lnspec.h" #include "s_sndseq.h" #include "doomstat.h" #include "r_state.h" -#include "gi.h" #include "serializer.h" #include "p_spec.h" #include "g_levellocals.h" diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp index c419f22280c..2c0e418b3a6 100644 --- a/src/p_pspr.cpp +++ b/src/p_pspr.cpp @@ -35,7 +35,6 @@ #include "p_local.h" #include "s_sound.h" #include "doomstat.h" -#include "gi.h" #include "p_pspr.h" #include "templates.h" #include "g_level.h" diff --git a/src/p_pusher.cpp b/src/p_pusher.cpp index c3bfe62af2f..5861ad636de 100644 --- a/src/p_pusher.cpp +++ b/src/p_pusher.cpp @@ -31,7 +31,6 @@ #include "p_spec.h" #include "serializer.h" #include "p_lnspec.h" -#include "c_cvars.h" #include "p_maputl.h" #include "p_local.h" #include "d_player.h" diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp index 6f38e0ae894..acf0ac5f25d 100644 --- a/src/p_saveg.cpp +++ b/src/p_saveg.cpp @@ -39,24 +39,16 @@ // State. #include "d_player.h" -#include "dobject.h" -#include "doomstat.h" -#include "r_state.h" -#include "m_random.h" #include "p_saveg.h" #include "s_sndseq.h" -#include "v_palette.h" #include "a_sharedglobal.h" #include "r_data/r_interpolate.h" -#include "g_level.h" #include "po_man.h" #include "p_setup.h" -#include "r_data/colormaps.h" #include "p_lnspec.h" #include "p_acs.h" #include "p_terrain.h" #include "am_map.h" -#include "r_data/r_translate.h" #include "sbar.h" #include "r_utility.h" #include "r_sky.h" diff --git a/src/p_secnodes.cpp b/src/p_secnodes.cpp index 0e62e622bc2..77b6c555cc8 100644 --- a/src/p_secnodes.cpp +++ b/src/p_secnodes.cpp @@ -25,10 +25,7 @@ //----------------------------------------------------------------------------- #include "g_levellocals.h" -#include "r_state.h" #include "p_maputl.h" -#include "p_blockmap.h" -#include "memarena.h" #include "actor.h" //============================================================================= diff --git a/src/p_sectors.cpp b/src/p_sectors.cpp index 94a1fe8a594..e0eca11dbb0 100644 --- a/src/p_sectors.cpp +++ b/src/p_sectors.cpp @@ -68,7 +68,6 @@ #include "a_sharedglobal.h" #include "p_local.h" #include "r_sky.h" -#include "r_data/colormaps.h" #include "g_levellocals.h" #include "vm.h" diff --git a/src/p_setup.cpp b/src/p_setup.cpp index 73fbeb622ac..621343decc5 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -59,7 +59,6 @@ #include -#include #ifdef _MSC_VER #include // for alloca() #endif @@ -67,27 +66,17 @@ #include "templates.h" #include "d_player.h" #include "m_argv.h" -#include "m_swap.h" -#include "m_bbox.h" #include "g_game.h" -#include "i_system.h" -#include "x86.h" #include "w_wad.h" -#include "doomdef.h" #include "p_local.h" #include "p_effect.h" #include "p_terrain.h" #include "nodebuild.h" -#include "s_sound.h" -#include "doomstat.h" #include "p_lnspec.h" -#include "v_palette.h" #include "c_console.h" -#include "c_cvars.h" #include "p_acs.h" #include "announcer.h" #include "wi_stuff.h" -#include "stats.h" #include "doomerrors.h" #include "gi.h" #include "p_conversation.h" @@ -95,20 +84,16 @@ #include "s_sndseq.h" #include "sbar.h" #include "p_setup.h" -#include "r_data/r_translate.h" #include "r_data/r_interpolate.h" #include "r_sky.h" #include "cmdlib.h" -#include "g_level.h" #include "md5.h" #include "compatibility.h" #include "po_man.h" #include "r_renderer.h" -#include "r_data/colormaps.h" #include "p_blockmap.h" #include "r_utility.h" #include "p_spec.h" -#include "p_saveg.h" #include "g_levellocals.h" #include "c_dispatch.h" #include "a_dynlight.h" diff --git a/src/p_sight.cpp b/src/p_sight.cpp index 2ba942c8093..1854b743bc3 100644 --- a/src/p_sight.cpp +++ b/src/p_sight.cpp @@ -28,19 +28,12 @@ #include "p_maputl.h" #include "p_blockmap.h" #include "m_random.h" -#include "m_bbox.h" #include "p_lnspec.h" -#include "g_level.h" #include "po_man.h" -#include "r_utility.h" #include "b_bot.h" #include "p_spec.h" #include "vm.h" -// State. -#include "r_state.h" - -#include "stats.h" #include "g_levellocals.h" #include "actorinlines.h" diff --git a/src/p_spec.cpp b/src/p_spec.cpp index e00d8a33aa5..5183324f99f 100644 --- a/src/p_spec.cpp +++ b/src/p_spec.cpp @@ -75,11 +75,7 @@ #include "gstrings.h" #include "events.h" -#include "i_system.h" -#include "m_argv.h" #include "m_random.h" -#include "m_bbox.h" -#include "w_wad.h" #include "p_local.h" #include "p_spec.h" @@ -91,20 +87,11 @@ #include "g_game.h" -#include "s_sound.h" -#include "sc_man.h" -#include "gi.h" -#include "statnums.h" -#include "g_level.h" -#include "v_font.h" #include "a_sharedglobal.h" -#include "serializer.h" #include "a_keys.h" #include "c_dispatch.h" #include "r_sky.h" #include "d_player.h" -#include "p_maputl.h" -#include "p_blockmap.h" #include "g_levellocals.h" #include "actorinlines.h" #ifndef NO_EDATA @@ -112,13 +99,8 @@ #endif #include "vm.h" -// State. -#include "r_state.h" - #include "c_console.h" -#include "r_data/r_interpolate.h" - static FRandom pr_playerinspecialsector ("PlayerInSpecialSector"); EXTERN_CVAR(Bool, cl_predict_specials) diff --git a/src/p_states.cpp b/src/p_states.cpp index a330bec764e..8b592247012 100644 --- a/src/p_states.cpp +++ b/src/p_states.cpp @@ -34,14 +34,11 @@ ** */ #include "actor.h" -#include "templates.h" #include "cmdlib.h" -#include "i_system.h" #include "c_dispatch.h" #include "v_text.h" #include "thingdef.h" #include "r_state.h" -#include "vm.h" // stores indices for symbolic state labels for some old-style DECORATE functions. diff --git a/src/p_switch.cpp b/src/p_switch.cpp index 3563f96b805..ec1d717ecc5 100644 --- a/src/p_switch.cpp +++ b/src/p_switch.cpp @@ -43,9 +43,6 @@ #include "s_sound.h" #include "doomstat.h" #include "r_state.h" -#include "w_wad.h" -#include "tarray.h" -#include "cmdlib.h" #include "serializer.h" #include "p_maputl.h" #include "p_spec.h" @@ -53,8 +50,6 @@ #include "actor.h" #include "actorinlines.h" -#include "gi.h" - static FRandom pr_switchanim ("AnimSwitch"); class DActiveButton : public DThinker diff --git a/src/p_teleport.cpp b/src/p_teleport.cpp index 55b93a423b7..2bb71f82b78 100644 --- a/src/p_teleport.cpp +++ b/src/p_teleport.cpp @@ -36,8 +36,6 @@ #include "r_state.h" #include "gi.h" #include "a_sharedglobal.h" -#include "m_random.h" -#include "i_system.h" #include "doomstat.h" #include "d_player.h" #include "p_maputl.h" diff --git a/src/p_terrain.cpp b/src/p_terrain.cpp index 8219e37a33a..8459ed27aed 100644 --- a/src/p_terrain.cpp +++ b/src/p_terrain.cpp @@ -43,9 +43,7 @@ #include "r_state.h" #include "w_wad.h" #include "sc_man.h" -#include "s_sound.h" #include "p_local.h" -#include "templates.h" #include "actor.h" #include "vm.h" diff --git a/src/p_things.cpp b/src/p_things.cpp index b8a0c5ffbec..2f5bd555530 100644 --- a/src/p_things.cpp +++ b/src/p_things.cpp @@ -35,21 +35,13 @@ #include "doomtype.h" #include "p_local.h" #include "info.h" -#include "s_sound.h" #include "doomstat.h" -#include "m_random.h" -#include "c_console.h" #include "c_dispatch.h" #include "a_sharedglobal.h" -#include "gi.h" -#include "templates.h" -#include "g_level.h" #include "v_text.h" -#include "i_system.h" #include "d_player.h" #include "r_utility.h" #include "p_spec.h" -#include "math/cmath.h" #include "actorptrselect.h" #include "g_levellocals.h" #include "actorinlines.h" diff --git a/src/p_tick.cpp b/src/p_tick.cpp index 67bcc592d0f..e4cc536cfd1 100644 --- a/src/p_tick.cpp +++ b/src/p_tick.cpp @@ -24,18 +24,14 @@ // //----------------------------------------------------------------------------- -#include #include "p_local.h" #include "p_effect.h" #include "c_console.h" #include "b_bot.h" -#include "s_sound.h" #include "doomstat.h" #include "sbar.h" #include "r_data/r_interpolate.h" -#include "i_sound.h" #include "d_player.h" -#include "g_level.h" #include "r_utility.h" #include "p_spec.h" #include "g_levellocals.h" diff --git a/src/p_trace.cpp b/src/p_trace.cpp index fd79861ec2e..b60abc477a0 100644 --- a/src/p_trace.cpp +++ b/src/p_trace.cpp @@ -34,11 +34,9 @@ #include "p_trace.h" #include "p_local.h" -#include "i_system.h" #include "r_sky.h" #include "doomstat.h" #include "p_maputl.h" -#include "r_defs.h" #include "p_spec.h" #include "g_levellocals.h" #include "p_terrain.h" diff --git a/src/p_udmf.cpp b/src/p_udmf.cpp index bb9055486f1..21d541bfb52 100644 --- a/src/p_udmf.cpp +++ b/src/p_udmf.cpp @@ -36,15 +36,12 @@ #include "doomstat.h" #include "p_setup.h" #include "p_lnspec.h" -#include "templates.h" #include "i_system.h" #include "gi.h" #include "r_sky.h" #include "g_level.h" -#include "v_palette.h" #include "p_udmf.h" #include "r_state.h" -#include "r_data/colormaps.h" #include "w_wad.h" #include "p_tags.h" #include "p_terrain.h" diff --git a/src/p_usdf.cpp b/src/p_usdf.cpp index 8161866224a..cb375816ffe 100644 --- a/src/p_usdf.cpp +++ b/src/p_usdf.cpp @@ -34,12 +34,9 @@ #include "p_setup.h" #include "p_lnspec.h" -#include "templates.h" -#include "i_system.h" #include "p_conversation.h" #include "p_udmf.h" #include "doomerrors.h" -#include "cmdlib.h" #include "actor.h" #include "a_pickups.h" #include "w_wad.h" diff --git a/src/p_user.cpp b/src/p_user.cpp index 6ec5b629fea..cb6c370cdd5 100644 --- a/src/p_user.cpp +++ b/src/p_user.cpp @@ -64,28 +64,19 @@ #include "p_local.h" #include "doomstat.h" #include "s_sound.h" -#include "i_system.h" #include "gi.h" #include "m_random.h" #include "p_pspr.h" #include "p_enemy.h" -#include "s_sound.h" #include "a_sharedglobal.h" #include "a_keys.h" -#include "statnums.h" -#include "v_palette.h" -#include "v_video.h" #include "w_wad.h" #include "cmdlib.h" #include "sbar.h" #include "intermission/intermission.h" #include "c_console.h" -#include "doomdef.h" #include "c_dispatch.h" -#include "tarray.h" -#include "g_level.h" #include "d_net.h" -#include "gstrings.h" #include "serializer.h" #include "r_renderer.h" #include "d_player.h" @@ -96,7 +87,6 @@ #include "vm.h" #include "g_levellocals.h" #include "actorinlines.h" -#include "r_data/r_translate.h" #include "p_acs.h" #include "events.h" diff --git a/src/p_xlat.cpp b/src/p_xlat.cpp index 4f3b4561191..315b64c3cb7 100644 --- a/src/p_xlat.cpp +++ b/src/p_xlat.cpp @@ -36,16 +36,10 @@ #include "g_level.h" #include "p_lnspec.h" #include "doomdata.h" -#include "m_swap.h" #include "p_spec.h" #include "p_local.h" #include "a_sharedglobal.h" -#include "gi.h" -#include "w_wad.h" -#include "sc_man.h" -#include "cmdlib.h" #include "g_levellocals.h" -#include "actorinlines.h" #include "xlat/xlat.h" // define names for the TriggerType field of the general linedefs diff --git a/src/po_man.cpp b/src/po_man.cpp index 359b887b8aa..76355d4db58 100644 --- a/src/po_man.cpp +++ b/src/po_man.cpp @@ -24,24 +24,18 @@ #include "doomdef.h" #include "p_local.h" -#include "i_system.h" -#include "w_wad.h" -#include "m_swap.h" #include "m_bbox.h" #include "s_sndseq.h" #include "a_sharedglobal.h" #include "p_3dmidtex.h" #include "p_lnspec.h" #include "r_data/r_interpolate.h" -#include "g_level.h" #include "po_man.h" #include "p_setup.h" -#include "vectors.h" #include "serializer.h" #include "p_blockmap.h" #include "p_maputl.h" #include "r_utility.h" -#include "p_blockmap.h" #include "g_levellocals.h" #include "actorinlines.h" #include "v_text.h" diff --git a/src/portal.cpp b/src/portal.cpp index 2268f8e8e79..1ac461d73f5 100644 --- a/src/portal.cpp +++ b/src/portal.cpp @@ -45,12 +45,9 @@ #include "p_tags.h" #include "v_text.h" #include "a_sharedglobal.h" -#include "i_system.h" #include "c_dispatch.h" #include "p_maputl.h" #include "p_spec.h" -#include "p_checkposition.h" -#include "math/cmath.h" #include "g_levellocals.h" #include "vm.h" diff --git a/src/posix/cocoa/i_joystick.cpp b/src/posix/cocoa/i_joystick.cpp index 747cc142268..a34c8b03d20 100644 --- a/src/posix/cocoa/i_joystick.cpp +++ b/src/posix/cocoa/i_joystick.cpp @@ -32,10 +32,8 @@ */ #include -#include #include #include -#include #include "d_event.h" #include "doomdef.h" diff --git a/src/posix/cocoa/i_main.mm b/src/posix/cocoa/i_main.mm index d528a0f72cf..dbba5cea090 100644 --- a/src/posix/cocoa/i_main.mm +++ b/src/posix/cocoa/i_main.mm @@ -35,7 +35,6 @@ #include "s_sound.h" #include -#include // Avoid collision between DObject class and Objective-C #define Class ObjectClass @@ -44,10 +43,8 @@ #include "c_cvars.h" #include "cmdlib.h" #include "d_main.h" -#include "doomerrors.h" #include "i_system.h" #include "m_argv.h" -#include "s_sound.h" #include "st_console.h" #include "version.h" diff --git a/src/posix/cocoa/i_system.mm b/src/posix/cocoa/i_system.mm index c8f066be5b9..94a911bfa27 100644 --- a/src/posix/cocoa/i_system.mm +++ b/src/posix/cocoa/i_system.mm @@ -34,8 +34,6 @@ #include "i_common.h" #include -#include -#include #include #include "d_protocol.h" diff --git a/src/posix/cocoa/i_video.mm b/src/posix/cocoa/i_video.mm index 0c37453df0a..0b22ee6e7ba 100644 --- a/src/posix/cocoa/i_video.mm +++ b/src/posix/cocoa/i_video.mm @@ -42,28 +42,18 @@ #include "c_dispatch.h" #include "doomstat.h" #include "hardware.h" -#include "i_system.h" #include "m_argv.h" #include "m_png.h" #include "r_renderer.h" #include "swrenderer/r_swrenderer.h" #include "st_console.h" -#include "stats.h" -#include "textures.h" -#include "v_palette.h" -#include "v_pfx.h" #include "v_text.h" -#include "v_video.h" #include "version.h" #include "videomodes.h" -#include "gl/system/gl_system.h" -#include "gl/data/gl_vertexbuffer.h" #include "gl/renderer/gl_renderer.h" #include "gl/system/gl_framebuffer.h" -#include "gl/system/gl_interface.h" #include "gl/textures/gl_samplers.h" -#include "gl/utility/gl_clock.h" #undef Class diff --git a/src/posix/cocoa/st_console.mm b/src/posix/cocoa/st_console.mm index dd876c378c4..3369da02363 100644 --- a/src/posix/cocoa/st_console.mm +++ b/src/posix/cocoa/st_console.mm @@ -34,7 +34,6 @@ #include "i_common.h" #include "d_main.h" -#include "i_system.h" #include "st_console.h" #include "v_text.h" #include "version.h" diff --git a/src/posix/cocoa/st_start.mm b/src/posix/cocoa/st_start.mm index 6ce48e80711..d10722ffb28 100644 --- a/src/posix/cocoa/st_start.mm +++ b/src/posix/cocoa/st_start.mm @@ -38,7 +38,6 @@ #include "c_cvars.h" #include "st_console.h" #include "st_start.h" -#include "v_text.h" FStartupScreen *StartScreen; diff --git a/src/posix/i_steam.cpp b/src/posix/i_steam.cpp index f233f4ce812..4c72e06ab5f 100644 --- a/src/posix/i_steam.cpp +++ b/src/posix/i_steam.cpp @@ -40,7 +40,6 @@ #include "doomerrors.h" #include "d_main.h" -#include "zstring.h" #include "sc_man.h" #include "cmdlib.h" diff --git a/src/posix/osx/iwadpicker_cocoa.mm b/src/posix/osx/iwadpicker_cocoa.mm index 2792e86302f..2b25f680e37 100644 --- a/src/posix/osx/iwadpicker_cocoa.mm +++ b/src/posix/osx/iwadpicker_cocoa.mm @@ -48,7 +48,6 @@ #include #include -#include CVAR(String, osx_additional_parameters, "", CVAR_ARCHIVE | CVAR_NOSET | CVAR_GLOBALCONFIG); diff --git a/src/posix/sdl/crashcatcher.c b/src/posix/sdl/crashcatcher.c index 11e5d179f30..be0e8f59902 100644 --- a/src/posix/sdl/crashcatcher.c +++ b/src/posix/sdl/crashcatcher.c @@ -1,13 +1,10 @@ #include #include #include -#include -#include #include #include #include #include -#include #ifdef __linux__ #include diff --git a/src/posix/sdl/critsec.cpp b/src/posix/sdl/critsec.cpp index ca9a225c00b..04aa4aa9d58 100644 --- a/src/posix/sdl/critsec.cpp +++ b/src/posix/sdl/critsec.cpp @@ -35,7 +35,6 @@ */ #include "SDL.h" -#include "SDL_thread.h" #include "i_system.h" class FInternalCriticalSection diff --git a/src/posix/sdl/hardware.cpp b/src/posix/sdl/hardware.cpp index 0ae4d8dedb0..3c000cb8e3b 100644 --- a/src/posix/sdl/hardware.cpp +++ b/src/posix/sdl/hardware.cpp @@ -34,20 +34,12 @@ #include #include -#include -#include "version.h" #include "hardware.h" -#include "i_video.h" -#include "i_system.h" -#include "c_console.h" -#include "c_cvars.h" #include "c_dispatch.h" #include "v_text.h" #include "doomstat.h" #include "m_argv.h" -#include "gl_sysfb.h" -#include "r_renderer.h" #include "swrenderer/r_swrenderer.h" EXTERN_CVAR (Bool, ticker) diff --git a/src/posix/sdl/i_input.cpp b/src/posix/sdl/i_input.cpp index 338b343d53a..1998823b657 100644 --- a/src/posix/sdl/i_input.cpp +++ b/src/posix/sdl/i_input.cpp @@ -31,23 +31,17 @@ ** */ #include -#include #include "doomtype.h" -#include "c_dispatch.h" #include "doomdef.h" #include "doomstat.h" #include "m_argv.h" -#include "i_input.h" #include "v_video.h" #include "d_main.h" #include "d_event.h" #include "d_gui.h" #include "c_console.h" -#include "c_cvars.h" -#include "i_system.h" #include "dikeys.h" -#include "templates.h" #include "s_sound.h" #include "events.h" diff --git a/src/posix/sdl/i_main.cpp b/src/posix/sdl/i_main.cpp index 95ed8322eb2..127198df89c 100644 --- a/src/posix/sdl/i_main.cpp +++ b/src/posix/sdl/i_main.cpp @@ -36,7 +36,6 @@ #include #include -#include #include #include #include @@ -45,15 +44,11 @@ #include "doomerrors.h" #include "m_argv.h" #include "d_main.h" -#include "i_system.h" -#include "i_video.h" #include "c_console.h" -#include "errors.h" #include "version.h" #include "w_wad.h" #include "g_level.h" #include "g_levellocals.h" -#include "r_state.h" #include "cmdlib.h" #include "r_utility.h" #include "doomstat.h" diff --git a/src/posix/sdl/i_system.cpp b/src/posix/sdl/i_system.cpp index 1f41788a044..15ec90698fa 100644 --- a/src/posix/sdl/i_system.cpp +++ b/src/posix/sdl/i_system.cpp @@ -27,17 +27,11 @@ #include #include -#include -#include -#include -#include #include -#include #include #include "doomerrors.h" -#include #include "doomtype.h" #include "doomstat.h" @@ -46,28 +40,16 @@ #include "cmdlib.h" #include "m_argv.h" #include "m_misc.h" -#include "i_video.h" #include "i_sound.h" -#include "i_music.h" #include "x86.h" #include "d_main.h" #include "d_net.h" #include "g_game.h" -#include "i_system.h" #include "c_dispatch.h" -#include "templates.h" -#include "v_palette.h" -#include "textures.h" -#include "bitmap.h" -#include "stats.h" -#include "hardware.h" #include "gameconfigfile.h" -#include "m_fixed.h" -#include "g_level.h" - EXTERN_CVAR (String, language) extern "C" diff --git a/src/posix/sdl/sdlglvideo.cpp b/src/posix/sdl/sdlglvideo.cpp index 60152f15c99..4d3b481314f 100644 --- a/src/posix/sdl/sdlglvideo.cpp +++ b/src/posix/sdl/sdlglvideo.cpp @@ -35,13 +35,10 @@ #include "doomtype.h" -#include "templates.h" #include "i_system.h" #include "i_video.h" #include "m_argv.h" #include "v_video.h" -#include "v_pfx.h" -#include "stats.h" #include "version.h" #include "c_console.h" @@ -54,8 +51,6 @@ #include "gl/renderer/gl_renderer.h" #include "gl/system/gl_framebuffer.h" #include "gl/shaders/gl_shader.h" -#include "gl/textures/gl_material.h" -#include "gl/system/gl_cvars.h" // MACROS ------------------------------------------------------------------ diff --git a/src/posix/sdl/st_start.cpp b/src/posix/sdl/st_start.cpp index 060548b53b0..38959f542d6 100644 --- a/src/posix/sdl/st_start.cpp +++ b/src/posix/sdl/st_start.cpp @@ -36,7 +36,6 @@ #include #include -#include #include #include "st_start.h" diff --git a/src/r_data/colormaps.cpp b/src/r_data/colormaps.cpp index 791101dd361..d8feac7c717 100644 --- a/src/r_data/colormaps.cpp +++ b/src/r_data/colormaps.cpp @@ -40,20 +40,9 @@ #include "i_system.h" #include "w_wad.h" -#include "doomdef.h" #include "r_sky.h" -#include "c_dispatch.h" -#include "sc_man.h" -#include "v_text.h" -#include "st_start.h" -#include "doomstat.h" -#include "v_palette.h" -#include "colormatcher.h" #include "colormaps.h" -#include "v_video.h" #include "templates.h" -#include "r_utility.h" -#include "r_renderer.h" TArray fakecmaps; diff --git a/src/r_data/gldefs.cpp b/src/r_data/gldefs.cpp index c01b905d9d6..20d28d2cd3d 100644 --- a/src/r_data/gldefs.cpp +++ b/src/r_data/gldefs.cpp @@ -34,18 +34,12 @@ */ #include #include "i_system.h" -#include "doomtype.h" -#include "c_cvars.h" -#include "c_dispatch.h" -#include "m_random.h" #include "sc_man.h" #include "templates.h" #include "w_wad.h" #include "gi.h" #include "r_state.h" #include "stats.h" -#include "zstring.h" -#include "d_dehacked.h" #include "v_text.h" #include "g_levellocals.h" #include "a_dynlight.h" diff --git a/src/r_data/matrix.cpp b/src/r_data/matrix.cpp index edc26e833c7..6b7e64df1e8 100644 --- a/src/r_data/matrix.cpp +++ b/src/r_data/matrix.cpp @@ -12,10 +12,6 @@ This is a simplified version of VSMatrix that has been adjusted for GZDoom's nee #include #include -#include -#include -#include -#include "doomtype.h" #include "matrix.h" #ifdef _MSC_VER diff --git a/src/r_data/models/models.cpp b/src/r_data/models/models.cpp index b8068f2fd43..65b588f2425 100644 --- a/src/r_data/models/models.cpp +++ b/src/r_data/models/models.cpp @@ -38,7 +38,6 @@ #include "d_player.h" #include "g_levellocals.h" #include "r_utility.h" -#include "i_time.h" #include "r_data/models/models.h" #ifdef _MSC_VER diff --git a/src/r_data/models/models_md2.cpp b/src/r_data/models/models_md2.cpp index df187a69dfb..999e0cd8230 100644 --- a/src/r_data/models/models_md2.cpp +++ b/src/r_data/models/models_md2.cpp @@ -27,9 +27,6 @@ **/ #include "w_wad.h" -#include "cmdlib.h" -#include "sc_man.h" -#include "m_crc32.h" #include "r_data/models/models.h" #ifdef _MSC_VER diff --git a/src/r_data/models/models_md3.cpp b/src/r_data/models/models_md3.cpp index a399ccb72dc..31f2c31cb24 100644 --- a/src/r_data/models/models_md3.cpp +++ b/src/r_data/models/models_md3.cpp @@ -22,8 +22,6 @@ #include "w_wad.h" #include "cmdlib.h" -#include "sc_man.h" -#include "m_crc32.h" #include "r_data/models/models.h" #define MAX_QPATH 64 diff --git a/src/r_data/models/models_voxel.cpp b/src/r_data/models/models_voxel.cpp index 6b9e26d2e4e..3c9af23741a 100644 --- a/src/r_data/models/models_voxel.cpp +++ b/src/r_data/models/models_voxel.cpp @@ -27,18 +27,11 @@ **/ #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 "colormatcher.h" #include "textures/bitmap.h" #include "g_levellocals.h" #include "models.h" -#include "v_palette.h" #ifdef _MSC_VER #pragma warning(disable:4244) // warning C4244: conversion from 'double' to 'float', possible loss of data diff --git a/src/r_data/portalgroups.cpp b/src/r_data/portalgroups.cpp index a7f1b6daea3..a65f8b5e02c 100644 --- a/src/r_data/portalgroups.cpp +++ b/src/r_data/portalgroups.cpp @@ -21,16 +21,9 @@ // #include "doomtype.h" -#include "colormatcher.h" -#include "i_system.h" #include "p_local.h" #include "p_lnspec.h" #include "c_dispatch.h" -#include "r_sky.h" -#include "sc_man.h" -#include "w_wad.h" -#include "gi.h" -#include "g_level.h" #include "a_sharedglobal.h" #include "g_levellocals.h" #include "r_utility.h" diff --git a/src/r_data/r_interpolate.cpp b/src/r_data/r_interpolate.cpp index 8f8fc3f8005..8f73fdcac22 100644 --- a/src/r_data/r_interpolate.cpp +++ b/src/r_data/r_interpolate.cpp @@ -37,7 +37,6 @@ #include "stats.h" #include "r_data/r_interpolate.h" #include "p_local.h" -#include "i_system.h" #include "po_man.h" #include "serializer.h" diff --git a/src/r_data/r_translate.cpp b/src/r_data/r_translate.cpp index 28a480b3db3..eeca4186411 100644 --- a/src/r_data/r_translate.cpp +++ b/src/r_data/r_translate.cpp @@ -38,14 +38,10 @@ #include "r_data/r_translate.h" #include "v_video.h" #include "g_game.h" -#include "colormatcher.h" #include "d_netinf.h" -#include "v_palette.h" #include "sc_man.h" #include "doomerrors.h" -#include "i_system.h" #include "w_wad.h" -#include "r_data/colormaps.h" #include "serializer.h" #include "d_player.h" #include "r_data/sprites.h" @@ -55,7 +51,6 @@ #include "m_crc32.h" #include "gi.h" -#include "stats.h" TAutoGrowArray translationtables[NUM_TRANSLATION_TABLES]; diff --git a/src/r_data/renderinfo.cpp b/src/r_data/renderinfo.cpp index 38e159f27fe..5b6cc6d13f8 100644 --- a/src/r_data/renderinfo.cpp +++ b/src/r_data/renderinfo.cpp @@ -28,18 +28,12 @@ #include "gl/system/gl_system.h" #include "doomtype.h" -#include "colormatcher.h" -#include "i_system.h" #include "p_local.h" #include "p_spec.h" #include "p_lnspec.h" #include "c_dispatch.h" #include "r_sky.h" -#include "sc_man.h" -#include "w_wad.h" -#include "gi.h" #include "p_setup.h" -#include "g_level.h" #include "g_levellocals.h" //========================================================================== diff --git a/src/r_data/sprites.cpp b/src/r_data/sprites.cpp index 2380e597a34..ce6123c1886 100644 --- a/src/r_data/sprites.cpp +++ b/src/r_data/sprites.cpp @@ -25,17 +25,13 @@ #include "w_wad.h" #include "i_system.h" #include "s_sound.h" -#include "c_console.h" #include "d_player.h" #include "d_netinf.h" #include "gi.h" -#include "colormatcher.h" #include "c_dispatch.h" -#include "r_defs.h" #include "v_text.h" #include "r_data/sprites.h" #include "r_data/voxels.h" -#include "textures/textures.h" #include "vm.h" void gl_InitModels(); diff --git a/src/r_data/voxels.cpp b/src/r_data/voxels.cpp index 2bef1a0b4e5..9dc0b7006cd 100644 --- a/src/r_data/voxels.cpp +++ b/src/r_data/voxels.cpp @@ -36,30 +36,14 @@ #include #include -#include "templates.h" -#include "doomdef.h" #include "m_swap.h" #include "m_argv.h" -#include "i_system.h" #include "w_wad.h" -#include "c_console.h" -#include "c_cvars.h" -#include "c_dispatch.h" -#include "doomstat.h" #include "v_video.h" #include "sc_man.h" #include "s_sound.h" #include "sbar.h" -#include "gi.h" -#include "r_sky.h" -#include "cmdlib.h" #include "g_level.h" -#include "d_net.h" -#include "colormatcher.h" -#include "d_netinf.h" -#include "v_palette.h" -#include "r_data/r_translate.h" -#include "r_data/colormaps.h" #include "r_data/sprites.h" #include "voxels.h" #include "info.h" diff --git a/src/r_sky.cpp b/src/r_sky.cpp index 7a45bff5035..31a9ec491db 100644 --- a/src/r_sky.cpp +++ b/src/r_sky.cpp @@ -37,7 +37,6 @@ #include "r_sky.h" #include "r_utility.h" #include "v_text.h" -#include "gi.h" #include "g_levellocals.h" // diff --git a/src/r_utility.cpp b/src/r_utility.cpp index abde8f8adeb..05dafee9b03 100644 --- a/src/r_utility.cpp +++ b/src/r_utility.cpp @@ -40,23 +40,18 @@ #include "m_bbox.h" #include "r_sky.h" #include "st_stuff.h" -#include "c_cvars.h" #include "c_dispatch.h" #include "v_video.h" #include "stats.h" #include "i_video.h" -#include "i_system.h" #include "a_sharedglobal.h" -#include "r_data/r_translate.h" #include "p_3dmidtex.h" #include "r_data/r_interpolate.h" -#include "v_palette.h" #include "po_man.h" #include "p_effect.h" #include "st_start.h" #include "v_font.h" #include "r_renderer.h" -#include "r_data/colormaps.h" #include "serializer.h" #include "r_utility.h" #include "d_player.h" @@ -64,7 +59,6 @@ #include "g_levellocals.h" #include "p_maputl.h" #include "sbar.h" -#include "math/cmath.h" #include "vm.h" #include "i_time.h" diff --git a/src/resourcefiles/file_7z.cpp b/src/resourcefiles/file_7z.cpp index 9e675682c8a..79ecea58382 100644 --- a/src/resourcefiles/file_7z.cpp +++ b/src/resourcefiles/file_7z.cpp @@ -39,10 +39,7 @@ #include "resourcefile.h" #include "cmdlib.h" -#include "templates.h" #include "v_text.h" -#include "w_zip.h" -#include "i_system.h" #include "w_wad.h" diff --git a/src/resourcefiles/file_directory.cpp b/src/resourcefiles/file_directory.cpp index 3897e03410e..03b33e4001e 100644 --- a/src/resourcefiles/file_directory.cpp +++ b/src/resourcefiles/file_directory.cpp @@ -43,7 +43,6 @@ #include "resourcefile.h" #include "cmdlib.h" -#include "doomerrors.h" diff --git a/src/resourcefiles/file_grp.cpp b/src/resourcefiles/file_grp.cpp index 4155e3485bc..c0458276a9f 100644 --- a/src/resourcefiles/file_grp.cpp +++ b/src/resourcefiles/file_grp.cpp @@ -34,8 +34,6 @@ */ #include "resourcefile.h" -#include "cmdlib.h" -#include "v_text.h" #include "w_wad.h" //========================================================================== diff --git a/src/resourcefiles/file_lump.cpp b/src/resourcefiles/file_lump.cpp index 244ff5c6a5a..d7eb68e884f 100644 --- a/src/resourcefiles/file_lump.cpp +++ b/src/resourcefiles/file_lump.cpp @@ -34,7 +34,6 @@ #include "resourcefile.h" #include "cmdlib.h" -#include "v_text.h" #include "w_wad.h" //========================================================================== diff --git a/src/resourcefiles/file_pak.cpp b/src/resourcefiles/file_pak.cpp index 776138d7048..c2705a97fbb 100644 --- a/src/resourcefiles/file_pak.cpp +++ b/src/resourcefiles/file_pak.cpp @@ -33,8 +33,6 @@ */ #include "resourcefile.h" -#include "cmdlib.h" -#include "v_text.h" #include "w_wad.h" //========================================================================== diff --git a/src/resourcefiles/file_rff.cpp b/src/resourcefiles/file_rff.cpp index 6843904c079..89ef440f341 100644 --- a/src/resourcefiles/file_rff.cpp +++ b/src/resourcefiles/file_rff.cpp @@ -34,9 +34,7 @@ */ #include "resourcefile.h" -#include "cmdlib.h" #include "templates.h" -#include "v_text.h" #include "w_wad.h" //========================================================================== diff --git a/src/resourcefiles/file_wad.cpp b/src/resourcefiles/file_wad.cpp index 2e0ebb1dc3c..c7a3a262ffd 100644 --- a/src/resourcefiles/file_wad.cpp +++ b/src/resourcefiles/file_wad.cpp @@ -34,13 +34,10 @@ */ #include "resourcefile.h" -#include "cmdlib.h" -#include "templates.h" #include "v_text.h" #include "w_wad.h" #include "gi.h" #include "i_system.h" -#include "w_zip.h" //========================================================================== // diff --git a/src/resourcefiles/file_zip.cpp b/src/resourcefiles/file_zip.cpp index b3bfa7a2dc8..e0cf4df9113 100644 --- a/src/resourcefiles/file_zip.cpp +++ b/src/resourcefiles/file_zip.cpp @@ -40,7 +40,6 @@ #include "v_text.h" #include "w_wad.h" #include "w_zip.h" -#include "i_system.h" #include "ancientzip.h" #define BUFREADCOMMENT (0x400) diff --git a/src/resourcefiles/resourcefile.cpp b/src/resourcefiles/resourcefile.cpp index adb484d32c0..419bd470741 100644 --- a/src/resourcefiles/resourcefile.cpp +++ b/src/resourcefiles/resourcefile.cpp @@ -38,10 +38,8 @@ #include "resourcefile.h" #include "cmdlib.h" #include "w_wad.h" -#include "doomerrors.h" #include "gi.h" #include "doomstat.h" -#include "w_zip.h" //========================================================================== diff --git a/src/s_advsound.cpp b/src/s_advsound.cpp index 85db21c4b1a..9de9d77398b 100644 --- a/src/s_advsound.cpp +++ b/src/s_advsound.cpp @@ -36,19 +36,11 @@ #include "templates.h" #include "actor.h" -#include "a_sharedglobal.h" -#include "s_sound.h" #include "c_dispatch.h" #include "w_wad.h" -#include "sc_man.h" -#include "g_level.h" -#include "cmdlib.h" #include "gi.h" -#include "doomstat.h" #include "i_sound.h" -#include "m_random.h" #include "d_netinf.h" -#include "i_system.h" #include "d_player.h" #include "serializer.h" #include "v_text.h" diff --git a/src/s_environment.cpp b/src/s_environment.cpp index 0618d72e359..8bd9661c7d9 100644 --- a/src/s_environment.cpp +++ b/src/s_environment.cpp @@ -33,7 +33,6 @@ */ #include "doomtype.h" -#include "tarray.h" #include "s_sound.h" #include "sc_man.h" #include "cmdlib.h" @@ -44,7 +43,6 @@ #include "c_cvars.h" #include "c_dispatch.h" -#include "files.h" #include "vm.h" #include "dobject.h" #include "menu/menu.h" diff --git a/src/s_sndseq.cpp b/src/s_sndseq.cpp index dea68cf0202..6f99fad6eb3 100644 --- a/src/s_sndseq.cpp +++ b/src/s_sndseq.cpp @@ -21,7 +21,6 @@ // #include -#include #include "doomtype.h" #include "doomstat.h" @@ -30,12 +29,10 @@ #include "s_sound.h" #include "s_sndseq.h" #include "w_wad.h" -#include "i_system.h" #include "cmdlib.h" #include "p_local.h" #include "po_man.h" #include "gi.h" -#include "templates.h" #include "c_dispatch.h" #include "g_level.h" #include "serializer.h" diff --git a/src/s_sound.cpp b/src/s_sound.cpp index 69a559de360..cac01b11132 100644 --- a/src/s_sound.cpp +++ b/src/s_sound.cpp @@ -58,7 +58,6 @@ #ifdef _WIN32 #include #endif -#include #include "i_system.h" #include "i_sound.h" @@ -70,7 +69,6 @@ #include "c_dispatch.h" #include "m_random.h" #include "w_wad.h" -#include "doomdef.h" #include "p_local.h" #include "doomstat.h" #include "cmdlib.h" @@ -79,13 +77,9 @@ #include "a_sharedglobal.h" #include "gstrings.h" #include "gi.h" -#include "templates.h" -#include "timidity/timidity.h" -#include "g_level.h" #include "po_man.h" #include "serializer.h" #include "d_player.h" -#include "r_state.h" #include "g_levellocals.h" #include "vm.h" diff --git a/src/sc_man.cpp b/src/sc_man.cpp index 216a5527af8..3399947cfa6 100644 --- a/src/sc_man.cpp +++ b/src/sc_man.cpp @@ -65,7 +65,6 @@ #include "sc_man.h" #include "w_wad.h" #include "cmdlib.h" -#include "m_misc.h" #include "templates.h" #include "doomstat.h" #include "v_text.h" diff --git a/src/scripting/backend/codegen.cpp b/src/scripting/backend/codegen.cpp index 256af647a54..e7180afd161 100644 --- a/src/scripting/backend/codegen.cpp +++ b/src/scripting/backend/codegen.cpp @@ -39,22 +39,13 @@ #include #include "actor.h" -#include "sc_man.h" -#include "tarray.h" -#include "templates.h" #include "cmdlib.h" -#include "i_system.h" -#include "m_random.h" #include "a_pickups.h" #include "thingdef.h" #include "p_lnspec.h" -#include "doomstat.h" #include "codegen.h" -#include "m_fixed.h" -#include "vmbuilder.h" #include "v_text.h" #include "w_wad.h" -#include "math/cmath.h" inline PClass *PObjectPointer::PointedClass() const { return static_cast(PointedType)->Descriptor; } diff --git a/src/scripting/backend/vmbuilder.cpp b/src/scripting/backend/vmbuilder.cpp index 131a2094bcc..1af5b46ba3b 100644 --- a/src/scripting/backend/vmbuilder.cpp +++ b/src/scripting/backend/vmbuilder.cpp @@ -34,11 +34,7 @@ #include "vmbuilder.h" #include "codegen.h" -#include "info.h" #include "m_argv.h" -//#include "thingdef.h" -#include "doomerrors.h" -#include "vmintern.h" struct VMRemap { diff --git a/src/scripting/decorate/olddecorations.cpp b/src/scripting/decorate/olddecorations.cpp index 7dc12d01777..62a00fe57dd 100644 --- a/src/scripting/decorate/olddecorations.cpp +++ b/src/scripting/decorate/olddecorations.cpp @@ -35,20 +35,13 @@ // HEADER FILES ------------------------------------------------------------ #include "actor.h" -#include "info.h" -#include "sc_man.h" -#include "tarray.h" -#include "templates.h" #include "r_defs.h" #include "a_pickups.h" -#include "s_sound.h" #include "cmdlib.h" #include "p_lnspec.h" #include "decallib.h" -#include "i_system.h" #include "thingdef.h" #include "backend/codegen.h" -#include "r_data/r_translate.h" // TYPES ------------------------------------------------------------------- diff --git a/src/scripting/decorate/thingdef_exp.cpp b/src/scripting/decorate/thingdef_exp.cpp index 37d613d8a3e..c94b9809308 100644 --- a/src/scripting/decorate/thingdef_exp.cpp +++ b/src/scripting/decorate/thingdef_exp.cpp @@ -39,16 +39,9 @@ */ #include "actor.h" -#include "sc_man.h" -#include "tarray.h" -#include "templates.h" #include "cmdlib.h" -#include "i_system.h" -#include "m_random.h" #include "a_pickups.h" #include "thingdef.h" -#include "p_lnspec.h" -#include "doomstat.h" #include "backend/codegen.h" FRandom pr_exrandom ("EX_Random"); diff --git a/src/scripting/decorate/thingdef_parse.cpp b/src/scripting/decorate/thingdef_parse.cpp index c2cc3ecbeba..bad24c87281 100644 --- a/src/scripting/decorate/thingdef_parse.cpp +++ b/src/scripting/decorate/thingdef_parse.cpp @@ -41,17 +41,10 @@ #include "doomtype.h" #include "actor.h" #include "a_pickups.h" -#include "sc_man.h" #include "thingdef.h" #include "a_morph.h" -#include "cmdlib.h" -#include "templates.h" -#include "v_palette.h" -#include "doomerrors.h" -#include "i_system.h" #include "backend/codegen.h" #include "w_wad.h" -#include "v_video.h" #include "v_text.h" #include "m_argv.h" diff --git a/src/scripting/decorate/thingdef_states.cpp b/src/scripting/decorate/thingdef_states.cpp index a5f48aa6caf..d03069775cc 100644 --- a/src/scripting/decorate/thingdef_states.cpp +++ b/src/scripting/decorate/thingdef_states.cpp @@ -39,23 +39,11 @@ */ #include "a_pickups.h" -#include "info.h" -#include "sc_man.h" -#include "tarray.h" -#include "templates.h" #include "cmdlib.h" #include "p_lnspec.h" #include "p_local.h" -#include "v_palette.h" -#include "doomerrors.h" #include "thingdef.h" -#include "a_sharedglobal.h" -#include "s_sound.h" -#include "i_system.h" -#include "colormatcher.h" #include "backend/codegen.h" -#include "templates.h" -#include "backend/vmbuilder.h" //========================================================================== //*** diff --git a/src/scripting/symbols.cpp b/src/scripting/symbols.cpp index 9fcefd60394..335edd552eb 100644 --- a/src/scripting/symbols.cpp +++ b/src/scripting/symbols.cpp @@ -35,7 +35,6 @@ #include #include "dobject.h" -#include "i_system.h" #include "templates.h" #include "serializer.h" #include "types.h" diff --git a/src/scripting/thingdef.cpp b/src/scripting/thingdef.cpp index aa8db34fdcf..d7869c26a34 100644 --- a/src/scripting/thingdef.cpp +++ b/src/scripting/thingdef.cpp @@ -40,29 +40,16 @@ #include "gi.h" #include "actor.h" -#include "info.h" -#include "sc_man.h" -#include "tarray.h" -#include "w_wad.h" -#include "templates.h" #include "r_defs.h" #include "a_pickups.h" -#include "s_sound.h" #include "cmdlib.h" #include "p_lnspec.h" #include "decallib.h" -#include "m_random.h" -#include "i_system.h" -#include "m_argv.h" #include "p_local.h" -#include "doomerrors.h" #include "a_weapons.h" #include "p_conversation.h" #include "v_text.h" -//#include "thingdef.h" #include "backend/codegen.h" -#include "a_sharedglobal.h" -#include "backend/vmbuilder.h" #include "stats.h" // EXTERNAL FUNCTION PROTOTYPES -------------------------------------------- diff --git a/src/scripting/thingdef_data.cpp b/src/scripting/thingdef_data.cpp index 4560b282efd..002c0a81a06 100644 --- a/src/scripting/thingdef_data.cpp +++ b/src/scripting/thingdef_data.cpp @@ -42,26 +42,18 @@ #include "actor.h" #include "d_player.h" #include "p_effect.h" -#include "autosegs.h" -#include "p_maputl.h" #include "gi.h" #include "p_terrain.h" #include "gstrings.h" -#include "zstring.h" -#include "d_event.h" #include "g_levellocals.h" #include "p_checkposition.h" -#include "r_sky.h" #include "v_font.h" -#include "v_video.h" -#include "c_bind.h" #include "menu/menu.h" #include "teaminfo.h" #include "r_data/sprites.h" #include "serializer.h" #include "wi_stuff.h" #include "a_dynlight.h" -#include "vm.h" #include "types.h" static TArray properties; diff --git a/src/scripting/thingdef_properties.cpp b/src/scripting/thingdef_properties.cpp index 4a98b50974b..e5338e37e3b 100644 --- a/src/scripting/thingdef_properties.cpp +++ b/src/scripting/thingdef_properties.cpp @@ -40,36 +40,19 @@ #include "gi.h" #include "d_player.h" -#include "info.h" -#include "tarray.h" #include "w_wad.h" -#include "templates.h" -#include "r_defs.h" -#include "a_pickups.h" -#include "s_sound.h" #include "cmdlib.h" #include "p_lnspec.h" #include "decallib.h" -#include "m_random.h" -#include "i_system.h" #include "p_local.h" #include "p_effect.h" -#include "v_palette.h" -#include "doomerrors.h" -#include "p_conversation.h" #include "v_text.h" #include "thingdef.h" -#include "a_sharedglobal.h" -#include "r_data/r_translate.h" #include "a_morph.h" -#include "colormatcher.h" #include "teaminfo.h" -#include "v_video.h" -#include "r_data/colormaps.h" #include "backend/vmbuilder.h" #include "a_keys.h" #include "g_levellocals.h" -#include "d_player.h" #include "types.h" //========================================================================== diff --git a/src/scripting/vm/vmexec.cpp b/src/scripting/vm/vmexec.cpp index 252371c4011..f1119feeef1 100644 --- a/src/scripting/vm/vmexec.cpp +++ b/src/scripting/vm/vmexec.cpp @@ -34,11 +34,7 @@ #include #include #include -#include "dobject.h" -#include "xs_Float.h" #include "r_state.h" -#include "textures/textures.h" -#include "math/cmath.h" #include "stats.h" #include "vmintern.h" #include "types.h" diff --git a/src/scripting/zscript/ast.cpp b/src/scripting/zscript/ast.cpp index 463364f99a5..77317350302 100644 --- a/src/scripting/zscript/ast.cpp +++ b/src/scripting/zscript/ast.cpp @@ -34,8 +34,6 @@ #include "dobject.h" #include "vmintern.h" #include "types.h" -#include "sc_man.h" -#include "memarena.h" #include "zcc_parser.h" #include "zcc-parse.h" diff --git a/src/scripting/zscript/zcc_compile.cpp b/src/scripting/zscript/zcc_compile.cpp index d782383e7f9..08131d15f67 100644 --- a/src/scripting/zscript/zcc_compile.cpp +++ b/src/scripting/zscript/zcc_compile.cpp @@ -34,22 +34,13 @@ #include "a_pickups.h" #include "thingdef.h" -#include "sc_man.h" #include "c_console.h" -#include "c_dispatch.h" -#include "doomerrors.h" #include "w_wad.h" -#include "cmdlib.h" -#include "m_alloc.h" #include "zcc_parser.h" #include "zcc-parse.h" #include "zcc_compile.h" #include "v_text.h" #include "p_lnspec.h" -#include "i_system.h" -#include "gdtoa.h" -#include "backend/vmbuilder.h" -#include "types.h" FSharedStringArena VMStringConstants; bool isActor(PContainerType *type); diff --git a/src/scripting/zscript/zcc_parser.cpp b/src/scripting/zscript/zcc_parser.cpp index f067311efdf..693ffcffa61 100644 --- a/src/scripting/zscript/zcc_parser.cpp +++ b/src/scripting/zscript/zcc_parser.cpp @@ -33,12 +33,8 @@ #include "dobject.h" #include "sc_man.h" -#include "c_console.h" -#include "c_dispatch.h" #include "w_wad.h" #include "cmdlib.h" -#include "m_alloc.h" -#include "i_system.h" #include "m_argv.h" #include "v_text.h" #include "version.h" diff --git a/src/serializer.cpp b/src/serializer.cpp index 02219544d9d..aa1c9a49e8f 100644 --- a/src/serializer.cpp +++ b/src/serializer.cpp @@ -41,27 +41,20 @@ #include "rapidjson/rapidjson.h" #include "rapidjson/writer.h" #include "rapidjson/prettywriter.h" -#include "rapidjson/stringbuffer.h" #include "rapidjson/document.h" #include "serializer.h" -#include "r_data/colormaps.h" #include "r_data/r_interpolate.h" -#include "r_defs.h" #include "r_state.h" #include "p_lnspec.h" -#include "i_system.h" #include "w_wad.h" #include "p_terrain.h" -#include "c_dispatch.h" #include "p_setup.h" #include "p_conversation.h" #include "dsectoreffect.h" #include "d_player.h" -#include "r_data/r_interpolate.h" #include "g_shared/a_sharedglobal.h" #include "po_man.h" #include "v_font.h" -#include "w_zip.h" #include "doomerrors.h" #include "v_text.h" #include "cmdlib.h" diff --git a/src/sound/i_music.cpp b/src/sound/i_music.cpp index 273ddb1152b..db8030bba26 100644 --- a/src/sound/i_music.cpp +++ b/src/sound/i_music.cpp @@ -35,32 +35,16 @@ #ifndef _WIN32 #include #include -#include -#include -#include -#include #include "mus2midi.h" #endif -#include -#include -#include #include #include "i_musicinterns.h" -#include "doomtype.h" #include "m_argv.h" -#include "i_music.h" #include "w_wad.h" -#include "c_console.h" #include "c_dispatch.h" -#include "i_system.h" -#include "i_sound.h" -#include "s_sound.h" -#include "m_swap.h" -#include "i_cd.h" #include "templates.h" -#include "m_misc.h" #include "stats.h" #include "timidity/timidity.h" #include "vm.h" diff --git a/src/sound/i_sound.cpp b/src/sound/i_sound.cpp index ac05783c531..1772d0c0de9 100644 --- a/src/sound/i_sound.cpp +++ b/src/sound/i_sound.cpp @@ -34,33 +34,18 @@ #include #include -#include #include "doomtype.h" -#include #include "oalsound.h" #include "mpg123_decoder.h" #include "sndfile_decoder.h" -#include "m_swap.h" -#include "stats.h" -#include "files.h" -#include "c_cvars.h" #include "c_dispatch.h" -#include "i_system.h" -#include "i_sound.h" #include "i_music.h" #include "m_argv.h" -#include "m_misc.h" -#include "w_wad.h" -#include "i_video.h" -#include "s_sound.h" #include "v_text.h" -#include "gi.h" - -#include "doomdef.h" EXTERN_CVAR (Float, snd_sfxvolume) CVAR (Int, snd_samplerate, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) diff --git a/src/sound/i_soundfont.cpp b/src/sound/i_soundfont.cpp index 3e30af74113..eb2027215f7 100644 --- a/src/sound/i_soundfont.cpp +++ b/src/sound/i_soundfont.cpp @@ -34,10 +34,8 @@ #include #include -#include #include "i_soundfont.h" #include "cmdlib.h" -#include "w_wad.h" #include "i_system.h" #include "gameconfigfile.h" #include "resourcefiles/resourcefile.h" diff --git a/src/sound/mididevices/music_adlmidi_mididevice.cpp b/src/sound/mididevices/music_adlmidi_mididevice.cpp index d878bfe1ff4..9025c47459f 100644 --- a/src/sound/mididevices/music_adlmidi_mididevice.cpp +++ b/src/sound/mididevices/music_adlmidi_mididevice.cpp @@ -35,13 +35,7 @@ // HEADER FILES ------------------------------------------------------------ #include "i_musicinterns.h" -#include "templates.h" -#include "doomdef.h" -#include "m_swap.h" -#include "w_wad.h" -#include "v_text.h" #include "adlmidi/adlmidi.h" -#include enum { diff --git a/src/sound/mididevices/music_fluidsynth_mididevice.cpp b/src/sound/mididevices/music_fluidsynth_mididevice.cpp index 9e3d9d4307c..9112e527abf 100644 --- a/src/sound/mididevices/music_fluidsynth_mididevice.cpp +++ b/src/sound/mididevices/music_fluidsynth_mididevice.cpp @@ -36,12 +36,7 @@ #include "i_musicinterns.h" #include "i_system.h" -#include "templates.h" -#include "doomdef.h" -#include "m_swap.h" -#include "w_wad.h" #include "v_text.h" -#include "version.h" #include "cmdlib.h" #include "i_soundfont.h" diff --git a/src/sound/mididevices/music_opl_mididevice.cpp b/src/sound/mididevices/music_opl_mididevice.cpp index 48aa8104f9f..f5a45ab233b 100644 --- a/src/sound/mididevices/music_opl_mididevice.cpp +++ b/src/sound/mididevices/music_opl_mididevice.cpp @@ -36,9 +36,6 @@ // HEADER FILES ------------------------------------------------------------ #include "i_musicinterns.h" -#include "templates.h" -#include "doomdef.h" -#include "m_swap.h" #include "w_wad.h" #include "v_text.h" #include "i_system.h" diff --git a/src/sound/mididevices/music_opldumper_mididevice.cpp b/src/sound/mididevices/music_opldumper_mididevice.cpp index 3519103e857..43f421c96f4 100644 --- a/src/sound/mididevices/music_opldumper_mididevice.cpp +++ b/src/sound/mididevices/music_opldumper_mididevice.cpp @@ -36,11 +36,7 @@ #include "i_musicinterns.h" #include "templates.h" -#include "doomdef.h" -#include "m_swap.h" -#include "w_wad.h" #include "opl.h" -#include "files.h" // MACROS ------------------------------------------------------------------ diff --git a/src/sound/mididevices/music_opnmidi_mididevice.cpp b/src/sound/mididevices/music_opnmidi_mididevice.cpp index f083ff63412..8c61ab9e7bd 100644 --- a/src/sound/mididevices/music_opnmidi_mididevice.cpp +++ b/src/sound/mididevices/music_opnmidi_mididevice.cpp @@ -35,14 +35,9 @@ // HEADER FILES ------------------------------------------------------------ #include "i_musicinterns.h" -#include "templates.h" -#include "doomdef.h" -#include "m_swap.h" #include "w_wad.h" -#include "v_text.h" #include "i_system.h" #include "opnmidi/opnmidi.h" -#include enum { diff --git a/src/sound/mididevices/music_softsynth_mididevice.cpp b/src/sound/mididevices/music_softsynth_mididevice.cpp index ccee4bd277e..46fcb59e1a9 100644 --- a/src/sound/mididevices/music_softsynth_mididevice.cpp +++ b/src/sound/mididevices/music_softsynth_mididevice.cpp @@ -36,10 +36,6 @@ #include "i_musicinterns.h" #include "templates.h" -#include "doomdef.h" -#include "m_swap.h" -#include "w_wad.h" -#include "v_text.h" #include "i_system.h" // MACROS ------------------------------------------------------------------ diff --git a/src/sound/mididevices/music_timidity_mididevice.cpp b/src/sound/mididevices/music_timidity_mididevice.cpp index 9f44d9eb81b..504fe8afe91 100644 --- a/src/sound/mididevices/music_timidity_mididevice.cpp +++ b/src/sound/mididevices/music_timidity_mididevice.cpp @@ -35,10 +35,6 @@ // HEADER FILES ------------------------------------------------------------ #include "i_musicinterns.h" -#include "templates.h" -#include "doomdef.h" -#include "m_swap.h" -#include "w_wad.h" #include "v_text.h" #include "timidity/timidity.h" diff --git a/src/sound/mididevices/music_timiditypp_mididevice.cpp b/src/sound/mididevices/music_timiditypp_mididevice.cpp index df91d1d44dc..d7025dbcf26 100644 --- a/src/sound/mididevices/music_timiditypp_mididevice.cpp +++ b/src/sound/mididevices/music_timiditypp_mididevice.cpp @@ -33,14 +33,8 @@ */ #include -#include #include "i_musicinterns.h" -#include "c_cvars.h" -#include "cmdlib.h" -#include "templates.h" -#include "version.h" -#include "m_misc.h" #include "v_text.h" #include "i_system.h" diff --git a/src/sound/mididevices/music_wavewriter_mididevice.cpp b/src/sound/mididevices/music_wavewriter_mididevice.cpp index 6bf585636b9..2fd23036350 100644 --- a/src/sound/mididevices/music_wavewriter_mididevice.cpp +++ b/src/sound/mididevices/music_wavewriter_mididevice.cpp @@ -36,12 +36,6 @@ // HEADER FILES ------------------------------------------------------------ #include "i_musicinterns.h" -#include "templates.h" -#include "doomdef.h" -#include "m_swap.h" -#include "w_wad.h" -#include "v_text.h" -#include "timidity/timidity.h" #include // MACROS ------------------------------------------------------------------ diff --git a/src/sound/mididevices/music_wildmidi_mididevice.cpp b/src/sound/mididevices/music_wildmidi_mididevice.cpp index fe3571389bc..ccb63ebf3f5 100644 --- a/src/sound/mididevices/music_wildmidi_mididevice.cpp +++ b/src/sound/mididevices/music_wildmidi_mididevice.cpp @@ -35,11 +35,6 @@ // HEADER FILES ------------------------------------------------------------ #include "i_musicinterns.h" -#include "templates.h" -#include "doomdef.h" -#include "m_swap.h" -#include "w_wad.h" -#include "v_text.h" #include "i_system.h" // MACROS ------------------------------------------------------------------ diff --git a/src/sound/midisources/midisource.cpp b/src/sound/midisources/midisource.cpp index acb09fd564b..a8e99214146 100644 --- a/src/sound/midisources/midisource.cpp +++ b/src/sound/midisources/midisource.cpp @@ -35,7 +35,6 @@ #include "i_musicinterns.h" -#include "midisource.h" char MIDI_EventLengths[7] = { 2, 2, 2, 2, 1, 1, 2 }; diff --git a/src/sound/midisources/midisource_hmi.cpp b/src/sound/midisources/midisource_hmi.cpp index 7b9276f1f66..0c555268c9f 100644 --- a/src/sound/midisources/midisource_hmi.cpp +++ b/src/sound/midisources/midisource_hmi.cpp @@ -36,10 +36,6 @@ #include "i_musicinterns.h" #include "templates.h" -#include "doomdef.h" -#include "m_swap.h" -#include "files.h" -#include "midisource.h" // MACROS ------------------------------------------------------------------ diff --git a/src/sound/midisources/midisource_mus.cpp b/src/sound/midisources/midisource_mus.cpp index f978b888f55..b41b9a23f29 100644 --- a/src/sound/midisources/midisource_mus.cpp +++ b/src/sound/midisources/midisource_mus.cpp @@ -35,10 +35,6 @@ #include "i_musicinterns.h" #include "templates.h" -#include "doomdef.h" -#include "m_swap.h" -#include "files.h" -#include "s_sound.h" // MACROS ------------------------------------------------------------------ diff --git a/src/sound/midisources/midisource_smf.cpp b/src/sound/midisources/midisource_smf.cpp index 5330d74d486..d7e8808f11d 100644 --- a/src/sound/midisources/midisource_smf.cpp +++ b/src/sound/midisources/midisource_smf.cpp @@ -38,10 +38,6 @@ // HEADER FILES ------------------------------------------------------------ #include "i_musicinterns.h" -#include "templates.h" -#include "doomdef.h" -#include "m_swap.h" -#include "files.h" // MACROS ------------------------------------------------------------------ diff --git a/src/sound/midisources/midisource_xmi.cpp b/src/sound/midisources/midisource_xmi.cpp index 3fbfdeb5db6..caad0897c98 100644 --- a/src/sound/midisources/midisource_xmi.cpp +++ b/src/sound/midisources/midisource_xmi.cpp @@ -35,10 +35,6 @@ // HEADER FILES ------------------------------------------------------------ #include "i_musicinterns.h" -#include "templates.h" -#include "doomdef.h" -#include "m_swap.h" -#include "files.h" // MACROS ------------------------------------------------------------------ diff --git a/src/sound/mpg123_decoder.cpp b/src/sound/mpg123_decoder.cpp index 716553c5218..ed13ea20d6a 100644 --- a/src/sound/mpg123_decoder.cpp +++ b/src/sound/mpg123_decoder.cpp @@ -32,7 +32,6 @@ */ #include "mpg123_decoder.h" -#include "files.h" #include "i_module.h" #include "cmdlib.h" diff --git a/src/sound/music_midi_base.cpp b/src/sound/music_midi_base.cpp index 90633bc533b..713475a3885 100644 --- a/src/sound/music_midi_base.cpp +++ b/src/sound/music_midi_base.cpp @@ -36,14 +36,7 @@ #include "i_musicinterns.h" #include "c_dispatch.h" -#include "i_music.h" -#include "i_system.h" -#include "gameconfigfile.h" -#include "cmdlib.h" -#include "m_misc.h" -#include "s_sound.h" -#include "templates.h" #include "v_text.h" #include "menu/menu.h" diff --git a/src/sound/musicformats/music_cd.cpp b/src/sound/musicformats/music_cd.cpp index 52de04a5766..58f1d1685d9 100644 --- a/src/sound/musicformats/music_cd.cpp +++ b/src/sound/musicformats/music_cd.cpp @@ -33,7 +33,6 @@ #include "i_musicinterns.h" #include "i_cd.h" -#include "files.h" void CDSong::Play (bool looping, int subsong) { diff --git a/src/sound/musicformats/music_dumb.cpp b/src/sound/musicformats/music_dumb.cpp index 19f76cb02b4..99974a1061d 100644 --- a/src/sound/musicformats/music_dumb.cpp +++ b/src/sound/musicformats/music_dumb.cpp @@ -37,14 +37,7 @@ #include #include "i_musicinterns.h" -#include "doomtype.h" -#include "doomdef.h" -#include "m_swap.h" -#include "m_fixed.h" -#include "c_cvars.h" -#include "i_sound.h" #include "i_system.h" -#include "files.h" #undef CDECL // w32api's windef.h defines this #include "../dumb/include/dumb.h" diff --git a/src/sound/musicformats/music_gme.cpp b/src/sound/musicformats/music_gme.cpp index b0dff3da1cc..0c1d6d230d4 100644 --- a/src/sound/musicformats/music_gme.cpp +++ b/src/sound/musicformats/music_gme.cpp @@ -38,11 +38,8 @@ //#define GME_DLL #include "i_musicinterns.h" -#include "c_cvars.h" -#include "critsec.h" #include #include "v_text.h" -#include "files.h" #include "templates.h" // MACROS ------------------------------------------------------------------ diff --git a/src/sound/musicformats/music_libsndfile.cpp b/src/sound/musicformats/music_libsndfile.cpp index 61be6b56c07..e4cd09a427c 100644 --- a/src/sound/musicformats/music_libsndfile.cpp +++ b/src/sound/musicformats/music_libsndfile.cpp @@ -35,8 +35,6 @@ // HEADER FILES ------------------------------------------------------------ #include "i_musicinterns.h" -#include "c_cvars.h" -#include "critsec.h" #include "v_text.h" #include "templates.h" #include "m_fixed.h" diff --git a/src/sound/musicformats/music_midistream.cpp b/src/sound/musicformats/music_midistream.cpp index 650d9f87cdf..c52f353398e 100644 --- a/src/sound/musicformats/music_midistream.cpp +++ b/src/sound/musicformats/music_midistream.cpp @@ -37,8 +37,6 @@ #include "i_musicinterns.h" #include "templates.h" -#include "doomdef.h" -#include "m_swap.h" #include "doomerrors.h" #include "v_text.h" diff --git a/src/sound/musicformats/music_opl.cpp b/src/sound/musicformats/music_opl.cpp index fe29bb145f3..f91b43aa6d4 100644 --- a/src/sound/musicformats/music_opl.cpp +++ b/src/sound/musicformats/music_opl.cpp @@ -32,7 +32,6 @@ */ #include "i_musicinterns.h" -#include "oplsynth/musicblock.h" #include "oplsynth/opl.h" static bool OPL_Active; diff --git a/src/sound/oalsound.cpp b/src/sound/oalsound.cpp index 391912162aa..4b494ed110a 100644 --- a/src/sound/oalsound.cpp +++ b/src/sound/oalsound.cpp @@ -33,20 +33,13 @@ */ #include -#include #include #include "doomstat.h" #include "templates.h" #include "oalsound.h" -#include "c_cvars.h" #include "c_dispatch.h" -#include "i_system.h" #include "v_text.h" -#include "gi.h" -#include "actor.h" -#include "r_state.h" -#include "w_wad.h" #include "i_module.h" #include "i_music.h" #include "i_musicinterns.h" diff --git a/src/sound/oplsynth/OPL3.cpp b/src/sound/oplsynth/OPL3.cpp index fee6080882b..291c2454224 100644 --- a/src/sound/oplsynth/OPL3.cpp +++ b/src/sound/oplsynth/OPL3.cpp @@ -44,7 +44,6 @@ */ #include -#include #include "doomtype.h" #include "opl.h" diff --git a/src/sound/oplsynth/dosbox/opl.cpp b/src/sound/oplsynth/dosbox/opl.cpp index 67fcefc0be9..4209fa2fe7c 100644 --- a/src/sound/oplsynth/dosbox/opl.cpp +++ b/src/sound/oplsynth/dosbox/opl.cpp @@ -26,7 +26,6 @@ #include "doomtype.h" #include "../opl.h" -#include "../musicblock.h" #include #include "m_random.h" diff --git a/src/sound/oplsynth/fmopl.cpp b/src/sound/oplsynth/fmopl.cpp index d50c0f329e7..a37cae27422 100644 --- a/src/sound/oplsynth/fmopl.cpp +++ b/src/sound/oplsynth/fmopl.cpp @@ -82,7 +82,6 @@ Revision History: #include #include #include -#include #include //#include "driver.h" /* use M.A.M.E. */ #include "opl.h" diff --git a/src/sound/oplsynth/musicblock.cpp b/src/sound/oplsynth/musicblock.cpp index daea5ea2d26..32254f67070 100644 --- a/src/sound/oplsynth/musicblock.cpp +++ b/src/sound/oplsynth/musicblock.cpp @@ -28,8 +28,6 @@ #include #include #include "musicblock.h" -#include "files.h" -#include "templates.h" #include "c_cvars.h" diff --git a/src/sound/oplsynth/opl_mus_player.cpp b/src/sound/oplsynth/opl_mus_player.cpp index 6cb33348e56..73b2d9bc64d 100644 --- a/src/sound/oplsynth/opl_mus_player.cpp +++ b/src/sound/oplsynth/opl_mus_player.cpp @@ -39,13 +39,10 @@ #include #include "opl_mus_player.h" -#include "doomtype.h" #include "opl.h" #include "w_wad.h" #include "templates.h" #include "c_cvars.h" -#include "i_system.h" -#include "stats.h" #define IMF_RATE 700.0 diff --git a/src/sound/sndfile_decoder.cpp b/src/sound/sndfile_decoder.cpp index f23ac23378a..28bf11374b4 100644 --- a/src/sound/sndfile_decoder.cpp +++ b/src/sound/sndfile_decoder.cpp @@ -32,8 +32,6 @@ */ #include "sndfile_decoder.h" #include "templates.h" -#include "files.h" -#include "xs_Float.h" #include "i_module.h" #include "cmdlib.h" diff --git a/src/sound/timidity/common.cpp b/src/sound/timidity/common.cpp index 953678424a6..02d10c7e8a0 100644 --- a/src/sound/timidity/common.cpp +++ b/src/sound/timidity/common.cpp @@ -23,14 +23,8 @@ #include #include -#include -#include #include "timidity.h" -#include "tarray.h" #include "i_system.h" -#include "w_wad.h" -#include "files.h" -#include "cmdlib.h" namespace Timidity { diff --git a/src/sound/timidity/instrum.cpp b/src/sound/timidity/instrum.cpp index 32ccd121ff3..a866412e1b3 100644 --- a/src/sound/timidity/instrum.cpp +++ b/src/sound/timidity/instrum.cpp @@ -30,8 +30,6 @@ #include #include "timidity.h" -#include "m_swap.h" -#include "files.h" #include "templates.h" #include "gf1patch.h" #include "i_soundfont.h" diff --git a/src/sound/timidity/instrum_dls.cpp b/src/sound/timidity/instrum_dls.cpp index 4f553ff5fd1..bc6b5b5d27c 100644 --- a/src/sound/timidity/instrum_dls.cpp +++ b/src/sound/timidity/instrum_dls.cpp @@ -27,7 +27,6 @@ #include "timidity.h" #include "doomdef.h" -#include "m_swap.h" #define __Sound_SetError(x) diff --git a/src/sound/timidity/instrum_font.cpp b/src/sound/timidity/instrum_font.cpp index 22fd5d50dac..f1ceb0b1bef 100644 --- a/src/sound/timidity/instrum_font.cpp +++ b/src/sound/timidity/instrum_font.cpp @@ -1,14 +1,9 @@ #include #include -#include #include -#include "doomdef.h" -#include "m_swap.h" -#include "templates.h" #include "timidity.h" #include "sf2.h" -#include "files.h" #include "i_soundfont.h" namespace Timidity diff --git a/src/sound/timidity/instrum_sf2.cpp b/src/sound/timidity/instrum_sf2.cpp index dd7f8dd617b..3f50f15750d 100644 --- a/src/sound/timidity/instrum_sf2.cpp +++ b/src/sound/timidity/instrum_sf2.cpp @@ -9,7 +9,6 @@ #include "templates.h" #include "timidity.h" #include "sf2.h" -#include "files.h" #include "i_soundfont.h" namespace Timidity diff --git a/src/sound/timidity/mix.cpp b/src/sound/timidity/mix.cpp index e09a15ba0ec..b2d23839cfc 100644 --- a/src/sound/timidity/mix.cpp +++ b/src/sound/timidity/mix.cpp @@ -26,8 +26,6 @@ #include #include "timidity.h" -#include "templates.h" -#include "c_cvars.h" namespace Timidity { diff --git a/src/sound/timidity/playmidi.cpp b/src/sound/timidity/playmidi.cpp index f8df539fa0e..835f4e30664 100644 --- a/src/sound/timidity/playmidi.cpp +++ b/src/sound/timidity/playmidi.cpp @@ -27,7 +27,6 @@ #include #include "timidity.h" -#include "c_cvars.h" namespace Timidity { diff --git a/src/sound/timidity/resample.cpp b/src/sound/timidity/resample.cpp index bd45271e129..254a7d06088 100644 --- a/src/sound/timidity/resample.cpp +++ b/src/sound/timidity/resample.cpp @@ -26,7 +26,6 @@ #include #include "timidity.h" -#include "c_cvars.h" namespace Timidity { diff --git a/src/sound/timiditypp/common.cpp b/src/sound/timiditypp/common.cpp index 77df91798aa..f6c8bbea033 100644 --- a/src/sound/timiditypp/common.cpp +++ b/src/sound/timiditypp/common.cpp @@ -23,14 +23,11 @@ #include #include -#include -#include #include #include #include "m_random.h" #include "common.h" -#include "cmdlib.h" namespace TimidityPlus { diff --git a/src/sound/timiditypp/configfile.cpp b/src/sound/timiditypp/configfile.cpp index 1344a9cd6c3..8f7a57509dc 100644 --- a/src/sound/timiditypp/configfile.cpp +++ b/src/sound/timiditypp/configfile.cpp @@ -22,17 +22,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include #include -#include - -#include - #include "timidity.h" #include "common.h" #include "instrum.h" #include "quantity.h" #include "cmdlib.h" -#include "i_soundfont.h" - namespace TimidityPlus diff --git a/src/sound/timiditypp/filter.cpp b/src/sound/timiditypp/filter.cpp index 7e3cb37ea97..1e82de4c58b 100644 --- a/src/sound/timiditypp/filter.cpp +++ b/src/sound/timiditypp/filter.cpp @@ -34,9 +34,7 @@ #include #include -#include "timidity.h" #include "common.h" -#include "instrum.h" #include "filter.h" namespace TimidityPlus diff --git a/src/sound/timiditypp/instrum.cpp b/src/sound/timiditypp/instrum.cpp index ddd0d8fab2c..554f01317dc 100644 --- a/src/sound/timiditypp/instrum.cpp +++ b/src/sound/timiditypp/instrum.cpp @@ -36,7 +36,6 @@ #include "filter.h" #include "quantity.h" #include "freq.h" -#include "i_soundfont.h" namespace TimidityPlus { diff --git a/src/sound/timiditypp/quantity.cpp b/src/sound/timiditypp/quantity.cpp index 8cded87f064..ea814006cdb 100644 --- a/src/sound/timiditypp/quantity.cpp +++ b/src/sound/timiditypp/quantity.cpp @@ -29,7 +29,6 @@ #include "timidity.h" #include "common.h" #include "instrum.h" -#include "playmidi.h" #include "tables.h" #include "quantity.h" diff --git a/src/sound/timiditypp/readmidic.cpp b/src/sound/timiditypp/readmidic.cpp index 14e07a8bdcb..eb1caf11adf 100644 --- a/src/sound/timiditypp/readmidic.cpp +++ b/src/sound/timiditypp/readmidic.cpp @@ -20,8 +20,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include #include -#include -#include #include "timidity.h" #include "instrum.h" diff --git a/src/sound/timiditypp/recache.cpp b/src/sound/timiditypp/recache.cpp index dcb15ca383b..28ac876766c 100644 --- a/src/sound/timiditypp/recache.cpp +++ b/src/sound/timiditypp/recache.cpp @@ -32,7 +32,6 @@ #include "instrum.h" #include "playmidi.h" #include "tables.h" -#include "mblock.h" #include "recache.h" #include "resample.h" diff --git a/src/sound/timiditypp/resample.cpp b/src/sound/timiditypp/resample.cpp index 90824ed5520..3c6f9686704 100644 --- a/src/sound/timiditypp/resample.cpp +++ b/src/sound/timiditypp/resample.cpp @@ -24,8 +24,6 @@ #include #include -#include - #include "timidity.h" #include "common.h" #include "instrum.h" diff --git a/src/sound/timiditypp/reverb.cpp b/src/sound/timiditypp/reverb.cpp index ae740114345..69b6f2959b5 100644 --- a/src/sound/timiditypp/reverb.cpp +++ b/src/sound/timiditypp/reverb.cpp @@ -35,8 +35,6 @@ #include "common.h" #include "reverb.h" #include "optcode.h" -#include -#include namespace TimidityPlus { diff --git a/src/sound/timiditypp/sbkconv.cpp b/src/sound/timiditypp/sbkconv.cpp index e2a81bcec4f..1b93a431ea9 100644 --- a/src/sound/timiditypp/sbkconv.cpp +++ b/src/sound/timiditypp/sbkconv.cpp @@ -40,9 +40,7 @@ #include #include -#include "timidity.h" #include "common.h" -#include "sffile.h" #include "sfitem.h" diff --git a/src/sound/timiditypp/sfitem.cpp b/src/sound/timiditypp/sfitem.cpp index fc7d55e6919..1e2e5cbfdde 100644 --- a/src/sound/timiditypp/sfitem.cpp +++ b/src/sound/timiditypp/sfitem.cpp @@ -23,10 +23,7 @@ * soundfont generator table definition *================================================================*/ -#include #include -#include "timidity.h" -#include "common.h" #include "sflayer.h" #include "sfitem.h" diff --git a/src/sound/timiditypp/sndfont.cpp b/src/sound/timiditypp/sndfont.cpp index b7bf005110e..62ea2f6e676 100644 --- a/src/sound/timiditypp/sndfont.cpp +++ b/src/sound/timiditypp/sndfont.cpp @@ -38,9 +38,6 @@ #include "tables.h" #include "instrum.h" #include "playmidi.h" -#include "sffile.h" -#include "sflayer.h" -#include "sfitem.h" #include "filter.h" #include "freq.h" #include "resample.h" diff --git a/src/sound/timiditypp/tables.cpp b/src/sound/timiditypp/tables.cpp index 66e95a66746..504579df979 100644 --- a/src/sound/timiditypp/tables.cpp +++ b/src/sound/timiditypp/tables.cpp @@ -30,7 +30,6 @@ #include #include #include "timidity.h" -#include "common.h" #include "tables.h" #include "instrum.h" diff --git a/src/sound/wildmidi/file_io.cpp b/src/sound/wildmidi/file_io.cpp index b1d3d2dd5ea..723359856d5 100644 --- a/src/sound/wildmidi/file_io.cpp +++ b/src/sound/wildmidi/file_io.cpp @@ -39,7 +39,6 @@ #include "files.h" #include "wm_error.h" #include "file_io.h" -#include "cmdlib.h" #include "i_soundfont.h" std::unique_ptr wm_sfreader; diff --git a/src/sound/wildmidi/wildmidi_lib.cpp b/src/sound/wildmidi/wildmidi_lib.cpp index 8bcaa9d3d77..b505d098292 100644 --- a/src/sound/wildmidi/wildmidi_lib.cpp +++ b/src/sound/wildmidi/wildmidi_lib.cpp @@ -32,16 +32,9 @@ #include #include #ifndef _WIN32 -#include #include -#include #endif -#include -#include #include -#include -#include -#include #include #include "common.h" diff --git a/src/statistics.cpp b/src/statistics.cpp index 447352f8629..0a3aeadeaa5 100644 --- a/src/statistics.cpp +++ b/src/statistics.cpp @@ -41,38 +41,23 @@ #include "g_level.h" #include "gstrings.h" #include "doomstat.h" -#include "configfile.h" #include "c_dispatch.h" -#include "c_console.h" -#include "d_gui.h" -#include "d_dehacked.h" #include "d_net.h" #include "g_game.h" #include "m_png.h" -#include "m_misc.h" #include "doomerrors.h" #include "w_wad.h" -#include "hu_stuff.h" #include "p_local.h" -#include "m_png.h" #include "p_setup.h" #include "s_sound.h" -#include "wi_stuff.h" -#include "sc_man.h" #include "cmdlib.h" #include "p_terrain.h" #include "decallib.h" -#include "autosegs.h" -#include "i_cd.h" #include "stats.h" #include "a_sharedglobal.h" -#include "v_text.h" -#include "r_sky.h" #include "p_lnspec.h" -#include "m_crc32.h" #include "serializer.h" #include "g_levellocals.h" -#include "files.h" CVAR(Int, savestatistics, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR(String, statfile, "zdoomstat.txt", CVAR_ARCHIVE|CVAR_GLOBALCONFIG) diff --git a/src/stats.cpp b/src/stats.cpp index d4c1d37dfa7..82b120bb2ef 100644 --- a/src/stats.cpp +++ b/src/stats.cpp @@ -36,11 +36,7 @@ #include "stats.h" #include "v_video.h" #include "v_text.h" -#include "hu_stuff.h" -#include "st_stuff.h" #include "c_dispatch.h" -#include "m_swap.h" -#include "sbar.h" FStat *FStat::FirstStat; diff --git a/src/stringtable.cpp b/src/stringtable.cpp index 549af499f2f..fc5e7ea8afa 100644 --- a/src/stringtable.cpp +++ b/src/stringtable.cpp @@ -33,11 +33,9 @@ */ #include -#include #include "stringtable.h" #include "cmdlib.h" -#include "m_swap.h" #include "w_wad.h" #include "i_system.h" #include "sc_man.h" @@ -109,7 +107,6 @@ void FStringTable::FreeNonDehackedStrings () } } -#include "doomerrors.h" void FStringTable::LoadStrings (bool enuOnly) { int lastlump, lump; diff --git a/src/strnatcmp.c b/src/strnatcmp.c index fb8636d87a5..58fa5571ab0 100644 --- a/src/strnatcmp.c +++ b/src/strnatcmp.c @@ -31,9 +31,7 @@ */ #include -#include #include -#include #include "strnatcmp.h" diff --git a/src/textures/anim_switches.cpp b/src/textures/anim_switches.cpp index ab53210fe09..160316c22de 100644 --- a/src/textures/anim_switches.cpp +++ b/src/textures/anim_switches.cpp @@ -34,10 +34,7 @@ #include "templates.h" #include "textures/textures.h" -#include "doomdef.h" -#include "g_game.h" #include "s_sound.h" -#include "doomstat.h" #include "r_state.h" #include "w_wad.h" #include "cmdlib.h" diff --git a/src/textures/animations.cpp b/src/textures/animations.cpp index e250e1b5c45..b2c0e3e5624 100644 --- a/src/textures/animations.cpp +++ b/src/textures/animations.cpp @@ -39,10 +39,7 @@ #include "m_random.h" #include "d_player.h" #include "p_spec.h" -#include "sc_man.h" -#include "templates.h" #include "w_wad.h" -#include "g_level.h" #include "serializer.h" // MACROS ------------------------------------------------------------------ diff --git a/src/textures/bitmap.cpp b/src/textures/bitmap.cpp index 33cfe2141bf..aee21372a26 100644 --- a/src/textures/bitmap.cpp +++ b/src/textures/bitmap.cpp @@ -33,9 +33,7 @@ */ #include "bitmap.h" -#include "templates.h" #include "r_data/r_translate.h" -#include "v_palette.h" #include "r_data/colormaps.h" diff --git a/src/textures/formats/automaptexture.cpp b/src/textures/formats/automaptexture.cpp index 294548f2d47..4d6ddfeaf02 100644 --- a/src/textures/formats/automaptexture.cpp +++ b/src/textures/formats/automaptexture.cpp @@ -38,7 +38,6 @@ #include "doomtype.h" #include "files.h" #include "w_wad.h" -#include "v_palette.h" #include "textures/textures.h" //========================================================================== diff --git a/src/textures/formats/backdroptexture.cpp b/src/textures/formats/backdroptexture.cpp index 9d9049fae12..e357c7830f6 100644 --- a/src/textures/formats/backdroptexture.cpp +++ b/src/textures/formats/backdroptexture.cpp @@ -36,18 +36,8 @@ #include "doomtype.h" #include "doomstat.h" #include "d_player.h" -#include "templates.h" #include "menu/menu.h" -#include "colormatcher.h" -#include "textures/textures.h" #include "w_wad.h" -#include "v_font.h" -#include "v_video.h" -#include "g_level.h" -#include "gi.h" -#include "r_defs.h" -#include "r_state.h" -#include "r_data/r_translate.h" //============================================================================= diff --git a/src/textures/formats/brightmaptexture.cpp b/src/textures/formats/brightmaptexture.cpp index feec1e422b5..7b3dae3a698 100644 --- a/src/textures/formats/brightmaptexture.cpp +++ b/src/textures/formats/brightmaptexture.cpp @@ -34,18 +34,11 @@ */ #include "doomtype.h" -#include "files.h" #include "w_wad.h" -#include "templates.h" #include "i_system.h" #include "r_data/r_translate.h" #include "bitmap.h" -#include "colormatcher.h" -#include "c_dispatch.h" #include "v_video.h" -#include "m_fixed.h" -#include "textures/textures.h" -#include "v_palette.h" class FBrightmapTexture : public FWorldTexture { diff --git a/src/textures/formats/buildtexture.cpp b/src/textures/formats/buildtexture.cpp index bc54a22ea64..3df85f90b11 100644 --- a/src/textures/formats/buildtexture.cpp +++ b/src/textures/formats/buildtexture.cpp @@ -39,12 +39,10 @@ #include "w_wad.h" #include "templates.h" #include "cmdlib.h" -#include "st_start.h" #include "colormatcher.h" #include "bitmap.h" #include "textures/textures.h" #include "r_data/sprites.h" -#include "r_data/r_translate.h" #include "resourcefiles/resourcefile.h" diff --git a/src/textures/formats/canvastexture.cpp b/src/textures/formats/canvastexture.cpp index f207593f061..2cb8b807fbe 100644 --- a/src/textures/formats/canvastexture.cpp +++ b/src/textures/formats/canvastexture.cpp @@ -34,10 +34,7 @@ */ #include "doomtype.h" -#include "files.h" -#include "v_palette.h" #include "v_video.h" -#include "textures/textures.h" FCanvasTexture::FCanvasTexture (const char *name, int width, int height) { diff --git a/src/textures/formats/ddstexture.cpp b/src/textures/formats/ddstexture.cpp index a7ed9854740..c0988bec7dd 100644 --- a/src/textures/formats/ddstexture.cpp +++ b/src/textures/formats/ddstexture.cpp @@ -51,10 +51,8 @@ #include "doomtype.h" #include "files.h" #include "w_wad.h" -#include "templates.h" #include "bitmap.h" #include "v_video.h" -#include "textures/textures.h" // Since we want this to compile under Linux too, we need to define this // stuff ourselves instead of including a DirectX header. diff --git a/src/textures/formats/flattexture.cpp b/src/textures/formats/flattexture.cpp index d3506b25010..1d2a47e565b 100644 --- a/src/textures/formats/flattexture.cpp +++ b/src/textures/formats/flattexture.cpp @@ -36,7 +36,6 @@ #include "doomtype.h" #include "files.h" #include "w_wad.h" -#include "v_palette.h" #include "textures/textures.h" //========================================================================== diff --git a/src/textures/formats/imgztexture.cpp b/src/textures/formats/imgztexture.cpp index b2cc67baaad..b01de82a609 100644 --- a/src/textures/formats/imgztexture.cpp +++ b/src/textures/formats/imgztexture.cpp @@ -36,11 +36,8 @@ #include "doomtype.h" #include "files.h" #include "w_wad.h" -#include "v_palette.h" #include "v_video.h" #include "bitmap.h" -#include "textures/textures.h" -#include "r_data/r_translate.h" bool checkIMGZPalette(FileReader &file); diff --git a/src/textures/formats/jpegtexture.cpp b/src/textures/formats/jpegtexture.cpp index 1bb05265b93..f3f626622c4 100644 --- a/src/textures/formats/jpegtexture.cpp +++ b/src/textures/formats/jpegtexture.cpp @@ -45,7 +45,6 @@ extern "C" #include "v_text.h" #include "bitmap.h" #include "v_video.h" -#include "textures/textures.h" struct FLumpSourceMgr : public jpeg_source_mgr diff --git a/src/textures/formats/multipatchtexture.cpp b/src/textures/formats/multipatchtexture.cpp index 9cb93cfcb2e..adbca13aa8b 100644 --- a/src/textures/formats/multipatchtexture.cpp +++ b/src/textures/formats/multipatchtexture.cpp @@ -49,9 +49,6 @@ #include "v_video.h" #include "v_text.h" #include "cmdlib.h" -#include "m_fixed.h" -#include "textures/textures.h" -#include "r_data/colormaps.h" // On the Alpha, accessing the shorts directly if they aren't aligned on a // 4-byte boundary causes unaligned access warnings. Why it does this at diff --git a/src/textures/formats/patchtexture.cpp b/src/textures/formats/patchtexture.cpp index 8b9045c0e73..2fe928b059d 100644 --- a/src/textures/formats/patchtexture.cpp +++ b/src/textures/formats/patchtexture.cpp @@ -36,12 +36,9 @@ #include "doomtype.h" #include "files.h" #include "w_wad.h" -#include "templates.h" #include "v_palette.h" #include "v_video.h" #include "bitmap.h" -#include "textures/textures.h" -#include "r_data/r_translate.h" // posts are runs of non masked source pixels diff --git a/src/textures/formats/pcxtexture.cpp b/src/textures/formats/pcxtexture.cpp index 40c58d0c0d8..4f797231221 100644 --- a/src/textures/formats/pcxtexture.cpp +++ b/src/textures/formats/pcxtexture.cpp @@ -37,11 +37,8 @@ #include "doomtype.h" #include "files.h" #include "w_wad.h" -#include "templates.h" #include "bitmap.h" -#include "colormatcher.h" #include "v_video.h" -#include "textures/textures.h" //========================================================================== // diff --git a/src/textures/formats/pngtexture.cpp b/src/textures/formats/pngtexture.cpp index 71f906899f2..bdb232c0c39 100644 --- a/src/textures/formats/pngtexture.cpp +++ b/src/textures/formats/pngtexture.cpp @@ -39,8 +39,6 @@ #include "templates.h" #include "m_png.h" #include "bitmap.h" -#include "v_palette.h" -#include "textures/textures.h" //========================================================================== // diff --git a/src/textures/formats/rawpagetexture.cpp b/src/textures/formats/rawpagetexture.cpp index 9a311b10f56..d2beade8391 100644 --- a/src/textures/formats/rawpagetexture.cpp +++ b/src/textures/formats/rawpagetexture.cpp @@ -36,7 +36,6 @@ #include "doomtype.h" #include "files.h" #include "w_wad.h" -#include "v_palette.h" #include "gi.h" #include "bitmap.h" #include "textures/textures.h" diff --git a/src/textures/formats/shadertexture.cpp b/src/textures/formats/shadertexture.cpp index cb42f25b880..1b1ab5c6ff0 100644 --- a/src/textures/formats/shadertexture.cpp +++ b/src/textures/formats/shadertexture.cpp @@ -35,21 +35,9 @@ */ #include "doomtype.h" -#include "doomstat.h" #include "d_player.h" -#include "templates.h" #include "menu/menu.h" -#include "colormatcher.h" -#include "textures/textures.h" #include "w_wad.h" -#include "v_font.h" -#include "v_video.h" -#include "g_level.h" -#include "gi.h" -#include "r_defs.h" -#include "r_state.h" -#include "r_data/r_translate.h" -#include "r_data/renderstyle.h" #include "bitmap.h" diff --git a/src/textures/formats/tgatexture.cpp b/src/textures/formats/tgatexture.cpp index 2b0aa16e6b6..36e0144ab00 100644 --- a/src/textures/formats/tgatexture.cpp +++ b/src/textures/formats/tgatexture.cpp @@ -38,9 +38,7 @@ #include "w_wad.h" #include "templates.h" #include "bitmap.h" -#include "colormatcher.h" #include "v_video.h" -#include "textures/textures.h" //========================================================================== diff --git a/src/textures/formats/warptexture.cpp b/src/textures/formats/warptexture.cpp index d78bc524981..3a5323b3dff 100644 --- a/src/textures/formats/warptexture.cpp +++ b/src/textures/formats/warptexture.cpp @@ -34,12 +34,9 @@ */ #include "doomtype.h" -#include "files.h" -#include "templates.h" #include "r_utility.h" #include "textures/textures.h" #include "warpbuffer.h" -#include "v_palette.h" #include "v_video.h" diff --git a/src/textures/hires/hirestex.cpp b/src/textures/hires/hirestex.cpp index 54d5a4c7571..c5aed162430 100644 --- a/src/textures/hires/hirestex.cpp +++ b/src/textures/hires/hirestex.cpp @@ -29,12 +29,7 @@ #include "sbar.h" #include "gi.h" #include "cmdlib.h" -#include "sc_man.h" -#include "doomstat.h" -#include "d_main.h" -#include "zstring.h" #include "bitmap.h" -#include "textures.h" #ifndef _WIN32 #include diff --git a/src/textures/hires/hqnx_asm/hq4x_asm.cpp b/src/textures/hires/hqnx_asm/hq4x_asm.cpp index 34a47440552..7ce8a162123 100644 --- a/src/textures/hires/hqnx_asm/hq4x_asm.cpp +++ b/src/textures/hires/hqnx_asm/hq4x_asm.cpp @@ -18,9 +18,6 @@ //Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -#include -#include -#include #include "hqnx_asm.h" namespace HQnX_asm diff --git a/src/textures/hires/hqresize.cpp b/src/textures/hires/hqresize.cpp index c2cba11ece8..3061726f345 100644 --- a/src/textures/hires/hqresize.cpp +++ b/src/textures/hires/hqresize.cpp @@ -37,7 +37,6 @@ #include "gl/system/gl_system.h" #include "gl/system/gl_interface.h" #include "gl/renderer/gl_renderer.h" -#include "c_cvars.h" #include "hqnx/hqx.h" #ifdef HAVE_MMX #include "hqnx_asm/hqnx_asm.h" diff --git a/src/textures/skyboxtexture.cpp b/src/textures/skyboxtexture.cpp index 943b1f44281..36581553c93 100644 --- a/src/textures/skyboxtexture.cpp +++ b/src/textures/skyboxtexture.cpp @@ -21,7 +21,6 @@ // #include "doomtype.h" -#include "sc_man.h" #include "w_wad.h" #include "textures.h" #include "skyboxtexture.h" diff --git a/src/textures/texture.cpp b/src/textures/texture.cpp index bf04fa86a6d..1a5d92192df 100644 --- a/src/textures/texture.cpp +++ b/src/textures/texture.cpp @@ -45,8 +45,6 @@ #include "c_dispatch.h" #include "v_video.h" #include "m_fixed.h" -#include "textures/textures.h" -#include "v_palette.h" FTexture *CreateBrightmapTexture(FTexture*); diff --git a/src/textures/texturemanager.cpp b/src/textures/texturemanager.cpp index c7dc35fd379..9cc70161a2d 100644 --- a/src/textures/texturemanager.cpp +++ b/src/textures/texturemanager.cpp @@ -48,11 +48,9 @@ #include "st_start.h" #include "cmdlib.h" #include "g_level.h" -#include "m_fixed.h" #include "v_video.h" #include "r_renderer.h" #include "r_sky.h" -#include "textures/textures.h" #include "vm.h" FTextureManager TexMan; diff --git a/src/umapinfo.cpp b/src/umapinfo.cpp index 745cdb94e2c..d7997a08343 100644 --- a/src/umapinfo.cpp +++ b/src/umapinfo.cpp @@ -19,11 +19,8 @@ #include #include -#include -#include #include "w_wad.h" #include "g_level.h" -#include "sc_man.h" #include "r_defs.h" #include "p_setup.h" #include "gi.h" diff --git a/src/v_blend.cpp b/src/v_blend.cpp index 7ea4a4fdfaa..e077ef827b3 100644 --- a/src/v_blend.cpp +++ b/src/v_blend.cpp @@ -38,18 +38,9 @@ #include "sbar.h" #include "c_cvars.h" #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 "g_levellocals.h" diff --git a/src/v_collection.cpp b/src/v_collection.cpp index 418f7e1ea3c..95f35097ad5 100644 --- a/src/v_collection.cpp +++ b/src/v_collection.cpp @@ -35,9 +35,7 @@ #include "v_collection.h" #include "v_font.h" #include "v_video.h" -#include "m_swap.h" #include "w_wad.h" -#include "textures.h" FImageCollection::FImageCollection () { diff --git a/src/v_draw.cpp b/src/v_draw.cpp index ae402e02c9f..693c2b868ef 100644 --- a/src/v_draw.cpp +++ b/src/v_draw.cpp @@ -37,26 +37,16 @@ #include "doomtype.h" #include "v_video.h" -#include "m_swap.h" #include "r_defs.h" #include "r_utility.h" #include "r_renderer.h" -#include "r_data/r_translate.h" #include "doomstat.h" -#include "v_palette.h" #include "gi.h" #include "g_level.h" -#include "st_stuff.h" #include "sbar.h" -#include "i_system.h" #include "i_video.h" -#include "templates.h" -#include "d_net.h" -#include "colormatcher.h" -#include "r_data/colormaps.h" #include "g_levellocals.h" -#include "textures.h" #include "vm.h" CUSTOM_CVAR(Int, uiscale, 0, CVAR_ARCHIVE | CVAR_NOINITCALL) diff --git a/src/v_font.cpp b/src/v_font.cpp index f352e06acd5..d9e624270ea 100644 --- a/src/v_font.cpp +++ b/src/v_font.cpp @@ -74,10 +74,8 @@ The FON2 header is followed by variable length data: // HEADER FILES ------------------------------------------------------------ #include -#include #include #include -#include #include "templates.h" #include "doomtype.h" @@ -85,15 +83,10 @@ The FON2 header is followed by variable length data: #include "v_font.h" #include "v_video.h" #include "w_wad.h" -#include "i_system.h" #include "gi.h" #include "cmdlib.h" #include "sc_man.h" #include "hu_stuff.h" -#include "textures/textures.h" -#include "r_data/r_translate.h" -#include "colormatcher.h" -#include "v_palette.h" #include "v_text.h" #include "vm.h" diff --git a/src/v_palette.cpp b/src/v_palette.cpp index 654526a2055..6d1114f912f 100644 --- a/src/v_palette.cpp +++ b/src/v_palette.cpp @@ -34,31 +34,20 @@ #include "g_level.h" -#include -#include -#include -#include #ifdef _WIN32 #include #else -#include #define O_BINARY 0 #endif -#include #include "templates.h" #include "v_video.h" -#include "i_system.h" #include "w_wad.h" #include "i_video.h" #include "c_dispatch.h" #include "st_stuff.h" -#include "gi.h" #include "x86.h" -#include "colormatcher.h" -#include "v_palette.h" #include "g_levellocals.h" -#include "r_data/colormaps.h" FPalette GPalette; FColorMatcher ColorMatcher; diff --git a/src/v_pfx.cpp b/src/v_pfx.cpp index 292ede574b2..884a9c7a416 100644 --- a/src/v_pfx.cpp +++ b/src/v_pfx.cpp @@ -34,7 +34,6 @@ #include "doomtype.h" #include "i_system.h" -#include "v_palette.h" #include "v_pfx.h" PfxUnion GPfxPal; diff --git a/src/v_text.cpp b/src/v_text.cpp index e0553ef0171..30d8972fb96 100644 --- a/src/v_text.cpp +++ b/src/v_text.cpp @@ -41,12 +41,8 @@ #include "i_system.h" #include "v_video.h" -#include "hu_stuff.h" #include "w_wad.h" -#include "m_swap.h" -#include "doomstat.h" -#include "templates.h" #include "gstrings.h" #include "vm.h" diff --git a/src/v_video.cpp b/src/v_video.cpp index 49862625f66..b6d8a1213cb 100644 --- a/src/v_video.cpp +++ b/src/v_video.cpp @@ -47,41 +47,27 @@ #include "i_video.h" #include "r_state.h" -#include "doomdef.h" -#include "doomdata.h" #include "doomstat.h" #include "c_console.h" #include "hu_stuff.h" #include "m_argv.h" -#include "m_bbox.h" -#include "m_swap.h" -#include "i_video.h" #include "v_video.h" #include "v_text.h" #include "sc_man.h" #include "w_wad.h" -#include "c_cvars.h" #include "c_dispatch.h" #include "cmdlib.h" -#include "gi.h" -#include "templates.h" #include "sbar.h" #include "hardware.h" -#include "r_data/r_translate.h" -#include "f_wipe.h" #include "m_png.h" -#include "colormatcher.h" -#include "v_palette.h" -#include "r_sky.h" #include "r_utility.h" #include "r_renderer.h" #include "menu/menu.h" -#include "r_data/voxels.h" #include "vm.h" #include "r_videoscale.h" #include "i_time.h" diff --git a/src/w_wad.cpp b/src/w_wad.cpp index 0976f5ed779..41b57811da2 100644 --- a/src/w_wad.cpp +++ b/src/w_wad.cpp @@ -38,22 +38,16 @@ #include #include -#include -#include #include #include "doomtype.h" #include "m_argv.h" -#include "i_system.h" #include "cmdlib.h" #include "c_dispatch.h" #include "w_wad.h" -#include "w_zip.h" #include "m_crc32.h" #include "v_text.h" -#include "templates.h" #include "gi.h" -#include "doomerrors.h" #include "resourcefiles/resourcefile.h" #include "md5.h" #include "doomstat.h" diff --git a/src/wi_stuff.cpp b/src/wi_stuff.cpp index 1c2530646f5..2fba4a33d1d 100644 --- a/src/wi_stuff.cpp +++ b/src/wi_stuff.cpp @@ -39,27 +39,18 @@ #include "m_swap.h" #include "i_system.h" #include "w_wad.h" -#include "g_game.h" #include "g_level.h" #include "s_sound.h" #include "doomstat.h" #include "v_video.h" #include "i_video.h" #include "wi_stuff.h" -#include "c_console.h" #include "hu_stuff.h" -#include "v_palette.h" #include "s_sndseq.h" -#include "sc_man.h" #include "v_text.h" #include "gi.h" #include "d_player.h" #include "d_netinf.h" -#include "b_bot.h" -#include "textures/textures.h" -#include "r_data/r_translate.h" -#include "templates.h" -#include "gstrings.h" #include "cmdlib.h" #include "g_levellocals.h" #include "vm.h" diff --git a/src/win32/hardware.cpp b/src/win32/hardware.cpp index 4c7f4377962..f79e6276c9f 100644 --- a/src/win32/hardware.cpp +++ b/src/win32/hardware.cpp @@ -36,10 +36,6 @@ #include #include "hardware.h" -#include "i_video.h" -#include "i_system.h" -#include "c_console.h" -#include "c_cvars.h" #include "c_dispatch.h" #include "v_text.h" #include "doomstat.h" diff --git a/src/win32/i_cd.cpp b/src/win32/i_cd.cpp index 12a673eb905..f6139e96f12 100644 --- a/src/win32/i_cd.cpp +++ b/src/win32/i_cd.cpp @@ -36,14 +36,11 @@ #define WIN32_LEAN_AND_MEAN #include #include -#include #include #include "doomtype.h" #include "c_cvars.h" -#include "c_dispatch.h" #include "m_argv.h" -#include "i_system.h" #include "version.h" #include "i_cd.h" diff --git a/src/win32/i_crash.cpp b/src/win32/i_crash.cpp index ac033d92151..9eeb92c3b41 100644 --- a/src/win32/i_crash.cpp +++ b/src/win32/i_crash.cpp @@ -37,9 +37,7 @@ #define WIN32_LEAN_AND_MEAN #define _WIN32_WINNT 0x0501 #include -#include #include -#include #include #ifndef _M_IX86 #include @@ -55,22 +53,14 @@ #endif #include #include -#include -#include -#include #include #include -#include -#include #include "doomtype.h" #include "resource.h" #include "version.h" #include "m_swap.h" -#include -#include -#include #include #include diff --git a/src/win32/i_dijoy.cpp b/src/win32/i_dijoy.cpp index 3dc978c4a98..1736aa7254c 100644 --- a/src/win32/i_dijoy.cpp +++ b/src/win32/i_dijoy.cpp @@ -45,14 +45,7 @@ #include #include "i_input.h" -#include "i_system.h" #include "d_event.h" -#include "d_gui.h" -#include "c_cvars.h" -#include "c_dispatch.h" -#include "doomdef.h" -#include "doomstat.h" -#include "hardware.h" #include "templates.h" #include "gameconfigfile.h" #include "cmdlib.h" diff --git a/src/win32/i_input.cpp b/src/win32/i_input.cpp index e6653f51264..050e32a8b45 100644 --- a/src/win32/i_input.cpp +++ b/src/win32/i_input.cpp @@ -46,16 +46,10 @@ #define INITGUID #endif #include -#include #include #include #include -#include -#include -#include -#include - #ifdef _MSC_VER #pragma warning(disable:4244) #endif @@ -78,7 +72,6 @@ #include "c_dispatch.h" -#include "doomtype.h" #include "doomdef.h" #include "doomstat.h" #include "m_argv.h" @@ -89,14 +82,9 @@ #include "d_main.h" #include "d_gui.h" #include "c_console.h" -#include "c_cvars.h" -#include "i_system.h" #include "s_sound.h" -#include "m_misc.h" #include "gameconfigfile.h" #include "hardware.h" -#include "templates.h" -#include "cmdlib.h" #include "d_event.h" #include "v_text.h" #include "version.h" diff --git a/src/win32/i_keyboard.cpp b/src/win32/i_keyboard.cpp index 056f802934e..840313ceada 100644 --- a/src/win32/i_keyboard.cpp +++ b/src/win32/i_keyboard.cpp @@ -40,13 +40,7 @@ #include #include "i_input.h" -#include "i_system.h" #include "d_event.h" -#include "d_gui.h" -#include "c_cvars.h" -#include "doomdef.h" -#include "doomstat.h" -#include "hardware.h" #include "rawinput.h" // MACROS ------------------------------------------------------------------ diff --git a/src/win32/i_main.cpp b/src/win32/i_main.cpp index 90e437a1468..7ade6eb7a29 100644 --- a/src/win32/i_main.cpp +++ b/src/win32/i_main.cpp @@ -49,7 +49,6 @@ //#include #define NOTIFY_FOR_THIS_SESSION 0 -#include #ifdef _MSC_VER #include #include @@ -57,27 +56,17 @@ #endif #include "resource.h" -#include -#include -#include - #include "doomerrors.h" #include "hardware.h" -#include "doomtype.h" #include "m_argv.h" #include "d_main.h" #include "i_module.h" -#include "i_system.h" #include "c_console.h" #include "version.h" -#include "i_video.h" -#include "i_sound.h" #include "i_input.h" #include "w_wad.h" -#include "templates.h" #include "cmdlib.h" -#include "g_level.h" #include "doomstat.h" #include "r_utility.h" #include "g_levellocals.h" @@ -88,8 +77,6 @@ #include "optwin32.h" -#include - // MACROS ------------------------------------------------------------------ // The main window's title. diff --git a/src/win32/i_mouse.cpp b/src/win32/i_mouse.cpp index a6d606f8dad..df81332e811 100644 --- a/src/win32/i_mouse.cpp +++ b/src/win32/i_mouse.cpp @@ -40,11 +40,8 @@ #include #include "i_input.h" -#include "i_system.h" #include "d_event.h" #include "d_gui.h" -#include "c_cvars.h" -#include "doomdef.h" #include "doomstat.h" #include "hardware.h" #include "rawinput.h" diff --git a/src/win32/i_rawps2.cpp b/src/win32/i_rawps2.cpp index efd9cd22160..2fdfe4c2177 100644 --- a/src/win32/i_rawps2.cpp +++ b/src/win32/i_rawps2.cpp @@ -36,22 +36,11 @@ #define WIN32_LEAN_AND_MEAN #define _WIN32_WINNT 0x0501 #include -#include -#include #include "i_input.h" -#include "i_system.h" #include "d_event.h" -#include "d_gui.h" -#include "c_cvars.h" -#include "c_dispatch.h" -#include "doomdef.h" -#include "doomstat.h" -#include "hardware.h" #include "templates.h" #include "gameconfigfile.h" -#include "cmdlib.h" -#include "v_text.h" #include "m_argv.h" #include "rawinput.h" diff --git a/src/win32/i_specialpaths.cpp b/src/win32/i_specialpaths.cpp index 375f301dd2d..ecd24efb1a8 100644 --- a/src/win32/i_specialpaths.cpp +++ b/src/win32/i_specialpaths.cpp @@ -41,7 +41,6 @@ #include "cmdlib.h" #include "m_misc.h" #include "version.h" // for GAMENAME -#include "i_system.h" #include "optwin32.h" diff --git a/src/win32/i_system.cpp b/src/win32/i_system.cpp index 7b79ad26ff5..28f2bf5ed96 100644 --- a/src/win32/i_system.cpp +++ b/src/win32/i_system.cpp @@ -47,15 +47,11 @@ #include #include -#include -#include #include #include #include #include -#include -#include #define WIN32_LEAN_AND_MEAN #include @@ -65,17 +61,10 @@ #include "hardware.h" #include "doomerrors.h" -#include -#include "doomtype.h" #include "version.h" -#include "doomdef.h" -#include "cmdlib.h" -#include "m_argv.h" #include "m_misc.h" -#include "i_video.h" #include "i_sound.h" -#include "i_music.h" #include "resource.h" #include "x86.h" #include "stats.h" @@ -84,17 +73,13 @@ #include "d_net.h" #include "g_game.h" #include "i_input.h" -#include "i_system.h" #include "c_dispatch.h" #include "templates.h" #include "gameconfigfile.h" #include "v_font.h" #include "g_level.h" #include "doomstat.h" -#include "v_palette.h" -#include "stats.h" #include "textures/bitmap.h" -#include "textures/textures.h" #include "optwin32.h" diff --git a/src/win32/i_xinput.cpp b/src/win32/i_xinput.cpp index c7c104d941b..50108991ab2 100644 --- a/src/win32/i_xinput.cpp +++ b/src/win32/i_xinput.cpp @@ -39,22 +39,12 @@ #define _WIN32_WINNT 0x0501 #include #include -#include #include #include "i_input.h" -#include "i_system.h" #include "d_event.h" -#include "d_gui.h" -#include "c_cvars.h" -#include "c_dispatch.h" -#include "doomdef.h" -#include "doomstat.h" -#include "hardware.h" #include "templates.h" #include "gameconfigfile.h" -#include "cmdlib.h" -#include "v_text.h" #include "m_argv.h" // MACROS ------------------------------------------------------------------ diff --git a/src/win32/st_start.cpp b/src/win32/st_start.cpp index 98034f002a2..549ccad1ce0 100644 --- a/src/win32/st_start.cpp +++ b/src/win32/st_start.cpp @@ -38,11 +38,9 @@ #define _WIN32_WINNT 0x0501 // required to get the MARQUEE defines #include #include -#include #include "resource.h" #include "st_start.h" -#include "resource.h" #include "templates.h" #include "i_system.h" #include "i_input.h" @@ -52,7 +50,6 @@ #include "s_sound.h" #include "m_argv.h" #include "d_main.h" -#include "v_palette.h" // MACROS ------------------------------------------------------------------ diff --git a/src/x86.cpp b/src/x86.cpp index 877bd726d3d..a27c6a98468 100644 --- a/src/x86.cpp +++ b/src/x86.cpp @@ -53,7 +53,6 @@ void DumpCPUInfo(const CPUInfo *cpu) #ifdef _MSC_VER #include #endif -#include #include diff --git a/src/xlat/parse_xlat.cpp b/src/xlat/parse_xlat.cpp index 87e68954d34..3e7f02d01b2 100644 --- a/src/xlat/parse_xlat.cpp +++ b/src/xlat/parse_xlat.cpp @@ -35,10 +35,6 @@ #include "doomtype.h" -#include "w_wad.h" -#include "c_console.h" -#include "info.h" -#include "gi.h" #include "parsecontext.h" #include "xlat_parser.h" #include "xlat.h" diff --git a/src/zstrformat.cpp b/src/zstrformat.cpp index aae653efe2c..2bec1780350 100644 --- a/src/zstrformat.cpp +++ b/src/zstrformat.cpp @@ -85,15 +85,11 @@ #include #include #include -#include -#include #include #include "zstring.h" #include "gdtoa.h" -#include - /* * MAXEXPDIG is the maximum number of decimal digits needed to store a