diff --git a/mk/windoze/glest_game.cbp b/mk/windoze/glest_game.cbp
index d0f6c251d..42c847cad 100644
--- a/mk/windoze/glest_game.cbp
+++ b/mk/windoze/glest_game.cbp
@@ -7,11 +7,14 @@
 		<Option compiler="mingw32_compiler" />
 		<Build>
 			<Target title="Debug Win32">
-				<Option output="glest_game" prefix_auto="1" extension_auto="1" />
+				<Option output="../../data/glest_game/glest_game.exe" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="../../data/glest_game/" />
 				<Option object_output="Debug Win32/glest_game" />
-				<Option type="0" />
+				<Option type="1" />
 				<Option compiler="mingw32_compiler" />
+				<Option use_console_runner="0" />
 				<Compiler>
+					<Add option="-g" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -96,40 +99,43 @@
 					<Add directory="$(NOINHERIT)" />
 				</ResourceCompiler>
 				<Linker>
+					<Add option="-Wl,-subsystem,console" />
+					<Add option="-mconsole" />
+					<Add library="mingw32" />
+					<Add library="ddraw" />
 					<Add library="dsound" />
 					<Add library="dxguid" />
-					<Add library="ogg_static" />
-					<Add library="vorbis_static" />
-					<Add library="vorbisfile_static" />
+					<Add library="ws2_32" />
+					<Add library="iphlpapi" />
+					<Add library="wsock32" />
+					<Add library="liblibogg" />
+					<Add library="liblibvorbis" />
+					<Add library="liblibvorbisfile" />
+					<Add library="zlib" />
+					<Add library="jpeg" />
+					<Add library="liblibpng" />
+					<Add library="xerces-c" />
+					<Add library="OpenAL32" />
+					<Add library="liblibcurl" />
+					<Add library="winmm" />
+					<Add library="gdi32" />
 					<Add library="opengl32" />
 					<Add library="glu32" />
-					<Add library="wsock32" />
-					<Add library="libglest" />
-					<Add library="mmc" />
+					<Add library="SDL" />
+					<Add library="SDLmain" />
 					<Add library="lua5.1" />
-					<Add library="xerces-c_3" />
-					<Add library="Dbghelp" />
-					<Add library="libpng" />
-					<Add library="jpeg" />
-					<Add library="zlib" />
-					<Add library="sdl" />
-					<Add library="sdlmain" />
-					<Add library="winmm" />
-					<Add library="openal32" />
-					<Add library="iphlpapi" />
-					<Add library="libstreflop" />
-					<Add library="libcurl" />
-					<Add library="ws2_32" />
+					<Add library="streflop" />
+					<Add library="glest" />
 					<Add directory="../../source/win32_deps/lib" />
-					<Add directory="../../build/Debug Win32/libglest" />
-					<Add directory="../../source/shared_lib/sources/streflop/libstreflop" />
+					<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/lib" />
 				</Linker>
 			</Target>
 			<Target title="Release Win32">
-				<Option output="glest_game" prefix_auto="1" extension_auto="1" />
+				<Option output="glest_game.exe" prefix_auto="0" extension_auto="0" />
 				<Option object_output="Release Win32/glest_game" />
 				<Option type="1" />
 				<Option compiler="mingw32_compiler" />
+				<Option use_console_runner="0" />
 				<Compiler>
 					<Add option="-D_WIN32" />
 					<Add option="-DWIN32" />
@@ -218,15 +224,18 @@
 					<Add directory="$(NOINHERIT)" />
 				</ResourceCompiler>
 				<Linker>
+					<Add option="-Wl,-subsystem,console" />
+					<Add option="-mconsole" />
+					<Add library="mingw32" />
 					<Add library="ddraw" />
 					<Add library="dsound" />
 					<Add library="dxguid" />
 					<Add library="ws2_32" />
 					<Add library="iphlpapi" />
 					<Add library="wsock32" />
-					<Add library="ogg_static" />
-					<Add library="vorbis_static" />
-					<Add library="vorbisfile_static" />
+					<Add library="liblibogg" />
+					<Add library="liblibvorbis" />
+					<Add library="liblibvorbisfile" />
 					<Add library="zlib" />
 					<Add library="jpeg" />
 					<Add library="liblibpng" />
diff --git a/mk/windoze/glest_game.depend b/mk/windoze/glest_game.depend
index 3d9164dd3..6c5029ff3 100644
--- a/mk/windoze/glest_game.depend
+++ b/mk/windoze/glest_game.depend
@@ -874,12 +874,12 @@
 	<netdb.h>
 	"leak_dumper.h"
 
-1283825715 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/common/base_thread.h
+1291510119 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/common/base_thread.h
 	"leak_dumper.h"
 	"thread.h"
 	<string>
 
-1283810434 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/common/simple_threads.h
+1291510227 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/common/simple_threads.h
 	"base_thread.h"
 	<vector>
 	<string>
@@ -1323,7 +1323,7 @@
 	"sound_container.h"
 	"leak_dumper.h"
 
-1291444912 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/facilities/game_util.cpp
+1291697703 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/facilities/game_util.cpp
 	"game_util.h"
 	"util.h"
 	"lang.h"
@@ -1541,7 +1541,7 @@
 	"graphics_interface.h"
 	"leak_dumper.h"
 
-1289288251 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/graphics/renderer.cpp
+1291504627 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/graphics/renderer.cpp
 	"renderer.h"
 	"texture_gl.h"
 	"main_menu.h"
@@ -1961,7 +1961,7 @@
 	"map_preview.h"
 	"leak_dumper.h"
 
-1290828295 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_custom_game.cpp
+1291513400 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_custom_game.cpp
 	"menu_state_custom_game.h"
 	"renderer.h"
 	"sound_renderer.h"
@@ -2013,7 +2013,7 @@
 	"socket.h"
 	"leak_dumper.h"
 
-1288459822 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_masterserver.cpp
+1291512889 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/menu/menu_state_masterserver.cpp
 	"menu_state_masterserver.h"
 	"renderer.h"
 	"sound_renderer.h"
@@ -2131,7 +2131,7 @@
 	"util.h"
 	"leak_dumper.h"
 
-1290828295 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/network/network_message.cpp
+1291510945 source:/home/softcoder/Code/megaglest/trunk/source/glest_game/network/network_message.cpp
 	"network_message.h"
 	<cassert>
 	<stdexcept>
