/****************************************************************************/
/* INCLUDES */
/****************************************************************************/
-#include <Include/compiler.h>
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <simgear/compiler.h>
+
+#ifdef HAVE_WINDOWS_H
+# include <windows.h>
+#endif
#include <vector>
-#include "sg.h"
+#include <plib/sg.h>
#include "FGWeatherDefs.h"
#include "FGPhysicalProperties.h"
-FG_USING_STD(vector);
-FG_USING_NAMESPACE(std);
+SG_USING_STD(vector);
+SG_USING_NAMESPACE(std);
/****************************************************************************/
/* used for output: */