optimize include files (include what you use)

2021-02-05 13:54:08 +01:00 · 2021-02-05 13:54:08 +01:00 · fbd05a1592
parent b0338164f7
commit fbd05a1592
141 changed files with 43 additions and 456 deletions
--- a/common/2d/bitblt.cpp
+++ b/common/2d/bitblt.cpp
@ -28,7 +28,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <string.h>
 #include "u_mem.h"
 #include "gr.h"
-#include "grdef.h"
 #include "rle.h"
 #include "dxxerror.h"
 #include "byteutil.h"
--- a/common/2d/bitmap.cpp
+++ b/common/2d/bitmap.cpp
@ -29,7 +29,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <stdio.h>
 #include "u_mem.h"
 #include "gr.h"
-#include "grdef.h"
 #include "dxxerror.h"
 #if DXX_USE_OGL
 #include "ogl_init.h"
--- a/common/2d/box.cpp
+++ b/common/2d/box.cpp
@ -19,10 +19,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.

 #include <algorithm>
 #include "u_mem.h"
-
-
 #include "gr.h"
-#include "grdef.h"

 namespace dcx {

--- a/common/2d/canvas.cpp
+++ b/common/2d/canvas.cpp
@ -22,7 +22,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.

 #include "u_mem.h"
 #include "gr.h"
-#include "grdef.h"
 #if DXX_USE_OGL
 #include "ogl_init.h"
 #endif
--- a/common/2d/circle.cpp
+++ b/common/2d/circle.cpp
@ -19,9 +19,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.


 #include "u_mem.h"
-
 #include "gr.h"
-#include "grdef.h"

 namespace dcx {

--- a/common/2d/disc.cpp
+++ b/common/2d/disc.cpp
@ -12,7 +12,6 @@

 #include "u_mem.h"
 #include "gr.h"
-#include "grdef.h"

 namespace dcx {

--- a/common/2d/gpixel.cpp
+++ b/common/2d/gpixel.cpp
@ -19,7 +19,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.

 #include "u_mem.h"
 #include "gr.h"
-#include "grdef.h"
 #if DXX_USE_OGL
 #include "ogl_init.h"
 #endif
--- a/common/2d/pixel.cpp
+++ b/common/2d/pixel.cpp
@ -25,7 +25,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.

 #include "u_mem.h"
 #include "gr.h"
-#include "grdef.h"
 #if DXX_USE_OGL
 #include "ogl_init.h"
 #endif
--- a/common/2d/rect.cpp
+++ b/common/2d/rect.cpp
@ -23,9 +23,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */

 #include "u_mem.h"
-
 #include "gr.h"
-#include "grdef.h"

 #if DXX_USE_OGL
 #include "ogl_init.h"
--- a/common/2d/rle.cpp
+++ b/common/2d/rle.cpp
@ -32,7 +32,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "pstypes.h"
 #include "u_mem.h"
 #include "gr.h"
-#include "grdef.h"
 #include "dxxerror.h"
 #include "rle.h"
 #include "byteutil.h"
--- a/common/3d/draw.cpp
+++ b/common/3d/draw.cpp
@ -16,8 +16,8 @@
 #include "3d.h"
 #include "globvars.h"
 #include "texmap.h"
-#include "clipper.h"
 #if !DXX_USE_OGL
+#include "clipper.h"
 #include "gr.h"
 #endif

--- a/common/3d/setup.cpp
+++ b/common/3d/setup.cpp
@ -17,7 +17,6 @@

 #include "3d.h"
 #include "globvars.h"
-#include "clipper.h"

 #if DXX_USE_OGL
 #include "ogl_init.h"
--- a/common/arch/sdl/event.cpp
+++ b/common/arch/sdl/event.cpp
@ -19,6 +19,7 @@
 #include "mouse.h"
 #include "window.h"
 #include "timer.h"
+#include "cmd.h"
 #include "config.h"
 #include "inferno.h"

--- a/common/arch/sdl/joy.cpp
+++ b/common/arch/sdl/joy.cpp
@ -21,7 +21,6 @@
 #include "console.h"
 #include "event.h"
 #include "u_mem.h"
-#include "playsave.h"
 #include "kconfig.h"
 #include "compiler-range_for.h"

--- a/common/arch/sdl/mouse.cpp
+++ b/common/arch/sdl/mouse.cpp
@ -18,7 +18,6 @@
 #include "event.h"
 #include "window.h"
 #include "mouse.h"
-#include "playsave.h"
 #include "dxxerror.h"
 #include "args.h"
 #include "gr.h"
--- a/common/include/console.h
+++ b/common/include/console.h
@ -14,8 +14,6 @@
 #include "pstypes.h"
 #include "dxxsconf.h"
 #include "fmtcheck.h"
-#include "cli.h"
-#include "cmd.h"
 #include "d_srcloc.h"
 #ifdef dsx
 #include "kconfig.h"
--- a/common/include/dxxerror.h
+++ b/common/include/dxxerror.h
@ -30,7 +30,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "dxxsconf.h"
 #include "dsx-ns.h"
 #include <assert.h>
-#include "fmtcheck.h"

 #ifdef __cplusplus

--- a/common/include/gr.h
+++ b/common/include/gr.h
@ -32,7 +32,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "palette.h"
 #include "dxxsconf.h"
 #include "dsx-ns.h"
-#include "fmtcheck.h"
 #include "pack.h"
 #include <array>

--- a/common/include/internal.h
+++ b/common/include/internal.h
@ -11,6 +11,7 @@
 #include "dxxsconf.h"
 #if DXX_USE_OGL
 #include "ogl_init.h" // interface to OpenGL module
+#include "ogl_extensions.h"
 #include "gr.h"

 #ifdef __cplusplus
--- a/common/include/joy.h
+++ b/common/include/joy.h
@ -14,7 +14,7 @@

 #include "dxxsconf.h"
 #include "dsx-ns.h"
-#include "event.h"
+#include "fwd-event.h"

 #if DXX_MAX_JOYSTICKS
 #include "pstypes.h"
--- a/common/include/mouse.h
+++ b/common/include/mouse.h
@ -18,7 +18,6 @@
 #ifdef __cplusplus
 #include <SDL_version.h>
 #include <cassert>
-#include "fwd-window.h"
 #include "event.h"

 struct SDL_MouseButtonEvent;
--- a/common/include/ogl_init.h
+++ b/common/include/ogl_init.h
@ -25,7 +25,6 @@
 #include "palette.h"
 #include "pstypes.h"
 #include "3d.h"
-#include "ogl_extensions.h"
 #include <array>

 #ifdef __cplusplus
--- a/common/include/partial_range.h
+++ b/common/include/partial_range.h
@ -11,7 +11,6 @@
 #include <cstdio>
 #include <string>
 #include <type_traits>
-#include "fwd-partial_range.h"
 #include <memory>
 #include "dxxsconf.h"

--- a/common/main/automap.h
+++ b/common/main/automap.h
@ -49,7 +49,7 @@ void automap_clear_visited(d_level_unique_automap_state &LevelUniqueAutomapState
 #include "ntstring.h"
 #include "d_array.h"
 #include "d_range.h"
-#include "fwd-window.h"
+#include "fwd-event.h"
 #include "segment.h"

 namespace dsx {
--- a/common/main/cli.cpp
+++ b/common/main/cli.cpp
@ -34,6 +34,7 @@
 #include "gamefont.h"
 #include "console.h"
 #include "cli.h"
+#include "cmd.h"
 #include "compiler-poison.h"

 // Cursor shown if we are in insert mode
--- a/common/main/cmd.cpp
+++ b/common/main/cmd.cpp
@ -23,6 +23,7 @@
 #include "u_mem.h"
 #include "strutil.h"
 #include "inferno.h"
+#include "cmd.h"
 #include "console.h"
 #include "cvar.h"
 #include "physfsx.h"
--- a/common/main/cvar.cpp
+++ b/common/main/cvar.cpp
@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include <physfs.h>

+#include "cmd.h"
 #include "console.h"
 #include "cvar.h"
 #include "dxxerror.h"
--- a/common/main/d_array.h
+++ b/common/main/d_array.h
@ -8,7 +8,6 @@
 #pragma once
 #include "dxxsconf.h"
 #include <array>
-#include "fwd-d_array.h"

 namespace dcx {

--- a/common/main/digi.h
+++ b/common/main/digi.h
@ -28,7 +28,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <SDL_version.h>
 #include <type_traits>
 #include "pstypes.h"
-#include "vecmat.h"
+//#include "vecmat.h"

 #ifdef __cplusplus
 #include "dxxsconf.h"
--- a/common/main/game.h
+++ b/common/main/game.h
@ -36,7 +36,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "fwd-segment.h"
 #include "window.h"
 #include "d_array.h"
-#include "gauges.h"
 #include "kconfig.h"
 #include "wall.h"

@ -58,6 +57,7 @@ extern fix FrameTime;           // time in seconds since last frame
 extern fix64 GameTime64;            // time in game (sum of FrameTime)
 extern int d_tick_count; // increments according to DESIGNATED_GAME_FRAMETIME
 extern int d_tick_step;  // true once in interval of DESIGNATED_GAME_FRAMETIME
+enum class gauge_inset_window_view : unsigned;
 }

 #if defined(DXX_BUILD_DESCENT_II)
--- a/common/main/mission.h
+++ b/common/main/mission.h
@ -32,7 +32,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "inferno.h"
 #include "dxxsconf.h"
 #include "dsx-ns.h"
-#include "fwd-window.h"

 #include "ntstring.h"

--- a/common/main/multi.h
+++ b/common/main/multi.h
@ -31,9 +31,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "fwd-player.h"
 #include "player-callsign.h"
 #include "player-flags.h"
-#include "weapon.h"
+#include "fwd-weapon.h"
 #include "mission.h"
-#include "newmenu.h"
 #include "powerup.h"
 #include "fwd-object.h"
 #include "fwd-wall.h"
--- a/common/main/net_udp.h
+++ b/common/main/net_udp.h
@ -12,6 +12,7 @@

 #pragma once
 #include "multi.h"
+#include "newmenu.h"

 #ifdef __cplusplus
 #include "pack.h"
--- a/common/main/object.h
+++ b/common/main/object.h
@ -33,7 +33,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "vecmat.h"
 #include "aistruct.h"
 #include "polyobj.h"
-#include "laser.h"

 #include <cassert>
 #include <cstdint>
@ -44,7 +43,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <vector>
 #include <stdexcept>
 #include "fwd-object.h"
-#include "weapon.h"
+#include "fwd-weapon.h"
+#include "fwd-player.h"
 #include "powerup.h"
 #include "compiler-poison.h"
 #include "physics_info.h"
--- a/common/main/player.h
+++ b/common/main/player.h
@ -29,7 +29,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.

 #include <physfs.h>
 #include "vecmat.h"
-#include "weapon.h"
+#include "fwd-weapon.h"

 #ifdef __cplusplus
 #include <algorithm>
--- a/common/main/playsave.h
+++ b/common/main/playsave.h
@ -50,7 +50,6 @@ enum class cockpit_3d_view : uint8_t
 #endif

 #include "gameplayopt.h"
-#include "gauges.h"
 #include <cstdint>

 #define N_SAVE_SLOTS    10
--- a/common/main/powerup.h
+++ b/common/main/powerup.h
@ -26,7 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #pragma once

 #include "dxxsconf.h"
-#include "vclip.h"
+#include "fwd-vclip.h"
 #include "fmtcheck.h"

 #ifdef __cplusplus
--- a/common/main/robot.h
+++ b/common/main/robot.h
@ -30,12 +30,12 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.

 #ifdef __cplusplus
 #include "pack.h"
-#include "ai.h"
 #include "aistruct.h"
 #include "polyobj.h"
 #include "weapon_id.h"
 #include "object.h"
 #include "fwd-partial_range.h"
+#include "digi.h"

 #define MAX_GUNS 8      //should be multiple of 4 for ubyte array

--- a/common/main/sounds.h
+++ b/common/main/sounds.h
@ -27,7 +27,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifndef _SOUNDS_H
 #define _SOUNDS_H

-#include "digi.h"
 #include <array>

 #ifdef dsx
--- a/d2x-rebirth/main/escort.cpp
+++ b/d2x-rebirth/main/escort.cpp
@ -36,6 +36,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "palette.h"
 #include "timer.h"
 #include "u_mem.h"
+#include "weapon.h"

 #include "object.h"
 #include "dxxerror.h"
@ -64,7 +65,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "automap.h"
 #include "laser.h"
 #include "escort.h"
-
+#include "vclip.h"
 #include "segiter.h"
 #include "compiler-range_for.h"
 #include "d_levelstate.h"
--- a/similar/2d/font.cpp
+++ b/similar/2d/font.cpp
@ -36,10 +36,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.

 #include "u_mem.h"
 #include "gr.h"
-#include "grdef.h"
 #include "dxxerror.h"
 #include "common/2d/bitmap.h"
-#include "makesig.h"
 #include "physfsx.h"
 #include "gamefont.h"
 #include "byteutil.h"
--- a/similar/2d/palette.cpp
+++ b/similar/2d/palette.cpp
@ -32,7 +32,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "pstypes.h"
 #include "u_mem.h"
 #include "gr.h"
-#include "grdef.h"
 #include "dxxerror.h"
 #include "maths.h"
 #include "palette.h"
--- a/similar/2d/pcx.cpp
+++ b/similar/2d/pcx.cpp
@ -27,7 +27,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <string.h>

 #include "gr.h"
-#include "grdef.h"
 #include "u_mem.h"
 #include "pcx.h"
 #include "physfsx.h"
--- a/similar/3d/interp.cpp
+++ b/similar/3d/interp.cpp
@ -21,7 +21,6 @@
 #include "console.h"
 #include "common/3d/globvars.h"
 #include "polyobj.h"
-#include "gr.h"
 #include "byteutil.h"
 #include "u_mem.h"

--- a/similar/arch/ogl/gr.cpp
+++ b/similar/arch/ogl/gr.cpp
@ -36,26 +36,19 @@
 #include <algorithm>
 #include <errno.h>
 #include <SDL.h>
-#include "hudmsg.h"
 #include "game.h"
-#include "text.h"
 #include "gr.h"
 #include "gamefont.h"
-#include "grdef.h"
 #include "palette.h"
 #include "u_mem.h"
 #include "dxxerror.h"
 #include "inferno.h"
-#include "screens.h"
 #include "strutil.h"
 #include "args.h"
-#include "key.h"
 #include "physfsx.h"
 #include "internal.h"
-#include "render.h"
 #include "console.h"
 #include "config.h"
-#include "playsave.h"
 #include "vers_id.h"

 #if defined(__APPLE__) && defined(__MACH__)
--- a/similar/arch/ogl/ogl.cpp
+++ b/similar/arch/ogl/ogl.cpp
@ -56,13 +56,11 @@
 #include "byteutil.h"
 #include "internal.h"
 #include "gauges.h"
-#include "playsave.h"
 #include "object.h"
 #include "args.h"

 #include "compiler-range_for.h"
 #include "d_levelstate.h"
-#include "d_range.h"
 #include "d_zip.h"
 #include "partial_range.h"

--- a/similar/arch/sdl/digi.cpp
+++ b/similar/arch/sdl/digi.cpp
@ -11,13 +11,11 @@

 #include "dxxerror.h"
 #include "vecmat.h"
-#include "piggy.h"
 #include "config.h"
 #include "digi.h"
 #include "sounds.h"
 #include "console.h"
 #include "rbaudio.h"
-#include "jukebox.h"
 #include "args.h"
 #include <stdlib.h>
 #include <stdio.h>
--- a/similar/arch/sdl/digi_audio.cpp
+++ b/similar/arch/sdl/digi_audio.cpp
@ -17,6 +17,7 @@
 #include <SDL.h>
 #include <digi_audio.h>
 #include "dxxerror.h"
+#include "fmtcheck.h"
 #include "vecmat.h"
 #include "digi.h"
 #include "sounds.h"
--- a/similar/arch/sdl/jukebox.cpp
+++ b/similar/arch/sdl/jukebox.cpp
@ -22,7 +22,6 @@
 #include "strutil.h"
 #include "u_mem.h"
 #include "physfs_list.h"
-#include "digi.h"

 #include "partial_range.h"
 #include <memory>
--- a/similar/editor/centers.cpp
+++ b/similar/editor/centers.cpp
@ -29,24 +29,17 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <string.h>

 #include "fuelcen.h"
-#include "screens.h"
 #include "inferno.h"
 #include "event.h"
 #include "segment.h"
 #include "editor.h"
 #include "editor/esegment.h"
-#include "timer.h"
-#include "objpage.h"
 #include "maths.h"
 #include "dxxerror.h"
-#include "kdefs.h"
-#include	"object.h"
+#include "object.h"
 #include "robot.h"
 #include "game.h"
 #include "powerup.h"
-#include "ai.h"
-#include "hostage.h"
-#include "eobject.h"
 #include "medwall.h"
 #include "eswitch.h"
 #include "ehostage.h"
--- a/similar/editor/curves.cpp
+++ b/similar/editor/curves.cpp
@ -29,10 +29,8 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <string.h>
 #include <ctype.h>
 #include <stdarg.h>
-#include "inferno.h"
 #include "vecmat.h"
 #include "gr.h"
-#include "key.h"
 #include "editor.h"
 #include "editor/esegment.h"
 #include "gameseg.h"
--- a/similar/editor/eobject.cpp
+++ b/similar/editor/eobject.cpp
@ -35,29 +35,25 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "editor/esegment.h"
 #include "editor/eobject.h"

-#include "objpage.h"
 #include "maths.h"
 #include "dxxerror.h"
 #include "kdefs.h"
-#include	"object.h"
+#include "object.h"
 #include "robot.h"
 #include "game.h"
-#include "ai.h"
 #include "bm.h"
 #include "3d.h"		//	For g3_point_to_vec
-#include	"fvi.h"
+#include "fvi.h"
+#include "vclip.h"

 #include "powerup.h"
-#include "fuelcen.h"
 #include "hostage.h"
-#include "medrobot.h"
 #include "player.h"
 #include "gameseg.h"
 #include "cntrlcen.h"

 #include "compiler-range_for.h"
 #include "d_levelstate.h"
-#include "segiter.h"

 #define	OBJ_SCALE		(F1_0/2)
 #define	OBJ_DEL_SIZE	(F1_0/2)
--- a/similar/editor/eswitch.cpp
+++ b/similar/editor/eswitch.cpp
@ -36,14 +36,11 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "segment.h"
 #include "dxxerror.h"
 #include "event.h"
-#include "gameseg.h"
 #include "wall.h"
 #include "medwall.h"
-#include "screens.h"
 #include "textures.h"
 #include "texmerge.h"
 #include "medrobot.h"
-#include "timer.h"
 #include "key.h"
 #include "ehostage.h"
 #include "centers.h"
--- a/similar/editor/group.cpp
+++ b/similar/editor/group.cpp
@ -34,13 +34,11 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "editor/esegment.h"
 #include "editor/medmisc.h"
 #include "dxxerror.h"
-#include "gamemine.h"
 #include "physfsx.h"
 #include "gameseg.h"
 #include "bm.h"				// For MAX_TEXTURES.
 #include "textures.h"
 #include "hash.h"
-#include "fuelcen.h"
 #include "kdefs.h"
 #include "fwd-wall.h"
 #include "medwall.h"
--- a/similar/editor/info.cpp
+++ b/similar/editor/info.cpp
@ -39,9 +39,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "dxxerror.h"
 #include "textures.h"
 #include "object.h"
-#include "ai.h"
-#include "texpage.h"		// Textue selection paging stuff
-#include "objpage.h"		// Object selection paging stuff
 #include "wall.h"
 #include "switch.h"
 #include "info.h"
--- a/similar/editor/kbuild.cpp
+++ b/similar/editor/kbuild.cpp
@ -24,10 +24,8 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */

 #include <string.h>
-#include "inferno.h"
 #include "editor/editor.h"
 #include "editor/esegment.h"
-#include "gameseg.h"
 #include "gamesave.h"
 #include "kdefs.h"
 #include "compiler-range_for.h"
--- a/similar/editor/kcurve.cpp
+++ b/similar/editor/kcurve.cpp
@ -26,7 +26,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.

 #include <string.h>

-#include "inferno.h"
 #include "editor.h"
 #include "editor/esegment.h"
 #include "kdefs.h"
--- a/similar/editor/kfuncs.cpp
+++ b/similar/editor/kfuncs.cpp
@ -27,7 +27,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "inferno.h"
 #include "func.h"
 #include "editor/kdefs.h"
-#include "segment.h"
 #include "editor/editor.h"
 #include "dxxerror.h"
 #include "slew.h"
--- a/similar/editor/kgame.cpp
+++ b/similar/editor/kgame.cpp
@ -30,7 +30,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "inferno.h"
 #include "editor.h"
 #include "ui.h"
-#include "game.h"
 #include "gamesave.h"
 #include "object.h"
 #include "gameseq.h"
--- a/similar/editor/khelp.cpp
+++ b/similar/editor/khelp.cpp
@ -24,7 +24,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */


-#include "inferno.h"
 #include "editor.h"
 #include "kdefs.h"

--- a/similar/editor/ksegmove.cpp
+++ b/similar/editor/ksegmove.cpp
@ -23,7 +23,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 *
 */

-#include "inferno.h"
 #include "editor.h"
 #include "editor/esegment.h"
 #include "kdefs.h"
--- a/similar/editor/ksegsel.cpp
+++ b/similar/editor/ksegsel.cpp
@ -26,7 +26,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <utility>
 #include <string.h>

-#include "inferno.h"
 #include "editor/editor.h"
 #include "editor/esegment.h"
 #include "editor/medmisc.h"
--- a/similar/editor/ksegsize.cpp
+++ b/similar/editor/ksegsize.cpp
@ -24,7 +24,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */

 #include <stdlib.h>
-#include "inferno.h"
 #include "editor.h"
 #include "editor/esegment.h"
 #include "dxxerror.h"
--- a/similar/editor/ktmap.cpp
+++ b/similar/editor/ktmap.cpp
@ -24,7 +24,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */

 #include <string.h>
-#include "inferno.h"
 #include "editor.h"
 #include "editor/esegment.h"
 #include "kdefs.h"
--- a/similar/editor/kview.cpp
+++ b/similar/editor/kview.cpp
@ -24,7 +24,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */


-#include "inferno.h"
 #include "editor.h"
 #include "editor/esegment.h"
 #include "editor/medmisc.h"
--- a/similar/editor/med.cpp
+++ b/similar/editor/med.cpp
@ -55,7 +55,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "mouse.h"
 #include "dxxerror.h"
 #include "kfuncs.h"
-#include "macro.h"
 #ifdef INCLUDE_XLISP
 #include "medlisp.h"
 #endif
@ -75,7 +74,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "object.h"
 #include "effects.h"
 #include "info.h"
-#include "ai.h"
 #include "console.h"
 #include "texpage.h"		// Textue selection paging stuff
 #include "objpage.h"		// Object selection paging stuff
@ -84,11 +82,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "medmisc.h"
 #include "meddraw.h"
 #include "medsel.h"
-#include "medrobot.h"
 #include "medwall.h"
-#include "eswitch.h"
-#include "ehostage.h"
-#include "centers.h"

 #include "fuelcen.h"
 #include "gameseq.h"
--- a/similar/editor/meddraw.cpp
+++ b/similar/editor/meddraw.cpp
@ -38,20 +38,12 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "editor/esegment.h"
 #include "wall.h"
 #include "switch.h"
-#include "key.h"
-#include "mouse.h"
 #include "dxxerror.h"
-#include "medlisp.h"
 #include "u_mem.h"
 #include "render.h"
-#include "game.h"
-#include "kdefs.h"
 #include "func.h"
 #include "textures.h"
-#include "screens.h"
-#include "texmap.h"
 #include "object.h"
-#include "fuelcen.h"
 #include "meddraw.h"
 #include "d_enumerate.h"
 #include "d_levelstate.h"
--- a/similar/editor/medmisc.cpp
+++ b/similar/editor/medmisc.cpp
@ -32,21 +32,15 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "3d.h"
 #include "u_mem.h"
 #include "dxxerror.h"
-#include "key.h"
-#include "mouse.h"
 #include "func.h"
 #include "inferno.h"
 #include "editor/editor.h"
 #include "editor/esegment.h"
 #include "editor/medmisc.h"
-#include "gameseg.h"
 #include "segment.h"
 #include "render.h"
-#include "screens.h"
 #include "object.h"
-#include "texpage.h"		// For texpage_goto_first
 #include "meddraw.h"		// For draw_World
-#include "game.h"
 #include "kdefs.h"

 #if DXX_USE_OGL
--- a/similar/editor/medrobot.cpp
+++ b/similar/editor/medrobot.cpp
@ -28,7 +28,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <math.h>
 #include <string.h>

-#include "screens.h"
 #include "inferno.h"
 #include "segment.h"
 #include "event.h"
@ -40,12 +39,11 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "maths.h"
 #include "dxxerror.h"
 #include "kdefs.h"
-#include	"object.h"
+#include "object.h"
 #include "robot.h"
 #include "game.h"
 #include "powerup.h"
 #include "ai.h"
-#include "hostage.h"
 #include "eobject.h"
 #include "medwall.h"
 #include "medrobot.h"
--- a/similar/editor/medsel.cpp
+++ b/similar/editor/medsel.cpp
@ -29,8 +29,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <string.h>
 #include "gr.h"
 #include "ui.h"
-#include "key.h"
-#include "dxxerror.h"
 #include "u_mem.h"
 #include "inferno.h"
 #include "gameseg.h"
--- a/similar/editor/medwall.cpp
+++ b/similar/editor/medwall.cpp
@ -38,15 +38,12 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "game.h"
 #include "gameseg.h"
 #include "textures.h"
-#include "screens.h"
 #include "switch.h"
 #include "editor/eswitch.h"
 #include "texmerge.h"
-#include "medrobot.h"
 #include "timer.h"
 #include "cntrlcen.h"
 #include "key.h"
-#include "ehostage.h"
 #include "centers.h"
 #include "piggy.h"
 #include "kdefs.h"
--- a/similar/editor/mine.cpp
+++ b/similar/editor/mine.cpp
@ -28,7 +28,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include "key.h"
 #include "gr.h"
 #include "bm.h"			// for MAX_TEXTURES
 #include "inferno.h"
@ -38,14 +37,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "wall.h"
 #include "dxxerror.h"
 #include "textures.h"
-#include "object.h"
 #include "physfsx.h"
 #include "gamemine.h"
 #include "gamesave.h"
-#include "gameseg.h"
 #include "ui.h"			// Because texpage.h need UI_DIALOG type
-#include "texpage.h"		// For texpage_goto_first
-#include "medwall.h"
 #include "switch.h"
 #include "fuelcen.h"

--- a/similar/editor/objpage.cpp
+++ b/similar/editor/objpage.cpp
@ -27,19 +27,18 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <stdlib.h>
 #include <stdio.h>
 #include "inferno.h"
-#include "screens.h"			// For GAME_SCREEN?????
 #include "editor.h"			// For TMAP_CURBOX??????
 #include "gr.h"				// For canves, font stuff
 #include "ui.h"				// For UI_GADGET stuff
 #include "object.h"			// For robot_bms
 #include "event.h"
-#include "dxxerror.h"
 #include "objpage.h"
 #include "bm.h"
 #include "player.h"
 #include "piggy.h"
 #include "cntrlcen.h"
 #include "kdefs.h"
+#include "vclip.h"

 constexpr std::integral_constant<unsigned, 8> OBJS_PER_PAGE{};

@ -51,7 +50,6 @@ static int ObjectPage = 0;
 #include "vecmat.h"
 #include "3d.h"
 #include "robot.h"
-#include "texmap.h"

 #include "hostage.h"
 #include "powerup.h"
--- a/similar/editor/segment.cpp
+++ b/similar/editor/segment.cpp
@ -27,7 +27,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include "key.h"
 #include "gr.h"
 #include "inferno.h"
 #include "segment.h"
@ -37,17 +36,13 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "object.h"
 #include "gameseg.h"
 #include "render.h"
-#include "game.h"
 #include "wall.h"
 #include "switch.h"
 #include "fuelcen.h"
-#include "cntrlcen.h"
 #include "seguvs.h"
-#include "gameseq.h"
 #include "kdefs.h"

 #include "medwall.h"
-#include "hostage.h"

 #include "compiler-poison.h"
 #include "compiler-range_for.h"
--- a/similar/editor/seguvs.cpp
+++ b/similar/editor/seguvs.cpp
@ -38,7 +38,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "wall.h"
 #include "editor/kdefs.h"
 #include "bm.h"		//	Needed for TmapInfo
-#include	"effects.h"     //      Needed for effects_bm_num
 #include "fvi.h"
 #include "seguvs.h"

--- a/similar/editor/texpage.cpp
+++ b/similar/editor/texpage.cpp
@ -30,7 +30,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.

 #include "inferno.h"
 #include "gameseg.h"
-#include "screens.h"			// For GAME_SCREEN?????
 #include "editor.h"			// For TMAP_CURBOX??????
 #include "gr.h"				// For canves, font stuff
 #include "ui.h"				// For UI_GADGET stuff
--- a/similar/editor/texture.cpp
+++ b/similar/editor/texture.cpp
@ -28,13 +28,11 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <stdarg.h>
 #include <math.h>
 #include <string.h>
-#include "inferno.h"
 #include "segment.h"
 #include "seguvs.h"
 #include "editor.h"
 #include "editor/esegment.h"
 #include "maths.h"
-#include "dxxerror.h"
 #include "kdefs.h"

 #include "compiler-range_for.h"
--- a/similar/main/ai.cpp
+++ b/similar/main/ai.cpp
@ -34,7 +34,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "3d.h"

 #include "object.h"
-#include "render.h"
 #include "dxxerror.h"
 #include "ai.h"
 #include "escort.h"
@ -53,17 +52,13 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "fireball.h"
 #include "morph.h"
 #include "effects.h"
-#include "timer.h"
 #include "sounds.h"
 #include "gameseg.h"
 #include "cntrlcen.h"
 #include "multibot.h"
 #include "multi.h"
 #include "gameseq.h"
-#include "key.h"
 #include "powerup.h"
-#include "gauges.h"
-#include "text.h"
 #include "args.h"
 #include "fuelcen.h"
 #include "controls.h"
@ -72,7 +67,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #if DXX_USE_EDITOR
 #include "editor/editor.h"
 #include "editor/esegment.h"
-#include "editor/kdefs.h"
 #endif

 //added 05/17/99 Matt Mueller
@ -83,7 +77,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "segiter.h"
 #include "d_enumerate.h"
 #include "d_levelstate.h"
-#include "d_range.h"
 #include <utility>

 using std::min;
--- a/similar/main/aipath.cpp
+++ b/similar/main/aipath.cpp
@ -44,7 +44,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "editor/esegment.h"
 #endif
 #include "player.h"
-#include "fireball.h"
 #include "game.h"

 #include "compiler-range_for.h"
--- a/similar/main/automap.cpp
+++ b/similar/main/automap.cpp
@ -39,7 +39,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "u_mem.h"
 #include "render.h"
 #include "object.h"
-#include "vclip.h"
 #include "game.h"
 #include "polyobj.h"
 #include "sounds.h"
@ -47,20 +46,14 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "bm.h"
 #include "key.h"
 #include "newmenu.h"
-#include "menu.h"
-#include "screens.h"
 #include "textures.h"
 #include "hudmsg.h"
-#include "mouse.h"
 #include "timer.h"
 #include "segpoint.h"
 #include "joy.h"
-#include "iff.h"
 #include "pcx.h"
 #include "palette.h"
 #include "wall.h"
-#include "hostage.h"
-#include "fuelcen.h"
 #include "physfsx.h"
 #include "gameseq.h"
 #include "gamefont.h"
@ -74,11 +67,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "powerup.h"
 #include "switch.h"
 #include "automap.h"
-#include "cntrlcen.h"
 #include "timer.h"
 #include "config.h"
 #include "playsave.h"
-#include "rbaudio.h"
 #include "window.h"
 #include "playsave.h"
 #include "args.h"
--- a/similar/main/bm.cpp
+++ b/similar/main/bm.cpp
@ -58,7 +58,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "console.h"
 #include "rle.h"
 #include "physfsx.h"
-#include "internal.h"
 #include "strutil.h"

 #if DXX_USE_EDITOR
--- a/similar/main/bmread.cpp
+++ b/similar/main/bmread.cpp
@ -48,7 +48,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "iff.h"
 #include "hostage.h"
 #include "powerup.h"
-#include "laser.h"
 #include "sounds.h"
 #include "piggy.h"
 #include "aistruct.h"
--- a/similar/main/cntrlcen.cpp
+++ b/similar/main/cntrlcen.cpp
@ -43,9 +43,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "segment.h"
 #include "object.h"
 #include "robot.h"
-#include "vclip.h"
 #include "physfs-serial.h"
-#include "fireball.h"
 #include "endlevel.h"
 #include "state.h"
 #include "args.h"
--- a/similar/main/collide.cpp
+++ b/similar/main/collide.cpp
@ -37,14 +37,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "bm.h"
 #include "3d.h"
 #include "segment.h"
-#include "texmap.h"
 #include "laser.h"
 #include "key.h"
 #include "gameseg.h"
 #include "object.h"
 #include "physics.h"
-#include "slew.h"
-#include "render.h"
 #include "wall.h"
 #include "vclip.h"
 #include "polyobj.h"
@ -54,14 +51,12 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "dxxerror.h"
 #include "ai.h"
 #include "hostage.h"
-#include "fuelcen.h"
 #include "sounds.h"
 #include "robot.h"
 #include "weapon.h"
 #include "player.h"
 #include "gauges.h"
 #include "powerup.h"
-#include "newmenu.h"
 #include "scores.h"
 #include "effects.h"
 #include "textures.h"
@ -77,9 +72,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "switch.h"
 #include "palette.h"
 #include "gameseq.h"
-#if DXX_USE_EDITOR
-#include "editor/editor.h"
-#endif
 #include "collide.h"
 #include "escort.h"

--- a/similar/main/config.cpp
+++ b/similar/main/config.cpp
@ -36,8 +36,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "songs.h"
 #include "kconfig.h"
 #include "palette.h"
-#include "args.h"
-#include "player.h"
 #include "digi.h"
 #include "mission.h"
 #include "u_mem.h"
--- a/similar/main/console.cpp
+++ b/similar/main/console.cpp
@ -29,6 +29,7 @@
 #include "vers_id.h"
 #include "timer.h"
 #include "cli.h"
+#include "cmd.h"
 #include "cvar.h"

 #include "dxxsconf.h"
--- a/similar/main/controls.cpp
+++ b/similar/main/controls.cpp
@ -26,9 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.

 #include <algorithm>
 #include <stdlib.h>
-#include "key.h"
 #include "joy.h"
-#include "timer.h"
 #include "dxxerror.h"
 #include "inferno.h"
 #include "game.h"
@ -37,10 +35,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "weapon.h"
 #include "bm.h"
 #include "controls.h"
-#include "render.h"
-#include "args.h"
 #include "palette.h"
-#include "mouse.h"
 #include "kconfig.h"
 #if defined(DXX_BUILD_DESCENT_II)
 #include "laser.h"
--- a/similar/main/credits.cpp
+++ b/similar/main/credits.cpp
@ -37,15 +37,12 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "key.h"
 #include "mouse.h"
 #include "palette.h"
-#include "game.h"
 #include "timer.h"
 #include "gamefont.h"
 #include "pcx.h"
 #include "credits.h"
 #include "u_mem.h"
 #include "screens.h"
-#include "digi.h"
-#include "rbaudio.h"
 #include "text.h"
 #include "songs.h"
 #include "menu.h"
--- a/similar/main/digiobj.cpp
+++ b/similar/main/digiobj.cpp
@ -34,14 +34,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "digi_audio.h"
 #include "sounds.h"
 #include "args.h"
-#include "key.h"
 #include "newdemo.h"
-#include "game.h"
 #include "gameseg.h"
 #include "dxxerror.h"
 #include "wall.h"
 #include "piggy.h"
-#include "text.h"
 #include "kconfig.h"
 #include "config.h"

--- a/similar/main/dumpmine.cpp
+++ b/similar/main/dumpmine.cpp
@ -35,31 +35,23 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "pstypes.h"
 #include "console.h"
 #include "physfsx.h"
-#include "key.h"
 #include "gr.h"
 #include "palette.h"
 #include "fmtcheck.h"

 #include "inferno.h"
-#if DXX_USE_EDITOR
-#include "editor/editor.h"
-#endif
 #include "dxxerror.h"
 #include "object.h"
 #include "wall.h"
-#include "gamemine.h"
 #include "gameseg.h"
 #include "robot.h"
-#include "player.h"
 #include "newmenu.h"
 #include "textures.h"
 #include "text.h"
 #include "bm.h"
-#include "menu.h"
 #include "switch.h"
 #include "fuelcen.h"
 #include "powerup.h"
-#include "gameseq.h"
 #include "polyobj.h"
 #include "gamesave.h"
 #include "piggy.h"
@ -67,7 +59,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "compiler-range_for.h"
 #include "d_enumerate.h"
 #include "d_levelstate.h"
-#include "d_range.h"
 #include "d_zip.h"
 #include "segiter.h"

--- a/similar/main/effects.cpp
+++ b/similar/main/effects.cpp
@ -38,7 +38,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "u_mem.h"
 #include "textures.h"
 #include "physfs-serial.h"
-#include "cntrlcen.h"
 #include "segment.h"
 #include "dxxerror.h"
 #include "object.h"
--- a/similar/main/endlevel.cpp
+++ b/similar/main/endlevel.cpp
@ -52,7 +52,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "game.h"
 #include "gamepal.h"
 #include "screens.h"
-#include "gauges.h"
 #include "terrain.h"
 #include "robot.h"
 #include "player.h"
@ -72,13 +71,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "movie.h"
 #endif
 #include "render.h"
-#include "titles.h"
 #include "hudmsg.h"
 #if DXX_USE_OGL
 #include "ogl_init.h"
 #endif

-#include "key.h"
 #include "joy.h"

 #if DXX_USE_EDITOR
--- a/similar/main/fireball.cpp
+++ b/similar/main/fireball.cpp
@ -49,18 +49,12 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "weapon.h"
 #include "fireball.h"
 #include "collide.h"
-#include "newmenu.h"
-#include "gameseq.h"
 #include "physics.h"
-#include "scores.h"
 #include "laser.h"
 #include "wall.h"
 #include "multi.h"
-#include "endlevel.h"
 #include "timer.h"
-#include "fuelcen.h"
 #include "playsave.h"
-#include "cntrlcen.h"
 #include "gameseg.h"
 #include "automap.h"
 #include "byteutil.h"
--- a/similar/main/fuelcen.cpp
+++ b/similar/main/fuelcen.cpp
@ -32,7 +32,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "gameseg.h"
 #include "game.h"		// For FrameTime
 #include "dxxerror.h"
-#include "gauges.h"
 #include "vclip.h"
 #include "fireball.h"
 #include "robot.h"
@ -45,11 +44,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "bm.h"
 #include "polyobj.h"
 #include "ai.h"
-#include "gamemine.h"
 #include "gamesave.h"
 #include "player.h"
 #include "collide.h"
-#include "laser.h"
 #include "multi.h"
 #include "multibot.h"
 #include "escort.h"
--- a/similar/main/game.cpp
+++ b/similar/main/game.cpp
@ -47,19 +47,15 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "key.h"
 #include "config.h"
 #include "object.h"
-#include "physics.h"
 #include "dxxerror.h"
 #include "joy.h"
-#include "iff.h"
 #include "pcx.h"
 #include "timer.h"
 #include "render.h"
 #include "laser.h"
 #include "screens.h"
 #include "textures.h"
-#include "slew.h"
 #include "gauges.h"
-#include "texmap.h"
 #include "3d.h"
 #include "effects.h"
 #include "menu.h"
@ -91,15 +87,12 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "switch.h"
 #include "controls.h"
 #include "songs.h"
-#include "rbaudio.h"

 #include "multi.h"
 #include "cntrlcen.h"
 #include "pcx.h"
 #include "state.h"
 #include "piggy.h"
-#include "multibot.h"
-#include "fvi.h"
 #include "ai.h"
 #include "robot.h"
 #include "playsave.h"
--- a/similar/main/gamecntl.cpp
+++ b/similar/main/gamecntl.cpp
@ -38,11 +38,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "key.h"
 #include "object.h"
 #include "menu.h"
-#include "physics.h"
 #include "dxxerror.h"
 #include "joy.h"
-#include "iff.h"
-#include "pcx.h"
 #include "timer.h"
 #include "render.h"
 #include "laser.h"
@ -52,7 +49,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "gauges.h"
 #include "texmap.h"
 #include "3d.h"
-#include "effects.h"
 #include "gameseg.h"
 #include "wall.h"
 #include "ai.h"
@ -78,19 +74,15 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "config.h"
 #include "hudmsg.h"
 #include "kconfig.h"
-#include "mouse.h"
 #include "titles.h"
 #include "gr.h"
 #include "playsave.h"
-#include "scores.h"

 #include "multi.h"
 #include "cntrlcen.h"
 #include "fuelcen.h"
-#include "pcx.h"
 #include "state.h"
 #include "piggy.h"
-#include "multibot.h"
 #include "ai.h"
 #include "rbaudio.h"
 #include "switch.h"
--- a/similar/main/gamefont.cpp
+++ b/similar/main/gamefont.cpp
@ -29,7 +29,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "gr.h"
 #include "dxxerror.h"
 #include <string.h>
-#include "strutil.h"
 #include "args.h"
 #include "physfsx.h"
 #include "gamefont.h"
--- a/similar/main/gamemine.cpp
+++ b/similar/main/gamemine.cpp
@ -41,15 +41,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "physfsx.h"
 #include "switch.h"
 #include "game.h"
-#include "newmenu.h"
-#if DXX_USE_EDITOR
-#include "editor/editor.h"
-#include "editor/esegment.h"
-#include "d_range.h"
-#endif
 #include "fuelcen.h"
 #include "hash.h"
-#include "key.h"
 #include "piggy.h"
 #include "gamesave.h"
 #include "compiler-poison.h"
--- a/similar/main/gamerend.cpp
+++ b/similar/main/gamerend.cpp
@ -36,7 +36,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "bm.h"
 #include "player.h"
 #include "render.h"
-#include "menu.h"
 #include "newmenu.h"
 #include "screens.h"
 #include "config.h"
@ -50,9 +49,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "multi.h"
 #include "hudmsg.h"
 #include "endlevel.h"
-#include "cntrlcen.h"
 #include "powerup.h"
-#include "laser.h"
 #include "playsave.h"
 #include "automap.h"
 #include "mission.h"
--- a/similar/main/gamesave.cpp
+++ b/similar/main/gamesave.cpp
@ -29,7 +29,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "pstypes.h"
 #include "strutil.h"
 #include "console.h"
-#include "key.h"
 #include "gr.h"
 #include "palette.h"
 #include "newmenu.h"
@ -43,23 +42,19 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "object.h"
 #include "game.h"
 #include "gameseg.h"
-#include "screens.h"
 #include "wall.h"
 #include "gamemine.h"
 #include "robot.h"
 #include "bm.h"
-#include "menu.h"
 #include "fireball.h"
 #include "switch.h"
 #include "fuelcen.h"
 #include "cntrlcen.h"
 #include "powerup.h"
-#include "hostage.h"
 #include "weapon.h"
 #include "player.h"
 #include "newdemo.h"
 #include "gameseq.h"
-#include "automap.h"
 #include "polyobj.h"
 #include "text.h"
 #include "gamefont.h"
@ -72,7 +67,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "textures.h"
 #include "d_enumerate.h"
 #include "d_range.h"
-
+#include "vclip.h"
 #include "compiler-range_for.h"
 #include "d_levelstate.h"
 #include "d_zip.h"
--- a/Show more
+++ b/Show more