@@ -2650,3 +2650,923 @@
 
 1188326643 /home/softcoder/Code/megaglest/trunk/source/win32_deps/xerces-c-src_2_8_0/src/xercesc/util/Platforms/NetBSD/NetBSDDefs.hpp
 
+1278057011 /usr/include/SDL/SDL_thread.h
+	"SDL_stdinc.h"
+	"SDL_error.h"
+	"SDL_mutex.h"
+	"begin_code.h"
+	<process.h>
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_stdinc.h
+	"SDL_config.h"
+	<sys/types.h>
+	<stdio.h>
+	<stdlib.h>
+	<stddef.h>
+	<stdarg.h>
+	<stdlib.h>
+	<malloc.h>
+	<stddef.h>
+	<stdarg.h>
+	<memory.h>
+	<string.h>
+	<strings.h>
+	<inttypes.h>
+	<stdint.h>
+	<ctype.h>
+	<iconv.h>
+	"begin_code.h"
+	<alloca.h>
+	<malloc.h>
+	<malloc.h>
+	<malloc.h>
+	<stdlib.h>
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_config.h
+	"SDL_platform.h"
+	<stdarg.h>
+
+1278057011 /usr/include/SDL/SDL_platform.h
+
+1289332244 /usr/include/sys/types.h
+	<features.h>
+	<bits/types.h>
+	<time.h>
+	<stddef.h>
+	<endian.h>
+	<sys/select.h>
+	<sys/sysmacros.h>
+	<bits/pthreadtypes.h>
+
+1289332223 /usr/include/features.h
+	<bits/predefs.h>
+	<sys/cdefs.h>
+	<gnu/stubs.h>
+
+1289332224 /usr/include/bits/predefs.h
+
+1289332245 /usr/include/sys/cdefs.h
+	<features.h>
+	<bits/wordsize.h>
+
+1289332239 /usr/include/bits/wordsize.h
+
+1289332224 /usr/include/gnu/stubs.h
+	<bits/wordsize.h>
+	<gnu/stubs-32.h>
+	<gnu/stubs-64.h>
+
+1289332265 /usr/include/gnu/stubs-64.h
+
+1289332244 /usr/include/bits/types.h
+	<features.h>
+	<bits/wordsize.h>
+	<bits/typesizes.h>
+
+1289332244 /usr/include/bits/typesizes.h
+
+1289332243 /usr/include/time.h
+	<features.h>
+	<stddef.h>
+	<bits/time.h>
+	<bits/types.h>
+	<bits/types.h>
+	<bits/types.h>
+	<bits/types.h>
+	<bits/types.h>
+	<xlocale.h>
+
+1289332243 /usr/include/bits/time.h
+	<bits/types.h>
+	<bits/types.h>
+
+1289332225 /usr/include/xlocale.h
+
+1289332241 /usr/include/endian.h
+	<features.h>
+	<bits/endian.h>
+	<bits/byteswap.h>
+
+1289332241 /usr/include/bits/endian.h
+
+1289332241 /usr/include/bits/byteswap.h
+	<bits/wordsize.h>
+
+1289332245 /usr/include/sys/select.h
+	<features.h>
+	<bits/types.h>
+	<bits/select.h>
+	<bits/sigset.h>
+	<time.h>
+	<bits/time.h>
+
+1289332245 /usr/include/bits/select.h
+	<bits/wordsize.h>
+
+1289332238 /usr/include/bits/sigset.h
+
+1289332244 /usr/include/sys/sysmacros.h
+	<features.h>
+
+1289332244 /usr/include/bits/pthreadtypes.h
+	<bits/wordsize.h>
+
+1289332240 /usr/include/stdio.h
+	<features.h>
+	<stddef.h>
+	<bits/types.h>
+	<libio.h>
+	<stdarg.h>
+	<bits/stdio_lim.h>
+	<bits/sys_errlist.h>
+	<getopt.h>
+	<bits/stdio.h>
+	<bits/stdio2.h>
+	<bits/stdio-ldbl.h>
+
+1289332240 /usr/include/libio.h
+	<_G_config.h>
+	<stdarg.h>
+	<sys/cdefs.h>
+	<bits/stdio-lock.h>
+	<shlib-compat.h>
+	<bits/libio-ldbl.h>
+
+1289332240 /usr/include/_G_config.h
+	<bits/types.h>
+	<stddef.h>
+	<wchar.h>
+	<gconv.h>
+
+1289332242 /usr/include/wchar.h
+	<features.h>
+	<stdio.h>
+	<stdarg.h>
+	<bits/wchar.h>
+	<stddef.h>
+	<wctype.h>
+	<xlocale.h>
+	<xlocale.h>
+	<xlocale.h>
+	<wctype.h>
+	<bits/wchar2.h>
+	<bits/wchar-ldbl.h>
+
+1289332242 /usr/include/bits/wchar.h
+
+1289332247 /usr/include/wctype.h
+	<features.h>
+	<bits/types.h>
+	<wchar.h>
+	<endian.h>
+	<xlocale.h>
+
+1289332242 /usr/include/bits/wchar2.h
+
+1289332242 /usr/include/bits/wchar-ldbl.h
+
+1289332224 /usr/include/gconv.h
+	<features.h>
+	<wchar.h>
+	<stddef.h>
+
+1289332240 /usr/include/bits/stdio-lock.h
+	<bits/libc-lock.h>
+	<lowlevellock.h>
+
+1289332224 /usr/include/bits/libc-lock.h
+	<pthread.h>
+	<stddef.h>
+	<lowlevellock.h>
+	<tls.h>
+	<pthread-functions.h>
+	<errno.h>
+	<gnu/option-groups.h>
+	<bp-sym.h>
+
+1289332252 /usr/include/pthread.h
+	<features.h>
+	<endian.h>
+	<sched.h>
+	<time.h>
+	<bits/pthreadtypes.h>
+	<bits/setjmp.h>
+	<bits/wordsize.h>
+
+1289332244 /usr/include/sched.h
+	<features.h>
+	<bits/types.h>
+	<stddef.h>
+	<time.h>
+	<bits/sched.h>
+
+1289332244 /usr/include/bits/sched.h
+
+1289332238 /usr/include/bits/setjmp.h
+	<bits/wordsize.h>
+
+1289332239 /usr/include/errno.h
+	<features.h>
+	<bits/errno.h>
+
+1289332239 /usr/include/bits/errno.h
+	<linux/errno.h>
+
+1290606045 /usr/include/linux/errno.h
+	<asm/errno.h>
+
+1290606046 /usr/include/asm/errno.h
+	<asm-generic/errno.h>
+
+1290606044 /usr/include/asm-generic/errno.h
+	<asm-generic/errno-base.h>
+
+1290606044 /usr/include/asm-generic/errno-base.h
+
+1289332261 /usr/include/gnu/option-groups.h
+
+1289332240 /usr/include/bits/libio-ldbl.h
+
+1289332239 /usr/include/bits/stdio_lim.h
+
+1289332240 /usr/include/bits/sys_errlist.h
+
+1289332244 /usr/include/getopt.h
+	<ctype.h>
+
+1289332236 /usr/include/ctype.h
+	<features.h>
+	<bits/types.h>
+	<endian.h>
+	<xlocale.h>
+
+1289332240 /usr/include/bits/stdio.h
+
+1289332240 /usr/include/bits/stdio2.h
+
+1289332240 /usr/include/bits/stdio-ldbl.h
+
+1289332239 /usr/include/stdlib.h
+	<features.h>
+	<stddef.h>
+	<bits/waitflags.h>
+	<bits/waitstatus.h>
+	<xlocale.h>
+	<sys/types.h>
+	<alloca.h>
+	<bits/stdlib.h>
+	<bits/stdlib-ldbl.h>
+
+1289332244 /usr/include/bits/waitflags.h
+
+1289332244 /usr/include/bits/waitstatus.h
+	<endian.h>
+
+1289332239 /usr/include/alloca.h
+	<features.h>
+	<stddef.h>
+
+1289332239 /usr/include/bits/stdlib.h
+
+1289332239 /usr/include/bits/stdlib-ldbl.h
+
+1289332241 /usr/include/malloc.h
+	<features.h>
+	<stddef.h>
+	<stdio.h>
+
+1289332241 /usr/include/memory.h
+	<features.h>
+	<string.h>
+
+1289332241 /usr/include/string.h
+	<features.h>
+	<stddef.h>
+	<xlocale.h>
+	<bits/string.h>
+	<bits/string2.h>
+	<bits/string3.h>
+
+1289332241 /usr/include/bits/string.h
+
+1289332241 /usr/include/bits/string2.h
+	<endian.h>
+	<bits/types.h>
+	<stdlib.h>
+
+1289332241 /usr/include/bits/string3.h
+
+1289332241 /usr/include/strings.h
+	<features.h>
+	<stddef.h>
+	<xlocale.h>
+
+1289332239 /usr/include/inttypes.h
+	<features.h>
+	<stdint.h>
+	<stddef.h>
+
+1289332239 /usr/include/stdint.h
+	<features.h>
+	<bits/wchar.h>
+	<bits/wordsize.h>
+
+1289332224 /usr/include/iconv.h
+	<features.h>
+	<stddef.h>
+
+1278057011 /usr/include/SDL/begin_code.h
+
+1278057011 /usr/include/SDL/close_code.h
+
+1278057011 /usr/include/SDL/SDL_error.h
+	"SDL_stdinc.h"
+	"begin_code.h"
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_mutex.h
+	"SDL_stdinc.h"
+	"SDL_error.h"
+	"begin_code.h"
+	"close_code.h"
+
+1277276853 /usr/include/curl/curl.h
+	"curlver.h"
+	"curlbuild.h"
+	"curlrules.h"
+	<stdio.h>
+	<limits.h>
+	<osreldate.h>
+	<sys/types.h>
+	<time.h>
+	<winsock2.h>
+	<ws2tcpip.h>
+	<sys/select.h>
+	<sys/socket.h>
+	<sys/time.h>
+	<sys/types.h>
+	<support/SupportDefs.h>
+	"easy.h"
+	"multi.h"
+	"typecheck-gcc.h"
+
+1277276853 /usr/include/curl/curlver.h
+
+1277276853 /usr/include/curl/curlbuild.h
+	<windows.h>
+	<winsock2.h>
+	<ws2tcpip.h>
+	<sys/types.h>
+	<stdint.h>
+	<inttypes.h>
+	<sys/socket.h>
+
+1289332246 /usr/include/sys/socket.h
+	<features.h>
+	<sys/uio.h>
+	<stddef.h>
+	<bits/sigset.h>
+	<bits/socket.h>
+	<bits/socket2.h>
+
+1289332245 /usr/include/sys/uio.h
+	<features.h>
+	<sys/types.h>
+	<bits/uio.h>
+
+1289332245 /usr/include/bits/uio.h
+	<sys/types.h>
+
+1289332246 /usr/include/bits/socket.h
+	<stddef.h>
+	<sys/types.h>
+	<bits/sockaddr.h>
+	<asm/socket.h>
+
+1289332246 /usr/include/bits/sockaddr.h
+
+1290606046 /usr/include/asm/socket.h
+	<asm-generic/socket.h>
+
+1290606044 /usr/include/asm-generic/socket.h
+	<asm/sockios.h>
+
+1290606046 /usr/include/asm/sockios.h
+	<asm-generic/sockios.h>
+
+1290606044 /usr/include/asm-generic/sockios.h
+
+1289332246 /usr/include/bits/socket2.h
+
+1277276853 /usr/include/curl/curlrules.h
+
+1289332223 /usr/include/limits.h
+	<features.h>
+	<bits/wordsize.h>
+	<bits/posix1_lim.h>
+	<bits/posix2_lim.h>
+	<bits/xopen_lim.h>
+
+1289332244 /usr/include/bits/posix1_lim.h
+	<bits/local_lim.h>
+
+1289332244 /usr/include/bits/local_lim.h
+	<linux/limits.h>
+
+1290606046 /usr/include/linux/limits.h
+
+1289332244 /usr/include/bits/posix2_lim.h
+
+1289332224 /usr/include/bits/xopen_lim.h
+	<bits/stdio_lim.h>
+	<bits/wordsize.h>
+
+1289332243 /usr/include/sys/time.h
+	<features.h>
+	<bits/types.h>
+	<time.h>
+	<bits/time.h>
+	<sys/select.h>
+
+1277276853 /usr/include/curl/easy.h
+
+1277276853 /usr/include/curl/multi.h
+	"curl.h"
+
+1277276853 /usr/include/curl/typecheck-gcc.h
+
+1278057011 /usr/include/SDL/SDL_types.h
+	"SDL_stdinc.h"
+
+1188326692 /usr/include/xercesc/util/XercesDefs.hpp
+	<xercesc/util/XercesVersion.hpp>
+	<xercesc/util/AutoSense.hpp>
+	<xercesc/util/Platforms/Win32/Win32Defs.hpp>
+	<xercesc/util/Platforms/Cygwin/CygwinDefs.hpp>
+	<xercesc/util/Platforms/AIX/AIXDefs.hpp>
+	<xercesc/util/Platforms/Solaris/SolarisDefs.hpp>
+	<xercesc/util/Platforms/OpenServer/OpenServerDefs.hpp>
+	<xercesc/util/Platforms/UnixWare/UnixWareDefs.hpp>
+	<xercesc/util/Platforms/HPUX/HPUXDefs.hpp>
+	<xercesc/util/Platforms/IRIX/IRIXDefs.hpp>
+	<xercesc/util/Platforms/Interix/InterixDefs.hpp>
+	<xercesc/util/Platforms/Tandem/TandemDefs.hpp>
+	<xercesc/util/Platforms/BeOS/BeOSDefs.hpp>
+	<xercesc/util/Platforms/Linux/LinuxDefs.hpp>
+	<xercesc/util/Platforms/FreeBSD/FreeBSDDefs.hpp>
+	<xercesc/util/Platforms/OS390/OS390Defs.hpp>
+	<xercesc/util/Platforms/PTX/PTXDefs.hpp>
+	<xercesc/util/Platforms/OS2/OS2Defs.hpp>
+	<xercesc/util/Platforms/MacOS/MacOSDefs.hpp>
+	<xercesc/util/Platforms/OS400/OS400Defs.hpp>
+	<xercesc/util/Platforms/Tru64/Tru64Defs.hpp>
+	<xercesc/util/Platforms/QNX/QNXDefs.hpp>
+	<xercesc/util/Compilers/VCPPDefs.hpp>
+	<xercesc/util/Compilers/CSetDefs.hpp>
+	<xercesc/util/Compilers/BorlandCDefs.hpp>
+	<xercesc/util/Compilers/SunCCDefs.hpp>
+	<xercesc/util/Compilers/SCOCCDefs.hpp>
+	<xercesc/util/Compilers/SunKaiDefs.hpp>
+	<xercesc/util/Compilers/HPCCDefs.hpp>
+	<xercesc/util/Compilers/MIPSproDefs.hpp>
+	<xercesc/util/Compilers/TandemCCDefs.hpp>
+	<xercesc/util/Compilers/GCCDefs.hpp>
+	<xercesc/util/Compilers/MVSCPPDefs.hpp>
+	<xercesc/util/Compilers/IBMVAW32Defs.hpp>
+	<xercesc/util/Compilers/IBMVAOS2Defs.hpp>
+	<xercesc/util/Compilers/CodeWarriorDefs.hpp>
+	<xercesc/util/Compilers/PTXCCDefs.hpp>
+	<xercesc/util/Compilers/OS400SetDefs.hpp>
+	<xercesc/util/Compilers/DECCXXDefs.hpp>
+	<xercesc/util/Compilers/QCCDefs.hpp>
+	<xercesc/util/Platforms/NetBSD/NetBSDDefs.hpp>
+
+1188326692 /usr/include/xercesc/util/XercesVersion.hpp
+
+1263501103 /usr/include/xercesc/util/AutoSense.hpp
+
+1188326645 /usr/include/xercesc/util/Platforms/Linux/LinuxDefs.hpp
+	<endian.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/VCPPDefs.hpp
+	<sys/types.h>
+	<limits.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/CSetDefs.hpp
+	<sys/types.h>
+	<limits.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/BorlandCDefs.hpp
+	<sys/types.h>
+	<limits.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/SunCCDefs.hpp
+	<sys/types.h>
+	<limits.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/SCOCCDefs.hpp
+	<sys/types.h>
+	<limits.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/SunKaiDefs.hpp
+	<memory.h>
+	<strings.h>
+	<sys/types.h>
+	<limits.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/HPCCDefs.hpp
+	<sys/types.h>
+	<limits.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/MIPSproDefs.hpp
+	<sys/types.h>
+	<limits.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/TandemCCDefs.hpp
+	<sys/types.h>
+	<limits.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/GCCDefs.hpp
+	<sys/types.h>
+	<limits.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/MVSCPPDefs.hpp
+	<sys/types.h>
+	<limits.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/IBMVAW32Defs.hpp
+	<sys/types.h>
+	<limits.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/IBMVAOS2Defs.hpp
+	<sys/types.h>
+	<limits.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/CodeWarriorDefs.hpp
+	<wchar.h>
+	<wctype.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/PTXCCDefs.hpp
+	<sys/types.h>
+	<limits.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/OS400SetDefs.hpp
+	<sys/types.h>
+	<limits.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/DECCXXDefs.hpp
+	<sys/types.h>
+	<limits.h>
+
+1188326639 /usr/include/xercesc/util/Compilers/QCCDefs.hpp
+	<sys/types.h>
+	<limits.h>
+	<inttypes.h>
+
+1278057011 /usr/include/SDL/SDL.h
+	"SDL_main.h"
+	"SDL_stdinc.h"
+	"SDL_audio.h"
+	"SDL_cdrom.h"
+	"SDL_cpuinfo.h"
+	"SDL_endian.h"
+	"SDL_error.h"
+	"SDL_events.h"
+	"SDL_loadso.h"
+	"SDL_mutex.h"
+	"SDL_rwops.h"
+	"SDL_thread.h"
+	"SDL_timer.h"
+	"SDL_video.h"
+	"SDL_version.h"
+	"begin_code.h"
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_main.h
+	"SDL_stdinc.h"
+	"begin_code.h"
+	"close_code.h"
+	"begin_code.h"
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_audio.h
+	"SDL_stdinc.h"
+	"SDL_error.h"
+	"SDL_endian.h"
+	"SDL_mutex.h"
+	"SDL_thread.h"
+	"SDL_rwops.h"
+	"begin_code.h"
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_endian.h
+	"SDL_stdinc.h"
+	"begin_code.h"
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_rwops.h
+	"SDL_stdinc.h"
+	"SDL_error.h"
+	"begin_code.h"
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_cdrom.h
+	"SDL_stdinc.h"
+	"SDL_error.h"
+	"begin_code.h"
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_cpuinfo.h
+	"SDL_stdinc.h"
+	"begin_code.h"
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_events.h
+	"SDL_stdinc.h"
+	"SDL_error.h"
+	"SDL_active.h"
+	"SDL_keyboard.h"
+	"SDL_mouse.h"
+	"SDL_joystick.h"
+	"SDL_quit.h"
+	"begin_code.h"
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_active.h
+	"SDL_stdinc.h"
+	"SDL_error.h"
+	"begin_code.h"
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_keyboard.h
+	"SDL_stdinc.h"
+	"SDL_error.h"
+	"SDL_keysym.h"
+	"begin_code.h"
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_keysym.h
+
+1278057011 /usr/include/SDL/SDL_mouse.h
+	"SDL_stdinc.h"
+	"SDL_error.h"
+	"SDL_video.h"
+	"begin_code.h"
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_video.h
+	"SDL_stdinc.h"
+	"SDL_error.h"
+	"SDL_rwops.h"
+	"begin_code.h"
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_joystick.h
+	"SDL_stdinc.h"
+	"SDL_error.h"
+	"begin_code.h"
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_quit.h
+	"SDL_stdinc.h"
+	"SDL_error.h"
+
+1278057011 /usr/include/SDL/SDL_loadso.h
+	"SDL_stdinc.h"
+	"SDL_error.h"
+	"begin_code.h"
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_timer.h
+	"SDL_stdinc.h"
+	"SDL_error.h"
+	"begin_code.h"
+	"close_code.h"
+
+1278057011 /usr/include/SDL/SDL_version.h
+	"SDL_stdinc.h"
+	"begin_code.h"
+	"close_code.h"
+
+1283810437 /home/softcoder/Code/megaglest/trunk/source/shared_lib/include/platform/sdl/platform_util.h
+	<string>
+	<stdexcept>
+	"platform_common.h"
+	"leak_dumper.h"
+
+1285867037 /usr/include/GL/gl.h
+	"gl_mangle.h"
+	<stdlib.h>
+	<windows.h>
+	<GL/mesa_wgl.h>
+	<GL/glext.h>
+
+1285867037 /usr/include/GL/gl_mangle.h
+
+1285867037 /usr/include/GL/glext.h
+	<windows.h>
+	<stddef.h>
+	<inttypes.h>
+	<inttypes.h>
+	<inttypes.h>
+	<stdint.h>
+	<stdint.h>
+	<inttypes.h>
+
+1285867030 /usr/include/GL/glu.h
+	"glu_mangle.h"
+	<GL/gl.h>
+
+1285867030 /usr/include/GL/glu_mangle.h
+
+1278057011 /usr/include/SDL/SDL_opengl.h
+	"SDL_config.h"
+	<windows.h>
+	<OpenGL/gl.h>
+	<OpenGL/glu.h>
+	<gl.h>
+	<glu.h>
+	<GL/gl.h>
+	<GL/glu.h>
+	<windows.h>
+	<stddef.h>
+
+1289332244 /usr/include/fcntl.h
+	<features.h>
+	<bits/fcntl.h>
+	<bits/types.h>
+	<time.h>
+	<bits/stat.h>
+	<bits/fcntl2.h>
+
+1289332244 /usr/include/bits/fcntl.h
+	<sys/types.h>
+	<bits/wordsize.h>
+	<bits/uio.h>
+
+1289332244 /usr/include/bits/stat.h
+
+1289332244 /usr/include/bits/fcntl2.h
+
+1289332244 /usr/include/unistd.h
+	<features.h>
+	<bits/posix_opt.h>
+	<bits/environments.h>
+	<bits/types.h>
+	<stddef.h>
+	<bits/confname.h>
+	<getopt.h>
+	<bits/unistd.h>
+
+1289332244 /usr/include/bits/posix_opt.h
+
+1289332244 /usr/include/bits/environments.h
+	<bits/wordsize.h>
+
+1289332244 /usr/include/bits/confname.h
+
+1289332244 /usr/include/bits/unistd.h
+
+1289332256 /usr/include/netinet/in.h
+	<features.h>
+	<stdint.h>
+	<sys/socket.h>
+	<bits/types.h>
+	<bits/in.h>
+	<endian.h>
+	<bits/byteswap.h>
+
+1289332257 /usr/include/bits/in.h
+
+1289332256 /usr/include/arpa/inet.h
+	<features.h>
+	<netinet/in.h>
+
+1289332253 /usr/include/netdb.h
+	<features.h>
+	<netinet/in.h>
+	<stdint.h>
+	<rpc/netdb.h>
+	<bits/siginfo.h>
+	<time.h>
+	<bits/netdb.h>
+
+1289332257 /usr/include/rpc/netdb.h
+	<features.h>
+	<stddef.h>
+
+1289332238 /usr/include/bits/siginfo.h
+	<bits/wordsize.h>
+
+1289332253 /usr/include/bits/netdb.h
+
+1103763184 /usr/include/lua5.1/lua.hpp
+	"lua.h"
+	"lualib.h"
+	"lauxlib.h"
+
+1218029412 /usr/include/lua5.1/lua.h
+	<stdarg.h>
+	<stddef.h>
+	"luaconf.h"
+
+1259004059 /usr/include/lua5.1/luaconf.h
+	<limits.h>
+	<stddef.h>
+	<unistd.h>
+	<io.h>
+	<stdio.h>
+	<stdio.h>
+	<readline/readline.h>
+	<readline/history.h>
+	<assert.h>
+	<math.h>
+	<unistd.h>
+
+1275301503 /usr/include/readline/readline.h
+	"rlstdc.h"
+	"rltypedefs.h"
+	"keymaps.h"
+	"tilde.h"
+	<stdio.h>
+	<readline/rlstdc.h>
+	<readline/rltypedefs.h>
+	<readline/keymaps.h>
+	<readline/tilde.h>
+
+1275301503 /usr/include/readline/rlstdc.h
+
+1275301503 /usr/include/readline/rltypedefs.h
+
+1275301503 /usr/include/readline/keymaps.h
+	"rlstdc.h"
+	"chardefs.h"
+	"rltypedefs.h"
+	<readline/rlstdc.h>
+	<readline/chardefs.h>
+	<readline/rltypedefs.h>
+
+1275301503 /usr/include/readline/chardefs.h
+	<ctype.h>
+	<string.h>
+
+1275301503 /usr/include/readline/tilde.h
+
+1275301503 /usr/include/readline/history.h
+	<time.h>
+	"rlstdc.h"
+	"rltypedefs.h"
+	<stdio.h>
+	<readline/rlstdc.h>
+	<readline/rltypedefs.h>
+
+1289332236 /usr/include/assert.h
+	<features.h>
+
+1289332237 /usr/include/math.h
+	<features.h>
+	<bits/huge_val.h>
+	<bits/huge_valf.h>
+	<bits/huge_vall.h>
+	<bits/inf.h>
+	<bits/nan.h>
+	<bits/mathdef.h>
+	<bits/mathcalls.h>
+	<bits/mathcalls.h>
+	<bits/mathcalls.h>
+	<bits/mathinline.h>
+
+1289332237 /usr/include/bits/huge_val.h
+	<endian.h>
+
+1289332237 /usr/include/bits/huge_valf.h
+
+1289332237 /usr/include/bits/huge_vall.h
+
+1289332237 /usr/include/bits/inf.h
+
+1289332237 /usr/include/bits/nan.h
+	<endian.h>
+
+1289332237 /usr/include/bits/mathdef.h
+	<bits/wordsize.h>
+
+1289332237 /usr/include/bits/mathcalls.h
+
+1289332237 /usr/include/bits/mathinline.h
+	<bits/wordsize.h>
+
+1198760545 /usr/include/lua5.1/lualib.h
+	"lua.h"
+
+1198760545 /usr/include/lua5.1/lauxlib.h
+	<stddef.h>
+	<stdio.h>
+	"lua.h"
+
+1269843832 /usr/include/AL/alc.h
+
+1269843812 /usr/include/AL/al.h
+
diff --git a/mk/windoze/glest_game.layout b/mk/windoze/glest_game.layout
index 91ce92347..fef40ab05 100644
--- a/mk/windoze/glest_game.layout
+++ b/mk/windoze/glest_game.layout
@@ -1,7 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="Release Win32" />
-	<File name="../../source/glest_game/main/main.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="1110" topLine="23" />
+	<File name="../../source/glest_game/ai/ai.cpp" open="1" top="0" tabpos="10">
+		<Cursor position="12418" topLine="415" />
+	</File>
+	<File name="../../source/glest_game/game/game.cpp" open="1" top="0" tabpos="6">
+		<Cursor position="17909" topLine="457" />
+	</File>
+	<File name="../../source/glest_game/global/config.cpp" open="1" top="0" tabpos="3">
+		<Cursor position="0" topLine="0" />
+	</File>
+	<File name="../../source/glest_game/global/core_data.cpp" open="1" top="0" tabpos="4">
+		<Cursor position="836" topLine="147" />
+	</File>
+	<File name="../../source/glest_game/global/lang.cpp" open="1" top="0" tabpos="5">
+		<Cursor position="900" topLine="17" />
+	</File>
+	<File name="../../source/glest_game/graphics/renderer.cpp" open="1" top="0" tabpos="8">
+		<Cursor position="4897" topLine="109" />
+	</File>
+	<File name="../../source/glest_game/main/main.cpp" open="1" top="0" tabpos="2">
+		<Cursor position="34050" topLine="857" />
+	</File>
+	<File name="../../source/glest_game/main/program.cpp" open="1" top="0" tabpos="7">
+		<Cursor position="3811" topLine="123" />
+	</File>
+	<File name="../../source/glest_game/menu/menu_state_connected_game.cpp" open="1" top="1" tabpos="11">
+		<Cursor position="12506" topLine="308" />
+	</File>
+	<File name="../../source/glest_game/type_instances/unit.cpp" open="1" top="0" tabpos="9">
+		<Cursor position="50789" topLine="1676" />
 	</File>
 </CodeBlocks_layout_file>
