From: curt <curt>
Date: Wed, 16 Feb 2000 23:01:03 +0000 (+0000)
Subject: One more pass at a reorg.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1294aed4650ec2aacef27a7fdeb2f4e012516ca0;p=flightgear.git

One more pass at a reorg.
---

diff --git a/Makefile.am b/Makefile.am
index eba570c27..0f96d8469 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,12 +2,11 @@ SUBDIRS = \
 	tests \
 	src
 
-EXTRA_DIST = FG-FAQ.v3 README.Unix README.Linux README.MacOS README.Win32 \
-	README.Win32-X README.autoconf README.gpc README.plib \
-	README.running Thanks VERSION acsite.m4 acconfig.h irix-hack.pl
+EXTRA_DIST = Thanks VERSION acsite.m4 acconfig.h irix-hack.pl
 
 dist-hook:
-	tar cf - docs-mini hints | (cd $(distdir); tar xvf -)
+	tar --exclude docs-mini/CVS --exclude hints/CVS -cf - docs-mini hints \
+		| (cd $(distdir); tar xvf -)
 	# tar cf - Simulator/FDM/JSBsim/aircraft Simulator/FDM/JSBsim/engine | (cd $(distdir); tar xvf -)
 
 
diff --git a/src/Aircraft/aircraft.cxx b/src/Aircraft/aircraft.cxx
index ef51a239d..498a52968 100644
--- a/src/Aircraft/aircraft.cxx
+++ b/src/Aircraft/aircraft.cxx
@@ -23,8 +23,8 @@
 
 #include <stdio.h>
 
-#include <simgear/logstream.hxx>
 #include <simgear/constants.h>
+#include <simgear/debug/logstream.hxx>
 
 #include "aircraft.hxx"
 
diff --git a/src/Airports/genapt.cxx b/src/Airports/genapt.cxx
index 8d509e097..af70ddf0d 100644
--- a/src/Airports/genapt.cxx
+++ b/src/Airports/genapt.cxx
@@ -36,12 +36,12 @@
 #  include <strings.h>
 #endif
 
-#include <simgear/logstream.hxx>
-#include <simgear/fg_geodesy.hxx>
-#include <simgear/mat3.h>
-#include <simgear/point3d.hxx>
-#include <simgear/polar3d.hxx>
-#include <simgear/fgstream.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/mat3.h>
+#include <simgear/math/point3d.hxx>
+#include <simgear/math/polar3d.hxx>
+#include <simgear/misc/fgstream.hxx>
 
 #include <Objects/materialmgr.hxx>
 
diff --git a/src/Airports/simple.cxx b/src/Airports/simple.cxx
index c31cce339..7b4442166 100644
--- a/src/Airports/simple.cxx
+++ b/src/Airports/simple.cxx
@@ -26,9 +26,9 @@
 
 #include <simgear/compiler.h>
 
-#include <simgear/logstream.hxx>
-#include <simgear/fgpath.hxx>
-#include <simgear/fgstream.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/fgstream.hxx>
 
 #include <Main/options.hxx>
 
diff --git a/src/Autopilot/autopilot.cxx b/src/Autopilot/autopilot.cxx
index d60026ba1..b7b201f5c 100644
--- a/src/Autopilot/autopilot.cxx
+++ b/src/Autopilot/autopilot.cxx
@@ -34,7 +34,7 @@
 #include <Scenery/scenery.hxx>
 
 #include <simgear/constants.h>
-#include <simgear/logstream.hxx>
+#include <simgear/debug/logstream.hxx>
 
 #include <Airports/simple.hxx>
 #include <GUI/gui.h>
diff --git a/src/Cockpit/cockpit.cxx b/src/Cockpit/cockpit.cxx
index 1987f8bac..840f0f47b 100644
--- a/src/Cockpit/cockpit.cxx
+++ b/src/Cockpit/cockpit.cxx
@@ -30,17 +30,17 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <simgear/logstream.hxx>
 #include <simgear/constants.h>
-#include <simgear/fg_random.h>
-#include <simgear/mat3.h>
-#include <simgear/polar3d.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_random.h>
+#include <simgear/math/mat3.h>
+#include <simgear/math/polar3d.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Include/general.hxx>
diff --git a/src/Cockpit/hud.cxx b/src/Cockpit/hud.cxx
index c8124619e..b9a543e47 100644
--- a/src/Cockpit/hud.cxx
+++ b/src/Cockpit/hud.cxx
@@ -42,11 +42,11 @@
 #  include <values.h>  // for MAXINT
 #endif
 
-#include <simgear/logstream.hxx>
 #include <simgear/constants.h>
-#include <simgear/fg_random.h>
-#include <simgear/mat3.h>
-#include <simgear/polar3d.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_random.h>
+#include <simgear/math/mat3.h>
+#include <simgear/math/polar3d.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <GUI/gui.h>
diff --git a/src/Cockpit/hud.hxx b/src/Cockpit/hud.hxx
index b2225ae42..b2fedeaee 100644
--- a/src/Cockpit/hud.hxx
+++ b/src/Cockpit/hud.hxx
@@ -48,7 +48,7 @@
 #include <deque>        // STL double ended queue
 
 #include <simgear/constants.h>
