diff --git a/quakespasm/Linux/QuakeSpasm.cbp b/quakespasm/Linux/QuakeSpasm.cbp
index 11ebca76..db411fac 100644
--- a/quakespasm/Linux/QuakeSpasm.cbp
+++ b/quakespasm/Linux/QuakeSpasm.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin/Debug/fitzquake" prefix_auto="1" extension_auto="1" />
+				<Option output="bin/Debug/quakespasm" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -17,7 +17,7 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="bin/Release/fitzquake" prefix_auto="1" extension_auto="1" />
+				<Option output="bin/Release/quakespasm" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -37,13 +37,10 @@
 		<Linker>
 			<Add option="`sdl-config --libs`" />
 			<Add option="-lGL" />
-			<Add option="-lGLU" />
-			<Add option="-lSDL_net" />
-			<Add directory="C:/Programme/SDL/lib" />
 		</Linker>
-		<Unit filename="cb.bmp" />
 		<Unit filename="../Quake/anorm_dots.h" />
 		<Unit filename="../Quake/anorms.h" />
+		<Unit filename="../Quake/arch_def.h" />
 		<Unit filename="../Quake/bspfile.h" />
 		<Unit filename="../Quake/cd_sdl.c">
 			<Option compilerVar="CC" />
@@ -92,7 +89,6 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../Quake/cvar.h" />
-		<Unit filename="../Quake/d_ifacea.h" />
 		<Unit filename="../Quake/draw.h" />
 		<Unit filename="../Quake/gl_draw.c">
 			<Option compilerVar="CC" />
@@ -169,6 +165,7 @@
 		<Unit filename="../Quake/menu.h" />
 		<Unit filename="../Quake/modelgen.h" />
 		<Unit filename="../Quake/net.h" />
+		<Unit filename="../Quake/net_defs.h" />
 		<Unit filename="../Quake/net_dgrm.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -180,14 +177,14 @@
 		<Unit filename="../Quake/net_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../Quake/net_sdl.c">
+		<Unit filename="../Quake/net_bsd.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../Quake/net_sdlnet.c">
+		<Unit filename="../Quake/net_udp.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../Quake/net_sdlnet.h" />
-		<Unit filename="../Quake/net_ser.h" />
+		<Unit filename="../Quake/net_udp.h" />
+		<Unit filename="../Quake/net_sys.h" />
 		<Unit filename="../Quake/pl_linux.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -206,6 +203,8 @@
 		<Unit filename="../Quake/progdefs.q1" />
 		<Unit filename="../Quake/progs.h" />
 		<Unit filename="../Quake/protocol.h" />
+		<Unit filename="../Quake/q_stdinc.h" />
+		<Unit filename="../Quake/qs_bmp.h" />
 		<Unit filename="../Quake/quakedef.h" />
 		<Unit filename="../Quake/r_alias.c">
 			<Option compilerVar="CC" />
@@ -257,7 +256,7 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../Quake/sys.h" />
-		<Unit filename="../Quake/sys_sdl.c">
+		<Unit filename="../Quake/sys_sdl_unix.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../Quake/vid.h" />
diff --git a/quakespasm/Linux/QuakeSpasm.layout b/quakespasm/Linux/QuakeSpasm.layout
index 7d7f07cf..4f8180db 100644
--- a/quakespasm/Linux/QuakeSpasm.layout
+++ b/quakespasm/Linux/QuakeSpasm.layout
@@ -94,7 +94,7 @@
 	<File name="../Quake/snd_sdl.c" open="1" top="0" tabpos="3">
 		<Cursor position="1435" topLine="20" />
 	</File>
-	<File name="../Quake/sys_sdl.c" open="0" top="0" tabpos="4">
+	<File name="../Quake/sys_sdl_unix.c" open="0" top="0" tabpos="4">
 		<Cursor position="3415" topLine="137" />
 	</File>
 	<File name="../Quake/wad.c" open="0" top="0" tabpos="3">
diff --git a/quakespasm/Windows/QuakeSpasm.cbp b/quakespasm/Windows/QuakeSpasm.cbp
index 28977726..abd03133 100644
--- a/quakespasm/Windows/QuakeSpasm.cbp
+++ b/quakespasm/Windows/QuakeSpasm.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin\Debug\sdlfitzquake" prefix_auto="1" extension_auto="1" />
+				<Option output="bin\Debug\quakespasm" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj\Debug\" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -17,7 +17,7 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="bin\Release\sdlfitzquake" prefix_auto="1" extension_auto="1" />
+				<Option output="bin\Release\quakespasm" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj\Release\" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -43,13 +43,12 @@
 			<Add library="winmm" />
 			<Add library="dxguid" />
 			<Add library="opengl32" />