diff --git a/mk/windoze/libstreflop.cbp b/mk/windoze/libstreflop.cbp
index bb97ff2ce..171c68fb3 100644
--- a/mk/windoze/libstreflop.cbp
+++ b/mk/windoze/libstreflop.cbp
@@ -8,9 +8,9 @@
 		<Build>
 			<Target title="Debug Win32">
 				<Option output="../../source/win32_deps/lib/libstreflop.a" prefix_auto="0" extension_auto="0" />
-				<Option working_dir="../../source/win32_deps/lib" />
+				<Option working_dir="" />
 				<Option object_output="Debug Win32/libstreflop" />
-				<Option type="3" />
+				<Option type="2" />
 				<Option compiler="mingw32_compiler" />
 				<Option createDefFile="1" />
 				<Compiler>
diff --git a/mk/windoze/shared_lib.cbp b/mk/windoze/shared_lib.cbp
index 7a8bae23f..b75bcf83d 100644
--- a/mk/windoze/shared_lib.cbp
+++ b/mk/windoze/shared_lib.cbp
@@ -85,7 +85,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release Win32">
-				<Option output="../../source/win32_deps/lib/libglest.a" prefix_auto="0" extension_auto="0" />
+				<Option output="../../source/win32_deps/lib/libglest.dll" prefix_auto="0" extension_auto="0" />
 				<Option working_dir="../../source/win32_deps/lib" />
 				<Option object_output="Release Win32/shared_lib" />
 				<Option type="3" />
