From 029dda3297e3697438e1a58188527cbae90beebe Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Tue, 1 Nov 2005 13:41:49 +0000
Subject: [PATCH] In the process of changing, adding and removing files the
 last few years there was the situation where four directories contained jst
 two files, of which three directories were aircraft related, and one
 directory contained test code from Curt that might be better of in SimGear
 anyhow.

This is just a patch to move a bunch of files to new locations. In case of
local changes to any of them you can do the following:

move replay.[ch]xx from src/Replay to src/Aircraft
move control.[ch]xx from src/Control to src/Aircraft
move ssgEntityArray.[ch]xx from src/Objects to simgear/screen

In addition it has been decided only to use .[ch]xx files in all directories
unless it's contained within an FDM specific directory, in which case the
author is free to do whatever (s)he wants.

In this repspect the following files have been renamed in src/Multiplayer:

tiny_xdr.[ch]pp has become tiny_xdr.[ch]xx
multiplaymgr.[ch]pp has become multiplaymgr.[ch]xx
---
 configure.ac                                  |   3 -
 src/Aircraft/Makefile.am                      |   5 +-
 src/Aircraft/aircraft.hxx                     |   3 +-
 src/{Controls => Aircraft}/controls.cxx       |  10 +-
 src/{Controls => Aircraft}/controls.hxx       |   4 -
 src/{Replay => Aircraft}/replay.cxx           |   0
 src/{Replay => Aircraft}/replay.hxx           |   0
 src/Autopilot/auto_gui.cxx                    |   1 -
 src/Cockpit/hud.hxx                           |   2 +-
 src/Controls/.cvsignore                       |   3 -
 src/Controls/Makefile.am                      |   5 -
 src/FDM/Balloon.cxx                           |   1 -
 src/FDM/JSBSim/JSBSim.cxx                     |   2 +-
 src/FDM/LaRCsim/LaRCsim.cxx                   |   2 +-
 src/FDM/MagicCarpet.cxx                       |   2 +-
 src/FDM/SP/ADA.cxx                            |   5 +-
 src/FDM/UFO.cxx                               |   2 +-
 src/GUI/gui_funcs.cxx                         |   4 +-
 src/GUI/mouse.cxx                             |   2 +-
 src/Main/Makefile.am                          |   2 -
 src/Main/fg_commands.cxx                      |   2 +-
 src/Main/fg_init.cxx                          |   4 +-
 src/Main/main.cxx                             |   4 +-
 src/Main/renderer.cxx                         |   2 +-
 src/Makefile.am                               |  11 +-
 src/MultiPlayer/Makefile.am                   |   2 +-
 src/MultiPlayer/mpmessages.hxx                |   4 +-
 .../{multiplaymgr.cpp => multiplaymgr.cxx}    |   8 +-
 .../{multiplaymgr.hpp => multiplaymgr.hxx}    |   0
 .../{tiny_xdr.cpp => tiny_xdr.cxx}            |   2 +-
 .../{tiny_xdr.hpp => tiny_xdr.hxx}            |   0
 src/Network/multiplay.hxx                     |   2 +-
 src/Network/native_ctrls.hxx                  |   4 +-
 src/Network/opengc.cxx                        |   1 -
 src/Objects/.cvsignore                        |   3 -
 src/Objects/Makefile.am                       |   6 -
 src/Objects/ssgEntityArray.cxx                | 362 ------------------
 src/Objects/ssgEntityArray.hxx                |  66 ----
 src/Replay/.cvsignore                         |   3 -
 src/Replay/Makefile.am                        |   5 -
 40 files changed, 36 insertions(+), 513 deletions(-)
 rename src/{Controls => Aircraft}/controls.cxx (99%)
 rename src/{Controls => Aircraft}/controls.hxx (99%)
 rename src/{Replay => Aircraft}/replay.cxx (100%)
 rename src/{Replay => Aircraft}/replay.hxx (100%)
 delete mode 100644 src/Controls/.cvsignore
 delete mode 100644 src/Controls/Makefile.am
 rename src/MultiPlayer/{multiplaymgr.cpp => multiplaymgr.cxx} (99%)
 rename src/MultiPlayer/{multiplaymgr.hpp => multiplaymgr.hxx} (100%)
 rename src/MultiPlayer/{tiny_xdr.cpp => tiny_xdr.cxx} (99%)
 rename src/MultiPlayer/{tiny_xdr.hpp => tiny_xdr.hxx} (100%)
 delete mode 100644 src/Objects/.cvsignore
 delete mode 100644 src/Objects/Makefile.am
 delete mode 100644 src/Objects/ssgEntityArray.cxx
 delete mode 100644 src/Objects/ssgEntityArray.hxx
 delete mode 100644 src/Replay/.cvsignore
 delete mode 100644 src/Replay/Makefile.am

