diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 4997d458da..5870b0476c 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -113,7 +113,7 @@ bool findNextInset(DocIterator & dit, vector<InsetCode> const & codes,
 	while (tmpdit) {
 		Inset const * inset = tmpdit.nextInset();
 		if (inset
-		    && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()
+		    && std::find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()
 		    && (contents.empty() ||
 		    static_cast<InsetCommand const *>(inset)->getFirstNonOptParam() == contents)) {
 			dit = tmpdit;
@@ -139,7 +139,7 @@ bool findInset(DocIterator & dit, vector<InsetCode> const & codes,
 	if (same_content) {
 		Inset const * inset = tmpdit.nextInset();
 		if (inset
-		    && find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) {
+		    && std::find(codes.begin(), codes.end(), inset->lyxCode()) != codes.end()) {
 			contents = static_cast<InsetCommand const *>(inset)->getFirstNonOptParam();
 		}
 	}
@@ -1563,7 +1563,7 @@ void BufferView::gotoLabel(docstring const & label)
 	for (InsetIterator it = inset_iterator_begin(buffer_.inset()); it; ++it) {
 		vector<docstring> labels;
 		it->getLabelList(buffer_, labels);
-		if (find(labels.begin(), labels.end(), label) != labels.end()) {
+		if (std::find(labels.begin(), labels.end(), label) != labels.end()) {
 			setCursor(it);
 			showCursor();
 			return;
diff --git a/src/Font.cpp b/src/Font.cpp
index 2b39813c51..39b78be01d 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -31,6 +31,8 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
+#include <cstring>
+
 using namespace std;
 using namespace lyx::support;
 
diff --git a/src/boost.cpp b/src/boost.cpp
index b255e60885..9d2d2b8aa2 100644
--- a/src/boost.cpp
+++ b/src/boost.cpp
@@ -18,6 +18,7 @@
 
 #include <exception>
 #include <iomanip>
+#include <iostream>
 
 using namespace std;
 using lyx::lyxerr;
diff --git a/src/frontends/qt4/GuiAlert.cpp b/src/frontends/qt4/GuiAlert.cpp
index ec904e9650..b53f20f738 100644
--- a/src/frontends/qt4/GuiAlert.cpp
+++ b/src/frontends/qt4/GuiAlert.cpp
@@ -30,6 +30,7 @@
 #include <QInputDialog>
 
 #include <iomanip>
+#include <iostream>
 
 using namespace std;
 using namespace lyx::support;
diff --git a/src/frontends/qt4/TocModel.cpp b/src/frontends/qt4/TocModel.cpp
index 287d7fab79..2f8fadc503 100644
--- a/src/frontends/qt4/TocModel.cpp
+++ b/src/frontends/qt4/TocModel.cpp
@@ -16,6 +16,7 @@
 #include "support/debug.h"
 
 #include <boost/assert.hpp>
+#include <climits>
 
 using namespace std;
 
diff --git a/src/graphics/GraphicsParams.cpp b/src/graphics/GraphicsParams.cpp
index e5c9b3d24f..0b2fbb2c14 100644
--- a/src/graphics/GraphicsParams.cpp
+++ b/src/graphics/GraphicsParams.cpp
@@ -14,6 +14,7 @@
 
 #include "Length.h"
 
+#include <cstdlib>
 #include <sstream>
 
 using namespace std;
diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index f8cc990cf9..e80e839691 100644
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -37,6 +37,7 @@
 #include "support/textutils.h"
 
 #include <boost/tokenizer.hpp>
+#include <limits>
 
 using namespace std;
 using namespace lyx::support;
diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 2908f2671b..9546aa3501 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -61,6 +61,7 @@
 #include <sstream>
 #include <iostream>
 #include <limits>
+#include <cstring>
 
 using namespace std;
 using namespace lyx::support;
diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp
index 33446a4aa3..ec5c443f31 100644
--- a/src/mathed/MathData.cpp
+++ b/src/mathed/MathData.cpp
@@ -37,6 +37,8 @@
 #include <boost/assert.hpp>
 #include <boost/next_prior.hpp>
 
+#include <cstdlib>
+
 using namespace std;
 
 namespace lyx {
diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp
index 42cfc31195..0895dcadee 100644
--- a/src/mathed/MathExtern.cpp
+++ b/src/mathed/MathExtern.cpp
@@ -43,6 +43,7 @@
 #include <algorithm>
 #include <sstream>
 #include <fstream>
+#include <memory>
 
 using namespace std;
 using namespace lyx::support;
diff --git a/src/mathed/MathStream.cpp b/src/mathed/MathStream.cpp
index b0a842f209..295b1d77d5 100644
--- a/src/mathed/MathStream.cpp
+++ b/src/mathed/MathStream.cpp
@@ -20,6 +20,7 @@
 #include "support/docstring.h"
 
 #include <algorithm>
+#include <cstring>
 #include <ostream>
 
 using namespace std;
diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp
index 82ec8dc54d..df3d031a16 100644
--- a/src/support/docstream.cpp
+++ b/src/support/docstream.cpp
@@ -15,6 +15,7 @@
 
 #include <cerrno>
 #include <cstdio>
+#include <cstring>
 #include <iconv.h>
 #include <locale>
 
diff --git a/src/support/minizip/zipunzip.cpp b/src/support/minizip/zipunzip.cpp
index 2c69453e6a..17d37ccacf 100644
--- a/src/support/minizip/zipunzip.cpp
+++ b/src/support/minizip/zipunzip.cpp
@@ -52,6 +52,8 @@
 
 #include <config.h>
 
+#include <cstdlib>
+#include <cstring>
 #include <string>
 #include <vector>
 #include <utility>