-#include <simgear/mat3.h>
+#include <simgear/math/mat3.h>
 
 #include <fg_typedefs.h>
 #include <Aircraft/aircraft.hxx>
diff --git a/src/Cockpit/hud_card.cxx b/src/Cockpit/hud_card.cxx
index b722cbfca..1278f631c 100644
--- a/src/Cockpit/hud_card.cxx
+++ b/src/Cockpit/hud_card.cxx
@@ -9,9 +9,9 @@
 #include <string.h>
 
 #include <simgear/constants.h>
-#include <simgear/fg_random.h>
-#include <simgear/mat3.h>
-#include <simgear/polar3d.hxx>
+#include <simgear/math/fg_random.h>
+#include <simgear/math/mat3.h>
+#include <simgear/math/polar3d.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <GUI/gui.h>
diff --git a/src/Cockpit/hud_dnst.cxx b/src/Cockpit/hud_dnst.cxx
index bfd9e07a4..6bbc61bf6 100644
--- a/src/Cockpit/hud_dnst.cxx
+++ b/src/Cockpit/hud_dnst.cxx
@@ -10,9 +10,9 @@
 #include <string.h>
 
 #include <simgear/constants.h>
-#include <simgear/fg_random.h>
-#include <simgear/mat3.h>
-#include <simgear/polar3d.hxx>
+#include <simgear/math/fg_random.h>
+#include <simgear/math/mat3.h>
+#include <simgear/math/polar3d.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Scenery/scenery.hxx>
diff --git a/src/Cockpit/hud_guag.cxx b/src/Cockpit/hud_guag.cxx
index 156147c6c..fe8d8f61b 100644
--- a/src/Cockpit/hud_guag.cxx
+++ b/src/Cockpit/hud_guag.cxx
@@ -10,9 +10,9 @@
 #include <string.h>
 
 #include <simgear/constants.h>
-#include <simgear/fg_random.h>
-#include <simgear/mat3.h>
-#include <simgear/polar3d.hxx>
+#include <simgear/math/fg_random.h>
+#include <simgear/math/mat3.h>
+#include <simgear/math/polar3d.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <GUI/gui.h>
diff --git a/src/Cockpit/hud_inst.cxx b/src/Cockpit/hud_inst.cxx
index ecf427a02..fdd2934f5 100644
--- a/src/Cockpit/hud_inst.cxx
+++ b/src/Cockpit/hud_inst.cxx
@@ -12,9 +12,9 @@
 #include <string.h>
 
 #include <simgear/constants.h>
-#include <simgear/fg_random.h>
-#include <simgear/mat3.h>
-#include <simgear/polar3d.hxx>
+#include <simgear/math/fg_random.h>
+#include <simgear/math/mat3.h>
+#include <simgear/math/polar3d.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Scenery/scenery.hxx>
diff --git a/src/Cockpit/hud_labl.cxx b/src/Cockpit/hud_labl.cxx
index 5380848b5..048394e0c 100644
--- a/src/Cockpit/hud_labl.cxx
+++ b/src/Cockpit/hud_labl.cxx
@@ -10,9 +10,9 @@
 #include <string.h>
 
 #include <simgear/constants.h>
-#include <simgear/fg_random.h>
-#include <simgear/mat3.h>
-#include <simgear/polar3d.hxx>
+#include <simgear/math/fg_random.h>
+#include <simgear/math/mat3.h>
+#include <simgear/math/polar3d.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <GUI/gui.h>
diff --git a/src/Cockpit/hud_ladr.cxx b/src/Cockpit/hud_ladr.cxx
index bfa97dcb0..13fb5df3c 100644
--- a/src/Cockpit/hud_ladr.cxx
+++ b/src/Cockpit/hud_ladr.cxx
@@ -10,9 +10,9 @@
 #include <string.h>
 
 #include <simgear/constants.h>
-#include <simgear/fg_random.h>
-#include <simgear/mat3.h>
-#include <simgear/polar3d.hxx>
+#include <simgear/math/fg_random.h>
+#include <simgear/math/mat3.h>
+#include <simgear/math/polar3d.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Scenery/scenery.hxx>
diff --git a/src/Cockpit/hud_lat.cxx b/src/Cockpit/hud_lat.cxx
index 6b30ea98a..39c6e1397 100644
--- a/src/Cockpit/hud_lat.cxx
+++ b/src/Cockpit/hud_lat.cxx
@@ -10,9 +10,9 @@
 #include <string.h>
 
 #include <simgear/constants.h>
-#include <simgear/fg_random.h>
-#include <simgear/mat3.h>
-#include <simgear/polar3d.hxx>
+#include <simgear/math/fg_random.h>
+#include <simgear/math/mat3.h>
+#include <simgear/math/polar3d.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <GUI/gui.h>
diff --git a/src/Cockpit/hud_lon.cxx b/src/Cockpit/hud_lon.cxx
index 8de08ca82..d46cf01cc 100644
--- a/src/Cockpit/hud_lon.cxx
+++ b/src/Cockpit/hud_lon.cxx
@@ -10,9 +10,9 @@
 #include <string.h>
 
 #include <simgear/constants.h>