@@ -164,6 +164,18 @@
 					<Add library="jpeg" />
 					<Add library="lua5.1" />
 					<Add library="liblibpng" />
+					<Add library="SDL" />
+					<Add library="iphlpapi" />
+					<Add library="gdi32" />
+					<Add library="dsound" />
+					<Add library="OpenAL32" />
+					<Add library="liblibcurl" />
+					<Add library="xerces-c" />
+					<Add library="dxguid" />
+					<Add library="liblibogg" />
+					<Add library="liblibvorbis" />
+					<Add library="liblibvorbisfile" />
+					<Add library="liblibvorbisenc" />
 					<Add directory="./" />
 					<Add directory="../../source/win32_deps/lib" />
 					<Add directory="../../source/win32_deps/xerces-c-src_2_8_0/lib" />
@@ -255,6 +267,84 @@
 					<Add directory="../../source/win32_deps/lib" />
 				</Linker>
 			</Target>
+			<Target title="Release Linux">
+				<Option output="../../source/linux_deps/lib/libglest.a" prefix_auto="0" extension_auto="0" />
+				<Option working_dir="" />
+				<Option object_output="Release Linux/shared_lib" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-DNDEBUG" />
+					<Add option="-DXML_LIBRARY" />
+					<Add option="-D_LIB" />
+					<Add option="-D_CRT_SECURE_NO_WARNINGS" />
+					<Add option="-DUSE_PCH=1" />
+					<Add option="-DUSE_STREFLOP" />
+					<Add option="-DSTREFLOP_SSE" />
+					<Add option="-DSTREFLOP_RANDOM_GEN_SIZE=32" />
+					<Add option="-DLIBM_COMPILING_FLT32" />
+					<Add option="-DCURL_STATICLIB" />
+					<Add option="-D_STDCALL_SUPPORTED" />
+					<Add option="-D_M_IX86" />
+					<Add directory="../../source/shared_lib/include" />
+					<Add directory="../../source/shared_lib/include/graphics" />
+					<Add directory="../../source/shared_lib/include/graphics/gl" />
+					<Add directory="../../source/shared_lib/include/platform" />
+					<Add directory="../../source/shared_lib/include/platform/posix" />
+					<Add directory="../../source/shared_lib/include/sound" />
+					<Add directory="../../source/shared_lib/include/util" />
+					<Add directory="../../source/shared_lib/include/lua" />
+					<Add directory="../../source/shared_lib/include/xml" />
+					<Add directory="../../source/shared_lib/include/platform/sdl" />
+					<Add directory="../../source/shared_lib/include/sound/openal" />
+					<Add directory="../../source/shared_lib/include/streflop" />
+					<Add directory="../../source/shared_lib/include/streflop/libm_flt32_source" />
+					<Add directory="../../source/shared_lib/include/platform/common" />
+					<Add directory="../../source/shared_lib/include/map" />
+					<Add directory="$(THIRDPARTY_INCLUDE_DIR)" />
+					<Add directory="$(THIRDPARTY_INCLUDE_DIR)/SDL" />
+					<Add directory="$(THIRDPARTY_INCLUDE_DIR)/lua5.1" />
+				</Compiler>
+				<ResourceCompiler>
+					<Add directory="../../source/shared_lib/include" />
+					<Add directory="../../source/shared_lib/include/graphics" />
+					<Add directory="../../source/shared_lib/include/graphics/gl" />
+					<Add directory="../../source/shared_lib/include/platform" />
+					<Add directory="../../source/shared_lib/include/sound" />
+					<Add directory="../../source/shared_lib/include/util" />
+					<Add directory="../../source/shared_lib/include/lua" />
+					<Add directory="../../source/shared_lib/include/xml" />
+					<Add directory="../../source/shared_lib/include/platform/sdl" />
+					<Add directory="../../source/shared_lib/include/sound/openal" />
+					<Add directory="../../source/shared_lib/include/platform/posix" />
+					<Add directory="../../source/shared_lib/include/streflop" />
+					<Add directory="../../source/shared_lib/include/streflop/libm_flt32_source" />
+					<Add directory="../../source/shared_lib/include/platform/common" />
+					<Add directory="../../source/shared_lib/include/map" />
+				</ResourceCompiler>
+				<Linker>
+					<Add library="streflop" />
+					<Add library="jpeg" />
+					<Add library="lua" />
+					<Add library="png" />
+					<Add library="sdl" />
+					<Add library="openal" />
+					<Add library="curl" />
+					<Add library="xerces-c" />
+					<Add library="ogg" />
+					<Add library="vorbis" />
+					<Add library="vorbisfile" />
+					<Add library="vorbisenc" />
+					<Add directory="$(THIRDPARTY_LIB_DIR)" />
+					<Add directory="./" />
+					<Add directory="../../source/linux_deps/lib" />
+				</Linker>
+				<Environment>
+					<Variable name="THIRDPARTY_LIB_DIR" value="/usr/lib" />
+					<Variable name="THIRDPARTY_INCLUDE_DIR" value="/usr/include" />
+				</Environment>
+			</Target>
 		</Build>
 		<Unit filename="../../source/shared_lib/include/graphics/BMPReader.h" />
 		<Unit filename="../../source/shared_lib/include/graphics/FileReader.h" />
