Move netcode files to a new folder

2024-11-14 17:01:07 +00:00 · 2022-12-31 14:10:19 +01:00 · 2022-12-31 14:10:19 +01:00 · 717e0d5a17
commit 717e0d5a17
parent 05d232c029
56 changed files with 170 additions and 169 deletions
--- a/src/Makefile
+++ b/src/Makefile
@ -207,6 +207,7 @@ objdir:=$(makedir)/objs
 sources+=\
 	$(call List,Sourcefile)\
 	$(call List,blua/Sourcefile)\
+	$(call List,netcode/Sourcefile)\

 depends:=$(basename $(filter %.c %.s,$(sources)))
 objects:=$(basename $(filter %.c %.s %.nas,$(sources)))
--- a/src/Sourcefile
+++ b/src/Sourcefile
@ -1,9 +1,5 @@
 string.c
 d_main.c
-d_clisrv.c
-d_net.c
-d_netfil.c
-d_netcmd.c
 dehacked.c
 deh_soc.c
 deh_lua.c
@ -77,9 +73,6 @@ s_sound.c
 sounds.c
 w_wad.c
 filesrch.c
-mserv.c
-http-mserv.c
-i_tcp.c
 lzf.c
 vid_copy.s
 b_bot.c
--- a/src/android/i_net.c
+++ b/src/android/i_net.c
@ -1,4 +1,4 @@
-#include "../i_net.h"
+#include "../netcode/i_net.h"

 boolean I_InitNetwork(void)
 {
--- a/src/blua/liolib.c
+++ b/src/blua/liolib.c
@ -19,7 +19,7 @@
 #include "lualib.h"
 #include "../i_system.h"
 #include "../g_game.h"
-#include "../d_netfil.h"
+#include "../netcode/d_netfil.h"
 #include "../lua_libs.h"
 #include "../byteptr.h"
 #include "../lua_script.h"
--- a/src/command.c
+++ b/src/command.c
@ -28,11 +28,11 @@
 #include "byteptr.h"
 #include "p_saveg.h"
 #include "g_game.h" // for player_names
-#include "d_netcmd.h"
+#include "netcode/d_netcmd.h"
 #include "hu_stuff.h"
 #include "p_setup.h"
 #include "lua_script.h"
-#include "d_netfil.h" // findfile
+#include "netcode/d_netfil.h" // findfile
 #include "r_data.h" // Color_cons_t

 //========
--- a/src/d_main.c
+++ b/src/d_main.c
@ -34,7 +34,7 @@
 #include "doomdef.h"
 #include "am_map.h"
 #include "console.h"
-#include "d_net.h"
+#include "netcode/d_net.h"
 #include "f_finale.h"
 #include "g_game.h"
 #include "hu_stuff.h"
@ -57,11 +57,11 @@
 #include "w_wad.h"
 #include "z_zone.h"
 #include "d_main.h"
-#include "d_netfil.h"
+#include "netcode/d_netfil.h"
 #include "m_cheat.h"
 #include "y_inter.h"
 #include "p_local.h" // chasecam
-#include "mserv.h" // ms_RoomId
+#include "netcode/mserv.h" // ms_RoomId
 #include "m_misc.h" // screenshot functionality
 #include "deh_tables.h" // Dehacked list test
 #include "m_cond.h" // condition initialization
--- a/src/deh_soc.c
+++ b/src/deh_soc.c
@ -34,7 +34,7 @@
 #include "r_sky.h"
 #include "fastcmp.h"
 #include "lua_script.h" // Reluctantly included for LUA_EvalMath
-#include "d_clisrv.h"
+#include "netcode/d_clisrv.h"

 #ifdef HWRENDER
 #include "hardware/hw_light.h"
--- a/src/deh_soc.h
+++ b/src/deh_soc.h
@ -35,7 +35,7 @@
 #include "r_sky.h"
 #include "fastcmp.h"
 #include "lua_script.h" // Reluctantly included for LUA_EvalMath
-#include "d_clisrv.h"
+#include "netcode/d_clisrv.h"

 #ifdef HWRENDER
 #include "hardware/hw_light.h"
--- a/src/doomstat.h
+++ b/src/doomstat.h
@ -683,7 +683,7 @@ extern boolean singletics;
 // Netgame stuff
 // =============

-#include "d_clisrv.h"
+#include "netcode/d_clisrv.h"

 extern consvar_t cv_timetic; // display high resolution timer
 extern consvar_t cv_powerupdisplay; // display powerups
--- a/src/dummy/i_net.c
+++ b/src/dummy/i_net.c
@ -1,4 +1,4 @@
-#include "../i_net.h"
+#include "../netcode/i_net.h"

 boolean I_InitNetwork(void)
 {
--- a/src/f_finale.c
+++ b/src/f_finale.c
@ -14,7 +14,7 @@
 #include "doomdef.h"
 #include "doomstat.h"
 #include "d_main.h"
-#include "d_netcmd.h"
+#include "netcode/d_netcmd.h"
 #include "f_finale.h"
 #include "g_game.h"
 #include "hu_stuff.h"
--- a/src/filesrch.c
+++ b/src/filesrch.c
@ -26,7 +26,7 @@
 #include <string.h>

 #include "filesrch.h"
-#include "d_netfil.h"
+#include "netcode/d_netfil.h"
 #include "m_misc.h"
 #include "z_zone.h"
 #include "m_menu.h" // Addons_option_Onchange
--- a/src/filesrch.h
+++ b/src/filesrch.h
@ -5,7 +5,7 @@
 #define __FILESRCH_H__

 #include "doomdef.h"
-#include "d_netfil.h"
+#include "netcode/d_netfil.h"
 #include "m_menu.h" // MAXSTRINGLENGTH
 #include "w_wad.h"

--- a/src/g_demo.c
+++ b/src/g_demo.c
@ -15,7 +15,7 @@
 #include "console.h"
 #include "d_main.h"
 #include "d_player.h"
-#include "d_clisrv.h"
+#include "netcode/d_clisrv.h"
 #include "p_setup.h"
 #include "i_time.h"
 #include "i_system.h"
--- a/src/g_game.c
+++ b/src/g_game.c
@ -15,7 +15,7 @@
 #include "console.h"
 #include "d_main.h"
 #include "d_player.h"
-#include "d_clisrv.h"
+#include "netcode/d_clisrv.h"
 #include "f_finale.h"
 #include "p_setup.h"
 #include "p_saveg.h"
--- a/src/g_input.c
+++ b/src/g_input.c
@ -18,7 +18,7 @@
 #include "i_gamepad.h"
 #include "keys.h"
 #include "hu_stuff.h" // need HUFONT start & end
-#include "d_net.h"
+#include "netcode/d_net.h"
 #include "console.h"

 #define MAXMOUSESENSITIVITY 100 // sensitivity steps
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@ -29,7 +29,7 @@
 #include "../r_patch.h"
 #include "../r_picformats.h"
 #include "../r_bsp.h"
-#include "../d_clisrv.h"
+#include "../netcode/d_clisrv.h"
 #include "../w_wad.h"
 #include "../z_zone.h"
 #include "../r_splats.h"
@ -5234,7 +5234,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
 		{
 			interpmobjstate_t casterinterp = {};
 			fixed_t groundz;
-			fixed_t floordiff; 
+			fixed_t floordiff;

 			if (R_UsingFrameInterpolation() && !paused)
 			{
@ -5244,7 +5244,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
 			{
 				R_InterpolateMobjState(caster, FRACUNIT, &casterinterp);
 			}
-			
+
 			groundz = R_GetShadowZ(thing, NULL);
 			floordiff = abs(((thing->eflags & MFE_VERTICALFLIP) ? caster->height : 0) + casterinterp.z - groundz);

--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@ -19,7 +19,7 @@
 #include "m_cond.h" // emblems
 #include "m_misc.h" // word jumping

-#include "d_clisrv.h"
+#include "netcode/d_clisrv.h"

 #include "g_game.h"
 #include "g_input.h"
--- a/src/i_time.c
+++ b/src/i_time.c
@ -17,7 +17,7 @@

 #include "command.h"
 #include "doomtype.h"
-#include "d_netcmd.h"
+#include "netcode/d_netcmd.h"
 #include "m_fixed.h"
 #include "i_system.h"

--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@ -27,11 +27,11 @@
 #include "y_inter.h"
 #include "hu_stuff.h"	// HU_AddChatText
 #include "console.h"
-#include "d_netcmd.h" // IsPlayerAdmin
+#include "netcode/d_netcmd.h" // IsPlayerAdmin
 #include "m_menu.h" // Player Setup menu color stuff
 #include "m_misc.h" // M_MapNumber
 #include "b_bot.h" // B_UpdateBotleader
-#include "d_clisrv.h" // CL_RemovePlayer
+#include "netcode/d_clisrv.h" // CL_RemovePlayer
 #include "i_system.h" // I_GetPreciseTime, I_GetPrecisePrecision

 #include "lua_script.h"
--- a/src/lua_hooklib.c
+++ b/src/lua_hooklib.c
@ -25,7 +25,7 @@
 #include "lua_hud.h" // hud_running errors

 #include "m_perfstats.h"
-#include "d_netcmd.h" // for cv_perfstats
+#include "netcode/d_netcmd.h" // for cv_perfstats
 #include "i_system.h" // I_GetPreciseTime

 /* =========================================================================
--- a/src/lua_script.c
+++ b/src/lua_script.c
@ -28,7 +28,7 @@
 #include "p_slopes.h" // for P_SlopeById and slopelist
 #include "p_polyobj.h" // polyobj_t, PolyObjects
 #ifdef LUA_ALLOW_BYTECODE
-#include "d_netfil.h" // for LUA_DumpFile
+#include "netcode/d_netfil.h" // for LUA_DumpFile
 #endif

 #include "lua_script.h"
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@ -19,7 +19,7 @@
 #include "r_local.h"
 #include "p_local.h"
 #include "p_setup.h"
-#include "d_net.h"
+#include "netcode/d_net.h"

 #include "m_cheat.h"
 #include "m_menu.h"
--- a/src/m_menu.c
+++ b/src/m_menu.c
@ -20,7 +20,7 @@

 #include "doomdef.h"
 #include "d_main.h"
-#include "d_netcmd.h"
+#include "netcode/d_netcmd.h"
 #include "console.h"
 #include "r_fps.h"
 #include "r_local.h"
@ -55,8 +55,8 @@
 #include "hardware/hw_main.h"
 #endif

-#include "d_net.h"
-#include "mserv.h"
+#include "netcode/d_net.h"
+#include "netcode/mserv.h"
 #include "m_misc.h"
 #include "m_anigif.h"
 #include "byteptr.h"
--- a/src/m_menu.h
+++ b/src/m_menu.h
@ -20,7 +20,7 @@
 #include "command.h"
 #include "f_finale.h" // for ttmode_enum
 #include "i_threads.h"
-#include "mserv.h"
+#include "netcode/mserv.h"
 #include "r_things.h" // for SKINNAMESIZE

 // Compatibility with old-style named NiGHTS replay files.
--- a/src/m_perfstats.c
+++ b/src/m_perfstats.c
@ -12,7 +12,7 @@
 #include "m_perfstats.h"
 #include "v_video.h"
 #include "i_video.h"
-#include "d_netcmd.h"
+#include "netcode/d_netcmd.h"
 #include "r_main.h"
 #include "i_system.h"
 #include "z_zone.h"
--- a/src/netcode/Sourcefile
+++ b/src/netcode/Sourcefile
@ -0,0 +1,7 @@
+d_clisrv.c
+d_net.c
+d_netcmd.c
+d_netfil.c
+http-mserv.c
+i_tcp.c
+mserv.c
--- a/src/netcode/d_clisrv.c
+++ b/src/netcode/d_clisrv.c
@ -15,48 +15,48 @@
 #include <unistd.h> //for unlink
 #endif

-#include "i_time.h"
+#include "../i_time.h"
 #include "i_net.h"
-#include "i_system.h"
-#include "i_video.h"
+#include "../i_system.h"
+#include "../i_video.h"
 #include "d_net.h"
-#include "d_main.h"
-#include "g_game.h"
-#include "st_stuff.h"
-#include "hu_stuff.h"
-#include "keys.h"
-#include "g_input.h"
-#include "i_gamepad.h"
-#include "m_menu.h"
-#include "console.h"
+#include "../d_main.h"
+#include "../g_game.h"
+#include "../st_stuff.h"
+#include "../hu_stuff.h"
+#include "../keys.h"
+#include "../g_input.h"
+#include "../i_gamepad.h"
+#include "../m_menu.h"
+#include "../console.h"
 #include "d_netfil.h"
-#include "byteptr.h"
-#include "p_saveg.h"
-#include "z_zone.h"
-#include "p_local.h"
-#include "p_haptic.h"
-#include "m_misc.h"
-#include "am_map.h"
-#include "m_random.h"
+#include "../byteptr.h"
+#include "../p_saveg.h"
+#include "../z_zone.h"
+#include "../p_local.h"
+#include "../p_haptic.h"
+#include "../m_misc.h"
+#include "../am_map.h"
+#include "../m_random.h"
 #include "mserv.h"
-#include "y_inter.h"
-#include "r_local.h"
-#include "m_argv.h"
-#include "p_setup.h"
-#include "lzf.h"
-#include "lua_script.h"
-#include "lua_hook.h"
-#include "lua_libs.h"
-#include "md5.h"
-#include "m_perfstats.h"
+#include "../y_inter.h"
+#include "../r_local.h"
+#include "../m_argv.h"
+#include "../p_setup.h"
+#include "../lzf.h"
+#include "../lua_script.h"
+#include "../lua_hook.h"
+#include "../lua_libs.h"
+#include "../md5.h"
+#include "../m_perfstats.h"

 // aaaaaa
-#include "i_gamepad.h"
+#include "../i_gamepad.h"

 // cl loading screen
-#include "v_video.h"
-#include "f_finale.h"
-#include "snake.h"
+#include "../v_video.h"
+#include "../f_finale.h"
+#include "../snake.h"

 //
 // NETWORKING
--- a/src/netcode/d_clisrv.h
+++ b/src/netcode/d_clisrv.h
@ -13,12 +13,12 @@
 #ifndef __D_CLISRV__
 #define __D_CLISRV__

-#include "d_ticcmd.h"
+#include "../d_ticcmd.h"
 #include "d_net.h"
 #include "d_netcmd.h"
 #include "d_net.h"
-#include "tables.h"
-#include "d_player.h"
+#include "../tables.h"
+#include "../d_player.h"
 #include "mserv.h"

 /*
--- a/src/netcode/d_net.c
+++ b/src/netcode/d_net.c
@ -16,19 +16,19 @@
 ///        This protocol uses a mix of "goback n" and "selective repeat" implementation
 ///        The NOTHING packet is sent when connection is idle to acknowledge packets

-#include "doomdef.h"
-#include "g_game.h"
-#include "i_time.h"
+#include "../doomdef.h"
+#include "../g_game.h"
+#include "../i_time.h"
 #include "i_net.h"
-#include "i_system.h"
-#include "m_argv.h"
+#include "../i_system.h"
+#include "../m_argv.h"
 #include "d_net.h"
-#include "w_wad.h"
+#include "../w_wad.h"
 #include "d_netfil.h"
 #include "d_clisrv.h"
-#include "z_zone.h"
+#include "../z_zone.h"
 #include "i_tcp.h"
-#include "d_main.h" // srb2home
+#include "../d_main.h" // srb2home

 //
 // NETWORKING
--- a/src/netcode/d_net.h
+++ b/src/netcode/d_net.h
--- a/src/netcode/d_netcmd.c
+++ b/src/netcode/d_netcmd.c
@ -12,44 +12,44 @@
 ///        commands are executed through the command buffer
 ///	       like console commands, other miscellaneous commands (at the end)

-#include "doomdef.h"
+#include "../doomdef.h"

-#include "console.h"
-#include "command.h"
-#include "i_time.h"
-#include "i_system.h"
-#include "g_game.h"
-#include "hu_stuff.h"
-#include "g_input.h"
-#include "i_gamepad.h"
-#include "m_menu.h"
-#include "r_local.h"
-#include "r_skins.h"
-#include "p_local.h"
-#include "p_setup.h"
-#include "s_sound.h"
-#include "i_sound.h"
-#include "m_misc.h"
-#include "am_map.h"
-#include "byteptr.h"
+#include "../console.h"
+#include "../command.h"
+#include "../i_time.h"
+#include "../i_system.h"
+#include "../g_game.h"
+#include "../hu_stuff.h"
+#include "../g_input.h"
+#include "../i_gamepad.h"
+#include "../m_menu.h"
+#include "../r_local.h"
+#include "../r_skins.h"
+#include "../p_local.h"
+#include "../p_setup.h"
+#include "../s_sound.h"
+#include "../i_sound.h"
+#include "../m_misc.h"
+#include "../am_map.h"
+#include "../byteptr.h"
 #include "d_netfil.h"
-#include "p_spec.h"
-#include "m_cheat.h"
+#include "../p_spec.h"
+#include "../m_cheat.h"
 #include "d_clisrv.h"
 #include "d_net.h"
-#include "v_video.h"
-#include "d_main.h"
-#include "m_random.h"
-#include "f_finale.h"
-#include "filesrch.h"
+#include "../v_video.h"
+#include "../d_main.h"
+#include "../m_random.h"
+#include "../f_finale.h"
+#include "../filesrch.h"
 #include "mserv.h"
-#include "z_zone.h"
-#include "lua_script.h"
-#include "lua_hook.h"
-#include "m_cond.h"
-#include "m_anigif.h"
-#include "md5.h"
-#include "m_perfstats.h"
+#include "../z_zone.h"
+#include "../lua_script.h"
+#include "../lua_hook.h"
+#include "../m_cond.h"
+#include "../m_anigif.h"
+#include "../md5.h"
+#include "../m_perfstats.h"

 #ifdef NETGAME_DEVMODE
 #define CV_RESTRICT CV_NETVAR
--- a/src/netcode/d_netcmd.h
+++ b/src/netcode/d_netcmd.h
@ -15,7 +15,7 @@
 #ifndef __D_NETCMD__
 #define __D_NETCMD__

-#include "command.h"
+#include "../command.h"

 // console vars
 extern consvar_t cv_playername;
--- a/src/netcode/d_netfil.c
+++ b/src/netcode/d_netfil.c
@ -31,24 +31,24 @@
 #include <sys/utime.h>
 #endif

-#include "doomdef.h"
-#include "doomstat.h"
-#include "d_main.h"
-#include "g_game.h"
-#include "i_time.h"
+#include "../doomdef.h"
+#include "../doomstat.h"
+#include "../d_main.h"
+#include "../g_game.h"
+#include "../i_time.h"
 #include "i_net.h"
-#include "i_system.h"
-#include "m_argv.h"
+#include "../i_system.h"
+#include "../m_argv.h"
 #include "d_net.h"
-#include "w_wad.h"
+#include "../w_wad.h"
 #include "d_netfil.h"
-#include "z_zone.h"
-#include "byteptr.h"
-#include "p_setup.h"
-#include "m_misc.h"
-#include "m_menu.h"
-#include "md5.h"
-#include "filesrch.h"
+#include "../z_zone.h"
+#include "../byteptr.h"
+#include "../p_setup.h"
+#include "../m_misc.h"
+#include "../m_menu.h"
+#include "../md5.h"
+#include "../filesrch.h"

 #include <errno.h>

--- a/src/netcode/d_netfil.h
+++ b/src/netcode/d_netfil.h
@ -15,7 +15,7 @@

 #include "d_net.h"
 #include "d_clisrv.h"
-#include "w_wad.h"
+#include "../w_wad.h"

 typedef enum
 {
--- a/src/netcode/http-mserv.c
+++ b/src/netcode/http-mserv.c
@ -18,14 +18,14 @@ Documentation available here.
 #include <curl/curl.h>
 #endif

-#include "doomdef.h"
+#include "../doomdef.h"
 #include "d_clisrv.h"
-#include "command.h"
-#include "m_argv.h"
-#include "m_menu.h"
+#include "../command.h"
+#include "../m_argv.h"
+#include "../m_menu.h"
 #include "mserv.h"
 #include "i_tcp.h"/* for current_port */
-#include "i_threads.h"
+#include "../i_threads.h"

 /* reasonable default I guess?? */
 #define DEFAULT_BUFFER_SIZE (4096)
--- a/src/netcode/i_addrinfo.c
+++ b/src/netcode/i_addrinfo.c
--- a/src/netcode/i_addrinfo.h
+++ b/src/netcode/i_addrinfo.h
--- a/src/netcode/i_net.h
+++ b/src/netcode/i_net.h
@ -18,8 +18,8 @@
 #pragma interface
 #endif

-#include "doomdef.h"
-#include "command.h"
+#include "../doomdef.h"
+#include "../command.h"

 /// \brief program net id
 #define DOOMCOM_ID (INT32)0x12345678l
--- a/src/netcode/i_tcp.c
+++ b/src/netcode/i_tcp.c
@ -36,7 +36,7 @@
 	#include <ws2tcpip.h>
 #endif

-#include "doomdef.h"
+#include "../doomdef.h"

 #ifdef USE_WINSOCK1
 	#include <winsock.h>
@ -122,14 +122,14 @@ typedef union

 #define MAXBANS 100

-#include "i_system.h"
+#include "../i_system.h"
 #include "i_net.h"
 #include "d_net.h"
 #include "d_netfil.h"
 #include "i_tcp.h"
-#include "m_argv.h"
+#include "../m_argv.h"

-#include "doomstat.h"
+#include "../doomstat.h"

 // win32
 #ifdef USE_WINSOCK
--- a/src/netcode/i_tcp.h
+++ b/src/netcode/i_tcp.h
--- a/src/netcode/mserv.c
+++ b/src/netcode/mserv.c
@ -15,13 +15,13 @@
 #include <time.h>
 #endif

-#include "doomstat.h"
-#include "doomdef.h"
-#include "command.h"
-#include "i_threads.h"
+#include "../doomstat.h"
+#include "../doomdef.h"
+#include "../command.h"
+#include "../i_threads.h"
 #include "mserv.h"
-#include "m_menu.h"
-#include "z_zone.h"
+#include "../m_menu.h"
+#include "../z_zone.h"

 #ifdef MASTERSERVER

--- a/src/netcode/mserv.h
+++ b/src/netcode/mserv.h
@ -14,7 +14,7 @@
 #ifndef _MSERV_H_
 #define _MSERV_H_

-#include "i_threads.h"
+#include "../i_threads.h"

 // lowered from 32 due to menu changes
 #define NUM_LIST_ROOMS 16
--- a/src/p_ceilng.c
+++ b/src/p_ceilng.c
@ -17,7 +17,7 @@
 #include "r_main.h"
 #include "s_sound.h"
 #include "z_zone.h"
-#include "d_netcmd.h"
+#include "netcode/d_netcmd.h"

 // ==========================================================================
 //                              CEILINGS
--- a/src/p_haptic.c
+++ b/src/p_haptic.c
@ -11,7 +11,7 @@

 #include "p_haptic.h"
 #include "g_game.h"
-#include "d_netcmd.h"
+#include "netcode/d_netcmd.h"
 #include "i_gamepad.h"
 #include "doomstat.h"

--- a/src/p_lights.c
+++ b/src/p_lights.c
@ -17,7 +17,7 @@
 #include "r_state.h"
 #include "z_zone.h"
 #include "m_random.h"
-#include "d_netcmd.h"
+#include "netcode/d_netcmd.h"

 /** Removes any active lighting effects in a sector.
  *
--- a/src/p_user.c
+++ b/src/p_user.c
@ -18,7 +18,7 @@
 #include "doomdef.h"
 #include "i_system.h"
 #include "d_event.h"
-#include "d_net.h"
+#include "netcode/d_net.h"
 #include "g_game.h"
 #include "p_local.h"
 #include "r_fps.h"
--- a/src/r_segs.c
+++ b/src/r_segs.c
@ -20,7 +20,7 @@

 #include "w_wad.h"
 #include "z_zone.h"
-#include "d_netcmd.h"
+#include "netcode/d_netcmd.h"
 #include "m_misc.h"
 #include "p_local.h" // Camera...
 #include "p_slopes.h"
--- a/src/r_things.c
+++ b/src/r_things.c
@ -34,7 +34,7 @@
 #include "p_tick.h"
 #include "p_local.h"
 #include "p_slopes.h"
-#include "d_netfil.h" // blargh. for nameonly().
+#include "netcode/d_netfil.h" // blargh. for nameonly().
 #include "m_cheat.h" // objectplace
 #ifdef HWRENDER
 #include "hardware/hw_md2.h"
--- a/src/screen.c
+++ b/src/screen.c
@ -27,7 +27,7 @@
 #include "hu_stuff.h"
 #include "z_zone.h"
 #include "d_main.h"
-#include "d_clisrv.h"
+#include "netcode/d_clisrv.h"
 #include "f_finale.h"
 #include "y_inter.h" // usebuffer
 #include "i_sound.h" // closed captions
--- a/src/sdl/i_gamepad.c
+++ b/src/sdl/i_gamepad.c
@ -15,7 +15,7 @@
 #include "../i_system.h"
 #include "../doomdef.h"
 #include "../d_main.h"
-#include "../d_netcmd.h"
+#include "../netcode/d_netcmd.h"
 #include "../g_game.h"
 #include "../m_argv.h"
 #include "../m_menu.h"
--- a/src/sdl/i_net.c
+++ b/src/sdl/i_net.c
@ -21,16 +21,16 @@

 #include "../i_system.h"
 #include "../d_event.h"
-#include "../d_net.h"
+#include "../netcode/d_net.h"
 #include "../m_argv.h"

 #include "../doomstat.h"

-#include "../i_net.h"
+#include "../netcode/i_net.h"

 #include "../z_zone.h"

-#include "../i_tcp.h"
+#include "../netcode/i_tcp.h"

 #ifdef HAVE_SDL

--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@ -188,7 +188,7 @@ static char returnWadPath[256];
 #include "../i_gamepad.h"
 #include "../i_threads.h"
 #include "../screen.h" //vid.WndParent
-#include "../d_net.h"
+#include "../netcode/d_net.h"
 #include "../g_game.h"
 #include "../filesrch.h"
 #include "endtxt.h"
@ -207,7 +207,7 @@ static char returnWadPath[256];

 #if !defined(NOMUMBLE) && defined(HAVE_MUMBLE)
 // Mumble context string
-#include "../d_clisrv.h"
+#include "../netcode/d_clisrv.h"
 #include "../byteptr.h"
 #endif

--- a/src/sdl/i_ttf.c
+++ b/src/sdl/i_ttf.c
@ -21,7 +21,7 @@
 #include "SDL_ttf.h"
 #include "../doomdef.h"
 #include "../doomstat.h"
-#include "../d_netfil.h"
+#include "../netcode/d_netfil.h"
 #include "../filesrch.h"
 #include "i_ttf.h"

--- a/src/w_wad.c
+++ b/src/w_wad.c
@ -51,8 +51,8 @@
 #include "filesrch.h"

 #include "d_main.h"
-#include "d_netfil.h"
-#include "d_clisrv.h"
+#include "netcode/d_netfil.h"
+#include "netcode/d_clisrv.h"
 #include "dehacked.h"
 #include "r_defs.h"
 #include "r_data.h"
--- a/src/y_inter.c
+++ b/src/y_inter.c
@ -15,7 +15,7 @@
 #include "f_finale.h"
 #include "g_game.h"
 #include "hu_stuff.h"
-#include "i_net.h"
+#include "netcode/i_net.h"
 #include "i_video.h"
 #include "p_tick.h"
 #include "r_defs.h"