-#include <simgear/fg_random.h>
-#include <simgear/mat3.h>
-#include <simgear/polar3d.hxx>
+#include <simgear/math/fg_random.h>
+#include <simgear/math/mat3.h>
+#include <simgear/math/polar3d.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <GUI/gui.h>
diff --git a/src/Cockpit/hud_scal.cxx b/src/Cockpit/hud_scal.cxx
index e092b504f..46d5ec951 100644
--- a/src/Cockpit/hud_scal.cxx
+++ b/src/Cockpit/hud_scal.cxx
@@ -10,9 +10,9 @@
 #include <string.h>
 
 #include <simgear/constants.h>
-#include <simgear/fg_random.h>
-#include <simgear/mat3.h>
-#include <simgear/polar3d.hxx>
+#include <simgear/math/fg_random.h>
+#include <simgear/math/mat3.h>
+#include <simgear/math/polar3d.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Scenery/scenery.hxx>
diff --git a/src/Cockpit/hud_tbi.cxx b/src/Cockpit/hud_tbi.cxx
index 868e1184c..307cb59a4 100644
--- a/src/Cockpit/hud_tbi.cxx
+++ b/src/Cockpit/hud_tbi.cxx
@@ -10,9 +10,9 @@
 #include <string.h>
 
 #include <simgear/constants.h>
-#include <simgear/fg_random.h>
-#include <simgear/mat3.h>
-#include <simgear/polar3d.hxx>
+#include <simgear/math/fg_random.h>
+#include <simgear/math/mat3.h>
+#include <simgear/math/polar3d.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Scenery/scenery.hxx>
diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index 09005b936..430dd0288 100644
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -30,10 +30,10 @@
 
 #include <plib/ssg.h>
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
-#include <simgear/logstream.hxx>
-#include <simgear/fgpath.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/misc/fgpath.hxx>
 
 #include <Main/options.hxx>
 #include <Objects/texload.h>
diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx
index 0fdc62671..da38c69ce 100644
--- a/src/Cockpit/panel.hxx
+++ b/src/Cockpit/panel.hxx
@@ -35,7 +35,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include <plib/ssg.h>
 
diff --git a/src/FDM/Balloon.cxx b/src/FDM/Balloon.cxx
index a8bbfb27f..e5b2b619a 100644
--- a/src/FDM/Balloon.cxx
+++ b/src/FDM/Balloon.cxx
@@ -45,10 +45,10 @@ HISTORY
 
 #include STL_STRING
 
-#include <simgear/logstream.hxx>
 #include <simgear/constants.h>
-#include <simgear/fg_geodesy.hxx>
-#include <simgear/fgpath.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/misc/fgpath.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Controls/controls.hxx>
diff --git a/src/FDM/JSBSim.cxx b/src/FDM/JSBSim.cxx
index 4c9fba90b..285b47bf0 100644
--- a/src/FDM/JSBSim.cxx
+++ b/src/FDM/JSBSim.cxx
@@ -29,10 +29,10 @@
 
 #include STL_STRING
 
-#include <simgear/logstream.hxx>
 #include <simgear/constants.h>
-#include <simgear/fg_geodesy.hxx>
-#include <simgear/fgpath.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/misc/fgpath.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Controls/controls.hxx>
diff --git a/src/FDM/LaRCsim.cxx b/src/FDM/LaRCsim.cxx
index 1331ea3a2..2b8a25023 100644
--- a/src/FDM/LaRCsim.cxx
+++ b/src/FDM/LaRCsim.cxx
@@ -24,7 +24,7 @@
 #include "LaRCsim.hxx"
 
 #include <simgear/constants.h>
-#include <simgear/logstream.hxx>
+#include <simgear/debug/logstream.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Controls/controls.hxx>
diff --git a/src/FDM/MagicCarpet.cxx b/src/FDM/MagicCarpet.cxx
index 8bff73792..9b09105ca 100644
--- a/src/FDM/MagicCarpet.cxx
+++ b/src/FDM/MagicCarpet.cxx
@@ -21,9 +21,9 @@
 // $Id$
 
 
-#include <simgear/fg_geodesy.hxx>
-#include <simgear/point3d.hxx>
-#include <simgear/polar3d.hxx>
+#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/point3d.hxx>
+#include <simgear/math/polar3d.hxx>
 
 #include <Controls/controls.hxx>
 #include <Main/options.hxx>
diff --git a/src/FDM/flight.cxx b/src/FDM/flight.cxx
index 9b1c08906..a0a0baedd 100644
--- a/src/FDM/flight.cxx
+++ b/src/FDM/flight.cxx
@@ -23,9 +23,9 @@
 
 #include <stdio.h>
 
-#include <simgear/logstream.hxx>
 #include <simgear/constants.h>
-#include <simgear/fg_geodesy.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_geodesy.hxx>
 
 #include <FDM/LaRCsim/ls_interface.h>
 #include <Main/options.hxx>
diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index dba7223c3..20c8326bd 100644
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -39,7 +39,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #if defined(FX) && defined(XMESA)
 #  include <GL/xmesa.h>
@@ -51,9 +51,9 @@
 #include <string.h>
 
 #include <simgear/constants.h>
-#include <simgear/logstream.hxx>
-#include <simgear/fgpath.hxx>
-#include <simgear/screen-dump.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/misc/fgpath.hxx>
+#include <simgear/screen/screen-dump.hxx>
 
 #include <Include/general.hxx>
 #include <Aircraft/aircraft.hxx>
diff --git a/src/Joystick/joystick.cxx b/src/Joystick/joystick.cxx
index 9ef133e4e..8b2256cca 100644
--- a/src/Joystick/joystick.cxx
+++ b/src/Joystick/joystick.cxx
@@ -29,7 +29,7 @@
 #  include <windows.h>                     
 #endif
 
-#include <simgear/logstream.hxx>
+#include <simgear/debug/logstream.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Main/options.hxx>
diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 8fd02cd84..ebe0a5f8d 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -33,7 +33,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -48,12 +48,12 @@
 
 #include STL_STRING
 
-#include <simgear/logstream.hxx>
 #include <simgear/constants.h>
-#include <simgear/fg_geodesy.hxx>
-#include <simgear/point3d.hxx>
-#include <simgear/polar3d.hxx>
-#include <simgear/fgpath.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/point3d.hxx>
+#include <simgear/math/polar3d.hxx>
+#include <simgear/misc/fgpath.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Airports/simple.hxx>
diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index b5b15156c..45934a1da 100644
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -25,8 +25,8 @@
 
 #include STL_STRING
 
-#include <simgear/logstream.hxx>
-#include <simgear/fg_types.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_types.hxx>
 
 #include <Main/options.hxx>
 
diff --git a/src/Main/keyboard.cxx b/src/Main/keyboard.cxx
index be17f6997..dcf0a7057 100644
--- a/src/Main/keyboard.cxx
+++ b/src/Main/keyboard.cxx
@@ -30,7 +30,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #if defined(FX) && defined(XMESA)
 #include <GL/xmesa.h>
@@ -41,9 +41,9 @@
 
 #include <plib/pu.h>		// plib include
 
-#include <simgear/logstream.hxx>
 #include <simgear/constants.h>
-#include <simgear/fgpath.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/misc/fgpath.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Astro/solarsystem.hxx>
diff --git a/src/Main/keyboard.hxx b/src/Main/keyboard.hxx
index a6f7bde7a..6602888f9 100644
--- a/src/Main/keyboard.hxx
+++ b/src/Main/keyboard.hxx
@@ -39,7 +39,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 
 // Handle keyboard events
diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index eabc9788d..ac570225d 100644
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -38,7 +38,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -65,12 +65,12 @@
 #endif
 
 #include <simgear/constants.h>  // for VERSION
-#include <simgear/logstream.hxx>
-#include <simgear/fg_geodesy.hxx>
-#include <simgear/mat3.h>
-#include <simgear/polar3d.hxx>
-#include <simgear/fg_random.h>
-#include <simgear/fgpath.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/mat3.h>
+#include <simgear/math/polar3d.hxx>
+#include <simgear/math/fg_random.h>
+#include <simgear/misc/fgpath.hxx>
 
 #include <Include/general.hxx>
 
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 1cbd37325..da885d388 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -38,9 +38,9 @@ bool global_fullscreen = true;
 
 #include STL_STRING
 
-#include <simgear/logstream.hxx>
-#include <simgear/fgstream.hxx>
 #include <simgear/constants.h>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/misc/fgstream.hxx>
 
 #include <Include/general.hxx>
 #include <Cockpit/cockpit.hxx>
diff --git a/src/Main/options.hxx b/src/Main/options.hxx
index 65a83e052..e01ee0ee4 100644
--- a/src/Main/options.hxx
+++ b/src/Main/options.hxx
@@ -40,13 +40,13 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #if defined(FX) && defined(XMESA)
 extern bool global_fullscreen;
 #endif
 
-#include <simgear/fg_types.hxx>
+#include <simgear/math/fg_types.hxx>
 
 #include STL_STRING
 #include <vector>
diff --git a/src/Main/save.cxx b/src/Main/save.cxx
index 50c80a7c4..a6f1d4184 100644
--- a/src/Main/save.cxx
+++ b/src/Main/save.cxx
@@ -38,8 +38,8 @@ TODO:
 
 #include <iostream>
 
-#include <simgear/fg_types.hxx>
 #include <simgear/constants.h>
+#include <simgear/math/fg_types.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Controls/controls.hxx>
diff --git a/src/Main/save.hxx b/src/Main/save.hxx
index b074d9468..1e55a09a7 100644
--- a/src/Main/save.hxx
+++ b/src/Main/save.hxx
@@ -31,7 +31,7 @@
 #  include <config.h>
 #endif
 
-#include <simgear/fg_types.hxx>
+#include <simgear/math/fg_types.hxx>
 #include <iostream>
 
 FG_USING_NAMESPACE(std);