diff --git a/configure.ac b/configure.ac
index 391e3226e..252e20e17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -512,7 +512,6 @@ AC_CONFIG_FILES([ \
 	src/Autopilot/Makefile \
 	src/Cockpit/Makefile \
 	src/Cockpit/built_in/Makefile \
-	src/Controls/Makefile \
 	src/Environment/Makefile \
 	src/FDM/Balloon/Makefile \
 	src/FDM/ExternalNet/Makefile \
@@ -535,8 +534,6 @@ AC_CONFIG_FILES([ \
 	src/MultiPlayer/Makefile \
 	src/Navaids/Makefile \
 	src/Network/Makefile \
-	src/Objects/Makefile \
-	src/Replay/Makefile \
 	src/Scenery/Makefile \
 	src/Scripting/Makefile \
 	src/Sound/Makefile \
diff --git a/src/Aircraft/Makefile.am b/src/Aircraft/Makefile.am
index a26f5b7ee..25dcd510d 100644
--- a/src/Aircraft/Makefile.am
+++ b/src/Aircraft/Makefile.am
@@ -1,5 +1,8 @@
 noinst_LIBRARIES = libAircraft.a
 
-libAircraft_a_SOURCES = aircraft.cxx aircraft.hxx
+libAircraft_a_SOURCES = \
+	aircraft.cxx aircraft.hxx \
+	controls.cxx controls.hxx \
+	replay.cxx replay.hxx
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
diff --git a/src/Aircraft/aircraft.hxx b/src/Aircraft/aircraft.hxx
index 406e9773e..c51c81624 100644
--- a/src/Aircraft/aircraft.hxx
+++ b/src/Aircraft/aircraft.hxx
@@ -33,9 +33,10 @@
 
 
 #include <FDM/flight.hxx>
-#include <Controls/controls.hxx>
 #include <Main/fg_init.hxx>
 
+#include "controls.hxx"
+
 
 // Define a structure containing all the parameters for an aircraft
 typedef struct{
diff --git a/src/Controls/controls.cxx b/src/Aircraft/controls.cxx
similarity index 99%
rename from src/Controls/controls.cxx
rename to src/Aircraft/controls.cxx
index 7da87d3c7..3594e7664 100644
--- a/src/Controls/controls.cxx
+++ b/src/Aircraft/controls.cxx
@@ -660,7 +660,6 @@ FGControls::bind ()
 	&FGControls::get_dome_norm, &FGControls::set_dome_norm);
   fgSetArchivable("/controls/lighting/dome-norm"); 
  
-#ifdef FG_HAVE_ARMAMENT
   // armament
   fgTie("/controls/armament/master-arm", this,
 	&FGControls::get_master_arm, &FGControls::set_master_arm);
@@ -703,8 +702,6 @@ FGControls::bind ()
       fgSetArchivable(name);
   }
 
-#endif
-
   // seat
   fgTie("/controls/seat/vertical-adjust", this,
 	&FGControls::get_vertical_adjust, 
@@ -979,7 +976,6 @@ void FGControls::unbind ()
   fgUntie("/controls/lighting/instruments-norm");  
   fgUntie("/controls/lighting/dome-norm");
 
-#ifdef FG_HAVE_ARMAMENT
   fgUntie("/controls/armament/master-arm");  
   fgUntie("/controls/armament/station-select");  
   fgUntie("/controls/armament/release-all");  
@@ -998,7 +994,7 @@ void FGControls::unbind ()
        "/controls/armament/station[%d]/jettison-all", index);
     fgUntie(name);
   }
-#endif
+
   fgUntie("/controls/seat/vertical-adjust");  
   fgUntie("/controls/seat/fore-aft-adjust");  
   for (index = 0; index < MAX_EJECTION_SEATS; index++) {
@@ -2014,8 +2010,6 @@ FGControls::move_dome_norm( double amt )
   CLAMP( &dome_norm, 0.0, 1.0 );
 }
 
-#ifdef FG_HAVE_ARMAMENT
-
 void
 FGControls::set_master_arm( bool val )
 {
@@ -2093,8 +2087,6 @@ FGControls::set_jettison_all( int station, bool val )
     }
 }
 
-#endif
-
 void
 FGControls::set_vertical_adjust( double pos )
 {
diff --git a/src/Controls/controls.hxx b/src/Aircraft/controls.hxx
similarity index 99%
rename from src/Controls/controls.hxx
rename to src/Aircraft/controls.hxx
index 4a0bea555..0d107b373 100644
--- a/src/Controls/controls.hxx
+++ b/src/Aircraft/controls.hxx
@@ -407,7 +407,6 @@ public:
     inline double get_instruments_norm() const { return instruments_norm; }
     inline double get_dome_norm() const { return dome_norm; }
 
-#ifdef FG_HAVE_ARMAMENT
     // controls/armament/
     inline bool get_master_arm() const { return master_arm; }
     inline int get_station_select() const { return station_select; }
@@ -418,7 +417,6 @@ public:
     inline bool get_release_stick(int station) const { return release_stick[station]; }
     inline bool get_release_all(int station) const { return release_all[station]; }
     inline bool get_jettison_all(int station) const { return jettison_all[station]; }
-#endif
 
     // controls/seat/
     inline double get_vertical_adjust() const { return vertical_adjust; }
@@ -595,7 +593,6 @@ public:
     void set_dome_norm( double intensity );
     void move_dome_norm( double amt );
 
-#ifdef FG_HAVE_ARMAMENT
     // controls/armament/
     void set_master_arm( bool val );
     void set_station_select( int station );
@@ -606,7 +603,6 @@ public:
     void set_release_stick( int station, bool val );
     void set_release_all( int station, bool val );
     void set_jettison_all( int station, bool val );
-#endif
 
     // controls/seat/
     void set_vertical_adjust( double pos );
diff --git a/src/Replay/replay.cxx b/src/Aircraft/replay.cxx
similarity index 100%
rename from src/Replay/replay.cxx
rename to src/Aircraft/replay.cxx
diff --git a/src/Replay/replay.hxx b/src/Aircraft/replay.hxx
similarity index 100%
rename from src/Replay/replay.hxx
rename to src/Aircraft/replay.hxx
diff --git a/src/Autopilot/auto_gui.cxx b/src/Autopilot/auto_gui.cxx
index 42343865d..e7ae0a45d 100644
--- a/src/Autopilot/auto_gui.cxx
+++ b/src/Autopilot/auto_gui.cxx
@@ -36,7 +36,6 @@
 
 #include <Aircraft/aircraft.hxx>
 #include <FDM/flight.hxx>
-#include <Controls/controls.hxx>
 #include <Scenery/scenery.hxx>
 
 #include <simgear/constants.h>
diff --git a/src/Cockpit/hud.hxx b/src/Cockpit/hud.hxx
index 89c3abd0b..50365f35a 100644
--- a/src/Cockpit/hud.hxx
+++ b/src/Cockpit/hud.hxx
@@ -54,8 +54,8 @@
 
 #include <Include/fg_typedefs.h>
 #include <Aircraft/aircraft.hxx>
+#include <Aircraft/controls.hxx>
 #include <FDM/flight.hxx>
-#include <Controls/controls.hxx>
 #include <GUI/gui.h>
 #include <Main/globals.hxx>
 #include <Main/viewmgr.hxx>
diff --git a/src/Controls/.cvsignore b/src/Controls/.cvsignore
deleted file mode 100644
index e99558847..000000000
--- a/src/Controls/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.deps
-Makefile
-Makefile.in
diff --git a/src/Controls/Makefile.am b/src/Controls/Makefile.am
deleted file mode 100644
index 02729a4fa..000000000
--- a/src/Controls/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-noinst_LIBRARIES = libControls.a
-
-libControls_a_SOURCES = controls.cxx controls.hxx
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
diff --git a/src/FDM/Balloon.cxx b/src/FDM/Balloon.cxx
index 9d7f19bad..1bf6d9913 100644
--- a/src/FDM/Balloon.cxx
+++ b/src/FDM/Balloon.cxx
@@ -55,7 +55,6 @@ HISTORY
 #include <simgear/misc/sg_path.hxx>
 
 #include <Aircraft/aircraft.hxx>
-#include <Controls/controls.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 
diff --git a/src/FDM/JSBSim/JSBSim.cxx b/src/FDM/JSBSim/JSBSim.cxx
index 40650a6ea..6b8fb7bfb 100644
--- a/src/FDM/JSBSim/JSBSim.cxx
+++ b/src/FDM/JSBSim/JSBSim.cxx
@@ -43,7 +43,7 @@
 #include <FDM/flight.hxx>
 
 #include <Aircraft/aircraft.hxx>
-#include <Controls/controls.hxx>
+#include <Aircraft/controls.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 
diff --git a/src/FDM/LaRCsim/LaRCsim.cxx b/src/FDM/LaRCsim/LaRCsim.cxx
index df59b52d2..8606b8b9d 100644
--- a/src/FDM/LaRCsim/LaRCsim.cxx
+++ b/src/FDM/LaRCsim/LaRCsim.cxx
@@ -29,7 +29,7 @@
 #include <simgear/scene/model/placement.hxx>
 
 #include <Aircraft/aircraft.hxx>
-#include <Controls/controls.hxx>
+#include <Aircraft/controls.hxx>
 #include <FDM/flight.hxx>
 #include <FDM/UIUCModel/uiuc_aircraft.h>
 #include <Main/fg_props.hxx>
diff --git a/src/FDM/MagicCarpet.cxx b/src/FDM/MagicCarpet.cxx
index fc84a6939..3c5fc9c04 100644
--- a/src/FDM/MagicCarpet.cxx
+++ b/src/FDM/MagicCarpet.cxx
@@ -29,7 +29,7 @@
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
 
-#include <Controls/controls.hxx>
+#include <Aircraft/controls.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 
diff --git a/src/FDM/SP/ADA.cxx b/src/FDM/SP/ADA.cxx
index 4ef0ea608..2f16eb380 100644
--- a/src/FDM/SP/ADA.cxx
+++ b/src/FDM/SP/ADA.cxx
@@ -26,11 +26,10 @@
 #include <simgear/io/sg_socket.hxx>
 #include <simgear/constants.h>
 
-#include <Controls/controls.hxx>
+#include <Aircraft/controls.hxx>
+#include <Scenery/scenery.hxx> //to pass ground elevation to FDM
 #include <Main/globals.hxx>
-
 #include <Main/fg_props.hxx> //to get ID of window (left/right or center)
-#include <Scenery/scenery.hxx> //to pass ground elevation to FDM
 
 #include "ADA.hxx"
 
diff --git a/src/FDM/UFO.cxx b/src/FDM/UFO.cxx
index f6b26f58d..60727faf3 100644
--- a/src/FDM/UFO.cxx
+++ b/src/FDM/UFO.cxx
@@ -29,7 +29,7 @@
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
 
-#include <Controls/controls.hxx>
+#include <Aircraft/controls.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 
diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index bc6bdc9c8..07a1b215a 100644
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -69,10 +69,10 @@
 
 #include <Include/general.hxx>
 #include <Aircraft/aircraft.hxx>
+#include <Aircraft/controls.hxx>
 #include <Airports/simple.hxx>
 #include <Autopilot/auto_gui.hxx>
 #include <Cockpit/panel.hxx>
-#include <Controls/controls.hxx>
 #include <FDM/flight.hxx>
 #include <Main/main.hxx>
 #include <Main/fg_init.hxx>
@@ -427,7 +427,7 @@ void fgHiResDump()
 
     message = "Snapshot saved to \"";
     message += filename;
-    message += '".';
+    message += "\".";
     mkDialog (message.c_str());
 
     free(tile);
diff --git a/src/GUI/mouse.cxx b/src/GUI/mouse.cxx
index 7be33c88a..28cdd35ec 100644
--- a/src/GUI/mouse.cxx
+++ b/src/GUI/mouse.cxx
@@ -55,10 +55,10 @@
 
 #include <Include/general.hxx>
 #include <Aircraft/aircraft.hxx>
+#include <Aircraft/controls.hxx>
 #include <Airports/simple.hxx>
 #include <Autopilot/auto_gui.hxx>
 #include <Cockpit/panel.hxx>
-#include <Controls/controls.hxx>
 #include <FDM/flight.hxx>
 #include <Main/fg_init.hxx>
 #include <Main/fg_props.hxx>
diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index bf8c092ad..4efa4deaf 100644
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -59,7 +59,6 @@ fgfs_LDADD = \
 	$(top_builddir)/src/ATC/libATC.a \
 	$(top_builddir)/src/Cockpit/libCockpit.a \
 	$(top_builddir)/src/Cockpit/built_in/libBuilt_in.a \
-	$(top_builddir)/src/Controls/libControls.a \
 	$(top_builddir)/src/FDM/libFlight.a \
 	$(top_builddir)/src/FDM/Balloon/libBalloon.a \
 	$(top_builddir)/src/FDM/ExternalNet/libExternalNet.a \
@@ -83,7 +82,6 @@ fgfs_LDADD = \
 	$(top_builddir)/src/Sound/libSound.a \
 	$(top_builddir)/src/Airports/libAirports.a \
 	$(MPLAYER_LIBS) \
-	$(top_builddir)/src/Replay/libReplay.a \
 	$(top_builddir)/src/Systems/libSystems.a \
 	$(top_builddir)/src/Time/libTime.a \
 	$(top_builddir)/src/Traffic/libTraffic.a \
diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 21e9975e5..8db3908dd 100644
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -22,7 +22,7 @@
 #include <GUI/gui.h>
 #include <GUI/new_gui.hxx>
 #include <GUI/dialog.hxx>
-#include <Replay/replay.hxx>
+#include <Aircraft/replay.hxx>
 #include <Scenery/tilemgr.hxx>
 #if defined(HAVE_PLIB_PSL)
 #  include <Scripting/scriptmgr.hxx>
diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 7a52560d6..ac668cb16 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -64,6 +64,7 @@
 #include <simgear/timing/lowleveltime.h>
 
 #include <Aircraft/aircraft.hxx>
+#include <Aircraft/replay.hxx>
 #include <Airports/apt_loader.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/simple.hxx>
@@ -99,7 +100,6 @@
 #include <AIModel/AIManager.hxx>
 #include <Navaids/navdb.hxx>
 #include <Navaids/navlist.hxx>
-#include <Replay/replay.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
 #include <Scripting/NasalSys.hxx>
@@ -114,7 +114,7 @@
 #include <Traffic/TrafficMgr.hxx>
 
 #ifdef FG_MPLAYER_AS
-#include <MultiPlayer/multiplaymgr.hpp>
+#include <MultiPlayer/multiplaymgr.hxx>
 #endif
 
 #include <Environment/environment_mgr.hxx>
diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 0858e06ff..c5fd29ab4 100644
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -55,6 +55,7 @@
 #include <simgear/scene/sky/sky.hxx>
 #include <Time/light.hxx>
 #include <Include/general.hxx>
+#include <Aircraft/replay.hxx>
 #include <Cockpit/cockpit.hxx>
 #include <Cockpit/hud.hxx>
 #include <Model/panelnode.hxx>
@@ -69,14 +70,13 @@
 #include <ATC/ATCdisplay.hxx>
 #include <ATC/ATCmgr.hxx>
 #include <ATC/AIMgr.hxx>
-#include <Replay/replay.hxx>
 #include <Time/tmp.hxx>
 #include <Time/fg_timer.hxx>
 #include <Environment/environment_mgr.hxx>
 #include <GUI/new_gui.hxx>
 
 #ifdef FG_MPLAYER_AS
-#include <MultiPlayer/multiplaymgr.hpp>
+#include <MultiPlayer/multiplaymgr.hxx>
 #endif
 
 
diff --git a/src/Main/renderer.cxx b/src/Main/renderer.cxx
index b5566b0c2..99b3c79fb 100644
--- a/src/Main/renderer.cxx
+++ b/src/Main/renderer.cxx
@@ -57,6 +57,7 @@
 #include <Time/light.hxx>
 #include <Time/light.hxx>
 #include <Aircraft/aircraft.hxx>
+// #include <Aircraft/replay.hxx>
 #include <Cockpit/panel.hxx>
 #include <Cockpit/cockpit.hxx>
 #include <Cockpit/hud.hxx>
@@ -66,7 +67,6 @@
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
 #include <ATC/ATCdisplay.hxx>
-#include <Replay/replay.hxx>
 #include <GUI/new_gui.hxx>
 
 #include "splash.hxx"
diff --git a/src/Makefile.am b/src/Makefile.am
index c0baac3c1..bdf468654 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,3 @@
-if ENABLE_MPLAYER_AS
-MPLAYER_DIRS = MultiPlayer
-else
-MPLAYER_DIRS =
-endif
-
 SUBDIRS = \
         Include \
         Aircraft \
@@ -11,7 +5,6 @@ SUBDIRS = \
         ATC \
         Autopilot \
         Cockpit \
-        Controls \
         Environment \
         FDM \
         GUI \
@@ -21,9 +14,7 @@ SUBDIRS = \
 	AIModel \
         Navaids \
         Network \
-	$(MPLAYER_DIRS) \
-        Objects \
-	Replay \
+	MultiPlayer \
         Scenery \
 	Scripting \
         Sound \
diff --git a/src/MultiPlayer/Makefile.am b/src/MultiPlayer/Makefile.am
index c6c16f601..1cadf5f33 100644
--- a/src/MultiPlayer/Makefile.am
+++ b/src/MultiPlayer/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LIBRARIES = libMultiPlayer.a
 
-libMultiPlayer_a_SOURCES = multiplaymgr.cpp multiplaymgr.hpp  mpplayer.cxx mpplayer.hxx mpmessages.hxx tiny_xdr.cpp tiny_xdr.hpp
+libMultiPlayer_a_SOURCES = multiplaymgr.cxx multiplaymgr.hxx  mpplayer.cxx mpplayer.hxx mpmessages.hxx tiny_xdr.cxx tiny_xdr.hxx
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
 
diff --git a/src/MultiPlayer/mpmessages.hxx b/src/MultiPlayer/mpmessages.hxx
index c4a13eb6c..3d34a4597 100644
--- a/src/MultiPlayer/mpmessages.hxx
+++ b/src/MultiPlayer/mpmessages.hxx
@@ -35,9 +35,9 @@
 *
 ******************************************************************/
 
-#include <simgear/compiler.h>
-#include "tiny_xdr.hpp"
 #include <plib/sg.h>
+#include <simgear/compiler.h>
+#include "tiny_xdr.hxx"
 
 // magic value for messages
 const uint32_t MSG_MAGIC = 0x46474653;  // "FGFS"
diff --git a/src/MultiPlayer/multiplaymgr.cpp b/src/MultiPlayer/multiplaymgr.cxx
similarity index 99%
rename from src/MultiPlayer/multiplaymgr.cpp
rename to src/MultiPlayer/multiplaymgr.cxx
index 126452c73..106d19068 100644
--- a/src/MultiPlayer/multiplaymgr.cpp
+++ b/src/MultiPlayer/multiplaymgr.cxx
@@ -38,13 +38,17 @@
 #   include <netinet/in.h>
 #   include <arpa/inet.h>
 #endif
-#include <plib/netSocket.h>
 #include <stdlib.h>
+
+#include <plib/netSocket.h>
+
 #include <simgear/debug/logstream.hxx>
+
 #include <Main/fg_props.hxx>
-#include "multiplaymgr.hpp"
+#include "multiplaymgr.hxx"
 #include "mpmessages.hxx"
 #include "mpplayer.hxx"
+
 #define MAX_PACKET_SIZE 1024
 
 // These constants are provided so that the ident 
diff --git a/src/MultiPlayer/multiplaymgr.hpp b/src/MultiPlayer/multiplaymgr.hxx
similarity index 100%
rename from src/MultiPlayer/multiplaymgr.hpp
rename to src/MultiPlayer/multiplaymgr.hxx
diff --git a/src/MultiPlayer/tiny_xdr.cpp b/src/MultiPlayer/tiny_xdr.cxx
similarity index 99%
rename from src/MultiPlayer/tiny_xdr.cpp
rename to src/MultiPlayer/tiny_xdr.cxx
index 2ec972795..ff572f8cc 100644
--- a/src/MultiPlayer/tiny_xdr.cpp
+++ b/src/MultiPlayer/tiny_xdr.cxx
@@ -13,7 +13,7 @@
 
 #include <plib/ul.h>
 
-#include "tiny_xdr.hpp"
+#include "tiny_xdr.hxx"
 
 /* XDR 8bit integers */
 xdr_data_t
diff --git a/src/MultiPlayer/tiny_xdr.hpp b/src/MultiPlayer/tiny_xdr.hxx
similarity index 100%
rename from src/MultiPlayer/tiny_xdr.hpp
rename to src/MultiPlayer/tiny_xdr.hxx
diff --git a/src/Network/multiplay.hxx b/src/Network/multiplay.hxx
index fd19a63e9..2b673e092 100644
--- a/src/Network/multiplay.hxx
+++ b/src/Network/multiplay.hxx
@@ -34,7 +34,7 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Model/acmodel.hxx>
-#include <MultiPlayer/multiplaymgr.hpp>
+#include <MultiPlayer/multiplaymgr.hxx>
 
 #include "protocol.hxx"
 
diff --git a/src/Network/native_ctrls.hxx b/src/Network/native_ctrls.hxx
index 7d5be525e..0eac591d4 100644
--- a/src/Network/native_ctrls.hxx
+++ b/src/Network/native_ctrls.hxx
@@ -29,14 +29,12 @@
 
 #include STL_STRING
 
-#include <Controls/controls.hxx>
-
+#include <Aircraft/controls.hxx>
 #include "protocol.hxx"
 #include "net_ctrls.hxx"
 
 SG_USING_STD(string);
 
-
 class FGNativeCtrls : public FGProtocol {
 
     FGNetCtrls net_ctrls;
diff --git a/src/Network/opengc.cxx b/src/Network/opengc.cxx
index 7b61fd7d9..4f7b5f2f0 100644
--- a/src/Network/opengc.cxx
+++ b/src/Network/opengc.cxx
@@ -36,7 +36,6 @@
 #include "opengc.hxx"
 #include <FDM/flight.hxx>
 #include <Main/globals.hxx>
-#include <Controls/controls.hxx>
 #include <Main/fg_props.hxx>
 
 SG_USING_STD(vector);
diff --git a/src/Objects/.cvsignore b/src/Objects/.cvsignore
deleted file mode 100644
index e99558847..000000000
--- a/src/Objects/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.deps
-Makefile
-Makefile.in
diff --git a/src/Objects/Makefile.am b/src/Objects/Makefile.am
deleted file mode 100644
index 0d7acd6fb..000000000
--- a/src/Objects/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-#noinst_LIBRARIES = libObjects.a
-
-#libObjects_a_SOURCES = 
-#	ssgEntityArray.hxx ssgEntityArray.cxx
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
diff --git a/src/Objects/ssgEntityArray.cxx b/src/Objects/ssgEntityArray.cxx
deleted file mode 100644
index d8ca2c64f..000000000
--- a/src/Objects/ssgEntityArray.cxx
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
-     PLIB - A Suite of Portable Game Libraries
-     Copyright (C) 1998,2002  Steve Baker
- 
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Library General Public
-     License as published by the Free Software Foundation; either
-     version 2 of the License, or (at your option) any later version.
- 
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Library General Public License for more details.
- 
-     You should have received a copy of the GNU Library General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
-     For further information visit http://plib.sourceforge.net
-
-     $Id$
-*/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include "ssgEntityArray.hxx"
-
-
-// Forward declaration of internal ssg stuff (for hot/isec/los/etc.)
-void _ssgPushPath ( ssgEntity *l ) ;
-void _ssgPopPath () ;
-
-
-void ssgEntityArray::copy_from ( ssgEntityArray *src, int clone_flags )
-{
-  ssgEntity::copy_from ( src, clone_flags ) ;
-
-  ssgEntity *k = src -> getModel ( ) ;
-  if ( k != NULL && ( clone_flags & SSG_CLONE_RECURSIVE ) )
-      setModel ( (ssgEntity *)( k -> clone ( clone_flags )) ) ;
-  else
-      setModel ( k ) ;
-
-  ssgTransform *t = src -> getPosTransform();
-  if ( t != NULL && ( clone_flags & SSG_CLONE_RECURSIVE ) )
-      pos = (ssgTransform *)( t -> clone ( clone_flags ) );
-  else
-      pos = t;
-
-  ssgVertexArray *v = src -> getLocations();
-  if ( v != NULL && ( clone_flags & SSG_CLONE_RECURSIVE ) )
-      locations = (ssgVertexArray *)( v -> clone ( clone_flags ) );
-  else
-      locations = v;
-
-  v = src -> getOrientations();
-  if ( v != NULL && ( clone_flags & SSG_CLONE_RECURSIVE ) )
-      orientations = (ssgVertexArray *)( v -> clone ( clone_flags ) );
-  else
-      orientations = v;
-}
-
-ssgBase *ssgEntityArray::clone ( int clone_flags )
-{
-  ssgEntityArray *b = new ssgEntityArray ;
-  b -> copy_from ( this, clone_flags ) ;
-  return b ;
-}
-
-
-
-ssgEntityArray::ssgEntityArray (void)
-{
-    type = ssgTypeBranch () ;
-    pos = new ssgTransform;
-    locations = new ssgVertexArray();
-    orientations = new ssgVertexArray();
-}
-
-
-ssgEntityArray::~ssgEntityArray (void)
-{
-    removeModel() ;
-    ssgDeRefDelete( pos );
-    locations->removeAll();
-    orientations->removeAll();
-
-    delete orientations;
-    delete locations;
-    delete pos;
-}
-
-
-void ssgEntityArray::zeroSpareRecursive ()
-{
-  zeroSpare () ;
-
-  model -> zeroSpareRecursive () ;
-  pos -> zeroSpareRecursive () ;
-  locations -> zeroSpareRecursive () ;
-  orientations -> zeroSpareRecursive () ;
-}
-
-
-void ssgEntityArray::recalcBSphere (void)
-{
-  emptyBSphere () ;
-
-  pos->removeAllKids();
-  pos->addKid( model );
-
-  for ( int i = 0; i < locations->getNum(); ++i ) {
-      sgCoord c;
-      sgSetCoord( &c, locations->get(i), orientations->get(i) );
-      pos->setTransform( &c );
-      extendBSphere( pos->getBSphere() );
-  }
-
-  pos->removeAllKids();
-
-  /* FIXME: Traverse placement list
-  for ( ssgEntity *k = getKid ( 0 ) ; k != NULL ; k = getNextKid () )
-    extendBSphere ( k -> getBSphere () ) ;
-  */
-
-  bsphere_is_invalid = FALSE ;
-}
-
-
-void ssgEntityArray::removeModel ()
-{
-    model->deadBeefCheck () ;
-    ssgDeRefDelete ( model ) ;
-}
-
-
-void ssgEntityArray::replaceModel ( ssgEntity *new_entity )
-{
-    removeModel();
-    setModel( new_entity );
-}
-
-
-void ssgEntityArray::addPlacement ( sgVec3 loc, sgVec3 orient )
-{
-    locations->add( loc ) ;
-    orientations->add( orient ) ;
-    dirtyBSphere () ;
-}
-
-
-void ssgEntityArray::removeAllPlacements()
-{
-    locations->removeAll();
-    orientations->removeAll();
-    dirtyBSphere () ;
-}
-
-
-void ssgEntityArray::print ( FILE *fd, char *indent, int how_much )
-{
-  ssgEntity::print ( fd, indent, how_much ) ;
-  fprintf ( fd, "%s  Num Kids=%d\n", indent, getNumKids() ) ;
-
-  if ( getNumParents() != getRef() )
-    ulSetError ( UL_WARNING, "Ref count doesn't tally with parent count" ) ;
-
-	if ( how_much > 1 )
-  {	if ( bsphere.isEmpty() )
-			fprintf ( fd, "%s  BSphere is Empty.\n", indent ) ;
-		else
-			fprintf ( fd, "%s  BSphere  R=%g, C=(%g,%g,%g)\n", indent,
-				bsphere.getRadius(), bsphere.getCenter()[0], bsphere.getCenter()[1], bsphere.getCenter()[2] ) ;
-	}
-
-  char in [ 100 ] ;
-  sprintf ( in, "%s  ", indent ) ;
-
-  model -> print ( fd, in, how_much ) ;
-}
-
-
-#ifdef HAVE_PLIB_PSL
-void ssgEntityArray::getStats ( int *num_branches, int *num_leaves, int *num_tris, int *num_verts )
-{
-  int nb, nl, nt, nv ;
-
-  *num_branches = 1 ;   /* this! */
-  *num_leaves   = 0 ;
-  *num_tris     = 0 ;
-  *num_verts    = 0 ;
-
-  model -> getStats ( & nb, & nl, & nt, & nv ) ;
-  *num_branches += nb * locations->getNum() ;
-  *num_leaves   += nl * locations->getNum() ;
-  *num_tris     += nt * locations->getNum() ;
-  *num_verts    += nv * locations->getNum() ;
-}
-#endif
-
-
-void ssgEntityArray::cull ( sgFrustum *f, sgMat4 m, int test_needed )
-{
-  if ( ! preTravTests ( &test_needed, SSGTRAV_CULL ) )
-    return ;
-
-  int cull_result = cull_test ( f, m, test_needed ) ;
-
-  if ( cull_result == SSG_OUTSIDE )
-    return ;
-
-  pos->removeAllKids();
-  pos->addKid( model );
-
-  for ( int i = 0; i < locations->getNum(); ++i ) {
-      sgCoord c;
-      sgSetCoord( &c, locations->get(i), orientations->get(i) );
-      pos->setTransform( &c );
-      pos->cull( f, m, cull_result != SSG_INSIDE );
-  }
-
-  pos->removeAllKids();
-
-  postTravTests ( SSGTRAV_CULL ) ; 
-}
-
-
-
-void ssgEntityArray::hot ( sgVec3 s, sgMat4 m, int test_needed )
-{
-  if ( ! preTravTests ( &test_needed, SSGTRAV_HOT ) )
-    return ;
-
-  int hot_result = hot_test ( s, m, test_needed ) ;
-
-  if ( hot_result == SSG_OUTSIDE )
-    return ;
-
-  _ssgPushPath ( this ) ;
-
-  pos->removeAllKids();
-  pos->addKid( model );
-
-  for ( int i = 0; i < locations->getNum(); ++i ) {
-      sgCoord c;
-      sgSetCoord( &c, locations->get(i), orientations->get(i) );
-      pos->setTransform( &c );
-      pos->hot ( s, m, hot_result != SSG_INSIDE );
-  }
-
-  pos->removeAllKids();
-
-  _ssgPopPath () ;
-
-  postTravTests ( SSGTRAV_HOT ) ;
-}
-
-
-
-void ssgEntityArray::los ( sgVec3 s, sgMat4 m, int test_needed )
-{
-  if ( ! preTravTests ( &test_needed, SSGTRAV_LOS ) )
-    return ;
-
-  int los_result = los_test ( s, m, test_needed ) ;
-
-  if ( los_result == SSG_OUTSIDE )
-    return ;
-
-  _ssgPushPath ( this ) ;
-
-  pos->removeAllKids();
-  pos->addKid( model );
-
-  for ( int i = 0; i < locations->getNum(); ++i ) {
-      sgCoord c;
-      sgSetCoord( &c, locations->get(i), orientations->get(i) );
-      pos->setTransform( &c );
-      pos->los ( s, m, los_result != SSG_INSIDE ) ;
-  }
-
-  pos->removeAllKids();
-
-  _ssgPopPath () ;
-
-  postTravTests ( SSGTRAV_LOS) ;
-}
-
-
-void ssgEntityArray::isect ( sgSphere *s, sgMat4 m, int test_needed )
-{
-  if ( ! preTravTests ( &test_needed, SSGTRAV_ISECT ) )
-    return ;
-
-  int isect_result = isect_test ( s, m, test_needed ) ;
-
-  if ( isect_result == SSG_OUTSIDE )
-    return ;
-
-  _ssgPushPath ( this ) ;
-
-  pos->removeAllKids();
-  pos->addKid( model );
-
-  for ( int i = 0; i < locations->getNum(); ++i ) {
-      sgCoord c;
-      sgSetCoord( &c, locations->get(i), orientations->get(i) );
-      pos->setTransform( &c );
-      pos->isect ( s, m, isect_result != SSG_INSIDE ) ;
-  }
-
-  pos->removeAllKids();
-
-  _ssgPopPath () ;
-
-  postTravTests ( SSGTRAV_ISECT ) ; 
-}
-
-
-#if 0
-int ssgEntityArray::load ( FILE *fd )
-{
-  int nkids ;
-
-  _ssgReadInt ( fd, & nkids ) ;
-
-  if ( ! ssgEntity::load ( fd ) )
-    return FALSE ;
-
-  for ( int i = 0 ; i < nkids ; i++ )
-  {
-    ssgEntity *kid ;
-
-    if ( ! _ssgLoadObject ( fd, (ssgBase **) &kid, ssgTypeEntity () ) )
-      return FALSE ;
-
-    addKid ( kid ) ;
-  }
-
-  return TRUE ;
-}
-
-
-int ssgEntityArray::save ( FILE *fd )
-{
-  _ssgWriteInt ( fd, getNumKids() ) ;
-
-  if ( ! ssgEntity::save ( fd ) )
-    return FALSE ;
-
-  for ( int i = 0 ; i < getNumKids() ; i++ )
-  {
-    if ( ! _ssgSaveObject ( fd, getKid ( i ) ) )
-       return FALSE ;
-  }
-
-  return TRUE ;
-}
-#endif
-
diff --git a/src/Objects/ssgEntityArray.hxx b/src/Objects/ssgEntityArray.hxx
deleted file mode 100644
index 659d6d6c5..000000000
--- a/src/Objects/ssgEntityArray.hxx
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef _SSG_ENTITY_ARRAY_HXX
-#define _SSG_ENTITY_ARRAY_HXX
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <plib/ssg.h>
-
-
-class ssgEntityArray : public ssgEntity
-{
-    // The replicated child
-    ssgEntity *model ;
-
-    // The one transformation node
-    ssgTransform *pos;
-
-    // The list of locations and orientations
-    ssgVertexArray *locations;
-    ssgVertexArray *orientations;
-
-protected:
-
-    virtual void copy_from ( ssgEntityArray *src, int clone_flags ) ;
-
-public:
-
-    virtual void zeroSpareRecursive ();
-
-    virtual ssgBase *clone ( int clone_flags = 0 ) ;
-    ssgEntityArray (void) ;
-    virtual ~ssgEntityArray (void) ;
-
-    ssgEntity *getModel () const { return model ; }
-    void setModel        ( ssgEntity *entity ) { model = entity; }
-    void removeModel     () ;
-    void replaceModel    ( ssgEntity *new_entity ) ;
-
-    ssgVertexArray *getLocations () const { return locations; }
-    ssgVertexArray *getOrientations () const { return orientations; }
-
-    float *getLocation ( int i ) const { return locations->get( i ); }
-    float *getOrientation ( int i ) const { return orientations->get( i ); }
-    void addPlacement ( sgVec3 loc, sgVec3 orient );
-    virtual int getNumPlacements() const { return locations->getNum(); }
-    void removeAllPlacements();
-
-    ssgTransform *getPosTransform() { return pos; }
-
-    virtual const char *getTypeName(void) ;
-    virtual void cull          ( sgFrustum *f, sgMat4 m, int test_needed ) ;
-    virtual void isect         ( sgSphere  *s, sgMat4 m, int test_needed ) ;
-    virtual void hot           ( sgVec3     s, sgMat4 m, int test_needed ) ;
-    virtual void los           ( sgVec3     s, sgMat4 m, int test_needed ) ;
-    virtual void print         ( FILE *fd = stderr, char *indent = "", int how_much = 2 ) ;
-#ifdef HAVE_PLIB_PSL
-    virtual void getStats ( int *num_branches, int *num_leaves, int *num_tris, int *num_vertices ) ;
-#endif
-    virtual int load ( FILE *fd ) ;
-    virtual int save ( FILE *fd ) ;
-    virtual void recalcBSphere () ;
-} ;
-
-
-#endif // _SSG_ENTITY_ARRAY_HXX
diff --git a/src/Replay/.cvsignore b/src/Replay/.cvsignore
deleted file mode 100644
index e99558847..000000000
--- a/src/Replay/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.deps
-Makefile
-Makefile.in
diff --git a/src/Replay/Makefile.am b/src/Replay/Makefile.am
deleted file mode 100644
index ed79d1eb8..000000000
--- a/src/Replay/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-noinst_LIBRARIES = libReplay.a
-
-libReplay_a_SOURCES = replay.hxx replay.cxx
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-- 
2.39.5