diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 617ec8c180..b9c6d9a763 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-05  Angus Leeming  <leeming@lyx.org>
+
+	* QCitation.h: 
+	* QGraphics.h: 
+	* QPrefs.h: 
+	* qscreen.[Ch]: 
+	ensure that the header files can be compiled stand-alone.
+
 2003-09-05  Angus Leeming  <leeming@lyx.org>
 
 	* *.C: strip out redundant #includes. (352 in total.)
diff --git a/src/frontends/qt2/QCitation.h b/src/frontends/qt2/QCitation.h
index 83256918d6..4bc13b8448 100644
--- a/src/frontends/qt2/QCitation.h
+++ b/src/frontends/qt2/QCitation.h
@@ -15,6 +15,7 @@
 
 
 #include "QDialogView.h"
+#include <vector>
 
 
 class QListBox;
diff --git a/src/frontends/qt2/QGraphics.h b/src/frontends/qt2/QGraphics.h
index 883290fe6b..0f9b65c4c0 100644
--- a/src/frontends/qt2/QGraphics.h
+++ b/src/frontends/qt2/QGraphics.h
@@ -15,6 +15,7 @@
 
 
 #include "QDialogView.h"
+#include <vector>
 
 
 class ControlGraphics;
diff --git a/src/frontends/qt2/QPrefs.h b/src/frontends/qt2/QPrefs.h
index 8835acc473..3559ac2e47 100644
--- a/src/frontends/qt2/QPrefs.h
+++ b/src/frontends/qt2/QPrefs.h
@@ -15,9 +15,9 @@
 
 #include "converter.h"
 #include "format.h"
+#include "ControlPrefs.h"
 
 #include "Qt2Base.h"
-#include "ControlPrefs.h"
 
 #include <vector>
 
diff --git a/src/frontends/qt2/qscreen.C b/src/frontends/qt2/qscreen.C
index 4efd6dcbaa..d3489afec6 100644
--- a/src/frontends/qt2/qscreen.C
+++ b/src/frontends/qt2/qscreen.C
@@ -45,6 +45,12 @@ QScreen::~QScreen()
 }
 
 
+WorkArea & QScreen::workarea() const
+{
+	return owner_;
+}
+
+
 void QScreen::repaint()
 {
 	QWidget * content = owner_.getContent();
diff --git a/src/frontends/qt2/qscreen.h b/src/frontends/qt2/qscreen.h
index d0cd247ce8..1017ba0aa5 100644
--- a/src/frontends/qt2/qscreen.h
+++ b/src/frontends/qt2/qscreen.h
@@ -17,6 +17,7 @@
 #include <qrect.h>
 #include <boost/scoped_ptr.hpp>
 
+class QWorkArea;
 class WorkArea;
 
 
@@ -31,7 +32,7 @@ public:
 
 protected:
 	/// get the work area
-	virtual WorkArea & workarea() const { return owner_; }
+	virtual WorkArea & workarea() const;
 
 	/// repaint the whole content immediately
 	void repaint();