diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 376889c9eb..84d1360a02 100644
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -671,13 +671,13 @@ string citationStyleToString(const CitationStyle & s)
 	string cite = citeCommands[s.style];
 	if (s.full) {
 		CiteStyle const * last = citeStylesFull + nCiteStylesFull;
-		if (find(citeStylesFull, last, s.style) != last)
+		if (std::find(citeStylesFull, last, s.style) != last)
 			cite += '*';
 	}
 
 	if (s.forceUpperCase) {
 		CiteStyle const * last = citeStylesUCase + nCiteStylesUCase;
-		if (find(citeStylesUCase, last, s.style) != last)
+		if (std::find(citeStylesUCase, last, s.style) != last)
 			cite[0] = 'C';
 	}
 
diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 88bbde5194..a5367b087d 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -1164,8 +1164,8 @@ QAbstractItemModel * GuiApplication::languageModel()
 	QStandardItemModel * lang_model = new QStandardItemModel(this);
 	lang_model->insertColumns(0, 1);
 	int current_row;
-	Languages::const_iterator it = languages.begin();
-	Languages::const_iterator end = languages.end();
+	Languages::const_iterator it = lyx::languages.begin();
+	Languages::const_iterator end = lyx::languages.end();
 	for (; it != end; ++it) {
 		current_row = lang_model->rowCount();
 		lang_model->insertRows(current_row, 1);
diff --git a/src/frontends/qt4/GuiSelectionManager.cpp b/src/frontends/qt4/GuiSelectionManager.cpp
index 75e38f675c..d087942ed4 100644
--- a/src/frontends/qt4/GuiSelectionManager.cpp
+++ b/src/frontends/qt4/GuiSelectionManager.cpp
@@ -23,6 +23,9 @@
 #include <QPushButton>
 #include <QAbstractListModel>
 
+#ifdef KeyPress
+#undef KeyPress
+#endif
 
 namespace lyx {
 namespace frontend {