#include <simgear/compiler.h>
#include <simgear/route/waypoint.hxx>
-#include STL_STRING
+#include <string>
#include <vector>
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
#include "gnnode.hxx"
#include "parking.hxx"