diff --git a/src/Main/splash.cxx b/src/Main/splash.cxx
index dea67dd69..c56be6779 100644
--- a/src/Main/splash.cxx
+++ b/src/Main/splash.cxx
@@ -35,13 +35,13 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include <string.h>
 
-#include <simgear/logstream.hxx>
-#include <simgear/fg_random.h>
-#include <simgear/fgpath.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_random.h>
+#include <simgear/misc/fgpath.hxx>
 
 #include <Main/options.hxx>
 #include <Objects/texload.h>
diff --git a/src/Main/views.cxx b/src/Main/views.cxx
index 3e64dc912..85948e10a 100644
--- a/src/Main/views.cxx
+++ b/src/Main/views.cxx
@@ -28,11 +28,11 @@
 
 #include <plib/ssg.h>		// plib include
 
-#include <simgear/logstream.hxx>
 #include <simgear/constants.h>
-#include <simgear/point3d.hxx>
-#include <simgear/polar3d.hxx>
-#include <simgear/vector.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/point3d.hxx>
+#include <simgear/math/polar3d.hxx>
+#include <simgear/math/vector.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Cockpit/panel.hxx>
diff --git a/src/Main/views.hxx b/src/Main/views.hxx
index 56c76f753..6191d189d 100644
--- a/src/Main/views.hxx
+++ b/src/Main/views.hxx
@@ -30,13 +30,13 @@
 #endif                                   
 
 #include <simgear/compiler.h>
+#include <simgear/math/point3d.hxx>
 
 #include <list>
 
 #include <plib/sg.h>		// plib include
 
 #include <FDM/flight.hxx>
-#include <simgear/point3d.hxx>
 #include <Time/fg_time.hxx>
 #include <Time/light.hxx>
 
diff --git a/src/Network/fg_file.cxx b/src/Network/fg_file.cxx
index 407926736..7575ecb90 100644
--- a/src/Network/fg_file.cxx
+++ b/src/Network/fg_file.cxx
@@ -25,7 +25,7 @@
 
 #include STL_STRING
 
-#include <simgear/logstream.hxx>
+#include <simgear/debug/logstream.hxx>
 
 #include "fg_file.hxx"
 
diff --git a/src/Network/fg_serial.cxx b/src/Network/fg_serial.cxx
index 977210347..78c1817a5 100644
--- a/src/Network/fg_serial.cxx
+++ b/src/Network/fg_serial.cxx
@@ -25,8 +25,8 @@
 
 #include STL_STRING
 
-#include <simgear/logstream.hxx>
-#include <simgear/serial.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/serial/serial.hxx>
 
 #include <Aircraft/aircraft.hxx>
 
diff --git a/src/Network/fg_serial.hxx b/src/Network/fg_serial.hxx
index 0360c6197..f95b813d1 100644
--- a/src/Network/fg_serial.hxx
+++ b/src/Network/fg_serial.hxx
@@ -39,7 +39,7 @@
 // #  include <time.h>
 // #endif
 
-#include <simgear/serial.hxx>
+#include <simgear/serial/serial.hxx>
 
 #include "iochannel.hxx"
 #include "protocol.hxx"
diff --git a/src/Network/fg_socket.cxx b/src/Network/fg_socket.cxx
index f718143ef..cbd50cf27 100644
--- a/src/Network/fg_socket.cxx
+++ b/src/Network/fg_socket.cxx
@@ -36,7 +36,7 @@
 
 #include STL_STRING
 
-#include <simgear/logstream.hxx>
+#include <simgear/debug/logstream.hxx>
 
 #include "fg_socket.hxx"
 
diff --git a/src/Network/fg_socket.hxx b/src/Network/fg_socket.hxx
index 9c35ea93a..21ff9953f 100644
--- a/src/Network/fg_socket.hxx
+++ b/src/Network/fg_socket.hxx
@@ -33,7 +33,7 @@
 
 #include <string>
 
-#include <simgear/fg_types.hxx>
+#include <simgear/math/fg_types.hxx>
 
 #include "iochannel.hxx"
 #include "protocol.hxx"
diff --git a/src/Network/garmin.cxx b/src/Network/garmin.cxx
index 68ec3c0de..4c8e1ca48 100644
--- a/src/Network/garmin.cxx
+++ b/src/Network/garmin.cxx
@@ -21,8 +21,8 @@
 // $Id$
 
 
-#include <simgear/logstream.hxx>
-#include <simgear/fg_geodesy.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_geodesy.hxx>
 
 #include <FDM/flight.hxx>
 #include <Time/fg_time.hxx>
diff --git a/src/Network/native.cxx b/src/Network/native.cxx
index 9418a7884..b66d33b7a 100644
--- a/src/Network/native.cxx
+++ b/src/Network/native.cxx
@@ -21,8 +21,8 @@
 // $Id$
 
 
-#include <simgear/logstream.hxx>
-#include <simgear/fg_geodesy.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_geodesy.hxx>
 
 #include <Time/fg_time.hxx>
 
