diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index 96a9f2beb4..2579aef45a 100644
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,3 +1,13 @@
+2002-08-13  Angus Leeming  <leeming@lyx.org>
+
+	* DialogBase.h: removed.
+
+	* Dialogs.h: rearrange #includes, forward declarations and some
+	functions. Remove commented out, historical code.
+
+	* Dialogs.[Ch] (showInfo): removed.
+
+	* guiapi.h (gui_ShowInfo): removed.
 
 2002-08-13  André Pönitz <poenitz@gmx.net>
 
diff --git a/src/frontends/DialogBase.h b/src/frontends/DialogBase.h
deleted file mode 100644
index e4179d0022..0000000000
--- a/src/frontends/DialogBase.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*-
-/* DialogBase.h
- * Abstract base class of all dialogs.
- * Author: Allan Rae <rae@lyx.org>
- * This file is part of
- * ======================================================
- *
- *           LyX, The Document Processor
- *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- *           This file Copyright 2000
- *           Allan Rae
- * ======================================================
- */
-#ifndef DIALOGBASE_H
-#define DIALOGBASE_H
-
-#include <boost/utility.hpp>
-
-/** Abstract base class of all dialogs.
-    The outside world only needs some way to tell a dialog when to show, hide
-    or update itself.  A dialog then takes whatever steps are necessary to
-    satisfy that request.  Thus a dialog will have to "pull" the necessary
-    details from the core of the program.
- */
-class DialogBase : boost::noncopyable
-{
-public:
-	/**@name Constructors and Deconstructors */
-	//@{
-	/// Virtual base destructor
-	virtual ~DialogBase() {}
-	//@}
-
-	/**@name Signal Targets */
-	//@{
-	///
-	//virtual void show() = 0;
-	///
-	virtual void hide() = 0;
-	///
-	virtual void update() {};
-	///
-	virtual void close() {};
-	//@}
-};
-
-#endif // DIALOGBASE_H
diff --git a/src/frontends/Dialogs.C b/src/frontends/Dialogs.C
index 30b5260055..77e6b2e948 100644
--- a/src/frontends/Dialogs.C
+++ b/src/frontends/Dialogs.C
@@ -150,14 +150,6 @@ void Dialogs::createIndex()
 }
 
 
-void Dialogs::showInfo(InsetInfo * /*ii*/)
-{
-#if 0
-	gui_ShowInfo(ii, *dialogs_lyxview, *this);
-#endif
-}
-
-
 void Dialogs::showLogFile()
 {
 	gui_ShowLogFile(*dialogs_lyxview, *this);
diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h
index db12181ec1..97e3bb873d 100644
--- a/src/frontends/Dialogs.h
+++ b/src/frontends/Dialogs.h
@@ -1,53 +1,41 @@
 // -*- C++ -*-
-/* Dialogs.h
- * Container of all dialogs and signals a LyXView needs or uses to access them.
- * Author: Allan Rae <rae@lyx.org>
- * This file is part of
- * ======================================================
- *
- *           LyX, The Document Processor
- *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- *           This file Copyright 2000
- *           Allan Rae
- * ======================================================
+/**
+ * \file Dialogs.h
+ * Copyright 1995-2002 The LyX Team.
+ * See the file COPYING.
+ * \author Allan Rae, rae@lyx.org
  */
 
 #ifndef DIALOGS_H
 #define DIALOGS_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "LString.h"
 
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals/signal0.hpp>
 #include <boost/signals/signal1.hpp>
-#include <vector>
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "DialogBase.h"
 
 // Maybe this should be a UIFunc modelled on LyXFunc
 class LyXView;
 
-class InsetGraphics;
 class InsetBibKey;
 class InsetBibtex;
+class InsetCommand;
 class InsetError;
+class InsetERT;
 class InsetExternal;
+class InsetFloat;
+class InsetGraphics;
 class InsetInclude;
 class InsetInfo;
-class InsetTabular;
-class InsetCommand;
 class InsetMinipage;
-class InsetFloat;
-class InsetERT;
 class Paragraph;
+class InsetTabular;
 
 /** Container of all dialogs and signals a LyXView needs or uses to access them
     The list of dialog signals isn't comprehensive but should be a good guide
@@ -57,12 +45,9 @@ class Dialogs : boost::noncopyable
 {
 public:
 	///
-	typedef boost::shared_ptr<DialogBase> db_ptr;
-	/**@name Constructor */
-	//@{
+	typedef boost::shared_ptr<boost::noncopyable> db_ptr;
 	///
 	Dialogs(LyXView *);
-	//@}
 
 	/** Redraw all visible dialogs because, for example, the GUI colours
 	    have been re-mapped. */
@@ -110,10 +95,16 @@ public:
 	void showDocument();
 	///
 	void showError(InsetError *);
+	///
+	void showERT(InsetERT *);
+	///
+	void updateERT(InsetERT *);
 	/// show the external inset dialog
 	void showExternal(InsetExternal *);
 	/// show the contents of a file.
 	void showFile(string const &);
+	///
+	void showFloat(InsetFloat *);
 	/// show all forked child processes
 	void showForks();
 	///
@@ -124,8 +115,6 @@ public:
 	void showIndex(InsetCommand *);
 	///
 	void createIndex();
-	///
-	void showInfo(InsetInfo *);
 	/// show the LaTeX log or build file
 	void showLogFile();
 	/// display the top-level maths panel
@@ -135,12 +124,6 @@ public:
 	///
 	void updateMinipage(InsetMinipage *);
 	///
-	void showERT(InsetERT *);
-	///
-	void updateERT(InsetERT *);
-	///
-	void showFloat(InsetFloat *);
-	///
 	void showParagraph();
 	///
 	boost::signal0<void>  updateParagraph;
@@ -181,11 +164,6 @@ public:
 	/// show the version control log
 	void showVCLogFile();
 	//@}
-private:
-	/// Add a dialog to the vector of dialogs.
-	//void add(DialogBase *);
-	/// the dialogs being managed
-	//std::vector<db_ptr> dialogs_;
 };
 
 #endif
diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 8a84487c38..d215f24039 100644
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,34 @@
+2002-08-14  Angus Leeming  <leeming@lyx.org>
+
+	* GUI.h: class GUI deries from boost::noncopyable
+
+	* ControlButtons.h: no longer derives from DialogBase, but instead
+	derives directly from boost::noncopyable.
+
+	* ViewBase.h: derives from boost::noncopyable.
+
+	* ControlCharacter.C:
+	* ControlCommand.C:
+	* ControlConnections.C:
+	* ControlGraphics.C:
+	* ControlInclude.C:
+	* ControlParagraph.C:
+	* ControlPreamble.C:
+	* ControlPrint.C:
+	* ControlSearch.C:
+	* ControlSpellchecker.C:
+	* ControlTexinfo.C:
+	* ControlThesaurus.C:
+	rearrange #includes. Remove unnecessary ones.
+
+	* ControlError.h: add "insets/inseterror.h".
+
+	* helper_funcs.h: add necessary #includes.
+
+	* tex_helpers.[Ch]: add #pragma directives for g++.
+
+	* Makefile.am: remove src/frontends from -I list to compiler.
+
 2002-08-13  Angus Leeming  <leeming@lyx.org>
 
 	* ControlConnections.C:
diff --git a/src/frontends/controllers/ControlButtons.h b/src/frontends/controllers/ControlButtons.h
index 2e5e796cae..42e8b8376b 100644
--- a/src/frontends/controllers/ControlButtons.h
+++ b/src/frontends/controllers/ControlButtons.h
@@ -33,14 +33,14 @@
 #pragma interface
 #endif
 
-#include "DialogBase.h" // This can go eventually
+#include <boost/utility.hpp>
 
 class ViewBase;
 class ButtonControllerBase;
 
 /** Abstract base class for Controllers with a ButtonController.
  */
