diff --git a/src/cursor.C b/src/cursor.C
index 3820ae29ff..4d95d0de0b 100644
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -39,7 +39,6 @@
 #include "mathed/InsetMath.h"
 #include "mathed/InsetMathScript.h"
 #include "mathed/MathMacroTable.h"
-#include "mathed/MathParser.h"
 
 #include "support/limited_stack.h"
 
diff --git a/src/mathed/InsetMathArray.C b/src/mathed/InsetMathArray.C
index 54b1deaff6..893518f8e8 100644
--- a/src/mathed/InsetMathArray.C
+++ b/src/mathed/InsetMathArray.C
@@ -15,7 +15,6 @@
 #include "MathData.h"
 #include "MathParser.h"
 #include "MathStream.h"
-#include "MathStream.h"
 
 #include "support/lstrings.h"
 
diff --git a/src/mathed/InsetMathBoxed.C b/src/mathed/InsetMathBoxed.C
index 4e15ce4ffe..303ba5d9f3 100644
--- a/src/mathed/InsetMathBoxed.C
+++ b/src/mathed/InsetMathBoxed.C
@@ -13,8 +13,6 @@
 #include "InsetMathBoxed.h"
 #include "MathData.h"
 #include "MathStream.h"
-#include "MathParser.h"
-#include "MathStream.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"
 
diff --git a/src/mathed/InsetMathDecoration.C b/src/mathed/InsetMathDecoration.C
index 846bac8faf..0018581af5 100644
--- a/src/mathed/InsetMathDecoration.C
+++ b/src/mathed/InsetMathDecoration.C
@@ -13,9 +13,8 @@
 
 #include "InsetMathDecoration.h"
 #include "MathData.h"
-#include "MathSupport.h"
 #include "MathParser.h"
-#include "MathStream.h"
+#include "MathSupport.h"
 #include "MathStream.h"
 
 #include "LaTeXFeatures.h"
diff --git a/src/mathed/InsetMathFBox.C b/src/mathed/InsetMathFBox.C
index 71a9ec192d..69ba854c10 100644
--- a/src/mathed/InsetMathFBox.C
+++ b/src/mathed/InsetMathFBox.C
@@ -13,8 +13,6 @@
 #include "InsetMathFBox.h"
 #include "MathData.h"
 #include "MathStream.h"
-#include "MathParser.h"
-#include "MathStream.h"
 #include "LColor.h"
 
 #include "support/std_ostream.h"
diff --git a/src/mathed/InsetMathHull.C b/src/mathed/InsetMathHull.C
index 8037531be2..a417f577d6 100644
--- a/src/mathed/InsetMathHull.C
+++ b/src/mathed/InsetMathHull.C
@@ -671,7 +671,6 @@ docstring InsetMathHull::nicelabel(row_type row) const
 		return docstring();
 	if (label_[row].empty())
 		return from_ascii("(#)");
-	// FIXME UNICODE
 	return '(' + label_[row] + ')';
 }
 
@@ -984,7 +983,6 @@ void InsetMathHull::doExtern(LCursor & cur, FuncRequest & func)
 		size_type pos = cur.cell().find_last(eq);
 		MathArray ar;
 		if (cur.inMathed() && cur.selection()) {
-			// FIXME UNICODE
 			asArray(grabAndEraseSelection(cur), ar);
 		} else if (pos == cur.cell().size()) {
 			ar = cur.cell();
diff --git a/src/mathed/InsetMathSize.C b/src/mathed/InsetMathSize.C
index 86ec8d8a25..f700b81762 100644
--- a/src/mathed/InsetMathSize.C
+++ b/src/mathed/InsetMathSize.C
@@ -12,7 +12,6 @@
 
 #include "InsetMathSize.h"
 #include "MathData.h"
-#include "MathStream.h"
 #include "MathParser.h"
 #include "MathStream.h"
 
diff --git a/src/mathed/MathAutoCorrect.C b/src/mathed/MathAutoCorrect.C
index 6c92f54565..59ccc3c936 100644
--- a/src/mathed/MathAutoCorrect.C
+++ b/src/mathed/MathAutoCorrect.C
@@ -29,9 +29,6 @@ using support::libFileSearch;
 
 using std::string;
 using std::ifstream;
-using std::istream;
-using std::istringstream;
-using std::ostream;
 using std::endl;
 using std::vector;
 
diff --git a/src/mathed/MathFactory.C b/src/mathed/MathFactory.C
index 7e1aeb497a..432d7d1e23 100644
--- a/src/mathed/MathFactory.C
+++ b/src/mathed/MathFactory.C
@@ -51,7 +51,6 @@
 #include "InsetMathXYMatrix.h"
 #include "MathMacroArgument.h"
 #include "MathMacroTable.h"
-#include "MathMacroTemplate.h"
 #include "MathParser.h"
 #include "MathSupport.h"
 
@@ -62,9 +61,6 @@
 
 #include "frontends/FontLoader.h"
 
-#include <fstream>
-#include <sstream>
-
 
 namespace lyx {
 
diff --git a/src/mathed/MathMacroTable.h b/src/mathed/MathMacroTable.h
index 28d2c289e6..f6e2db77aa 100644
--- a/src/mathed/MathMacroTable.h
+++ b/src/mathed/MathMacroTable.h
@@ -13,7 +13,6 @@
 #define MATH_MACROTABLE_H
 
 #include <map>
-#include <string>
 #include <vector>
 
 #include "support/docstring.h"