diff --git a/configure.ac b/configure.ac
index ecb4cd26c3..5bcbe727e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -388,7 +388,7 @@ int mkstemp(char*);
 #endif
 #endif
 
-#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
+#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM) && !defined(__CYGWIN__)
 #  define USE_BOOST_FORMAT 1
 #else
 #  define USE_BOOST_FORMAT 0
diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 9f9f198c30..48dbad0357 100644
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -46,6 +46,7 @@ using std::istringstream;
 using std::ostringstream;
 using std::string;
 using std::vector;
+using std::find;
 
 
 namespace bv_funcs {
diff --git a/src/cursor.C b/src/cursor.C
index ee3b064c8b..a94fdc2800 100644
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -64,6 +64,7 @@ using std::endl;
 using std::isalpha;
 #endif
 using std::min;
+using std::for_each;
 
 namespace {
 
diff --git a/src/frontends/controllers/helper_funcs.h b/src/frontends/controllers/helper_funcs.h
index 36def74d20..b3ba620dca 100644
--- a/src/frontends/controllers/helper_funcs.h
+++ b/src/frontends/controllers/helper_funcs.h
@@ -16,6 +16,7 @@
 #include <utility>
 #include <vector>
 #include <string>
+#include <algorithm>
 
 
 namespace lyx {
diff --git a/src/graph.C b/src/graph.C
index 87c67fc075..8e7a7a131c 100644
--- a/src/graph.C
+++ b/src/graph.C
@@ -17,6 +17,7 @@
 
 using std::vector;
 using std::reverse;
+using std::fill;
 
 
 int Graph::bfs_init(int s, bool clear_visited)
diff --git a/src/graphics/GraphicsTypes.h b/src/graphics/GraphicsTypes.h
index 1b34eabd77..f3e37b54c8 100644
--- a/src/graphics/GraphicsTypes.h
+++ b/src/graphics/GraphicsTypes.h
@@ -17,6 +17,8 @@
 
 #include "support/translator.h"
 
+#include <string>
+
 
 namespace lyx {
 namespace graphics {
diff --git a/src/lyx_main.C b/src/lyx_main.C
index 9a15cda10d..100d845f53 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -80,6 +80,7 @@ namespace fs = boost::filesystem;
 using std::endl;
 using std::string;
 using std::vector;
+using std::for_each;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::exit;