#include <simgear/compiler.h>
#include <vector>
-#include STL_STRING
+#include <string>
#include <simgear/bucket/newbucket.hxx>
#include <simgear/math/point3d.hxx>
#include <strings.h>
#endif
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
namespace simgear {