--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -1395,8 +1395,8 @@ add_executable( zdoom WIN32
 	timidity/timidity.cpp
 	win32/g15/g15.cpp #ST
 	xlat/parse_xlat.cpp
-	../upnpnat/upnpnat.cpp #ST
-	../upnpnat/xmlParser.cpp #ST
+#	../upnpnat/upnpnat.cpp #ST
+#	../upnpnat/xmlParser.cpp #ST
 	#fragglescript/t_fspic.cpp
 	#fragglescript/t_func.cpp
 	#fragglescript/t_load.cpp
@@ -1455,7 +1455,7 @@ include_directories( .
 	../gdtoa
 	../dumb/include
         ../sqlite/ #ZA
-	../upnpnat/ #ST
+#	../upnpnat/ #ST
 	${CMAKE_BINARY_DIR}/gdtoa
 	${SYSTEM_SOURCES_DIR} )
 
--- src/sdl/i_system.cpp
+++ src/sdl/i_system.cpp
@@ -31,6 +31,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
+#include <sys/wait.h>
 #include <fcntl.h>
 #include <signal.h>
 #ifndef NO_GTK
--- src/sv_main.cpp
+++ src/sv_main.cpp
@@ -58,7 +58,7 @@
 
 #include "networkheaders.h"
 
-#include "../upnpnat/upnpnat.h"
+//#include "../upnpnat/upnpnat.h"
 
 // [BB] Needed for timeGetTime() in SERVER_Tick().
 #ifdef _MSC_VER
@@ -398,7 +398,7 @@ void SERVER_Construct( void )
 
 	// Set up a socket and network message buffer.
 	NETWORK_Construct( usPort, false );
-
+/*
 	// [BB] Forward the external port with UPnP.
 	if ( Args->CheckParm ( "-upnp" ) )
 	{
@@ -421,7 +421,7 @@ void SERVER_Construct( void )
 		else
 			Printf( "Sucessfully added port mapping.\n" );
 	}
-
+*/
 	// Initizlize the playeringame array (is this necessary?).
 	for ( ULONG ulIdx = 0; ulIdx < MAXPLAYERS; ++ulIdx )
 		playeringame[ulIdx] = false;
--- tools/updaterevision/updaterevision.c
+++ tools/updaterevision/updaterevision.c
@@ -165,8 +165,8 @@ int main(int argc, char **argv)
 		{
 			struct tm	*lt = gmtime( &hgdate );
 			fprintf (stream, "#define HG_TIME \"%d%02d%02d-%02d%02d", lt->tm_year - 100, lt->tm_mon + 1, lt->tm_mday, lt->tm_hour, lt->tm_min);
-			if ( localchanges )
-				fprintf (stream, "M" );
+//			if ( localchanges )
+//				fprintf (stream, "M" );
 			fprintf (stream, "\"\n" );
 		}