Source tree reorg: Normalized #include paths after the dir moves

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3215 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/Makeproject

@@ -16,7 +16,7 @@ case "$HOST_SYSTEM" in
 		uqm_NAME="$uqm_NAME.exe"
 		;;
 esac
-uqm_CFLAGS="$uqm_CFLAGS -Isrc -Isrc/uqm"
+uqm_CFLAGS="$uqm_CFLAGS -Isrc"
 if [ "$uqm_HAVE_REGEX" = 0 ]; then
 	uqm_CFLAGS="$uqm_CFLAGS -Isrc/regex"
 fi

sc2/build/msvc6/UrQuanMasters.dsp

@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\src" /I "..\..\src\uqm" /I "..\..\src\regex" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /D "USE_PLATFORM_ACCEL" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\src" /I "..\..\src\regex" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /D "USE_PLATFORM_ACCEL" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -74,7 +74,7 @@ PostBuild_Cmds=rebase -b 0x400000 -x . "../../uqm.exe"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\src\uqm" /I "..\..\src\regex" /D "DEBUG" /D "_DEBUG" /D "DEBUG_TRACK_SEM" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /D "USE_PLATFORM_ACCEL" /FR /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\src\regex" /D "DEBUG" /D "_DEBUG" /D "DEBUG_TRACK_SEM" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /D "USE_PLATFORM_ACCEL" /FR /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -100,9 +100,9 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug_NoAccel"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\src\uqm" /I "..\..\src\regex" /D "DEBUG" /D "_DEBUG" /D "DEBUG_TRACK_SEM" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /FR /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\src" /I "..\..\src\regex" /D "DEBUG" /D "_DEBUG" /D "DEBUG_TRACK_SEM" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /FR /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -128,9 +128,9 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Release_NoAccel"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\src" /I "..\..\src\uqm" /I "..\..\src\regex" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /FR /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\src" /I "..\..\src\regex" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D _VW=320 /D _VH=240 /D "HAVE_OPENGL" /D "GFXMODULE_SDL" /D "THREADLIB_SDL" /D "HAVE_OPENAL" /D "HAVE_ZIP" /D "HAVE_JOYSTICK" /D "NETPLAY" /D "ZLIB_DLL" /D "USE_INTERNAL_MIKMOD" /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -4425,11 +4425,11 @@ SOURCE=..\..\src\port.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\uqm.c
+SOURCE=..\..\src\types.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\types.h
+SOURCE=..\..\src\uqm.c
 # End Source File
 # Begin Source File
 
@@ -4569,7 +4569,7 @@ SOURCE=..\..\TODO
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\res\kohr-ah1.ico
+SOURCE="..\..\src\res\kohr-ah1.ico"
 # End Source File
 # Begin Source File
 
@@ -4581,19 +4581,19 @@ SOURCE=..\..\src\res\starcon2.ico
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\res\ur-quan-icon-alpha.ico
+SOURCE="..\..\src\res\ur-quan-icon-alpha.ico"
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\res\ur-quan-icon-std.ico
+SOURCE="..\..\src\res\ur-quan-icon-std.ico"
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\res\ur-quan1.ico
+SOURCE="..\..\src\res\ur-quan1.ico"
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\res\ur-quan2.ico
+SOURCE="..\..\src\res\ur-quan2.ico"
 # End Source File
 # Begin Source File
 

sc2/src/libs/graphics/drawable.c

@@ -19,9 +19,10 @@
 #include "gfxintrn.h"
 #include "libs/misc.h"
 #include "tfb_draw.h"
-#include "units.h"
 #include "libs/mathlib.h"
 #include "gfxother.h"
+// XXX: we should not include anything from uqm/ inside libs/
+#include "uqm/units.h"
 
 FRAME _CurFramePtr;
 

sc2/src/libs/graphics/sdl/3do_funcs.c

@@ -22,9 +22,10 @@
 #include "pure.h"
 #include "opengl.h"
 #include "primitives.h"
-#include "units.h"
 #include "libs/graphics/drawcmd.h"
 #include "libs/graphics/tfb_draw.h"
+// XXX: we should not include anything from uqm/ inside libs/
+#include "uqm/units.h"
 
 
 int batch_depth = 0;

sc2/src/libs/graphics/sdl/sdl_common.c

@@ -31,10 +31,10 @@
 #include "port.h"
 #include "libs/uio.h"
 #include "libs/log.h"
-#include "controls.h"
 #include "libs/vidlib.h"
-		// XXX: Should not be included from here.
+// XXX: we should not include anything from uqm/ inside libs/
-#include "uqmdebug.h"
+#include "uqm/controls.h"
+#include "uqm/uqmdebug.h"
 #include SDL_INCLUDE(SDL_thread.h)
 
 SDL_Surface *SDL_Video;

sc2/src/libs/graphics/tfb_draw.c

@@ -17,8 +17,9 @@
 #include "gfx_common.h"
 #include "tfb_draw.h"
 #include "drawcmd.h"
-#include "units.h"
 #include "libs/log.h"
+// XXX: we should not include anything from uqm/ inside libs/
+#include "uqm/units.h"
 
 static const HOT_SPOT NullHs = {0, 0};
 

sc2/src/libs/graphics/widgets.c

@@ -16,10 +16,11 @@
 
 #include "gfx_common.h"
 #include "widgets.h"
-#include "colors.h"
 #include "libs/strlib.h"
-#include "setup.h"
+// XXX: we should not include anything from uqm/ inside libs/
-#include "units.h"
+#include "uqm/colors.h"
+#include "uqm/setup.h"
+#include "uqm/units.h"
 
 WIDGET *widget_focus = NULL;
 