@@ -307,19 +397,22 @@
 		<Unit filename="../../source/shared_lib/include/platform/common/platform_common.h" />
 		<Unit filename="../../source/shared_lib/include/platform/common/simple_threads.h" />
 		<Unit filename="../../source/shared_lib/include/platform/posix/socket.h" />
+		<Unit filename="../../source/shared_lib/include/platform/sdl/factory_repository.h">
+			<Option target="Release Linux" />
+		</Unit>
 		<Unit filename="../../source/shared_lib/include/platform/sdl/gl_wrap.h" />
 		<Unit filename="../../source/shared_lib/include/platform/sdl/noimpl.h" />
 		<Unit filename="../../source/shared_lib/include/platform/sdl/platform_main.h" />
+		<Unit filename="../../source/shared_lib/include/platform/sdl/platform_util.h">
+			<Option target="Release Linux" />
+		</Unit>
 		<Unit filename="../../source/shared_lib/include/platform/sdl/sdl_private.h" />
 		<Unit filename="../../source/shared_lib/include/platform/sdl/thread.h" />
+		<Unit filename="../../source/shared_lib/include/platform/sdl/types.h">
+			<Option target="Release Linux" />
+		</Unit>
 		<Unit filename="../../source/shared_lib/include/platform/sdl/window.h" />
 		<Unit filename="../../source/shared_lib/include/platform/sdl/window_gl.h" />