diff --git a/src/Network/nmea.cxx b/src/Network/nmea.cxx
index 9a5b46ae7..c7bb6f4ee 100644
--- a/src/Network/nmea.cxx
+++ b/src/Network/nmea.cxx
@@ -21,8 +21,8 @@
 // $Id$
 
 
-#include <simgear/logstream.hxx>
-#include <simgear/fg_geodesy.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_geodesy.hxx>
 
 #include <FDM/flight.hxx>
 #include <Time/fg_time.hxx>
diff --git a/src/Network/protocol.cxx b/src/Network/protocol.cxx
index 61c040840..07fc52c66 100644
--- a/src/Network/protocol.cxx
+++ b/src/Network/protocol.cxx
@@ -21,7 +21,7 @@
 // $Id$
 
 
-#include <simgear/logstream.hxx>
+#include <simgear/debug/logstream.hxx>
 
 #include "iochannel.hxx"
 #include "protocol.hxx"
diff --git a/src/Network/pve.cxx b/src/Network/pve.cxx
index 16c87fa31..cc2b7f854 100644
--- a/src/Network/pve.cxx
+++ b/src/Network/pve.cxx
@@ -21,8 +21,8 @@
 // $Id$
 
 
-#include <simgear/logstream.hxx>
-#include <simgear/fg_geodesy.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_geodesy.hxx>
 
 #include <FDM/flight.hxx>
 #include <Time/fg_time.hxx>
diff --git a/src/Network/rul.cxx b/src/Network/rul.cxx
index d8b1bf206..718b18197 100644
--- a/src/Network/rul.cxx
+++ b/src/Network/rul.cxx
@@ -22,8 +22,8 @@
 // $Id$
 
 
-#include <simgear/logstream.hxx>
-#include <simgear/fg_geodesy.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_geodesy.hxx>
 
 #include <FDM/flight.hxx>
 #include <Time/fg_time.hxx>
diff --git a/src/Objects/fragment.cxx b/src/Objects/fragment.cxx
index 047db1c46..0edbf5e02 100644
--- a/src/Objects/fragment.cxx
+++ b/src/Objects/fragment.cxx
@@ -22,8 +22,8 @@
 
 
 #include <simgear/constants.h>
-#include <simgear/mat3.h>
-#include <simgear/point3d.hxx>
+#include <simgear/math/mat3.h>
+#include <simgear/math/point3d.hxx>
 
 #include <Scenery/tileentry.hxx>
 
diff --git a/src/Objects/fragment.hxx b/src/Objects/fragment.hxx
index 3314ad4ea..b1609c1d4 100644
--- a/src/Objects/fragment.hxx
+++ b/src/Objects/fragment.hxx
@@ -38,14 +38,14 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include <simgear/compiler.h>
 
 #include <vector>
 
 #include <simgear/constants.h>
-#include <simgear/point3d.hxx>
+#include <simgear/math/point3d.hxx>
 
 FG_USING_STD(vector);
 
diff --git a/src/Objects/material.cxx b/src/Objects/material.cxx
index d16760fd8..737e8471b 100644
--- a/src/Objects/material.cxx
+++ b/src/Objects/material.cxx
@@ -36,13 +36,13 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include STL_STRING
 
-#include <simgear/logstream.hxx>
-#include <simgear/fgpath.hxx>
-#include <simgear/fgstream.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/fgstream.hxx>
 
 #include "material.hxx"
 #include "texload.h"
diff --git a/src/Objects/material.hxx b/src/Objects/material.hxx
index cb0cd06db..464189e45 100644
--- a/src/Objects/material.hxx
+++ b/src/Objects/material.hxx
@@ -40,7 +40,7 @@
 #include <simgear/compiler.h>
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include STL_STRING      // Standard C++ string library
 
diff --git a/src/Objects/materialmgr.cxx b/src/Objects/materialmgr.cxx
index 204d1f287..88a7028b4 100644
--- a/src/Objects/materialmgr.cxx
+++ b/src/Objects/materialmgr.cxx
@@ -34,16 +34,16 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include <simgear/compiler.h>
 
 #include <string.h>
 #include STL_STRING
 
-#include <simgear/logstream.hxx>
-#include <simgear/fgpath.hxx>
-#include <simgear/fgstream.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/fgstream.hxx>
 
 #include <Main/options.hxx>
 #include <Main/views.hxx>
diff --git a/src/Objects/materialmgr.hxx b/src/Objects/materialmgr.hxx
index 69d482394..cc5d60200 100644
--- a/src/Objects/materialmgr.hxx
+++ b/src/Objects/materialmgr.hxx
@@ -40,7 +40,7 @@
 #include <simgear/compiler.h>
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include STL_STRING		// Standard C++ string library
 #include <map>			// STL associative "array"
diff --git a/src/Objects/obj.cxx b/src/Objects/obj.cxx
index 93e87b380..56a590b51 100644
--- a/src/Objects/obj.cxx
+++ b/src/Objects/obj.cxx
@@ -44,16 +44,16 @@
 #include <vector>		// STL
 #include <ctype.h>		// isdigit()
 
-#include <simgear/logstream.hxx>
-#include <simgear/fgstream.hxx>
 #include <simgear/constants.h>
