diff --git a/ChangeLog b/ChangeLog
index 76487df190..5601dc540d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2000-07-19  Angus Leeming  <a.leeming@ic.ac.uk>
 
+	* src/frontends/xforms/FormPrint.[Ch] : moved #include
+	form_print.h out of the header file. Replaced with forward
+	declarations of the relevant struct.
+
+	* src/frontends/xforms/FormPreferences.[Ch] : ditto for
+	form_preferences.h.
+
 	* src/commandtags.h: do not include "debug.h" which does not
 	belong there. #include it in some other places because of this
 	change. 
diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index af85d050b7..f16d0244dd 100644
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -8,6 +8,7 @@
 #include FORMS_H_LOCATION
 
 #include "FormPreferences.h"
+#include "form_preferences.h"
 #include "xform_macros.h"
 #include "input_validators.h"
 #include "LyXView.h"
diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h
index 5f8a8eba70..6014914cb0 100644
--- a/src/frontends/xforms/FormPreferences.h
+++ b/src/frontends/xforms/FormPreferences.h
@@ -18,13 +18,19 @@
 #define FORMPREFERENCES_H
 
 #include "DialogBase.h"
-#include "form_preferences.h"
 #ifdef SIGC_CXX_NAMESPACES
 using SigC::Connection;
 #endif
 
 class LyXView;
 class Dialogs;
+struct FD_form_preferences;
+struct FD_form_bind;
+struct FD_form_misc;
+struct FD_form_screen_fonts;
+struct FD_form_interface_fonts;
+struct FD_form_printer;
+struct FD_form_paths;
 
 /** This class provides an XForms implementation of the FormPreferences Dialog.
     The preferences dialog allows users to set/save their preferences.
diff --git a/src/frontends/xforms/FormPrint.C b/src/frontends/xforms/FormPrint.C
index 9371027c49..70894485c5 100644
--- a/src/frontends/xforms/FormPrint.C
+++ b/src/frontends/xforms/FormPrint.C
@@ -8,6 +8,7 @@
 #include FORMS_H_LOCATION
 
 #include "FormPrint.h"
+#include "form_print.h"
 #include "xform_macros.h"
 #include "input_validators.h"
 #include "LyXView.h"
diff --git a/src/frontends/xforms/FormPrint.h b/src/frontends/xforms/FormPrint.h
index bba61cd3cb..f9e2d7b27c 100644
--- a/src/frontends/xforms/FormPrint.h
+++ b/src/frontends/xforms/FormPrint.h
@@ -18,13 +18,13 @@
 #define FORMPRINT_H
 
 #include "DialogBase.h"
-#include "form_print.h"
 #ifdef SIGC_CXX_NAMESPACES
 using SigC::Connection;
 #endif
 
 class LyXView;
 class Dialogs;
+struct FD_form_print;
 
 /** This class provides an XForms implementation of the FormPrint Dialog.
     The print dialog allows users to print their documents.