-		<Unit filename="../../source/shared_lib/include/platform/win32/glob.h" />
-		<Unit filename="../../source/shared_lib/include/platform/win32/platform_definitions.h" />
-		<Unit filename="../../source/shared_lib/include/platform/win32/platform_util.h" />
-		<Unit filename="../../source/shared_lib/include/platform/win32/types.h" />
-		<Unit filename="../../source/shared_lib/include/sound/ds8/sound_factory_ds8.h" />
-		<Unit filename="../../source/shared_lib/include/sound/ds8/sound_player_ds8.h" />
 		<Unit filename="../../source/shared_lib/include/sound/sound.h" />
 		<Unit filename="../../source/shared_lib/include/sound/sound_factory.h" />
 		<Unit filename="../../source/shared_lib/include/sound/sound_file_loader.h" />
@@ -383,17 +476,19 @@
 		<Unit filename="../../source/shared_lib/sources/platform/common/platform_common.cpp" />
 		<Unit filename="../../source/shared_lib/sources/platform/common/simple_threads.cpp" />
 		<Unit filename="../../source/shared_lib/sources/platform/posix/socket.cpp" />
+		<Unit filename="../../source/shared_lib/sources/platform/sdl/factory_repository.cpp">
+			<Option target="Release Linux" />
+		</Unit>
 		<Unit filename="../../source/shared_lib/sources/platform/sdl/gl_wrap.cpp" />
