diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 285d670b8..83e31551d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D2X-Rebirth Changelog
 
+20090304
+--------
+various: Abstracting networking protocols - Step 1: Renaming network-related files; Removing net_ipx.h (former network.h) includes from as much files as possible to make isolation of IPX-related functions easier in Step 2; Version defines Cleanup - needed later for good Version-Checking
+
 20090303
 --------
 arch/include/digi_mixer_music.h, arch/include/jukebox.h, arch/sdl/digi_mixer_music.c, arch/sdl/digi_mixer.c, arch/sdl/digi.c, arch/sdl/init.c, arch/sdl/jukebox.c, arch/sdl/rbaudio.c, include/rbaudio.h, main/automap.c, main/config.h, main/credits.c, main/digi.h, main/game.c, main/gamecntl.c, main/kconfig.c, main/kmatrix.c, main/menu.c, main/network.c, main/newmenu.c, main/scores.c, main/songs.c, main/songs.h: Associate the jukebox with Redbook Audio via new 'extmusic' layer - separating from MIDI and making it handle ALL music (not just game music)
diff --git a/SConstruct b/SConstruct
index 4aee56bd2..2c400e740 100644
--- a/SConstruct
+++ b/SConstruct
@@ -135,10 +135,10 @@ common_sources = [
 'main/movie.c',
 'main/multi.c',
 'main/multibot.c',
+'main/net_ipx.c',
 'main/netdrv.c',
 'main/netdrv_udp.c',
 'main/netpkt.c',
-'main/network.c',
 'main/newdemo.c',
 'main/newmenu.c',
 'main/noloss.c',
@@ -241,8 +241,8 @@ editor_sources = [
 
 # for linux
 arch_linux_sources = [
-'arch/linux/netdrv_ipx.c',
-'arch/linux/netdrv_kali.c',
+'arch/linux/ipx.c',
+'arch/linux/ipx_kali.c',
 'arch/linux/ukali.c'
 ]
 
@@ -260,7 +260,7 @@ if (sdlmixer == 1):
 # for windows
 arch_win32_sources = [
 'arch/win32/hmpfile.c',
-'arch/win32/netdrv_ipx.c',
+'arch/win32/ipx.c',
 ]
 
 # for Mac OS X
diff --git a/arch/linux/netdrv_ipx.c b/arch/linux/ipx.c
similarity index 100%
rename from arch/linux/netdrv_ipx.c
rename to arch/linux/ipx.c
diff --git a/arch/linux/netdrv_kali.c b/arch/linux/ipx_kali.c
similarity index 100%
rename from arch/linux/netdrv_kali.c
rename to arch/linux/ipx_kali.c
diff --git a/arch/win32/netdrv_ipx.c b/arch/win32/ipx.c
similarity index 100%
rename from arch/win32/netdrv_ipx.c
rename to arch/win32/ipx.c
diff --git a/main/ai.c b/main/ai.c
index 1a3a9510f..3648fcdc9 100644
--- a/main/ai.c
+++ b/main/ai.c
@@ -55,7 +55,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "multibot.h"
 #ifdef NETWORK
 #include "multi.h"
-#include "network.h"
 #endif
 #include "gameseq.h"
 #include "key.h"
diff --git a/main/ai2.c b/main/ai2.c
index 23214c207..ba17de8fe 100644
--- a/main/ai2.c
+++ b/main/ai2.c
@@ -54,7 +54,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "multibot.h"
 #ifdef NETWORK
 #include "multi.h"
-#include "network.h"
 #endif
 #include "gameseq.h"
 #include "key.h"
diff --git a/main/automap.c b/main/automap.c
index d53050069..7ba62f978 100644
--- a/main/automap.c
+++ b/main/automap.c
@@ -58,7 +58,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "gamefont.h"
 #ifdef NETWORK
 #include "multi.h"
-#include "network.h"
 #endif
 #include "kconfig.h"
 #include "endlevel.h"
diff --git a/main/collide.c b/main/collide.c
index ad83dff17..ade0ef4ba 100644
--- a/main/collide.c
+++ b/main/collide.c
@@ -55,9 +55,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "player.h"
 #include "gauges.h"
 #include "powerup.h"
-#ifdef NETWORK
-#include "network.h"
-#endif
 #include "newmenu.h"
 #include "scores.h"
 #include "effects.h"
diff --git a/main/endlevel.c b/main/endlevel.c
index eb558c4bb..78b6c4f03 100644
--- a/main/endlevel.c
+++ b/main/endlevel.c
@@ -61,7 +61,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "vclip.h"
 #include "fireball.h"
 #ifdef NETWORK
-#include "network.h"
+#include "net_ipx.h"
 #endif
 #include "text.h"
 #include "digi.h"
diff --git a/main/fireball.c b/main/fireball.c
index 1087ef6ae..14eb8431c 100644
--- a/main/fireball.c
+++ b/main/fireball.c
@@ -47,7 +47,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "collide.h"
 #include "newmenu.h"
 #ifdef NETWORK
-#include "network.h"
+#include "net_ipx.h"
 #endif
 #include "gameseq.h"
 #include "physics.h"
diff --git a/main/fuelcen.c b/main/fuelcen.c
index 2262a49b8..7e0240bcb 100644
--- a/main/fuelcen.c
+++ b/main/fuelcen.c
@@ -49,7 +49,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "collide.h"
 #include "laser.h"
 #ifdef NETWORK
-#include "network.h"
 #include "multi.h"
 #endif
 #include "multibot.h"
diff --git a/main/game.c b/main/game.c
index b70a2878b..f6698c17e 100644
--- a/main/game.c
+++ b/main/game.c
@@ -75,9 +75,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "powerup.h"
 #include "fireball.h"
 #include "newmenu.h"
-#ifdef NETWORK
-#include "network.h"
-#endif
 #include "gamefont.h"
 #include "endlevel.h"
 #include "kconfig.h"
diff --git a/main/gamecntl.c b/main/gamecntl.c
index 9f0829c5a..11f7be784 100644
--- a/main/gamecntl.c
+++ b/main/gamecntl.c
@@ -71,9 +71,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "powerup.h"
 #include "songs.h"
 #include "newmenu.h"
-#ifdef NETWORK
-#include "network.h"
-#endif
 #include "gamefont.h"
 #include "endlevel.h"
 #include "kconfig.h"
diff --git a/main/gamerend.c b/main/gamerend.c
index 52120daf6..931446bce 100644
--- a/main/gamerend.c
+++ b/main/gamerend.c
@@ -55,7 +55,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "gameseq.h"
 
 #ifdef NETWORK
-#include "network.h"
+#include "net_ipx.h"
 #endif
 
 #ifdef OGL
diff --git a/main/gameseq.c b/main/gameseq.c
index 1b82a8ed7..d8af7d8f0 100644
--- a/main/gameseq.c
+++ b/main/gameseq.c
@@ -79,7 +79,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "endlevel.h"
 #ifdef NETWORK
 #  include "multi.h"
-#  include "network.h"
 #  include "netpkt.h"
 #endif
 #include "playsave.h"
diff --git a/main/gauges.c b/main/gauges.c
index ed4438a7d..483e81d90 100644
--- a/main/gauges.c
+++ b/main/gauges.c
@@ -44,7 +44,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "sounds.h"
 #ifdef NETWORK
 #include "multi.h"
-#include "network.h"
 #endif
 #include "endlevel.h"
 #include "cntrlcen.h"
diff --git a/main/inferno.c b/main/inferno.c
index 45b9ef9f9..59e621105 100644
--- a/main/inferno.c
+++ b/main/inferno.c
@@ -77,9 +77,6 @@ char copyright[] = "DESCENT II  COPYRIGHT (C) 1994-1996 PARALLAX SOFTWARE CORPOR
 #include "player.h"
 #include "text.h"
 #include "gauges.h"
-#ifdef NETWORK
-#include "network.h"
-#endif
 #include "gamefont.h"
 #include "kconfig.h"
 #include "mouse.h"
diff --git a/main/kmatrix.c b/main/kmatrix.c
index 9c131cec8..43d8f7fa2 100644
--- a/main/kmatrix.c
+++ b/main/kmatrix.c
@@ -50,7 +50,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "kmatrix.h"
 #include "gauges.h"
 #include "pcx.h"
-#include "network.h"
+#include "net_ipx.h"
 
 #ifdef OGL
 #include "ogl_init.h"
diff --git a/main/laser.c b/main/laser.c
index a9f5ecd7b..25a03946d 100644
--- a/main/laser.c
+++ b/main/laser.c
@@ -48,9 +48,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "timer.h"
 #include "player.h"
 #include "sounds.h"
-#ifdef NETWORK
-#include "network.h"
-#endif
 #include "ai.h"
 #include "powerup.h"
 #include "multi.h"
diff --git a/main/menu.c b/main/menu.c
index 0db93089b..e6e6ff011 100644
--- a/main/menu.c
+++ b/main/menu.c
@@ -50,7 +50,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "gamefont.h"
 #include "newmenu.h"
 #ifdef NETWORK
-#  include "network.h"
+#  include "net_ipx.h"
 #  include "netdrv.h"
 #  include "multi.h"
 #endif
diff --git a/main/multi.c b/main/multi.c
index 28fca7b93..ebeb93e83 100644
--- a/main/multi.c
+++ b/main/multi.c
@@ -30,7 +30,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "u_mem.h"
 #include "strutil.h"
 #include "game.h"
-#include "network.h"
+#include "net_ipx.h"
 #include "multi.h"
 #include "object.h"
 #include "laser.h"
diff --git a/main/multibot.c b/main/multibot.c
index d31595bc8..965c2bf31 100644
--- a/main/multibot.c
+++ b/main/multibot.c
@@ -29,7 +29,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "object.h"
 #include "multibot.h"
 #include "game.h"
-#include "network.h"
+#include "net_ipx.h"
 #include "multi.h"
 #include "laser.h"
 #include "error.h"
diff --git a/main/network.c b/main/net_ipx.c
similarity index 99%
rename from main/network.c
rename to main/net_ipx.c
index 6d9746a5d..fed0d4859 100644
--- a/main/network.c
+++ b/main/net_ipx.c
@@ -42,7 +42,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "player.h"
 #include "gameseq.h"
 #include "fireball.h"
-#include "network.h"
+#include "net_ipx.h"
 #include "game.h"
 #include "multi.h"
 #include "endlevel.h"
diff --git a/main/network.h b/main/net_ipx.h
similarity index 99%
rename from main/network.h
rename to main/net_ipx.h
index 1bac01b83..d9cd29a6b 100644
--- a/main/network.h
+++ b/main/net_ipx.h
@@ -1,4 +1,4 @@
-/* $Id: network.h,v 1.1.1.1 2006/03/17 19:56:24 zicodxx Exp $ */
+/* $Id: net_ipx.h,v 1.1.1.1 2006/03/17 19:56:24 zicodxx Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
diff --git a/main/netdrv.c b/main/netdrv.c
index 84c04f18c..88d80a1ec 100644
--- a/main/netdrv.c
+++ b/main/netdrv.c
@@ -37,7 +37,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "config.h"
 #include "args.h"
 #include "text.h"
-#include "network.h"
+#include "net_ipx.h"
 #include "console.h"
 #include "netdrv.h"
 #include "checker.h"
diff --git a/main/netdrv_udp.c b/main/netdrv_udp.c
index 9b8c4bfea..777699b12 100755
--- a/main/netdrv_udp.c
+++ b/main/netdrv_udp.c
@@ -26,7 +26,7 @@
 #include "console.h"
 #include "error.h"
 #include "netdrv.h"
-#include "network.h"
+#include "net_ipx.h"
 #include "timer.h"
 #include "netdrv_udp.h"
 #include "key.h"
diff --git a/main/netpkt.c b/main/netpkt.c
index 5c75c0a49..3c04ed80c 100644
--- a/main/netpkt.c
+++ b/main/netpkt.c
@@ -113,7 +113,7 @@ ushort netmisc_calc_checksum(void * vptr, int len)
 
 #include "multi.h"
 #ifdef NETWORK
-#include "network.h"
+#include "net_ipx.h"
 #endif
 #include "object.h"
 #include "powerup.h"
diff --git a/main/netpkt.h b/main/netpkt.h
index 288cfd6d6..0d98c0d5e 100644
--- a/main/netpkt.h
+++ b/main/netpkt.h
@@ -22,7 +22,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #define _NETMISC_H
 
 #include "multi.h"
-#include "network.h"
+#include "net_ipx.h"
 
 // Returns a checksum of a block of memory.
 extern ushort netmisc_calc_checksum(void *vptr, int len);
diff --git a/main/newdemo.c b/main/newdemo.c
index 564e3e228..2d4c85809 100644
--- a/main/newdemo.c
+++ b/main/newdemo.c
@@ -88,7 +88,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "palette.h"
 #include "multi.h"
 #ifdef NETWORK
-#include "network.h"
+#include "net_ipx.h"
 #endif
 #include "text.h"
 #include "cntrlcen.h"
diff --git a/main/newmenu.c b/main/newmenu.c
index 8dc94530d..1ed4322d1 100644
--- a/main/newmenu.c
+++ b/main/newmenu.c
@@ -51,9 +51,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "newmenu.h"
 #include "gamefont.h"
 #include "gamepal.h"
-#ifdef NETWORK
-#include "network.h"
-#endif
 #include "iff.h"
 #include "pcx.h"
 #include "u_mem.h"
diff --git a/main/noloss.h b/main/noloss.h
index e041828da..97abfc711 100644
--- a/main/noloss.h
+++ b/main/noloss.h
@@ -5,7 +5,7 @@
 #include "strutil.h"
 #include "pstypes.h"
 #include "netpkt.h"
-#include "network.h"
+#include "net_ipx.h"
 #include "game.h"
 #include "multi.h"
 #include "netpkt.h"
diff --git a/main/object.c b/main/object.c
index 5467001c2..d0595d93f 100644
--- a/main/object.c
+++ b/main/object.c
@@ -62,9 +62,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "newdemo.h"
 #include "player.h"
 #include "weapon.h"
-#ifdef NETWORK
-#include "network.h"
-#endif
 #include "newmenu.h"
 #include "gauges.h"
 #include "multi.h"
diff --git a/main/state.c b/main/state.c
index 695024e79..90f627337 100644
--- a/main/state.c
+++ b/main/state.c
@@ -85,7 +85,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "laser.h"
 #include "state.h"
 #ifdef NETWORK
-#include "network.h"
+#include "net_ipx.h"
 #endif
 #ifdef OGL
 #include "gr.h"
diff --git a/main/switch.c b/main/switch.c
index 99d5a0c5f..306b431ac 100644
--- a/main/switch.c
+++ b/main/switch.c
@@ -43,9 +43,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "endlevel.h"
 #include "gameseq.h"
 #include "multi.h"
-#ifdef NETWORK
-#include "network.h"
-#endif
 #include "palette.h"
 #include "robot.h"
 #include "bm.h"
diff --git a/main/vers_id.h b/main/vers_id.h
index 180276b3e..67874a3ac 100644
--- a/main/vers_id.h
+++ b/main/vers_id.h
@@ -1,9 +1,4 @@
-/* $Id: vers_id.h,v 1.1.1.1 2006/03/17 19:57:28 zicodxx Exp $ */
-//
-// Auto-generated include file [used to be]
-// Generated by MAKE from INFERNO.INI settings
-//
-
+/* Version defines */
 
 #ifndef _VERS_ID
 #define _VERS_ID
@@ -12,12 +7,12 @@
 
 #ifdef D2XMICRO
 #define VERSION D2XMAJOR "." D2XMINOR "." D2XMICRO
+#define D2X_IVER (atoi(D2XMAJOR)*10000+atoi(D2XMINOR)*100+atoi(D2XMICRO)
 #else
 #define VERSION D2XMAJOR "." D2XMINOR
+#define D2X_IVER (atoi(D2XMAJOR)*10000+atoi(D2XMINOR)*100)
 #endif
 
 #define DESCENT_VERSION "D2X-Rebirth v" VERSION
-// #define D2X_IVER (D2XMAJOR*10000+D2XMINOR*100+D2XMICRO)
-#define D2X_IVER (atoi(D2XMAJOR)*1000+atoi(D2XMINOR)*10)
 
 #endif /* _VERS_ID */