-#include <simgear/mat3.h>
-#include <simgear/fg_geodesy.hxx>
-#include <simgear/fg_random.h>
-#include <simgear/point3d.hxx>
-#include <simgear/polar3d.hxx>
-#include <simgear/stopwatch.hxx>
-#include <simgear/texcoord.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/mat3.h>
+#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/fg_random.h>
+#include <simgear/math/point3d.hxx>
+#include <simgear/math/polar3d.hxx>
+#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/stopwatch.hxx>
+#include <simgear/misc/texcoord.hxx>
 
 #include <Main/options.hxx>
 #include <Scenery/tileentry.hxx>
diff --git a/src/Scenery/scenery.cxx b/src/Scenery/scenery.cxx
index 056debf93..e74a2ad24 100644
--- a/src/Scenery/scenery.cxx
+++ b/src/Scenery/scenery.cxx
@@ -30,12 +30,12 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include <stdio.h>
 #include <string.h>
 
-#include <simgear/logstream.hxx>
+#include <simgear/debug/logstream.hxx>
 
 #include <Main/options.hxx>
 
diff --git a/src/Scenery/scenery.hxx b/src/Scenery/scenery.hxx
index 73ec74c21..baf9cce22 100644
--- a/src/Scenery/scenery.hxx
+++ b/src/Scenery/scenery.hxx
@@ -30,7 +30,7 @@
 #endif                                   
 
 
-#include <simgear/point3d.hxx>
+#include <simgear/math/point3d.hxx>
 
 
 // Define a structure containing global scenery parameters
diff --git a/src/Scenery/tilecache.cxx b/src/Scenery/tilecache.cxx
index 4b142eaff..41dc85b8b 100644
--- a/src/Scenery/tilecache.cxx
+++ b/src/Scenery/tilecache.cxx
@@ -30,14 +30,14 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include <plib/ssg.h>		// plib include
 
-#include <simgear/logstream.hxx>
-#include <simgear/fgstream.hxx>
-#include <simgear/newbucket.hxx>
-#include <simgear/fgpath.hxx>
+#include <simgear/bucket/newbucket.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/fgpath.hxx>
 
 #include <Airports/genapt.hxx>
 #include <Clouds/cloudobj.hxx>
diff --git a/src/Scenery/tilecache.hxx b/src/Scenery/tilecache.hxx
index 61fea8f32..2f81cb0de 100644
--- a/src/Scenery/tilecache.hxx
+++ b/src/Scenery/tilecache.hxx
@@ -39,12 +39,12 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include <vector>
 
-#include <simgear/newbucket.hxx>
-#include <simgear/point3d.hxx>
+#include <simgear/bucket/newbucket.hxx>
+#include <simgear/math/point3d.hxx>
 
 #include "tileentry.hxx"
 
diff --git a/src/Scenery/tileentry.cxx b/src/Scenery/tileentry.cxx
index cc336b081..fa860606c 100644
--- a/src/Scenery/tileentry.cxx
+++ b/src/Scenery/tileentry.cxx
@@ -30,8 +30,8 @@
 #include STL_FUNCTIONAL
 #include STL_ALGORITHM
 
-#include <simgear/logstream.hxx>
-#include <simgear/newbucket.hxx>
+#include <simgear/bucket/newbucket.hxx>
+#include <simgear/debug/logstream.hxx>
 
 #include "tileentry.hxx"
 
diff --git a/src/Scenery/tileentry.hxx b/src/Scenery/tileentry.hxx
index f17fb75ce..3ccd50f81 100644
--- a/src/Scenery/tileentry.hxx
+++ b/src/Scenery/tileentry.hxx
@@ -38,7 +38,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include <simgear/compiler.h>
 
@@ -47,8 +47,8 @@
 
 #include <plib/ssg.h>		// plib includes
 
-#include <simgear/newbucket.hxx>
-#include <simgear/point3d.hxx>
+#include <simgear/bucket/newbucket.hxx>
+#include <simgear/math/point3d.hxx>
 
 #include <Objects/fragment.hxx>
 
diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index 4621d762b..f151c7d0f 100644
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -30,15 +30,15 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
-#include <simgear/logstream.hxx>
 #include <simgear/constants.h>
-#include <simgear/fg_geodesy.hxx>
-#include <simgear/mat3.h>
-#include <simgear/point3d.hxx>
-#include <simgear/polar3d.hxx>
-#include <simgear/vector.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/mat3.h>
+#include <simgear/math/point3d.hxx>
+#include <simgear/math/polar3d.hxx>
+#include <simgear/math/vector.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Main/options.hxx>
diff --git a/src/Scenery/tilemgr.hxx b/src/Scenery/tilemgr.hxx
index fef244802..2837ba5d4 100644
--- a/src/Scenery/tilemgr.hxx
+++ b/src/Scenery/tilemgr.hxx
@@ -33,7 +33,7 @@
 
 #include <list>
 
-#include <simgear/newbucket.hxx>
+#include <simgear/bucket/newbucket.hxx>
 
 
 FG_USING_STD(list);