+		<Unit filename="../../source/shared_lib/sources/platform/sdl/platform_util.cpp">
+			<Option target="Release Linux" />
+		</Unit>
 		<Unit filename="../../source/shared_lib/sources/platform/sdl/thread.cpp" />
 		<Unit filename="../../source/shared_lib/sources/platform/sdl/window.cpp" />
 		<Unit filename="../../source/shared_lib/sources/platform/sdl/window_gl.cpp" />
-		<Unit filename="../../source/shared_lib/sources/platform/win32/factory_repository.cpp" />
-		<Unit filename="../../source/shared_lib/sources/platform/win32/gl_wrap_billy.cpp" />
-		<Unit filename="../../source/shared_lib/sources/platform/win32/glob.c">
-			<Option compilerVar="CC" />
+		<Unit filename="../../source/shared_lib/sources/platform/unix/gl_wrap.cpp">
+			<Option target="Release Linux" />
 		</Unit>
-		<Unit filename="../../source/shared_lib/sources/platform/win32/platform_util.cpp" />
-		<Unit filename="../../source/shared_lib/sources/sound/ds8/sound_player_ds8.cpp" />
 		<Unit filename="../../source/shared_lib/sources/sound/openal/sound_player_openal.cpp" />
 		<Unit filename="../../source/shared_lib/sources/sound/sound.cpp" />
 		<Unit filename="../../source/shared_lib/sources/sound/sound_file_loader.cpp" />
