diff --git a/src/Airports/GenAirports/build.cxx b/src/Airports/GenAirports/build.cxx
index 82a77967..a4ea6a4c 100644
--- a/src/Airports/GenAirports/build.cxx
+++ b/src/Airports/GenAirports/build.cxx
@@ -36,6 +36,11 @@
 #include <list>
 #include STL_STRING
 
+#include <iostream>
+SG_USING_STD(cout);
+SG_USING_STD(cerr);
+SG_USING_STD(endl);
+
 #include <plib/sg.h>			// plib include
 
 #include <simgear/constants.h>
diff --git a/src/Airports/GenAirports/convex_hull.cxx b/src/Airports/GenAirports/convex_hull.cxx
index 9d1f6b6f..a24270f7 100644
--- a/src/Airports/GenAirports/convex_hull.cxx
+++ b/src/Airports/GenAirports/convex_hull.cxx
@@ -26,12 +26,16 @@
 #include <stdio.h>
 
 #include <map>
+#include <iostream>
 
 #include <simgear/compiler.h>
 #include <simgear/constants.h>
 
 SG_USING_STD(less);
 SG_USING_STD(map);
+SG_USING_STD(cerr);
+SG_USING_STD(cout);
+SG_USING_STD(endl);
 
 #include <simgear/constants.h>
 
diff --git a/src/Airports/GenAirports/main.cxx b/src/Airports/GenAirports/main.cxx
index cc8e254a..db711fce 100644
--- a/src/Airports/GenAirports/main.cxx
+++ b/src/Airports/GenAirports/main.cxx
@@ -33,6 +33,11 @@
 #endif
 
 #include <list>
+#include <iostream>
+SG_USING_STD(cout);
+SG_USING_STD(cerr);
+SG_USING_STD(endl);
+
 #include <stdio.h>
 #include <string.h>
 #include STL_STRING
diff --git a/src/Airports/GenAirports/poly_extra.cxx b/src/Airports/GenAirports/poly_extra.cxx
index 99ef7086..a106491a 100644
--- a/src/Airports/GenAirports/poly_extra.cxx
+++ b/src/Airports/GenAirports/poly_extra.cxx
@@ -22,6 +22,13 @@
 //
 
 
+#include <simgear/compiler.h>
+
+#include <iostream>
+SG_USING_STD(cout);
+SG_USING_STD(cerr);
+SG_USING_STD(endl);
+
 #include <stdio.h>
 
 #include <simgear/math/sg_geodesy.hxx>
diff --git a/src/Airports/GenAirports/rwy_common.cxx b/src/Airports/GenAirports/rwy_common.cxx
index 4eed6426..a8d9c1b8 100644
--- a/src/Airports/GenAirports/rwy_common.cxx
+++ b/src/Airports/GenAirports/rwy_common.cxx
@@ -21,9 +21,15 @@
 // $Id$
 //
 
+#include <simgear/compiler.h>
 
 #include <simgear/constants.h>
 
+#include <iostream>
+SG_USING_STD(cout);
+SG_USING_STD(cerr);
+SG_USING_STD(endl);
+
 #include "global.hxx"
 #include "poly_extra.hxx"
 #include "rwy_common.hxx"
diff --git a/src/Airports/GenAirports/rwy_nonprec.cxx b/src/Airports/GenAirports/rwy_nonprec.cxx
index e366d415..8dbcea2f 100644
--- a/src/Airports/GenAirports/rwy_nonprec.cxx
+++ b/src/Airports/GenAirports/rwy_nonprec.cxx
@@ -21,6 +21,13 @@
 // $Id$
 //
 
+#include <simgear/compiler.h>
+
+#include <iostream>
+SG_USING_STD(cout);
+SG_USING_STD(cerr);
+SG_USING_STD(endl);
+
 
 #include "rwy_common.hxx"
 #include "rwy_nonprec.hxx"
diff --git a/src/Airports/GenAirports/rwy_prec.cxx b/src/Airports/GenAirports/rwy_prec.cxx
index f651f1ad..1a0936e3 100644
--- a/src/Airports/GenAirports/rwy_prec.cxx
+++ b/src/Airports/GenAirports/rwy_prec.cxx
@@ -21,6 +21,12 @@
 // $Id$
 //
 
+#include <simgear/compiler.h>
+
+#include <iostream>
+SG_USING_STD(cout);
+SG_USING_STD(cerr);
+SG_USING_STD(endl);
 
 #include "rwy_common.hxx"
 #include "rwy_nonprec.hxx"
diff --git a/src/Airports/GenAirports/rwy_simple.cxx b/src/Airports/GenAirports/rwy_simple.cxx
index 945397e8..52f702ca 100644
--- a/src/Airports/GenAirports/rwy_simple.cxx
+++ b/src/Airports/GenAirports/rwy_simple.cxx
@@ -22,6 +22,13 @@
 //
 
 
+#include <simgear/compiler.h>
+
+#include <iostream>
+SG_USING_STD(cout);
+SG_USING_STD(cerr);
+SG_USING_STD(endl);
+
 #include <simgear/constants.h>
 
 #include "poly_extra.hxx"
diff --git a/src/Airports/GenAirports/rwy_visual.cxx b/src/Airports/GenAirports/rwy_visual.cxx
index fe942a35..a6113508 100644
--- a/src/Airports/GenAirports/rwy_visual.cxx
+++ b/src/Airports/GenAirports/rwy_visual.cxx
@@ -22,6 +22,13 @@
 //
 
 
+#include <simgear/compiler.h>
+
+#include <iostream>
+SG_USING_STD(cout);
+SG_USING_STD(cerr);
+SG_USING_STD(endl);
+
 #include "rwy_common.hxx"
 #include "rwy_visual.hxx"
 
diff --git a/src/Airports/GenAirports/taxiway.cxx b/src/Airports/GenAirports/taxiway.cxx
index d1d084c1..6fdc4049 100644
--- a/src/Airports/GenAirports/taxiway.cxx
+++ b/src/Airports/GenAirports/taxiway.cxx
@@ -22,6 +22,13 @@
 //
 
 
+#include <simgear/compiler.h>
+
+#include <iostream>
+SG_USING_STD(cout);
+SG_USING_STD(cerr);
+SG_USING_STD(endl);
+
 #include <simgear/constants.h>
 
 #include "poly_extra.hxx"
diff --git a/src/Prep/Photo/.cvsignore b/src/Prep/Photo/.cvsignore
index 58d95ab8..9f384473 100644
--- a/src/Prep/Photo/.cvsignore
+++ b/src/Prep/Photo/.cvsignore
@@ -1,5 +1,6 @@
 .deps
 Makefile
 Makefile.in
+findcorners
 photo
 wgs84offset
diff --git a/src/Prep/Photo/findcorners.cxx b/src/Prep/Photo/findcorners.cxx
index 8b8eab0b..d5893d2d 100644
--- a/src/Prep/Photo/findcorners.cxx
+++ b/src/Prep/Photo/findcorners.cxx
@@ -1,7 +1,14 @@
 // find (lat/lon) of each corner of an image
 
+#include <simgear/compiler.h>
+
 #include <stdlib.h>
 
+#include <iostream>
+
+SG_USING_STD(cout);
+SG_USING_STD(endl);
+
 #include <simgear/math/sg_geodesy.hxx>
 
 int main( int argc, char **argv ) {