sc2/src/libs/input/sdl/input.c

@@ -25,11 +25,12 @@
 #include "libs/input/sdl/vcontrol.h"
 #include "libs/input/sdl/keynames.h"
 #include "libs/misc.h"
-#include "controls.h"
 #include "libs/file.h"
 #include "libs/log.h"
 #include "libs/reslib.h"
 #include "options.h"
+// XXX: we should not include anything from uqm/ inside libs/
+#include "uqm/controls.h"
 
 
 #define KBDBUFSIZE (1 << 8)

sc2/src/libs/resource/resinit.c

@@ -19,17 +19,17 @@
 #include "resintrn.h"
 #include "libs/misc.h"
 #include "options.h"
-#include "nameref.h"
 #include "types.h"
 #include "libs/log.h"
 #include "libs/gfxlib.h"
 #include "libs/reslib.h"
 #include "libs/sndlib.h"
 #include "libs/vidlib.h"
-#include "coderes.h"
 #include "propfile.h"
 #include <ctype.h>
 #include <stdlib.h>
+// XXX: we should not include anything from uqm/ inside libs/
+#include "uqm/coderes.h"
 
 static RESOURCE_INDEX
 allocResourceIndex (void) {

sc2/src/libs/sound/trackplayer.c

@@ -18,10 +18,13 @@
 #include "libs/sound/trackplayer.h"
 #include "libs/sound/trackint.h"
 #include "libs/log.h"
-#include "comm.h"
 #include "options.h"
 #include <ctype.h>
 #include <stdlib.h>
+#include <string.h>
+#include <memory.h>
+// XXX: we should not include anything from uqm/ inside libs/
+#include "uqm/comm.h"
 
 
 static int track_count;       //total number of subtitle tracks

sc2/src/libs/video/video.c

@@ -16,9 +16,10 @@
 
 #include "video.h"
 
-#include "setup.h"
 #include "vidplayer.h"
 #include "libs/inplib.h"
+// XXX: we should not include anything from uqm/ inside libs/
+#include "uqm/setup.h"
 
 
 #define NULL_VIDEO_REF	(0)

sc2/src/libs/video/vidplayer.c

@@ -16,13 +16,14 @@
 
 #include "vidplayer.h"
 
-#include "controls.h"
-#include "settings.h"
-#include "setup.h"
-#include "sounds.h"
 #include "libs/graphics/gfx_common.h"
 #include "libs/graphics/tfb_draw.h"
 #include "libs/log.h"
+// XXX: we should not include anything from uqm/ inside libs/
+#include "uqm/controls.h"
+#include "uqm/settings.h"
+#include "uqm/setup.h"
+#include "uqm/sounds.h"
 
 // video callbacks
 static void vp_BeginFrame (TFB_VideoDecoder*);

sc2/src/uqm.c

@@ -31,8 +31,8 @@
 #include "libs/input/input_common.h"
 #include "libs/inplib.h"
 #include "libs/tasklib.h"
-#include "controls.h"
+#include "uqm/controls.h"
-#include "battle.h"
+#include "uqm/battle.h"
 		// For BATTLE_FRAME_RATE
 #include "libs/file.h"
 #include "port.h"
@@ -41,16 +41,16 @@
 #include "libs/log.h"
 #include "options.h"
 #include "uqmversion.h"
-#include "comm.h"
+#include "uqm/comm.h"
 #ifdef NETPLAY
 #	include "libs/callback.h"
 #	include "libs/alarm.h"
 #	include "libs/net.h"
-#	include "netplay/netoptions.h"
+#	include "uqm/netplay/netoptions.h"
-#	include "netplay/netplay.h"
+#	include "uqm/netplay/netplay.h"
 #endif
-#include "setup.h"
+#include "uqm/setup.h"
-#include "starcon.h"
+#include "uqm/starcon.h"
 
 
 #if defined (GFXMODULE_SDL)

sc2/src/uqm/comm/arilou/arilouc.c

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/arilou/resinst.h"
+#include "resinst.h"
-#include "comm/arilou/strings.h"
+#include "strings.h"
 
-#include "gameev.h"
+#include "uqm/gameev.h"
 
 
 static LOCDATA arilou_desc =

sc2/src/uqm/comm/blackur/blackurc.c

@@ -16,9 +16,9 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/blackur/resinst.h"
+#include "resinst.h"
-#include "comm/blackur/strings.h"
+#include "strings.h"
 
 static LOCDATA blackurq_desc =
 {

sc2/src/uqm/comm/chmmr/chmmrc.c

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/chmmr/resinst.h"
+#include "resinst.h"
-#include "comm/chmmr/strings.h"
+#include "strings.h"
 
-#include "build.h"
+#include "uqm/build.h"
 
 
 static LOCDATA chmmr_desc =

sc2/src/uqm/comm/comandr/comandr.c

@@ -16,10 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "setup.h"
+#include "../commall.h"
-#include "comm/commall.h"
+#include "resinst.h"
-#include "comm/comandr/resinst.h"
+#include "strings.h"
-#include "comm/comandr/strings.h"
+
+#include "uqm/setup.h"
 #include "libs/graphics/gfx_common.h"
 
 static LOCDATA commander_desc =

sc2/src/uqm/comm/commall.h

@@ -17,10 +17,10 @@
 #ifndef _COMMALL_H
 #define _COMMALL_H
 
-#include "colors.h"
+#include "uqm/colors.h"
-#include "comm.h"
+#include "uqm/comm.h"
-#include "commglue.h"
+#include "uqm/commglue.h"
-#include "encount.h"
+#include "uqm/encount.h"
 #include "libs/reslib.h"
 
 #endif  /* _COMMALL_H */

sc2/src/uqm/comm/druuge/druugec.c

@@ -16,12 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/druuge/resinst.h"
+#include "resinst.h"
-#include "comm/druuge/strings.h"
+#include "strings.h"
 
-#include "build.h"
+#include "uqm/build.h"
-#include "setup.h"
+#include "uqm/setup.h"
 
 
 static LOCDATA druuge_desc =

sc2/src/uqm/comm/ilwrath/ilwrathc.c

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/ilwrath/resinst.h"
+#include "resinst.h"
-#include "comm/ilwrath/strings.h"
+#include "strings.h"
 
-#include "gameev.h"
+#include "uqm/gameev.h"
 
 
 static LOCDATA ilwrath_desc =

sc2/src/uqm/comm/melnorm/melnorm.c

@@ -16,13 +16,13 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/melnorm/resinst.h"
+#include "resinst.h"
-#include "comm/melnorm/strings.h"
+#include "strings.h"
 
-#include "gameev.h"
+#include "uqm/gameev.h"
-#include "setup.h"
+#include "uqm/setup.h"
-#include "shipcont.h"
+#include "uqm/shipcont.h"
 #include "libs/inplib.h"
 #include "libs/mathlib.h"
 

sc2/src/uqm/comm/mycon/myconc.c

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/mycon/resinst.h"
+#include "resinst.h"
-#include "comm/mycon/strings.h"
+#include "strings.h"
 
-#include "gameev.h"
+#include "uqm/gameev.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/comm/orz/orzc.c

@@ -16,10 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/orz/resinst.h"
+#include "resinst.h"
-#include "comm/orz/strings.h"
+#include "strings.h"
-#include "build.h"
+
+#include "uqm/build.h"
 
 
 static LOCDATA orz_desc =

sc2/src/uqm/comm/pkunk/pkunkc.c

@@ -16,12 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/pkunk/resinst.h"
+#include "resinst.h"
-#include "comm/pkunk/strings.h"
+#include "strings.h"
 
-#include "build.h"
+#include "uqm/build.h"
-#include "gameev.h"
+#include "uqm/gameev.h"
 
 
 static LOCDATA pkunk_desc =

sc2/src/uqm/comm/rebel/rebel.c

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/yehat/resinst.h"
+#include "../yehat/resinst.h"
-#include "comm/rebel/strings.h"
+#include "strings.h"
 
-#include "build.h"
+#include "uqm/build.h"
 
 
 static LOCDATA yehat_desc =

sc2/src/uqm/comm/shofixt/shofixt.c

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/shofixt/resinst.h"
+#include "resinst.h"
-#include "comm/shofixt/strings.h"
+#include "strings.h"
 
-#include "gameev.h"
+#include "uqm/gameev.h"
 
 
 static LOCDATA shofixti_desc =

sc2/src/uqm/comm/slyhome/slyhome.c

@@ -16,10 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "gameev.h"
+#include "../commall.h"
-#include "comm/commall.h"
+#include "resinst.h"
-#include "comm/slyhome/resinst.h"
+#include "strings.h"
-#include "comm/slyhome/strings.h"
+
+#include "uqm/gameev.h"
 
 
 static LOCDATA slylandro_desc =

sc2/src/uqm/comm/slyland/slyland.c

@@ -16,13 +16,13 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/slyland/resinst.h"
+#include "resinst.h"
-#include "comm/slyland/strings.h"
+#include "strings.h"
-#include "options.h"
 
-#include "battle.h"
+#include "options.h"
-#include "setup.h"
+#include "uqm/battle.h"
+#include "uqm/setup.h"
 
 
 static LOCDATA slylandro_desc =

sc2/src/uqm/comm/spahome/spahome.c

@@ -16,12 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/spathi/resinst.h"
+#include "../spathi/resinst.h"
-#include "comm/spahome/strings.h"
+#include "strings.h"
 
-#include "build.h"
+#include "uqm/build.h"
-#include "gameev.h"
+#include "uqm/gameev.h"
 
 
 static LOCDATA spahome_desc =

sc2/src/uqm/comm/spathi/spathic.c

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/spathi/resinst.h"
+#include "resinst.h"
-#include "comm/spathi/strings.h"
+#include "strings.h"
 
-#include "build.h"
+#include "uqm/build.h"
 
 
 static LOCDATA spathi_desc =

sc2/src/uqm/comm/starbas/starbas.c

@@ -16,13 +16,13 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/comandr/resinst.h"
+#include "../comandr/resinst.h"
-#include "comm/starbas/strings.h"
+#include "strings.h"
 
-#include "build.h"
+#include "uqm/build.h"
-#include "setup.h"
+#include "uqm/setup.h"
-#include "shipcont.h"
+#include "uqm/shipcont.h"
 #include "libs/graphics/gfx_common.h"
 #include "libs/inplib.h"
 #include "libs/mathlib.h"

sc2/src/uqm/comm/supox/supoxc.c

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/supox/resinst.h"
+#include "resinst.h"
-#include "comm/supox/strings.h"
+#include "strings.h"
 
-#include "build.h"
+#include "uqm/build.h"
 
 
 static LOCDATA supox_desc =

sc2/src/uqm/comm/syreen/syreenc.c

@@ -16,12 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/syreen/resinst.h"
+#include "resinst.h"
-#include "comm/syreen/strings.h"
+#include "strings.h"
-#include "libs/sound/sound.h"
 
-#include "build.h"
+#include "libs/sound/sound.h"
+#include "uqm/build.h"
 
 
 static LOCDATA syreen_desc =

sc2/src/uqm/comm/talkpet/talkpet.c

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/talkpet/resinst.h"
+#include "resinst.h"
-#include "comm/talkpet/strings.h"
+#include "strings.h"
 
-#include "build.h"
+#include "uqm/build.h"
 
 static LOCDATA talkpet_desc =
 {

sc2/src/uqm/comm/thradd/thraddc.c

@@ -16,12 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/thradd/resinst.h"
+#include "resinst.h"
-#include "comm/thradd/strings.h"
+#include "strings.h"
 
-#include "build.h"
+#include "uqm/build.h"
-#include "gameev.h"
+#include "uqm/gameev.h"
 
 
 static LOCDATA thradd_desc =

sc2/src/uqm/comm/umgah/umgahc.c

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/umgah/resinst.h"
+#include "resinst.h"
-#include "comm/umgah/strings.h"
+#include "strings.h"
 
-#include "build.h"
+#include "uqm/build.h"
 
 
 static LOCDATA umgah_desc =

sc2/src/uqm/comm/urquan/urquanc.c

@@ -16,9 +16,9 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/urquan/resinst.h"
+#include "resinst.h"
-#include "comm/urquan/strings.h"
+#include "strings.h"
 
 static LOCDATA urquan_desc =
 {

sc2/src/uqm/comm/utwig/utwigc.c

@@ -16,12 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/utwig/resinst.h"
+#include "resinst.h"
-#include "comm/utwig/strings.h"
+#include "strings.h"
 
-#include "build.h"
+#include "uqm/build.h"
-#include "gameev.h"
+#include "uqm/gameev.h"
 
 
 static LOCDATA utwig_desc =

sc2/src/uqm/comm/vux/vuxc.c

@@ -16,9 +16,9 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/vux/resinst.h"
+#include "resinst.h"
-#include "comm/vux/strings.h"
+#include "strings.h"
 
 static LOCDATA vux_desc =
 {

sc2/src/uqm/comm/yehat/yehatc.c

@@ -16,12 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/yehat/resinst.h"
+#include "resinst.h"
-#include "comm/yehat/strings.h"
+#include "strings.h"
 
-#include "build.h"
+#include "uqm/build.h"
-#include "gameev.h"
+#include "uqm/gameev.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/comm/zoqfot/zoqfotc.c

@@ -16,12 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "comm/commall.h"
+#include "../commall.h"
-#include "comm/zoqfot/resinst.h"
+#include "resinst.h"
-#include "comm/zoqfot/strings.h"
+#include "strings.h"
 
-#include "build.h"
+#include "uqm/build.h"
-#include "gameev.h"
+#include "uqm/gameev.h"
 
 
 #define ZOQ_FG_COLOR WHITE_COLOR

sc2/src/uqm/netplay/checksum.c

@@ -28,7 +28,7 @@
 		// for DUMP_CRC_OPS
 #include "netconnection.h"
 #include "netmelee.h"
-#include "tactrans.h"
+#include "../tactrans.h"
 		// for new_ship
 #include "libs/log.h"
 #include "libs/mathlib.h"

sc2/src/uqm/netplay/checksum.h

@@ -28,7 +28,7 @@ typedef uint32 Checksum;
 #include "netplay.h"
 #include "crc.h"
 
-#include "element.h"
+#include "../element.h"
 #include "libs/gfxlib.h"
 
 #include "netconnection.h"

sc2/src/uqm/netplay/netmelee.c

@@ -21,22 +21,22 @@
 #include "libs/callback.h"
 #include "libs/log.h"
 #include "libs/net.h"
-#include "netplay/netinput.h"
+#include "netinput.h"
-#include "netplay/netmisc.h"
+#include "netmisc.h"
-#include "netplay/netsend.h"
+#include "netsend.h"
-#include "netplay/notify.h"
+#include "notify.h"
-#include "netplay/packetq.h"
+#include "packetq.h"
-#include "netplay/proto/npconfirm.h"
+#include "proto/npconfirm.h"
-#include "netplay/proto/ready.h"
+#include "proto/ready.h"
-#include "netplay/proto/reset.h"
+#include "proto/reset.h"
 
-#include "battlecontrols.h"
+#include "../battlecontrols.h"
 		// for NetworkInputContext
-#include "controls.h"
+#include "../controls.h"
 		// for BATTLE_INPUT_STATE
-#include "init.h"
+#include "../init.h"
 		// for NUM_PLAYERS
-#include "globdata.h"
+#include "../globdata.h"
 		// for GLOBAL
 
 #include <errno.h>

sc2/src/uqm/netplay/netmisc.c

@@ -23,7 +23,7 @@
 #include "packetsenders.h"
 #include "proto/ready.h"
 
-#include "melee.h"
+#include "../melee.h"
 		// For feedback functions.
 
 #include <stdlib.h>

sc2/src/uqm/netplay/netmisc.h

@@ -25,7 +25,7 @@ typedef struct BattleStateData BattleStateData;
 #include "netstate.h"
 #include "types.h"
 
-#include "battle.h"
+#include "../battle.h"
 		// for BattleFrameCounter, BATTLE_FRAME_RATE
 
 struct BattleStateData {

sc2/src/uqm/netplay/notify.h

@@ -22,7 +22,7 @@
 #include "netplay.h"
 		// for NETPLAY_CHECKSUM
 #include "netconnection.h"
-#include "controls.h"
+#include "../controls.h"
 		// for BATTLE_INPUT_STATE
 #ifdef NETPLAY_CHECKSUM
 #	include "checksum.h"

sc2/src/uqm/netplay/packethandlers.c

@@ -31,15 +31,15 @@
 #include "proto/reset.h"
 #include "libs/log.h"
 
-#include "controls.h"
+#include "../controls.h"
 		// for BATTLE_INPUT_STATE
-#include "init.h"
+#include "../init.h"
 		// for NUM_PLAYERS
-#include "globdata.h"
+#include "../globdata.h"
 		// for GLOBAL
-#include "melee.h"
+#include "../melee.h"
 		// for various update functions.
-#include "pickmele.h"
+#include "../pickmele.h"
 		// for various update functions.
 #include "libs/mathlib.h"
 		// for TFB_SeedRandom

sc2/src/uqm/netplay/packetsenders.h

@@ -24,7 +24,7 @@
 #include "netconnection.h"
 #include "packet.h"
 
-#include "controls.h"
+#include "../controls.h"
 		// for BATTLE_INPUT_STATE
 
 void sendInit(NetConnection *conn);

sc2/src/uqm/planets/calc.c

@@ -17,7 +17,7 @@
  */
 
 /* ----------------------------- INCLUDES ---------------------------- */
-#include "encount.h"
+#include "../encount.h"
 #include "libs/mathlib.h"
 #include "libs/log.h"
 /* -------------------------------- DATA -------------------------------- */

sc2/src/uqm/planets/cargo.c

@@ -16,13 +16,13 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "colors.h"
+#include "../colors.h"
-#include "controls.h"
+#include "../controls.h"
-#include "gamestr.h"
+#include "../gamestr.h"
-#include "shipcont.h"
+#include "../shipcont.h"
-#include "setup.h"
+#include "../setup.h"
-#include "sounds.h"
+#include "../sounds.h"
-#include "util.h"
+#include "../util.h"
 
 
 void

sc2/src/uqm/planets/devices.c

@@ -16,18 +16,18 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "../build.h"
-#include "encount.h"
+#include "../encount.h"
-#include "gamestr.h"
+#include "../gamestr.h"
-#include "controls.h"
+#include "../controls.h"
-#include "settings.h"
+#include "../settings.h"
-#include "shipcont.h"
+#include "../shipcont.h"
-#include "load.h"
+#include "../load.h"
-#include "setup.h"
+#include "../setup.h"
-#include "state.h"
+#include "../state.h"
-#include "grpinfo.h"
+#include "../grpinfo.h"
-#include "sounds.h"
+#include "../sounds.h"
-#include "util.h"
+#include "../util.h"
 #include "libs/strlib.h"
 
 

sc2/src/uqm/planets/genall.h

@@ -17,8 +17,11 @@
 #ifndef _GENALL_H
 #define _GENALL_H
 
-#include "planets/planets.h"
+#include "planets.h"
 #include "libs/compiler.h"
+#include "../globdata.h"
+#include "../nameref.h"
+#include "../resinst.h"
 
 
 #endif  /* _GENALL_H */

sc2/src/uqm/planets/genburv.c

@@ -16,10 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "globdata.h"
+#include "genall.h"
-#include "nameref.h"
-#include "resinst.h"
-#include "planets/genall.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/planets/genchmmr.c

@@ -16,16 +16,13 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "encount.h"
-#include "globdata.h"
 #include "lander.h"
-#include "nameref.h"
+#include "../build.h"
-#include "resinst.h"
+#include "../encount.h"
-#include "setup.h"
+#include "../setup.h"
-#include "state.h"
+#include "../state.h"
-#include "sounds.h"
+#include "../sounds.h"
-#include "planets/genall.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/planets/gencol.c

@@ -16,11 +16,10 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "globdata.h"
+#include "../build.h"
-#include "state.h"
+#include "../state.h"
-#include "grpinfo.h"
+#include "../grpinfo.h"
-#include "planets/genall.h"
 
 
 void

sc2/src/uqm/planets/gendru.c

@@ -16,15 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "encount.h"
-#include "globdata.h"
 #include "lander.h"
-#include "ipdisp.h"
+#include "../build.h"
-#include "nameref.h"
+#include "../encount.h"
-#include "resinst.h"
+#include "../ipdisp.h"
-#include "state.h"
+#include "../state.h"
-#include "planets/genall.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/planets/genilw.c

@@ -16,14 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "encount.h"
+#include "../build.h"
-#include "globdata.h"
+#include "../encount.h"
-#include "ipdisp.h"
+#include "../ipdisp.h"
-#include "nameref.h"
+#include "../state.h"
-#include "resinst.h"
-#include "state.h"
-#include "planets/genall.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/planets/genmel.c

@@ -16,11 +16,10 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "encount.h"
+#include "../build.h"
-#include "globdata.h"
+#include "../encount.h"
-#include "state.h"
+#include "../state.h"
-#include "planets/genall.h"
 #include "libs/log.h"
 
 

sc2/src/uqm/planets/genmyc.c

@@ -16,15 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "encount.h"
+#include "../build.h"
-#include "globdata.h"
+#include "../encount.h"
-#include "ipdisp.h"
+#include "../ipdisp.h"
-#include "nameref.h"
+#include "../setup.h"
-#include "resinst.h"
+#include "../state.h"
-#include "setup.h"
-#include "state.h"
-#include "planets/genall.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/planets/genorz.c

@@ -16,17 +16,14 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "encount.h"
-#include "globdata.h"
 #include "lander.h"
-#include "ipdisp.h"
+#include "../build.h"
-#include "nameref.h"
+#include "../encount.h"
-#include "resinst.h"
+#include "../ipdisp.h"
-#include "setup.h"
+#include "../setup.h"
-#include "state.h"
+#include "../state.h"
-#include "sounds.h"
+#include "../sounds.h"
-#include "planets/genall.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/planets/genpet.c

@@ -16,15 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "encount.h"
+#include "../build.h"
-#include "globdata.h"
+#include "../encount.h"
-#include "ipdisp.h"
+#include "../ipdisp.h"
-#include "nameref.h"
+#include "../setup.h"
-#include "resinst.h"
+#include "../state.h"
-#include "setup.h"
-#include "state.h"
-#include "planets/genall.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/planets/genpku.c

@@ -16,15 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "encount.h"
-#include "globdata.h"
 #include "lander.h"
-#include "ipdisp.h"
+#include "../build.h"
-#include "nameref.h"
+#include "../encount.h"
-#include "resinst.h"
+#include "../ipdisp.h"
-#include "state.h"
+#include "../state.h"
-#include "planets/genall.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/planets/genrain.c

@@ -16,9 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "encount.h"
+#include "genall.h"
-#include "globdata.h"
+#include "../encount.h"
-#include "planets/genall.h"
 
 
 void

sc2/src/uqm/planets/gensam.c

@@ -16,14 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "encount.h"
+#include "../build.h"
-#include "globdata.h"
+#include "../encount.h"
-#include "resinst.h"
+#include "../races.h"
-#include "races.h"
+#include "../state.h"
-#include "state.h"
+#include "../grpinfo.h"
-#include "grpinfo.h"
-#include "planets/genall.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/planets/genshof.c

@@ -16,11 +16,10 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "globdata.h"
+#include "../build.h"
-#include "state.h"
+#include "../state.h"
-#include "grpinfo.h"
+#include "../grpinfo.h"
-#include "planets/genall.h"
 
 
 static void

sc2/src/uqm/planets/gensly.c

@@ -16,9 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "encount.h"
+#include "genall.h"
-#include "resinst.h"
+#include "../encount.h"
-#include "planets/genall.h"
 
 
 void

sc2/src/uqm/planets/gensol.c

@@ -16,18 +16,15 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "gamestr.h"
-#include "globdata.h"
 #include "lander.h"
 #include "lifeform.h"
-#include "nameref.h"
+#include "../build.h"
-#include "races.h"
+#include "../gamestr.h"
-#include "resinst.h"
+#include "../races.h"
-#include "state.h"
+#include "../state.h"
-#include "grpinfo.h"
+#include "../grpinfo.h"
-#include "encount.h"
+#include "../encount.h"
-#include "planets/genall.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/planets/genspa.c

@@ -16,15 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "encount.h"
-#include "globdata.h"
-#include "ipdisp.h"
 #include "lifeform.h"
-#include "nameref.h"
+#include "../build.h"
-#include "resinst.h"
+#include "../encount.h"
-#include "state.h"
+#include "../ipdisp.h"
-#include "planets/genall.h"
+#include "../state.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/planets/gensup.c

@@ -16,15 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "encount.h"
-#include "globdata.h"
 #include "lander.h"
-#include "ipdisp.h"
+#include "../build.h"
-#include "nameref.h"
+#include "../encount.h"
-#include "resinst.h"
+#include "../ipdisp.h"
-#include "state.h"
+#include "../state.h"
-#include "planets/genall.h"
 #include "libs/mathlib.h"
 
 void

sc2/src/uqm/planets/gensyr.c

@@ -16,9 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "encount.h"
+#include "genall.h"
-#include "resinst.h"
+#include "../encount.h"
-#include "planets/genall.h"
 
 
 static void

sc2/src/uqm/planets/genthrad.c

@@ -16,15 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "encount.h"
+#include "../build.h"
-#include "globdata.h"
+#include "../encount.h"
-#include "ipdisp.h"
+#include "../ipdisp.h"
-#include "nameref.h"
+#include "../setup.h"
-#include "resinst.h"
+#include "../state.h"
-#include "setup.h"
-#include "state.h"
-#include "planets/genall.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/planets/genutw.c

@@ -16,15 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "encount.h"
+#include "../build.h"
-#include "globdata.h"
+#include "../encount.h"
-#include "ipdisp.h"
+#include "../ipdisp.h"
-#include "nameref.h"
+#include "../setup.h"
-#include "resinst.h"
+#include "../state.h"
-#include "setup.h"
-#include "state.h"
-#include "planets/genall.h"
 #include "libs/mathlib.h"
 
 void

sc2/src/uqm/planets/genvault.c

@@ -16,13 +16,10 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "encount.h"
+#include "genall.h"
-#include "globdata.h"
 #include "lander.h"
-#include "nameref.h"
+#include "../encount.h"
-#include "resinst.h"
+#include "../setup.h"
-#include "setup.h"
-#include "planets/genall.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/planets/genvux.c

@@ -16,18 +16,15 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "encount.h"
-#include "globdata.h"
 #include "lander.h"
-#include "ipdisp.h"
 #include "lifeform.h"
-#include "nameref.h"
+#include "../build.h"
-#include "resinst.h"
+#include "../encount.h"
-#include "setup.h"
+#include "../ipdisp.h"
-#include "state.h"
+#include "../setup.h"
-#include "sounds.h"
+#include "../state.h"
-#include "planets/genall.h"
+#include "../sounds.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/planets/genwreck.c

@@ -16,11 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "globdata.h"
+#include "genall.h"
 #include "lander.h"
-#include "nameref.h"
-#include "resinst.h"
-#include "planets/genall.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/planets/genyeh.c

@@ -16,14 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "encount.h"
+#include "../build.h"
-#include "globdata.h"
+#include "../encount.h"
-#include "ipdisp.h"
+#include "../ipdisp.h"
-#include "nameref.h"
+#include "../state.h"
-#include "resinst.h"
-#include "state.h"
-#include "planets/genall.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/planets/genzoq.c

@@ -16,14 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "genall.h"
-#include "encount.h"
+#include "../build.h"
-#include "globdata.h"
+#include "../encount.h"
-#include "nameref.h"
+#include "../state.h"
-#include "resinst.h"
+#include "../grpinfo.h"
-#include "state.h"
-#include "grpinfo.h"
-#include "planets/genall.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/planets/lander.c

@@ -18,19 +18,19 @@
 
 #include "lander.h"
 
-#include "cons_res.h"
-#include "controls.h"
-#include "colors.h"
-#include "encount.h"
-#include "process.h"
-#include "gamestr.h"
 #include "lifeform.h"
 #include "scan.h"
-#include "nameref.h"
+#include "../cons_res.h"
-#include "resinst.h"
+#include "../controls.h"
-#include "setup.h"
+#include "../colors.h"
-#include "sounds.h"
+#include "../encount.h"
-#include "element.h"
+#include "../process.h"
+#include "../gamestr.h"
+#include "../nameref.h"
+#include "../resinst.h"
+#include "../setup.h"
+#include "../sounds.h"
+#include "../element.h"
 #include "libs/graphics/gfx_common.h"
 #include "libs/mathlib.h"
 #include "libs/log.h"

sc2/src/uqm/planets/lander.h

@@ -19,12 +19,12 @@
 #ifndef _LANDER_H
 #define _LANDER_H
 
-#include "planets/elemdata.h"
+#include "elemdata.h"
 #include "libs/compiler.h"
 #include "libs/gfxlib.h"
 #include "libs/sndlib.h"
-#include "menustat.h"
+#include "../menustat.h"
-#include "element.h"
+#include "../element.h"
 
 
 #define NUM_TEXT_FRAMES 32

sc2/src/uqm/planets/orbits.c

@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "encount.h"
+#include "planets.h"
-#include "planets/planets.h"
+#include "../encount.h"
 #include "libs/compiler.h"
 #include "libs/mathlib.h"
 #include "libs/log.h"

sc2/src/uqm/planets/oval.c

@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "units.h"
+#include "../units.h"
 #include "libs/gfxlib.h"
 #include "libs/graphics/context.h"
 #include "libs/graphics/drawable.h"

sc2/src/uqm/planets/pl_stuff.c

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "planets/planets.h"
+#include "planets.h"
-#include "setup.h"
+#include "../setup.h"
 #include "libs/graphics/gfx_common.h"
 #include "libs/graphics/drawable.h"
-#include "planets/scan.h"
+#include "scan.h"
 
 #include <math.h>
 

sc2/src/uqm/planets/planets.c

@@ -16,15 +16,15 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "element.h"
 #include "scan.h"
 #include "lander.h"
-#include "settings.h"
+#include "../element.h"
-#include "setup.h"
+#include "../settings.h"
-#include "uqmdebug.h"
+#include "../setup.h"
+#include "../uqmdebug.h"
+#include "../resinst.h"
+#include "../nameref.h"
 #include "libs/graphics/gfx_common.h"
-#include "resinst.h"
-#include "nameref.h"
 
 
 extern int rotate_planet_task (void *data);

sc2/src/uqm/planets/planets.h

@@ -19,8 +19,8 @@
 #ifndef _PLANETS_H
 #define _PLANETS_H
 
-#include "menustat.h"
+#include "../menustat.h"
-#include "units.h"
+#include "../units.h"
 
 #define END_INTERPLANETARY START_INTERPLANETARY
 

sc2/src/uqm/planets/plangen.c

@@ -16,12 +16,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "nameref.h"
+#include "planets.h"
-#include "resinst.h"
+#include "scan.h"
-#include "setup.h"
+#include "../nameref.h"
+#include "../resinst.h"
+#include "../setup.h"
 #include "options.h"
-#include "planets/planets.h"
-#include "planets/scan.h"
 #include "libs/graphics/gfx_common.h"
 #include "libs/graphics/drawable.h"
 #include "libs/mathlib.h"

sc2/src/uqm/planets/pstarmap.c

@@ -16,20 +16,20 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "colors.h"
-#include "controls.h"
-#include "encount.h"
-#include "gameopt.h"
-#include "gamestr.h"
-#include "globdata.h"
-#include "options.h"
 #include "scan.h"
-#include "shipcont.h"
+#include "../colors.h"
-#include "settings.h"
+#include "../controls.h"
-#include "setup.h"
+#include "../encount.h"
-#include "sounds.h"
+#include "../gameopt.h"
-#include "state.h"
+#include "../gamestr.h"
-#include "uqmdebug.h"
+#include "../globdata.h"
+#include "../shipcont.h"
+#include "../settings.h"
+#include "../setup.h"
+#include "../sounds.h"
+#include "../state.h"
+#include "../uqmdebug.h"
+#include "options.h"
 #include "libs/inplib.h"
 #include "libs/strlib.h"
 #include "libs/graphics/gfx_common.h"

sc2/src/uqm/planets/report.c

@@ -16,15 +16,15 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "colors.h"
+#include "lander.h"
-#include "controls.h"
+#include "planets.h"
-#include "gamestr.h"
+#include "../colors.h"
+#include "../controls.h"
+#include "../gamestr.h"
+#include "../setup.h"
+#include "../sounds.h"
+#include "../uqmdebug.h"
 #include "options.h"
-#include "setup.h"
-#include "sounds.h"
-#include "planets/lander.h"
-#include "planets/planets.h"
-#include "uqmdebug.h"
 #include "libs/inplib.h"
 
 #include <ctype.h>

sc2/src/uqm/planets/roster.c

@@ -16,13 +16,13 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
+#include "../build.h"
-#include "colors.h"
+#include "../colors.h"
-#include "controls.h"
+#include "../controls.h"
-#include "races.h"
+#include "../races.h"
-#include "shipcont.h"
+#include "../shipcont.h"
-#include "setup.h"
+#include "../setup.h"
-#include "sounds.h"
+#include "../sounds.h"
 #include "libs/gfxlib.h"
 #include "libs/tasklib.h"
 

sc2/src/uqm/planets/scan.c

@@ -16,23 +16,23 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "build.h"
-#include "cons_res.h"
-#include "controls.h"
-#include "encount.h"
-#include "gamestr.h"
-#include "lifeform.h"
-#include "nameref.h"
-#include "options.h"
-#include "resinst.h"
-#include "settings.h"
-#include "load.h"
-#include "util.h"
 #include "lander.h"
-#include "process.h"
+#include "lifeform.h"
-#include "setup.h"
+#include "../build.h"
-#include "sounds.h"
+#include "../cons_res.h"
-#include "state.h"
+#include "../controls.h"
+#include "../encount.h"
+#include "../gamestr.h"
+#include "../nameref.h"
+#include "../resinst.h"
+#include "../settings.h"
+#include "../load.h"
+#include "../util.h"
+#include "../process.h"
+#include "../setup.h"
+#include "../sounds.h"
+#include "../state.h"
+#include "options.h"
 #include "libs/graphics/gfx_common.h"
 #include "libs/inplib.h"
 #include "libs/mathlib.h"

sc2/src/uqm/planets/solarsys.c

@@ -16,23 +16,23 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "colors.h"
-#include "controls.h"
-#include "encount.h"
-#include "gamestr.h"
-#include "globdata.h"
-#include "init.h"
-#include "nameref.h"
-#include "resinst.h"
-#include "settings.h"
 #include "lander.h"
-#include "ipdisp.h"
+#include "../colors.h"
-#include "process.h"
+#include "../controls.h"
-#include "load.h"
+#include "../encount.h"
-#include "setup.h"
+#include "../gamestr.h"
-#include "sounds.h"
+#include "../globdata.h"
-#include "state.h"
+#include "../init.h"
-#include "uqmdebug.h"
+#include "../nameref.h"
+#include "../resinst.h"
+#include "../settings.h"
+#include "../ipdisp.h"
+#include "../process.h"
+#include "../load.h"
+#include "../setup.h"
+#include "../sounds.h"
+#include "../state.h"
+#include "../uqmdebug.h"
 #include "libs/graphics/gfx_common.h"
 #include "libs/mathlib.h"
 #include "libs/inplib.h"

sc2/src/uqm/planets/sundata.h

@@ -19,7 +19,7 @@
 #ifndef _SUNDATA_H
 #define _SUNDATA_H
 
-#include "planets/plandata.h"
+#include "plandata.h"
 #include "libs/compiler.h"
 
 

sc2/src/uqm/ships/androsyn/androsyn.c

@@ -16,9 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "ships/ship.h"
+#include "../ship.h"
-#include "ships/androsyn/resinst.h"
+#include "resinst.h"
-#include "ship.h"
 
 #include "libs/mathlib.h"
 

sc2/src/uqm/ships/arilou/arilou.c

@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "ships/ship.h"
+#include "../ship.h"
-#include "ships/arilou/resinst.h"
+#include "resinst.h"
 
 #include "libs/mathlib.h"
 

sc2/src/uqm/ships/blackurq/blackurq.c

@@ -16,10 +16,10 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "ships/ship.h"
+#include "../ship.h"
-#include "ships/blackurq/resinst.h"
+#include "resinst.h"
 
-#include "globdata.h"
+#include "uqm/globdata.h"
 
 
 #define MAX_CREW MAX_CREW_SIZE

sc2/src/uqm/ships/chenjesu/chenjesu.c

@@ -16,11 +16,10 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "ships/ship.h"
+#include "../ship.h"
-#include "ships/chenjesu/resinst.h"
+#include "resinst.h"
-#include "ship.h"
 
-#include "globdata.h"
+#include "uqm/globdata.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/ships/chmmr/chmmr.c

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "ships/ship.h"
+#include "../ship.h"
-#include "ships/chmmr/resinst.h"
+#include "resinst.h"
 
-#include "colors.h"
+#include "uqm/colors.h"
-#include "globdata.h"
+#include "uqm/globdata.h"
 #include "libs/mathlib.h"
 
 

sc2/src/uqm/ships/druuge/druuge.c

@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "ships/ship.h"
+#include "../ship.h"
-#include "ships/druuge/resinst.h"
+#include "resinst.h"
 
 #define MAX_CREW 14
 #define MAX_ENERGY 32

sc2/src/uqm/ships/human/human.c

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "ships/ship.h"
+#include "../ship.h"
-#include "ships/human/resinst.h"
+#include "resinst.h"
 
-#include "colors.h"
+#include "uqm/colors.h"
-#include "globdata.h"
+#include "uqm/globdata.h"
 
 
 #define MAX_CREW 18

sc2/src/uqm/ships/ilwrath/ilwrath.c

@@ -16,12 +16,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "ships/ship.h"
+#include "../ship.h"
-#include "ships/ilwrath/resinst.h"
+#include "resinst.h"
-#include "ship.h"
 
-#include "colors.h"
+#include "uqm/colors.h"
-#include "globdata.h"
+#include "uqm/globdata.h"
 
 
 #define MAX_CREW 22