diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 8cc5bb145a..3090eb09c1 100644
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-05  Angus Leeming  <leeming@lyx.org>
+
+	* math_binaryopinset.[Ch]:
+	* math_gridinfo.h: 
+	* math_xyarrowinset.[Ch]: 
+	ensure that the header file can be compiled stand-alone.
+
 2003-09-05  Angus Leeming  <leeming@lyx.org>
 
 	* *.C: strip out redundant #includes. (168 in total.)
diff --git a/src/mathed/math_binaryopinset.C b/src/mathed/math_binaryopinset.C
index 7d7586d048..5b99d411a6 100644
--- a/src/mathed/math_binaryopinset.C
+++ b/src/mathed/math_binaryopinset.C
@@ -26,9 +26,9 @@ MathBinaryOpInset::MathBinaryOpInset(char op)
 {}
 
 
-InsetBase * MathBinaryOpInset::clone() const
+auto_ptr<InsetBase> MathBinaryOpInset::clone() const
 {
-	return new MathBinaryOpInset(*this);
+	return auto_ptr<InsetBase>(new MathBinaryOpInset(*this));
 }
 
 
diff --git a/src/mathed/math_binaryopinset.h b/src/mathed/math_binaryopinset.h
index 538696e0ff..009766f611 100644
--- a/src/mathed/math_binaryopinset.h
+++ b/src/mathed/math_binaryopinset.h
@@ -14,6 +14,7 @@
 
 #include "math_nestinset.h"
 #include "math_nestinset.h"
+#include "metricsinfo.h"
 
 
 /// An inset for multiplication
@@ -22,7 +23,7 @@ public:
 	///
 	explicit MathBinaryOpInset(char op);
 	///
-	InsetBase * clone() const;
+	virtual std::auto_ptr<InsetBase> clone() const;
 	///
 	void draw(PainterInfo &, int x, int y) const;
 	///
diff --git a/src/mathed/math_gridinfo.h b/src/mathed/math_gridinfo.h
index eed8590879..9d50b53133 100644
--- a/src/mathed/math_gridinfo.h
+++ b/src/mathed/math_gridinfo.h
@@ -12,6 +12,8 @@
 #ifndef MATH_GRIDINFO_H
 #define MATH_GRIDINFO_H
 
+#include "LString.h"
+
 struct ColInfo
 {
 	ColInfo() : align('c'), rightline(0), leftline(false) {}
diff --git a/src/mathed/math_xyarrowinset.C b/src/mathed/math_xyarrowinset.C
index 26b569cd80..522d3e0d8c 100644
--- a/src/mathed/math_xyarrowinset.C
+++ b/src/mathed/math_xyarrowinset.C
@@ -27,9 +27,9 @@ MathXYArrowInset::MathXYArrowInset()
 {}
 
 
-InsetBase * MathXYArrowInset::clone() const
+auto_ptr<InsetBase> MathXYArrowInset::clone() const
 {
-	return new MathXYArrowInset(*this);
+	return auto_ptr<InsetBase>(new MathXYArrowInset(*this));
 }
 
 
diff --git a/src/mathed/math_xyarrowinset.h b/src/mathed/math_xyarrowinset.h
index 8b8e3a33a7..fe69939be4 100644
--- a/src/mathed/math_xyarrowinset.h
+++ b/src/mathed/math_xyarrowinset.h
@@ -25,7 +25,7 @@ public:
 	///
 	MathXYArrowInset();
 	///
-	InsetBase * clone() const;
+	virtual std::auto_ptr<InsetBase> clone() const;
 	///
 	void metrics(MetricsInfo & mi) const;
 	///