One more pass at a reorg.

diff --git a/Makefile.am b/Makefile.am
index eba570c2725fc0016c8b7499fff3d633e85dd60c..0f96d8469bc1dfeed1b6934066f759340a146bdb 100644 (file)
--- 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 ef51a239d966a8193483f7ef1c86768c00e3ce17..498a52968dbff272dfe450ea49ad77040c590c3c 100644 (file)
--- 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 8d509e09792a9f26068f85e62c26ff56a8eea253..af70ddf0ddb4d67fa9ec6fc51bf7b1f9dbb70e6c 100644 (file)
--- 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 c31cce339a00305a40e2102e9e25e280db325d49..7b444216617b6e3483a54d55bfa7674353d1bef4 100644 (file)
--- 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 d60026ba1805fa0e9d4bdf8bbb30136824788627..b7b201f5ccfdf2dacf0720f48cceb076527aed1a 100644 (file)
--- 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 1987f8bac7485155042a2971f1fb2fae22236235..840f0f47bd9f65c631aa33dafd7b0a694d8ab163 100644 (file)
--- 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 c8124619e5d608415f965fdcc0e149e191994ab3..b9a543e476a112c755f51e05d4f121828d5689bf 100644 (file)
--- 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 b2225ae4294968c93789eb34348beb6574899f97..b2fedeaee52d6902ab4eeb3276ff7a438c4f6eae 100644 (file)
--- 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 b722cbfca96da99214ec6994c38e8d2fbf63dea8..1278f631c478bca73dbbe4c43f3418499eeca7d0 100644 (file)
--- 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 bfd9e07a4e20553376bbfc6ced7b469e0398f637..6bbc61bf6adf5d87e098df5ee18b6e5007e558ae 100644 (file)
--- 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 156147c6c413602adf6831cdc289ed6599f8c504..fe8d8f61b7877d0d4786ca3602016e3a29198d0e 100644 (file)
--- 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 ecf427a0266b378a0fdd013eb26e840980642dfd..fdd2934f56f5c1993e447974bd4b69fc7e858626 100644 (file)
--- 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 5380848b58c1a556dea7aeea014d9d81e1c3f6d6..048394e0cc40046f35dbb6972af40558b1663ae5 100644 (file)
--- 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 bfa97dcb046d93a305102d04d6f3474b39c7dddd..13fb5df3c9c33da854fae0a8c1dfcf536bd6ce7a 100644 (file)
--- 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 6b30ea98a77a848e60a856d950d55c5aef797cad..39c6e13972a1ca3549b2ceeec8583e3bcefab03b 100644 (file)
--- 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 8de08ca82e2194f8599c162401d7f15bfe449ee7..d46cf01cce8ad6bd99b83ffda5479976927f7445 100644 (file)
--- 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 e092b504ffb85dad499817b801eb90b007618073..46d5ec951ecb9c5580e7572c09d4270062449c47 100644 (file)
--- 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 868e1184c5c9f37214585a8e59279b70811cd8a6..307cb59a4889c4819af6032558aae53880ba9643 100644 (file)
--- 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 09005b936606f67c3133bab2859c4304ddf1e344..430dd0288a3f418c13b9cab11ae7056480c2a72d 100644 (file)
--- 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 0fdc626714a3a9fb72b79b75201beb9f8b730f27..da38c69cedf5710bfe8d0785643f3402e0cda778 100644 (file)
--- 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 a8bbfb27f3ac7fa0d3058786ff7d4b53170c1f38..e5b2b619a0497040cb8ca312e1558f7c5b9ff876 100644 (file)
--- 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 4c9fba90b66464b9c4fb6b372cb821b8252a76b0..285b47bf07978d14c2da9fcfd0790e6af8e79d71 100644 (file)
--- 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 1331ea3a2335bfe1ab99a58fe7b9590a70c81754..2b8a250237af75c85ea8ba1a63c334c8ba58a57e 100644 (file)
--- 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 8bff737926b61706957fb5d310d9a96cc1ef971b..9b09105ca5700d6be86ed367800776cf1aa858af 100644 (file)
--- 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 9b1c089060c602a44f1bbd1a52a0f72957132ee0..a0a0baedd7b224a3b70d67ea3d8a55bce103fb2f 100644 (file)
--- 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 dba7223c3b728d450b0efdd60c89ff938adcb219..20c8326bd8170d7b5b1cf6fcc8d1e55ce0366df2 100644 (file)
--- 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 9ef133e4e248d850073f427c8a90281a8275f933..8b2256cca60dc2a4cf0e2544969772d2048bca08 100644 (file)
--- 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 8fd02cd841c05513bd06b34dd796996caa8c0255..ebe0a5f8d8b91d7727283f96590a502f9e590565 100644 (file)
--- 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 b5b15156cdebe8d4a980f03a474ecc98cff1aa87..45934a1da7bf027b247d056ce3d1d7208ac7f96a 100644 (file)
--- 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 be17f6997bfcab87eca3e1e173b07838957744f0..dcf0a7057691bdce2bfc814e10f6613c87bbaee3 100644 (file)
--- 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 a6f7bde7a95e8886651c48b5fca11058e542cb3f..6602888f9e5f998c5e1b275ab138ff2894735b7c 100644 (file)
--- 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 eabc9788ddac7cdb5b949b31da5d77e28dcdb877..ac570225d545c03538f2f9a5e5733164d3a8f920 100644 (file)
--- 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 1cbd37325ccb65257dc56ce31a3ffb03048baf72..da885d3881f843c4f92289d2fd77bc4fb9f2c799 100644 (file)
--- 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 65a83e05222b562e8109a146f65233a3fe54fd94..e01ee0ee4823894a9e86abb9f49407b58f1dd46b 100644 (file)
--- 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 50c80a7c4c333d12fd376a659daec54fafa025e8..a6f1d41840dcbe4902d258d39b19de543eacf1ce 100644 (file)
--- 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 b074d9468665a5ff13d17e3b24907831a922f9a6..1e55a09a7a5667f823cdb1d4cc503f8a290ff73a 100644 (file)
--- 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 dea67dd6970806df348994b1da98b1ca8761603c..c56be67790f82d2d1a3ad5444edd328facc93b9f 100644 (file)
--- 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 3e64dc912e329bfdaec054fb1c4d9f48250b2a32..85948e10aa0dbfc2cf82b565edc5e782282bd214 100644 (file)
--- 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 56c76f753fcd3abd4b90ddad94ca0da8f3f7ee1d..6191d189dd516b0e1e875355b5ba322f8fd2d218 100644 (file)
--- 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 407926736883630961f4498e13651eb69cab4159..7575ecb90cf400addac10f31fe4386a90081e210 100644 (file)
--- 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 97721034794dae011e397bc770c47597d17360a0..78c1817a5c3c913b252a91c89acaad417e8381a8 100644 (file)
--- 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 0360c61977991e13f39ebcebda4949f8ceea8cd0..f95b813d1b990e018f56e6c2c0114f11adc0748f 100644 (file)
--- 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 f718143ef08035d204ead4c84095ea18dbeb678a..cbd50cf2735935707d753b9bea98b82cc3a5b14f 100644 (file)
--- 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 9c35ea93a6cfbd86c99ab52219e744d13c8f6139..21ff9953f445489f9b1fae70919bb432eb05b245 100644 (file)
--- 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 68ec3c0deb5228690940d1745abfa25f40be03f1..4c8e1ca48d9d8f627071df2ba84c60071f8060ba 100644 (file)
--- 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 9418a7884366b96a95d797b555c0edaa711293a9..b66d33b7a83d6a8c0ea21a69a57c880ee20532d3 100644 (file)
--- 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 9a5b46ae752847da35124d207729f1f4491aaccc..c7bb6f4ee17f39a9df302c9d92099a25c68535f0 100644 (file)
--- 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 61c04084021b3e231776f1f41b4c952cc38c2806..07fc52c6612d99ec0c3c585da84cf30f76ec7fdb 100644 (file)
--- 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 16c87fa31013eb1b858f98cc7c3b3d30436878aa..cc2b7f854ebd07f7bedcaa0d2c5bb7e629f979ea 100644 (file)
--- 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 d8b1bf20662f4e69e8e078a487a94f020eb3d7b6..718b181974993c0e1f8dec5ad7f389f2fbf75031 100644 (file)
--- 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 047db1c4616e1ac8719d8901f4e64c4f3581c489..0edbf5e0227810c6018039d5ab37c92989fff86f 100644 (file)
--- 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 3314ad4ea5490548fd1201717cc6eff6627bbca6..b1609c1d439a982d8299ff34d5427f24875d558b 100644 (file)
--- 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 d16760fd8476c2c5c1cc4062a050c26321d06b8c..737e8471b9e3f4e361c29260d52bea9a19060b05 100644 (file)
--- 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 cb0cd06db2cf201ad1965e413a6812b2edeb805e..464189e45373cd2c950753914cbda0cb2e803bd9 100644 (file)
--- 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 204d1f2871600bde6b265cb0185e2b6a96cff735..88a7028b4a83a4b118c4ec9fd5e410900506a02c 100644 (file)
--- 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 69d482394c2da98fe3f0c0e5461bcd8b5917f6c9..cc5d60200bf33d0c40ce33681dba057329214f94 100644 (file)
--- 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 93e87b38023a0ca7d9da85f6da11f087d4835234..56a590b517efbaa75e002c2179436495609a8c00 100644 (file)
--- 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 056debf9343bee2eb80f3757c6c1b810be0242cc..e74a2ad245ff026d1edd9efe16d4d6008997a977 100644 (file)
--- 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 73ec74c21d65baeb993f430b8221510d67bee0e4..baf9cce2267062e5e530d26ee509ed04ce6494d3 100644 (file)
--- 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 4b142eaffabcdc25b9188a4df737a58e65146cf6..41dc85b8bb33417e6caddae550fe2ed997712e9a 100644 (file)
--- 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 61fea8f323e58dbda3122d2dfc7d4e4c55c8d77e..2f81cb0de964bb6fb13ad13bded80689e4709d19 100644 (file)
--- 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 cc336b081ee1fbdfbe3f792636c9628b74ae2b9a..fa860606ceea82c35cd9f5c0ba1fae81858d05ea 100644 (file)
--- 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 f17fb75cedbf1d1ed46653a95597d21245c02215..3ccd50f819e0d9fc3cf190faa5f8271cba3609be 100644 (file)
--- 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 4621d762baf08c4ed2ef97bff3053f2f5f39a3f0..f151c7d0f242ccf2ea2c5a39607d1342d51f50b9 100644 (file)
--- 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 fef2448020f8084cb80e8a8e0fe92636bb8c0bbf..2837ba5d4e7a32ded9273b50fdee24aca5073cc3 100644 (file)
--- 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 9345f979f0abefeb98e56dd95d1a74d637d85851..eec5c593c2070efeeacafa09476d17715a68a5de 100644 (file)
--- 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 88cc02aae864dff6320f66f91e15edf65a965e94..eebf7b6b37a3d799a1ca314a55b5401e79bd4d40 100644 (file)
--- 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 4cee244bded339180cb4dc18a400ec197143ac48..875eb4347bf776b3acd9f73aaa7c4555e1ca6987 100644 (file)
--- 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 ac7449b3936a9fa6e4946de22d45383d093877e8..0466f033e8e8dbb0b8b8cd6ff95b3c644a15a746 100644 (file)
--- 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 bd236d7b29bf5d52f8e9f70aeda8166ef9e9d176..5d1648e678c2e6e453bf61f7ef17ccf2e03eced0 100644 (file)
--- 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 d2665549dbcef7bca975fb8a39ef7c08537c98ca..3ae598ca24c31bd738afafb615418bca3ac22a3b 100644 (file)
--- 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 526051563531ba1f4c47f30ed1b03b19adc2626e..35e12966b5b29bd52979eb069cefefb5c90f933d 100644 (file)
--- 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 bd5bf4f75f73d62c2088cff240102dec2c0ebbf4..56717d3f64ffe57977d1f342f9a10c88a1dc701e 100644 (file)
--- 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"