-			<Add library="glu32" />
-			<Add library="SDL_net" />
 			<Add library="ws2_32" />
 			<Add directory="C:\Programme\SDL\lib" />
 		</Linker>
 		<Unit filename="..\Quake\anorm_dots.h" />
 		<Unit filename="..\Quake\anorms.h" />
+		<Unit filename="..\Quake\arch_def.h" />
 		<Unit filename="..\Quake\bspfile.h" />
 		<Unit filename="..\Quake\cd_sdl.c">
 			<Option compilerVar="CC" />
@@ -98,7 +97,6 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\Quake\cvar.h" />
-		<Unit filename="..\Quake\d_ifacea.h" />
 		<Unit filename="..\Quake\draw.h" />
 		<Unit filename="..\Quake\gl_draw.c">
 			<Option compilerVar="CC" />
@@ -174,6 +172,7 @@
 		<Unit filename="..\Quake\menu.h" />
 		<Unit filename="..\Quake\modelgen.h" />
 		<Unit filename="..\Quake\net.h" />
+		<Unit filename="..\Quake\net_defs.h" />
 		<Unit filename="..\Quake\net_dgrm.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -185,13 +184,18 @@
 		<Unit filename="..\Quake\net_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\Quake\net_sdl.c">
+		<Unit filename="..\Quake\net_win.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\Quake\net_sdlnet.c">
+		<Unit filename="..\Quake\net_sys.h" />
+		<Unit filename="..\Quake\net_wins.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\Quake\net_sdlnet.h" />
+		<Unit filename="..\Quake\net_wins.h" />
+		<Unit filename="..\Quake\net_wipx.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\Quake\net_wipx.h" />
 		<Unit filename="..\Quake\pl_win.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -209,6 +213,8 @@
 		<Unit filename="..\Quake\progdefs.h" />
 		<Unit filename="..\Quake\progs.h" />
 		<Unit filename="..\Quake\protocol.h" />
+		<Unit filename="..\Quake\q_stdinc.h" />
+		<Unit filename="..\Quake\qs_bmp.h" />
 		<Unit filename="..\Quake\quakedef.h" />
 		<Unit filename="..\Quake\r_alias.c">
 			<Option compilerVar="CC" />
@@ -260,7 +266,7 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\Quake\sys.h" />
-		<Unit filename="..\Quake\sys_sdl.c">
+		<Unit filename="..\Quake\sys_sdl_win.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\Quake\vid.h" />
@@ -276,6 +282,7 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\Quake\world.h" />
+		<Unit filename="..\Quake\wsaerror.h" />
 		<Unit filename="..\Quake\zone.c">
 			<Option compilerVar="CC" />
 		</Unit>
diff --git a/quakespasm/Windows/QuakeSpasm.layout b/quakespasm/Windows/QuakeSpasm.layout
index 53757099..10eb2bdb 100644
--- a/quakespasm/Windows/QuakeSpasm.layout
+++ b/quakespasm/Windows/QuakeSpasm.layout
@@ -55,7 +55,7 @@
 	<File name="..\Quake\net_dgrm.c" open="0" top="0" tabpos="3">
 		<Cursor position="905" topLine="21" />
 	</File>
-	<File name="..\Quake\net_sdlnet.c" open="1" top="1" tabpos="2">
+	<File name="..\Quake\net_wins.c" open="1" top="1" tabpos="2">
 		<Cursor position="766" topLine="0" />
 	</File>
 	<File name="..\Quake\pl_win.c" open="0" top="0" tabpos="2">
@@ -85,7 +85,7 @@
 	<File name="..\Quake\snd_mix.c" open="0" top="0" tabpos="0">
 		<Cursor position="3595" topLine="145" />
 	</File>
-	<File name="..\Quake\sys_sdl.c" open="0" top="0" tabpos="6">
+	<File name="..\Quake\sys_sdl_win.c" open="0" top="0" tabpos="6">
 		<Cursor position="3415" topLine="137" />
 	</File>
 	<File name="..\Quake\wad.c" open="0" top="0" tabpos="5">