diff --git a/src/Time/event.cxx b/src/Time/event.cxx
index 9345f979f..eec5c593c 100644
--- a/src/Time/event.cxx
+++ b/src/Time/event.cxx
@@ -53,7 +53,7 @@
                          // contains milliseconds
 #endif
 
-#include <simgear/logstream.hxx>
+#include <simgear/debug/logstream.hxx>
 
 #include "event.hxx"
 
diff --git a/src/Time/fg_time.cxx b/src/Time/fg_time.cxx
index 88cc02aae..eebf7b6b3 100644
--- a/src/Time/fg_time.cxx
+++ b/src/Time/fg_time.cxx
@@ -49,9 +49,9 @@
 #  include <sys/time.h>  // for get/setitimer, gettimeofday, struct timeval
 #endif
 
-#include <simgear/logstream.hxx>
 #include <simgear/constants.h>
-#include <simgear/fgpath.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/misc/fgpath.hxx>
 
 #include <Astro/sky.hxx>
 #include <Astro/solarsystem.hxx>
diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index 4cee244bd..875eb4347 100644
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -31,7 +31,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include <simgear/compiler.h>
 
@@ -48,13 +48,13 @@
 #include <string>
 FG_USING_STD(string);
 
-#include <simgear/logstream.hxx>
 #include <simgear/constants.h>
-#include <simgear/fg_geodesy.hxx>
-#include <simgear/interpolater.hxx>
-#include <simgear/mat3.h>
-#include <simgear/polar3d.hxx>
-#include <simgear/fgpath.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/interpolater.hxx>
+#include <simgear/math/mat3.h>
+#include <simgear/math/polar3d.hxx>
+#include <simgear/misc/fgpath.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Main/options.hxx>
diff --git a/src/Time/light.hxx b/src/Time/light.hxx
index ac7449b39..0466f033e 100644
--- a/src/Time/light.hxx
+++ b/src/Time/light.hxx
@@ -39,12 +39,12 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include <plib/sg.h>			// plib include
 
-#include <simgear/interpolater.hxx>
-#include <simgear/point3d.hxx>
+#include <simgear/math/interpolater.hxx>
+#include <simgear/math/point3d.hxx>
 
 
 // Define a structure containing the global lighting parameters
diff --git a/src/Time/moonpos.cxx b/src/Time/moonpos.cxx
index bd236d7b2..5d1648e67 100644
--- a/src/Time/moonpos.cxx
+++ b/src/Time/moonpos.cxx
@@ -51,13 +51,13 @@
 #  include <time.h>
 #endif
 
-#include <simgear/logstream.hxx>
 #include <simgear/constants.h>
-#include <simgear/fg_geodesy.hxx>
-#include <simgear/mat3.h>
-#include <simgear/point3d.hxx>
-#include <simgear/polar3d.hxx>
-#include <simgear/vector.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/mat3.h>
+#include <simgear/math/point3d.hxx>
+#include <simgear/math/polar3d.hxx>
+#include <simgear/math/vector.hxx>
 
 #include <Astro/solarsystem.hxx>
 #include <Main/views.hxx>
diff --git a/src/Time/sunpos.cxx b/src/Time/sunpos.cxx
index d2665549d..3ae598ca2 100644
--- a/src/Time/sunpos.cxx
+++ b/src/Time/sunpos.cxx
@@ -50,13 +50,13 @@
 #  include <time.h>
 #endif
 
-#include <simgear/logstream.hxx>
 #include <simgear/constants.h>
-#include <simgear/fg_geodesy.hxx>
-#include <simgear/mat3.h>
-#include <simgear/point3d.hxx>
-#include <simgear/polar3d.hxx>
-#include <simgear/vector.hxx>
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/mat3.h>
+#include <simgear/math/point3d.hxx>
+#include <simgear/math/polar3d.hxx>
+#include <simgear/math/vector.hxx>
 
 #include <Astro/solarsystem.hxx>
 #include <Main/views.hxx>
diff --git a/src/Weather/weather.cxx b/src/Weather/weather.cxx
index 526051563..35e12966b 100644
--- a/src/Weather/weather.cxx
+++ b/src/Weather/weather.cxx
@@ -30,13 +30,14 @@
 #endif
 
 #include <GL/glut.h>
-#include <XGL/xgl.h>
+#include <simgear/xgl/xgl.h>
 
 #include <math.h>
 
+#include <simgear/debug/logstream.hxx>
+#include <simgear/math/fg_random.h>
+
 #include <Aircraft/aircraft.hxx>
-#include <Debug/logstream.hxx>
-#include <Math/fg_random.h>
 #include <Weather/weather.hxx>
 
 
diff --git a/src/WeatherCM/FGWeatherParse.h b/src/WeatherCM/FGWeatherParse.h
index bd5bf4f75..56717d3f6 100644
--- a/src/WeatherCM/FGWeatherParse.h
+++ b/src/WeatherCM/FGWeatherParse.h
@@ -64,7 +64,7 @@ HISTORY
 #include <simgear/compiler.h>
 #include <vector>
 
-#include <simgear/fgstream.hxx>
+#include <simgear/misc/fgstream.hxx>
 
 #include "FGPhysicalProperties.h"