diff --git a/src/AIModel/AIAircraft.cxx b/src/AIModel/AIAircraft.cxx
index 0a1050863..180f0bfc8 100644
--- a/src/AIModel/AIAircraft.cxx
+++ b/src/AIModel/AIAircraft.cxx
@@ -22,7 +22,6 @@
 #  include <config.h>
 #endif
 
-#include <simgear/route/waypoint.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
 #include <Viewer/viewer.hxx>
diff --git a/src/AIModel/AIFlightPlan.cxx b/src/AIModel/AIFlightPlan.cxx
index 1e03b8835..f8f7c5763 100644
--- a/src/AIModel/AIFlightPlan.cxx
+++ b/src/AIModel/AIFlightPlan.cxx
@@ -24,7 +24,6 @@
 
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/route/waypoint.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/structure/exception.hxx>
 #include <simgear/constants.h>
diff --git a/src/AIModel/AIFlightPlanCreateCruise.cxx b/src/AIModel/AIFlightPlanCreateCruise.cxx
index c611f2095..5807b9ae2 100644
--- a/src/AIModel/AIFlightPlanCreateCruise.cxx
+++ b/src/AIModel/AIFlightPlanCreateCruise.cxx
@@ -25,7 +25,6 @@
 
 #include <fstream>
 #include <iostream>
-#include <simgear/route/waypoint.hxx>
 
 #include <Airports/simple.hxx>
 #include <Airports/runways.hxx>
diff --git a/src/Airports/dynamics.cxx b/src/Airports/dynamics.cxx
index 5a077968d..b4e91554e 100644
--- a/src/Airports/dynamics.cxx
+++ b/src/Airports/dynamics.cxx
@@ -32,7 +32,6 @@
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/route/waypoint.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Airports/runways.hxx>
diff --git a/src/Airports/groundnetwork.cxx b/src/Airports/groundnetwork.cxx
index 3d710e6a7..a63002eac 100644
--- a/src/Airports/groundnetwork.cxx
+++ b/src/Airports/groundnetwork.cxx
@@ -35,7 +35,6 @@
 #include <osg/Shape>
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/route/waypoint.hxx>
 #include <simgear/scene/material/EffectGeode.hxx>
 #include <simgear/scene/material/matlib.hxx>
 #include <simgear/scene/material/mat.hxx>
diff --git a/src/Airports/groundnetwork.hxx b/src/Airports/groundnetwork.hxx
index 78f1282d6..61555dc50 100644
--- a/src/Airports/groundnetwork.hxx
+++ b/src/Airports/groundnetwork.hxx
@@ -31,7 +31,6 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/route/waypoint.hxx>
 
 #include <string>
 #include <vector>
diff --git a/src/Autopilot/route_mgr.hxx b/src/Autopilot/route_mgr.hxx
index f3c939f0e..babfe31ef 100644
--- a/src/Autopilot/route_mgr.hxx
+++ b/src/Autopilot/route_mgr.hxx
@@ -25,7 +25,6 @@
 #define _ROUTE_MGR_HXX 1
 
 #include <simgear/props/props.hxx>
-#include <simgear/route/waypoint.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 
 #include <Navaids/route.hxx>
diff --git a/src/GUI/MapWidget.cxx b/src/GUI/MapWidget.cxx
index 99e536a4f..5a53ffe7f 100644
--- a/src/GUI/MapWidget.cxx
+++ b/src/GUI/MapWidget.cxx
@@ -8,8 +8,6 @@
 #include <algorithm> // for std::sort
 #include <plib/puAux.h>
 
-#include <simgear/sg_inlines.h>
-#include <simgear/route/waypoint.hxx>
 #include <simgear/sg_inlines.h>
 #include <simgear/misc/strutils.hxx>
 #include <simgear/magvar/magvar.hxx>
diff --git a/src/GUI/WaypointList.cxx b/src/GUI/WaypointList.cxx
index 01911c989..e8e5b36dc 100644
--- a/src/GUI/WaypointList.cxx
+++ b/src/GUI/WaypointList.cxx
@@ -11,7 +11,6 @@
 
 #include <plib/puAux.h>
 
-#include <simgear/route/waypoint.hxx>
 #include <simgear/structure/callback.hxx>
 #include <simgear/sg_inlines.h>
 
diff --git a/src/Navaids/waypoint.cxx b/src/Navaids/waypoint.cxx
index dd1ae7a96..ede0f026d 100644
--- a/src/Navaids/waypoint.cxx
+++ b/src/Navaids/waypoint.cxx
@@ -24,7 +24,6 @@
 #include "waypoint.hxx"
 
 #include <simgear/structure/exception.hxx>
-#include <simgear/route/waypoint.hxx>
 
 #include <Airports/simple.hxx>
 #include <Airports/runways.hxx>
@@ -44,13 +43,6 @@ BasicWaypt::BasicWaypt(const SGGeod& aPos, const string& aIdent, RouteBase* aOwn
   }
 }
 
-BasicWaypt::BasicWaypt(const SGWayPoint& aWP, RouteBase* aOwner) :
-  Waypt(aOwner),
-  _pos(aWP.get_target()),
-  _ident(aWP.get_id())
-{
-}
-
 BasicWaypt::BasicWaypt(RouteBase* aOwner) :
   Waypt(aOwner)
 {
diff --git a/src/Navaids/waypoint.hxx b/src/Navaids/waypoint.hxx
index 47dd78105..d01070b6f 100644
--- a/src/Navaids/waypoint.hxx
+++ b/src/Navaids/waypoint.hxx
@@ -25,21 +25,17 @@
 
 class FGAirport;
 typedef SGSharedPtr<FGAirport> FGAirportRef;
-class SGWayPoint;
 class FGRunway;
 
 namespace flightgear
 {
 
-
 class BasicWaypt : public Waypt
 {
 public:
   
   BasicWaypt(const SGGeod& aPos, const std::string& aIdent, RouteBase* aOwner);
-  
-  BasicWaypt(const SGWayPoint& aWP, RouteBase* aOwner);
-  
+    
   BasicWaypt(RouteBase* aOwner);
   
   virtual SGGeod position() const
diff --git a/src/Traffic/SchedFlight.cxx b/src/Traffic/SchedFlight.cxx
index 5339a292f..e04f1d8a4 100644
--- a/src/Traffic/SchedFlight.cxx
+++ b/src/Traffic/SchedFlight.cxx
@@ -51,7 +51,6 @@
 
 #include <simgear/compiler.h>
 #include <simgear/props/props.hxx>
-#include <simgear/route/waypoint.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/xml/easyxml.hxx>
diff --git a/src/Traffic/Schedule.cxx b/src/Traffic/Schedule.cxx
index 760a04a33..9af6a0c27 100644
--- a/src/Traffic/Schedule.cxx
+++ b/src/Traffic/Schedule.cxx
@@ -41,7 +41,6 @@
 #include <simgear/sg_inlines.h>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/props/props.hxx>
-#include <simgear/route/waypoint.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/xml/easyxml.hxx>
 
diff --git a/src/Traffic/TrafficMgr.cxx b/src/Traffic/TrafficMgr.cxx
index 43f3acefe..a4562d3b4 100644
--- a/src/Traffic/TrafficMgr.cxx
+++ b/src/Traffic/TrafficMgr.cxx
@@ -56,7 +56,6 @@
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/misc/sg_dir.hxx>
 #include <simgear/props/props.hxx>
-#include <simgear/route/waypoint.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/xml/easyxml.hxx>