-class ControlButtons : public DialogBase
+class ControlButtons : boost::noncopyable
 {
 public:
 	///
diff --git a/src/frontends/controllers/ControlCharacter.C b/src/frontends/controllers/ControlCharacter.C
index 92cfdb6b74..2d88494d57 100644
--- a/src/frontends/controllers/ControlCharacter.C
+++ b/src/frontends/controllers/ControlCharacter.C
@@ -13,14 +13,16 @@
 #endif
 
 #include "ControlCharacter.h"
+
 #include "ViewBase.h"
 #include "ButtonControllerBase.h"
+
 #include "buffer.h"
-#include "Liason.h"
 #include "bufferview_funcs.h" // ToggleAndShow
 #include "gettext.h"
 #include "language.h"
 
+#include "frontends/Liason.h"
 #include "frontends/LyXView.h"
 
 using Liason::setMinibuffer;
diff --git a/src/frontends/controllers/ControlCommand.C b/src/frontends/controllers/ControlCommand.C
index 869ad31c07..00f909eaab 100644
--- a/src/frontends/controllers/ControlCommand.C
+++ b/src/frontends/controllers/ControlCommand.C
@@ -17,14 +17,11 @@
 #pragma implementation
 #endif
 
-#include "ViewBase.h"
-#include "ButtonControllerBase.h"
 #include "ControlCommand.h"
-#include "buffer.h"
-#include "Dialogs.h"
-#include "lyxfunc.h"
+
 #include "BufferView.h"
 #include "funcrequest.h"
+#include "lyxfunc.h"
 
 
 ControlCommand::ControlCommand(LyXView & lv, Dialogs & d, kb_action ac)
diff --git a/src/frontends/controllers/ControlConnections.C b/src/frontends/controllers/ControlConnections.C
index 0f99ed0641..a154f07a24 100644
--- a/src/frontends/controllers/ControlConnections.C
+++ b/src/frontends/controllers/ControlConnections.C
@@ -18,11 +18,13 @@
 #endif
 
 #include "ControlConnections.h"
+
 #include "ViewBase.h"
-#include "Dialogs.h"
+
 #include "buffer.h"
 #include "BufferView.h"
 
+#include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
 
 #include <boost/bind.hpp>
diff --git a/src/frontends/controllers/ControlError.h b/src/frontends/controllers/ControlError.h
index ee47576a06..b74f07ac19 100644
--- a/src/frontends/controllers/ControlError.h
+++ b/src/frontends/controllers/ControlError.h
@@ -21,6 +21,7 @@
 #endif
 
 #include "ControlInset.h"
+#include "insets/inseterror.h" // needed for proper instantiation of GUI<>.
 
 class InsetError;
 
diff --git a/src/frontends/controllers/ControlGraphics.C b/src/frontends/controllers/ControlGraphics.C
index f096f51ea9..b9fb684ff5 100644
--- a/src/frontends/controllers/ControlGraphics.C
+++ b/src/frontends/controllers/ControlGraphics.C
@@ -22,10 +22,9 @@
 
 #include "helper_funcs.h"
 
-#include "converter.h"
 #include "buffer.h"
 #include "BufferView.h"
-#include "Dialogs.h"
+#include "converter.h"
 #include "gettext.h"
 #include "lyxrc.h"
 
diff --git a/src/frontends/controllers/ControlInclude.C b/src/frontends/controllers/ControlInclude.C
index 0d16a4c219..7550790c0b 100644
--- a/src/frontends/controllers/ControlInclude.C
+++ b/src/frontends/controllers/ControlInclude.C
@@ -5,7 +5,7 @@
  *
  * \author Alejandro Aguilar Sierra
  * \author John Levon, moz@compsoc.man.ac.uk
- * \author Angus Leeming, a.leeming@.ac.uk
+ * \author Angus Leeming, a.leeming@ic.ac.uk
  */
 
 #include <config.h>
@@ -15,13 +15,16 @@
 #endif
 
 #include "ControlInclude.h"
-#include "Alert.h"
-#include "BufferView.h"
-#include "lyxfunc.h"
-#include "gettext.h"
+
 #include "helper_funcs.h"
-#include "lyxrc.h"
+
+#include "BufferView.h"
 #include "funcrequest.h"
+#include "gettext.h"
+#include "lyxfunc.h"
+#include "lyxrc.h"
+
+#include "frontends/Alert.h"
 
 #include "support/filetools.h"
 
diff --git a/src/frontends/controllers/ControlParagraph.C b/src/frontends/controllers/ControlParagraph.C
index 58738aed95..08750e7c13 100644
--- a/src/frontends/controllers/ControlParagraph.C
+++ b/src/frontends/controllers/ControlParagraph.C
@@ -14,16 +14,21 @@
 #endif
 
 #include "ControlParagraph.h"
+
 #include "ButtonControllerBase.h"
 #include "ViewBase.h"
-#include "ParagraphParameters.h"
-#include "Liason.h"
+
+#include "buffer.h"
 #include "BufferView.h"
 #include "gettext.h"
-#include "buffer.h"
 #include "lyxtext.h"
+#include "ParagraphParameters.h"
+
+#include "frontends/Dialogs.h"
+#include "frontends/Liason.h"
+
 #include "support/LAssert.h"
-#include "Dialogs.h"
+
 #include <boost/bind.hpp>
 
 using Liason::setMinibuffer;
@@ -32,9 +37,8 @@ using Liason::setMinibuffer;
 ControlParagraph::ControlParagraph(LyXView & lv, Dialogs & d)
 	: ControlDialogBD(lv, d), pp_(0), ininset_(false)
 {
-     d_.updateParagraph.connect(
-	     boost::bind(&ControlParagraph::changedParagraph, this));
-
+	d_.updateParagraph.connect(
+		boost::bind(&ControlParagraph::changedParagraph, this));
 }
 
 
diff --git a/src/frontends/controllers/ControlPreamble.C b/src/frontends/controllers/ControlPreamble.C
index b1eb78c120..7b068a98ba 100644
--- a/src/frontends/controllers/ControlPreamble.C
+++ b/src/frontends/controllers/ControlPreamble.C
@@ -13,11 +13,14 @@
 #endif
 
 #include "ControlPreamble.h"
+
 #include "ViewBase.h"
+
 #include "buffer.h"
-#include "Liason.h"
 #include "gettext.h"
 
+#include "frontends/Liason.h"
+
 
 ControlPreamble::ControlPreamble(LyXView & lv, Dialogs & d)
 	: ControlDialogBD(lv, d),
diff --git a/src/frontends/controllers/ControlPrint.C b/src/frontends/controllers/ControlPrint.C
index 0845ec8648..5feb5aa7c9 100644
--- a/src/frontends/controllers/ControlPrint.C
+++ b/src/frontends/controllers/ControlPrint.C
@@ -18,14 +18,18 @@
 #endif
 
 #include "ControlPrint.h"
+
 #include "ViewBase.h"
 #include "ButtonControllerBase.h"
+
 #include "buffer.h"
-#include "PrinterParams.h"
-#include "Liason.h"
-#include "helper_funcs.h"
-#include "frontends/Alert.h"
 #include "gettext.h"
+#include "helper_funcs.h"
+#include "PrinterParams.h"
+
+#include "frontends/Alert.h"
+#include "frontends/Liason.h"
+
 #include "support/LAssert.h"
 
 using Liason::printBuffer;
diff --git a/src/frontends/controllers/ControlSearch.C b/src/frontends/controllers/ControlSearch.C
index 0ccfd73f0c..5a734197df 100644
--- a/src/frontends/controllers/ControlSearch.C
+++ b/src/frontends/controllers/ControlSearch.C
@@ -18,10 +18,11 @@
 #endif
 
 #include "ControlSearch.h"
-#include "Liason.h"
-#include "lyxfind.h"
-#include "gettext.h"
 
+#include "gettext.h"
+#include "lyxfind.h"
+
+#include "frontends/Liason.h"
 
 #include "support/lstrings.h"
 
diff --git a/src/frontends/controllers/ControlSpellchecker.C b/src/frontends/controllers/ControlSpellchecker.C
index 488319605a..24c6f23b7c 100644
--- a/src/frontends/controllers/ControlSpellchecker.C
+++ b/src/frontends/controllers/ControlSpellchecker.C
@@ -13,16 +13,15 @@
 #endif
 
 #include "ControlSpellchecker.h"
-#include "buffer.h"
-#include "lyxrc.h"
-#include "BufferView.h"
-#include "lyxtext.h"
-#include "gettext.h"
-#include "language.h"
 
 #include "ViewBase.h"
-#include "Dialogs.h"
-#include "Liason.h"
+
+#include "buffer.h"
+#include "BufferView.h"
+#include "gettext.h"
+#include "language.h"
+#include "lyxrc.h"
+#include "lyxtext.h"
 
 #include "frontends/Alert.h"
 
diff --git a/src/frontends/controllers/ControlTexinfo.C b/src/frontends/controllers/ControlTexinfo.C
index 46b4c46789..16b3f32ce2 100644
--- a/src/frontends/controllers/ControlTexinfo.C
+++ b/src/frontends/controllers/ControlTexinfo.C
@@ -18,11 +18,11 @@
 #endif
 
 #include "ControlTexinfo.h"
-#include "Dialogs.h"
-#include "gettext.h"
+
 #include "helper_funcs.h"
 #include "tex_helpers.h"
 
+#include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
 
 #include "support/filetools.h" // FileSearch
diff --git a/src/frontends/controllers/ControlThesaurus.C b/src/frontends/controllers/ControlThesaurus.C
index 51db250e52..aa1234117f 100644
--- a/src/frontends/controllers/ControlThesaurus.C
+++ b/src/frontends/controllers/ControlThesaurus.C
@@ -13,9 +13,11 @@
 #endif
 
 #include "ControlThesaurus.h"
-#include "Liason.h"
-#include "lyxfind.h"
+
 #include "gettext.h"
+#include "lyxfind.h"
+
+#include "frontends/Liason.h"
 
 
 using Liason::setMinibuffer;
diff --git a/src/frontends/controllers/GUI.h b/src/frontends/controllers/GUI.h
index c54320a786..74e7c26fce 100644
--- a/src/frontends/controllers/GUI.h
+++ b/src/frontends/controllers/GUI.h
@@ -12,12 +12,13 @@
 
 #include "ButtonController.h"
 
+#include <boost/utility.hpp>
 
 /** This class makes a whole out of the disparate parts of a dialog.
  */
 template <typename Controller, typename GUIview,
 	  typename Policy,     typename GUIbc>
-class GUI {
+class GUI : boost::noncopyable {
 public:
 	///
 	GUI(LyXView & lv, Dialogs & d);
diff --git a/src/frontends/controllers/Makefile.am b/src/frontends/controllers/Makefile.am
index 1639786496..0de486400e 100644
--- a/src/frontends/controllers/Makefile.am
+++ b/src/frontends/controllers/Makefile.am
@@ -3,7 +3,6 @@ include $(top_srcdir)/config/common.am
 noinst_LTLIBRARIES = libcontrollers.la
 
 INCLUDES = -I$(top_srcdir)/src/ \
-	-I$(top_srcdir)/src/frontends/ \
 	$(SIGC_CFLAGS) $(BOOST_INCLUDES)
 
 EXTRA_DIST = ButtonController.tmpl ControlDialog.tmpl ControlInset.tmpl
diff --git a/src/frontends/controllers/ViewBase.h b/src/frontends/controllers/ViewBase.h
index c1d98ab83b..90a565ea9a 100644
--- a/src/frontends/controllers/ViewBase.h
+++ b/src/frontends/controllers/ViewBase.h
@@ -16,10 +16,12 @@
 
 #include "support/LAssert.h"
 
+#include <boost/utility.hpp>
+
 class ControlButtons;
 
 
-class ViewBase {
+class ViewBase : boost::noncopyable {
 public:
 	///
 	ViewBase() : controller_ptr_(0) {}
diff --git a/src/frontends/controllers/helper_funcs.h b/src/frontends/controllers/helper_funcs.h
index eb8e77a50c..279f5ce0a8 100644
--- a/src/frontends/controllers/helper_funcs.h
+++ b/src/frontends/controllers/helper_funcs.h
@@ -15,12 +15,15 @@
 #ifndef HELPERFUNCS_H
 #define HELPERFUNCS_H
 
-#include <utility> // pair
-
 #ifdef __GNUG__
 #pragma interface
 #endif
 
+#include "LString.h"
+
+#include <utility> // pair
+#include <vector> // pair
+
 class LyXView;
 
 /** Launch a file dialog and return the chosen file.
diff --git a/src/frontends/controllers/tex_helpers.C b/src/frontends/controllers/tex_helpers.C
index ed5c4021c4..eb74039082 100644
--- a/src/frontends/controllers/tex_helpers.C
+++ b/src/frontends/controllers/tex_helpers.C
@@ -8,6 +8,10 @@
 
 #include <config.h>
 
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
 #include "tex_helpers.h"
 
 #include "debug.h"
diff --git a/src/frontends/controllers/tex_helpers.h b/src/frontends/controllers/tex_helpers.h
index c2be1d4a70..a14ab6d41a 100644
--- a/src/frontends/controllers/tex_helpers.h
+++ b/src/frontends/controllers/tex_helpers.h
@@ -9,6 +9,10 @@
 #ifndef TEX_HELPERS_H
 #define TEX_HELPERS_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "LString.h"
 
 // build filelists of all availabe bst/cls/sty-files. done through
diff --git a/src/frontends/guiapi.h b/src/frontends/guiapi.h
index 692d0da836..fda0fe1841 100644
--- a/src/frontends/guiapi.h
+++ b/src/frontends/guiapi.h
@@ -11,7 +11,6 @@ class InsetExternal;
 class InsetFloat;
 class InsetGraphics;
 class InsetInclude;
-class InsetInfo;
 class InsetMinipage;
 class InsetTabular;
 
@@ -36,7 +35,6 @@ extern "C" {
 	void gui_ShowInclude(InsetInclude *, LyXView & lv, Dialogs & d);
 	void gui_ShowIndex(InsetCommand *, LyXView & lv, Dialogs & d);
 	void gui_CreateIndex(LyXView & lv, Dialogs & d);
-	void gui_ShowInfo(InsetInfo *, LyXView & lv, Dialogs & d);
 	void gui_ShowLogFile(LyXView & lv, Dialogs & d);
 	void gui_ShowMathPanel(LyXView & lv, Dialogs & d);
 	void gui_ShowMinipage(InsetMinipage *, LyXView & lv, Dialogs & d);
diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 8e4ad9c20b..03d7023525 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,9 +1,32 @@
+2002-08-14  Angus Leeming  <leeming@lyx.org>
+
+	* FormBaseDeprecated.h: no longer derives from DialogBase, but instead
+	derives directly from boost::noncopyable.
+	(show): made public.
+
+	* FeedbackController.h: rearrange #includes.
+
+	* FormDocument.C:
+	* FormMathsDeco.C:
+	* FormMathsDelim.C:
+	* FormMathsMatrix.C:
+	* FormMathsPanel.C:
+	* FormTabular.C: remove #include "Dialogs.h"
+
+	* FormMathsBitmap.C: remove #include "Dialogs.h", "LyXView.h".
+
+	* FormPreferences.C: rearrange #includes.
+
+	* FormTabular.h (showInset, updateInset): make public.
+
+	* FormDocument.C (build): enable the bmtable to find the right file!
+
+	* guiapi.C (gui_ShowInfo): removed.
 
 2002-08-13  André Poenitz  <poenitz@gmx.net>
 
 	* Toolbar_pimpl.C: small cleanup
 
-
 2002-08-13  Angus Leeming  <leeming@lyx.org>
 
 	* FileDialog.C:
diff --git a/src/frontends/xforms/FeedbackController.h b/src/frontends/xforms/FeedbackController.h
index 371b653d7c..5d3a93038e 100644
--- a/src/frontends/xforms/FeedbackController.h
+++ b/src/frontends/xforms/FeedbackController.h
@@ -16,13 +16,13 @@
 #ifndef FEEDBACKCONTROLLER_H
 #define FEEDBACKCONTROLLER_H
 
-#include "forms_fwd.h"
-#include "LString.h"
-
 #ifdef __GNUG__
 #pragma interface
 #endif
 
+#include "forms_fwd.h"
+#include "LString.h"
+
 class FeedbackController
 {
 public:
diff --git a/src/frontends/xforms/FormBaseDeprecated.h b/src/frontends/xforms/FormBaseDeprecated.h
index 8e514b4056..e83bacc84d 100644
--- a/src/frontends/xforms/FormBaseDeprecated.h
+++ b/src/frontends/xforms/FormBaseDeprecated.h
@@ -20,13 +20,13 @@
 #pragma interface
 #endif
 
-#include "DialogBase.h"
 #include "LString.h"
 #include "xformsBC.h"
 #include "FeedbackController.h"
 
 #include "forms_fwd.h"
 
+#include <boost/utility.hpp>
 #include <boost/signals/connection.hpp>
 
 class Buffer;
@@ -34,7 +34,7 @@ class Dialogs;
 class LyXView;
 class Tooltips;
 
-class FormBaseDeprecated : public DialogBase, public FeedbackController
+class FormBaseDeprecated : boost::noncopyable, public FeedbackController
 {
 public:
 	///
@@ -57,7 +57,8 @@ public:
 
 	Tooltips & tooltips();
 
-	friend void gui_ShowDocument(LyXView &, Dialogs &);
+	/// Create the dialog if necessary, update it and display it.
+	virtual void show();
 
 protected: // methods
 
@@ -71,8 +72,6 @@ protected: // methods
 	 */
 	virtual void redraw();
 
-	/// Create the dialog if necessary, update it and display it.
-	virtual void show();
 	/// Hide the dialog.
 	virtual void hide();
 	/// Update the dialog.
diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index 874241260b..2e75829252 100644
--- a/src/frontends/xforms/FormDocument.C
+++ b/src/frontends/xforms/FormDocument.C
@@ -18,7 +18,6 @@
 #include "FormDocument.h"
 #include "forms/form_document.h"
 #include "Alert.h"
-#include "Dialogs.h"
 #include "lyxtextclasslist.h"
 #include "combox.h"
 #include "tex-strings.h"
@@ -301,6 +300,10 @@ void FormDocument::build()
 	setPrehandler(bullets_->input_bullet_latex);
 	fl_set_input_maxchars(bullets_->input_bullet_latex, 80);
 
+	string const bmtablefile = LibFileSearch("images", "standard", "xpm");
+	fl_set_bmtable_pixmap_file(bullets_->bmtable_bullet_panel, 6, 6,
+				   bmtablefile.c_str());
+
 	bc_.addReadOnly(bullets_->radio_bullet_depth_1);
 	bc_.addReadOnly(bullets_->radio_bullet_depth_2);
 	bc_.addReadOnly(bullets_->radio_bullet_depth_3);
diff --git a/src/frontends/xforms/FormMathsBitmap.C b/src/frontends/xforms/FormMathsBitmap.C
index 81e562922d..94986dc7dc 100644
--- a/src/frontends/xforms/FormMathsBitmap.C
+++ b/src/frontends/xforms/FormMathsBitmap.C
@@ -15,8 +15,6 @@
 #endif
 
 #include "FormMathsBitmap.h"
-#include "Dialogs.h"
-#include "frontends/LyXView.h"
 #include "bmtable.h"
 #include "debug.h"
 #include "forms_gettext.h"
diff --git a/src/frontends/xforms/FormMathsDeco.C b/src/frontends/xforms/FormMathsDeco.C
index 5dc7b29ff1..41ba656ae9 100644
--- a/src/frontends/xforms/FormMathsDeco.C
+++ b/src/frontends/xforms/FormMathsDeco.C
@@ -17,7 +17,6 @@
 
 #include "FormMathsDeco.h"
 #include "forms/form_maths_deco.h"
-#include "Dialogs.h"
 #include "bmtable.h"
 #include FORMS_H_LOCATION
 
diff --git a/src/frontends/xforms/FormMathsDelim.C b/src/frontends/xforms/FormMathsDelim.C
index 432d4775a8..b921970c6f 100644
--- a/src/frontends/xforms/FormMathsDelim.C
+++ b/src/frontends/xforms/FormMathsDelim.C
@@ -17,12 +17,19 @@
 
 #include "FormMathsDelim.h"
 #include "forms/form_maths_delim.h"
-#include "Dialogs.h"
-#include "frontends/LyXView.h"
+
 #include "bmtable.h"
+
 #include "debug.h"
 #include "funcrequest.h"
+#include "lyxfunc.h"
+
+#include "frontends/LyXView.h"
+
+#include "support/lstrings.h"
+
 #include "Lsstream.h"
+
 #include FORMS_H_LOCATION
 
 #include "delim.xbm"
diff --git a/src/frontends/xforms/FormMathsMatrix.C b/src/frontends/xforms/FormMathsMatrix.C
index d15a8a9fc2..5682e967c8 100644
--- a/src/frontends/xforms/FormMathsMatrix.C
+++ b/src/frontends/xforms/FormMathsMatrix.C
@@ -15,18 +15,23 @@
 #pragma implementation
 #endif
 
-#include <algorithm>
-
 #include "FormMathsMatrix.h"
 #include "forms/form_maths_matrix.h"
-#include "Dialogs.h"
-#include "frontends/LyXView.h"
-#include "Lsstream.h"
+
 #include "funcrequest.h"
+#include "lyxfunc.h"
+
+#include "frontends/LyXView.h"
+
 #include "support/LAssert.h"
 #include "support/lyxalgo.h" // lyx::count
+
+#include "Lsstream.h"
+
 #include FORMS_H_LOCATION
 
+#include <algorithm>
+
 #ifndef CXX_GLOBAL_CSTD
 using std::strlen;
 #endif
diff --git a/src/frontends/xforms/FormMathsPanel.C b/src/frontends/xforms/FormMathsPanel.C
index dd60769731..ee9caa4d86 100644
--- a/src/frontends/xforms/FormMathsPanel.C
+++ b/src/frontends/xforms/FormMathsPanel.C
@@ -15,7 +15,6 @@
 #pragma implementation
 #endif
 
-#include "Dialogs.h"
 #include "frontends/LyXView.h"
 #include "FormMathsPanel.h"
 #include "forms/form_maths_panel.h"
diff --git a/src/frontends/xforms/FormMathsPanel.h b/src/frontends/xforms/FormMathsPanel.h
index db1af2827f..c80a09a230 100644
--- a/src/frontends/xforms/FormMathsPanel.h
+++ b/src/frontends/xforms/FormMathsPanel.h
@@ -37,7 +37,6 @@ struct FD_maths_panel;
  */
 class FormMathsPanel : public FormBaseBD {
 public:
-	friend void gui_ShowMathPanel(LyXView &, Dialogs &);
 	///
 	FormMathsPanel(LyXView *, Dialogs *);
 	///
diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index f071e37d16..e433ca981f 100644
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -14,12 +14,17 @@
 
 #include "FormPreferences.h"
 #include "forms/form_preferences.h"
-#include "Dialogs.h"
+
+#include "combox.h"
+#include "Color.h"
+#include "input_validators.h"
+#include "forms_gettext.h"
+#include "xforms_helpers.h"
+#include "helper_funcs.h"
 
 #include "buffer.h"
 #include "converter.h"
 #include "debug.h"
-#include "frontends/LyXView.h"
 #include "language.h"
 #include "frnt_lang.h"
 #include "lyxlex.h"
@@ -28,12 +33,8 @@
 #include "Lsstream.h"
 #include "funcrequest.h"
 
-#include "combox.h"
-#include "Color.h"
-#include "input_validators.h"
-#include "forms_gettext.h"
-#include "xforms_helpers.h"
-#include "helper_funcs.h"
+#include "frontends/LyXView.h"
+#include "frontends/Dialogs.h"
 
 #include "support/lyxfunctional.h"
 #include "support/lyxmanip.h"
diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h
index 335220f121..8635d362f6 100644
--- a/src/frontends/xforms/FormPreferences.h
+++ b/src/frontends/xforms/FormPreferences.h
@@ -50,7 +50,6 @@ struct FD_preferences_spelloptions;
  */
 class FormPreferences : public FormBaseBI {
 public:
-	friend void gui_ShowPreferences(LyXView &, Dialogs &);
 	///
 	FormPreferences(LyXView &, Dialogs &);
 
diff --git a/src/frontends/xforms/FormTabular.C b/src/frontends/xforms/FormTabular.C
index ac2133b2e3..3bd41556a6 100644
--- a/src/frontends/xforms/FormTabular.C
+++ b/src/frontends/xforms/FormTabular.C
@@ -17,7 +17,6 @@
 #include "FormTabular.h"
 #include "forms/form_tabular.h"
 #include "frontends/LyXView.h"
-#include "Dialogs.h"
 #include "buffer.h"
 #include "xforms_helpers.h"
 #include "lyxrc.h" // to set the default length values
diff --git a/src/frontends/xforms/FormTabular.h b/src/frontends/xforms/FormTabular.h
index c05e426bea..4c2ac7f6c7 100644
--- a/src/frontends/xforms/FormTabular.h
+++ b/src/frontends/xforms/FormTabular.h
@@ -31,12 +31,14 @@ struct FD_tabular_longtable;
  */
 class FormTabular : public FormInset {
 public:
-	friend void gui_ShowTabular(InsetTabular *, LyXView &, Dialogs &);
-	friend void gui_UpdateTabular(InsetTabular *, LyXView &, Dialogs &);
-
 	/// #FormTabular x(LyXFunc ..., Dialogs ...);#
 	FormTabular(LyXView &, Dialogs &);
 
+	/// Slot launching dialog to an existing inset
+	void showInset(InsetTabular *);
+	/// Slot launching dialog to an existing inset
+	void updateInset(InsetTabular *);
+
 private:
 	/// Pointer to the actual instantiation of the ButtonController.
 	virtual xformsBC & bc();
@@ -46,10 +48,6 @@ private:
 	/// Disconnect signals. Also perform any necessary housekeeping.
 	virtual void disconnect();
 
-	/// Slot launching dialog to an existing inset
-	void showInset(InsetTabular *);
-	/// Slot launching dialog to an existing inset
-	void updateInset(InsetTabular *);
 	/// Update dialog before showing it
 	virtual void update();
 	/// Build the dialog
diff --git a/src/frontends/xforms/guiapi.C b/src/frontends/xforms/guiapi.C
index 170da9a79c..efbe136bce 100644
--- a/src/frontends/xforms/guiapi.C
+++ b/src/frontends/xforms/guiapi.C
@@ -347,13 +347,6 @@ extern "C" {
 	}
 
 
-#if 0
-	void gui_ShowInfo(InsetInfo *, LyXView & lv, Dialogs & d)
-	{
-	}
-#endif
-
-
 	void gui_ShowLogFile(LyXView & lv, Dialogs & d)
 	{
 		static GUI<ControlLog, FormLog,