@@ -412,6 +507,9 @@
 		<Unit filename="../../source/shared_lib/sources/xml/xml_parser.cpp" />
 		<Unit filename="../../source/win32_deps/src/glprocs.c">
 			<Option compilerVar="CC" />
+			<Option target="Debug Win32" />
+			<Option target="Release Win32" />
+			<Option target="Release_NO_STREFLOP Win32" />
 		</Unit>
 		<Extensions>
 			<code_completion />
diff --git a/mk/windoze/shared_lib.layout b/mk/windoze/shared_lib.layout
index 00c0dc259..76e159bf4 100644
--- a/mk/windoze/shared_lib.layout
+++ b/mk/windoze/shared_lib.layout
@@ -13,12 +13,24 @@
 	<File name="../../source/shared_lib/include/platform/sdl/gl_wrap.h" open="0" top="0" tabpos="0">
 		<Cursor position="621" topLine="0" />
 	</File>
+	<File name="../../source/shared_lib/include/platform/sdl/platform_main.h" open="1" top="0" tabpos="7">
+		<Cursor position="696" topLine="0" />
+	</File>
+	<File name="../../source/shared_lib/include/platform/win32/platform_definitions.h" open="1" top="0" tabpos="8">
+		<Cursor position="0" topLine="0" />
+	</File>
+	<File name="../../source/shared_lib/include/platform/win32/platform_util.h" open="1" top="0" tabpos="9">
+		<Cursor position="0" topLine="5" />
+	</File>
 	<File name="../../source/shared_lib/include/platform/win32/types.h" open="0" top="0" tabpos="0">
 		<Cursor position="542" topLine="0" />
 	</File>
 	<File name="../../source/shared_lib/include/streflop/streflop.h" open="0" top="0" tabpos="0">
 		<Cursor position="1089" topLine="3" />
 	</File>
+	<File name="../../source/shared_lib/include/util/properties.h" open="1" top="0" tabpos="12">
+		<Cursor position="1476" topLine="44" />
+	</File>
 	<File name="../../source/shared_lib/include/util/util.h" open="0" top="0" tabpos="0">
 		<Cursor position="601" topLine="0" />
 	</File>
@@ -34,10 +46,19 @@
 	<File name="../../source/shared_lib/sources/platform/posix/socket.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="360" topLine="0" />
 	</File>
-	<File name="../../source/shared_lib/sources/platform/win32/platform_util.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="542" topLine="0" />
+	<File name="../../source/shared_lib/sources/platform/win32/platform_util.cpp" open="1" top="0" tabpos="5">
+		<Cursor position="1915" topLine="26" />
 	</File>
-	<File name="../../source/win32_deps/src/glprocs.c" open="1" top="1" tabpos="4">
+	<File name="../../source/shared_lib/sources/sound/openal/sound_player_openal.cpp" open="1" top="0" tabpos="18">
+		<Cursor position="8638" topLine="291" />
+	</File>
+	<File name="../../source/shared_lib/sources/util/conversion.cpp" open="1" top="0" tabpos="15">
+		<Cursor position="663" topLine="7" />
+	</File>
+	<File name="../../source/shared_lib/sources/util/properties.cpp" open="1" top="0" tabpos="11">
+		<Cursor position="4900" topLine="115" />
+	</File>
+	<File name="../../source/win32_deps/src/glprocs.c" open="1" top="0" tabpos="4">
 		<Cursor position="64" topLine="0" />
 	</File>
 </CodeBlocks_layout_file>
diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp
index 14c285b19..aadc8f2a8 100644
--- a/source/shared_lib/sources/platform/posix/socket.cpp
+++ b/source/shared_lib/sources/platform/posix/socket.cpp
@@ -13,7 +13,7 @@
 #include <cstdlib>
 #include <stdexcept>
 
-#if defined(HAVE_SYS_IOCTL_H)
+#if defined(HAVE_SYS_IOCTL_H) || defined(__linux__)
   #define BSD_COMP /* needed for FIONREAD on Solaris2 */
   #include <sys/ioctl.h>
 #endif
@@ -1022,10 +1022,10 @@ int Socket::send(const void *data, int dataSize) {
 	        	SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] attemptCount = %d, sock = %d, dataSize = %d, data = %p\n",__FILE__,__FUNCTION__,__LINE__,attemptCount,sock,dataSize,data);
 #ifdef __APPLE__
                 bytesSent = ::send(sock, (const char *)data, dataSize, SO_NOSIGPIPE);
-#else			
+#else
                 bytesSent = ::send(sock, (const char *)data, dataSize, MSG_NOSIGNAL);
 #endif
-			
+
                 SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s] #2 EAGAIN during send, trying again returned: %d\n",__FILE__,__FUNCTION__,bytesSent);
 	        //}
 	        SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] attemptCount = %d\n",__FILE__,__FUNCTION__,__LINE__,attemptCount);
@@ -1611,7 +1611,7 @@ void BroadCastClientSocketThread::execute() {
 
 	SystemFlags::OutputDebug(SystemFlags::debugNetwork,"Broadcast Client thread is exiting\n");
 	setRunningStatus(false);
-	
+
 
     SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
 }