diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 9060c41502..52b590aac2 100644
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -532,7 +532,7 @@
 
 2004-01-25  Angus Leeming  <leeming@lyx.org>
 
-	* ControlSearch.[Ch]: derive from Dialog::Controller rather than
+	* ControlSearch.[Ch]: derive from Controller rather than
 	the deprecated ControlDialogBD.
 
 2004-01-08  Alfredo Braunstein  <abraunst@lyx.org>
diff --git a/src/frontends/controllers/ControlBox.cpp b/src/frontends/controllers/ControlBox.cpp
index fd7a29905e..a468cca5c2 100644
--- a/src/frontends/controllers/ControlBox.cpp
+++ b/src/frontends/controllers/ControlBox.cpp
@@ -23,7 +23,7 @@ namespace lyx {
 namespace frontend {
 
 ControlBox::ControlBox(Dialog & parent)
-	: Dialog::Controller(parent)
+	: Controller(parent)
 {}
 
 
diff --git a/src/frontends/controllers/ControlBox.h b/src/frontends/controllers/ControlBox.h
index 85b92a0033..e13d691751 100644
--- a/src/frontends/controllers/ControlBox.h
+++ b/src/frontends/controllers/ControlBox.h
@@ -22,7 +22,7 @@ class InsetBoxParams;
 
 namespace frontend {
 
-class ControlBox : public Dialog::Controller {
+class ControlBox : public Controller {
 public:
 	///
 	ControlBox(Dialog &);
diff --git a/src/frontends/controllers/ControlBranch.cpp b/src/frontends/controllers/ControlBranch.cpp
index e961723e1e..a08b72ea8b 100644
--- a/src/frontends/controllers/ControlBranch.cpp
+++ b/src/frontends/controllers/ControlBranch.cpp
@@ -27,7 +27,7 @@ namespace lyx {
 namespace frontend {
 
 ControlBranch::ControlBranch(Dialog & parent)
-	: Dialog::Controller(parent)
+	: Controller(parent)
 {}
 
 
diff --git a/src/frontends/controllers/ControlBranch.h b/src/frontends/controllers/ControlBranch.h
index 33e470c85b..78a537ec01 100644
--- a/src/frontends/controllers/ControlBranch.h
+++ b/src/frontends/controllers/ControlBranch.h
@@ -23,7 +23,7 @@ class InsetBranchParams;
 
 namespace frontend {
 
-class ControlBranch : public Dialog::Controller {
+class ControlBranch : public Controller {
 public:
 	///
 	ControlBranch(Dialog &);
diff --git a/src/frontends/controllers/ControlChanges.cpp b/src/frontends/controllers/ControlChanges.cpp
index a394498703..6014176540 100644
--- a/src/frontends/controllers/ControlChanges.cpp
+++ b/src/frontends/controllers/ControlChanges.cpp
@@ -31,7 +31,7 @@ namespace frontend {
 
 
 ControlChanges::ControlChanges(Dialog & parent)
-	: Dialog::Controller(parent)
+	: Controller(parent)
 {}
 
 
diff --git a/src/frontends/controllers/ControlChanges.h b/src/frontends/controllers/ControlChanges.h
index de5b6cf6ff..8b600b3b8a 100644
--- a/src/frontends/controllers/ControlChanges.h
+++ b/src/frontends/controllers/ControlChanges.h
@@ -23,7 +23,7 @@ namespace frontend {
 /**
  * A controller for the merge changes dialog.
  */
-class ControlChanges : public Dialog::Controller {
+class ControlChanges : public Controller {
 public:
 	///
 	ControlChanges(Dialog &);
diff --git a/src/frontends/controllers/ControlCharacter.cpp b/src/frontends/controllers/ControlCharacter.cpp
index fe9444be39..d6e1f8f966 100644
--- a/src/frontends/controllers/ControlCharacter.cpp
+++ b/src/frontends/controllers/ControlCharacter.cpp
@@ -26,7 +26,7 @@ namespace lyx {
 namespace frontend {
 
 ControlCharacter::ControlCharacter(Dialog & parent)
-	: Dialog::Controller(parent),
+	: Controller(parent),
 	  font_(0), toggleall_(false), reset_lang_(false)
 {}
 
diff --git a/src/frontends/controllers/ControlCharacter.h b/src/frontends/controllers/ControlCharacter.h
index b97dd69008..cfe5cd54fc 100644
--- a/src/frontends/controllers/ControlCharacter.h
+++ b/src/frontends/controllers/ControlCharacter.h
@@ -23,7 +23,7 @@ class Color_color;
 
 namespace frontend {
 
-class ControlCharacter : public Dialog::Controller {
+class ControlCharacter : public Controller {
 public:
 	///
 	ControlCharacter(Dialog &);
diff --git a/src/frontends/controllers/ControlCommand.cpp b/src/frontends/controllers/ControlCommand.cpp
index df6c8a1f23..5fe84f8161 100644
--- a/src/frontends/controllers/ControlCommand.cpp
+++ b/src/frontends/controllers/ControlCommand.cpp
@@ -23,7 +23,7 @@ namespace frontend {
 
 ControlCommand::ControlCommand(Dialog & dialog, string const & command_name,
 			       string const & lfun_name)
-	: Dialog::Controller(dialog), params_(command_name),
+	: Controller(dialog), params_(command_name),
 	  lfun_name_(lfun_name)
 {}
 
diff --git a/src/frontends/controllers/ControlCommand.h b/src/frontends/controllers/ControlCommand.h
index 36ca7e9260..0bd7ebb33a 100644
--- a/src/frontends/controllers/ControlCommand.h
+++ b/src/frontends/controllers/ControlCommand.h
@@ -22,7 +22,7 @@
 namespace lyx {
 namespace frontend {
 
-class ControlCommand : public Dialog::Controller {
+class ControlCommand : public Controller {
 public:
 	/** LFUN_INSET_APPLY requires a name, "citation", "ref" etc so that
 	    it knows what to do with the rest of the contents.
diff --git a/src/frontends/controllers/ControlDocument.cpp b/src/frontends/controllers/ControlDocument.cpp
index d2ef46d55b..77f502efae 100644
--- a/src/frontends/controllers/ControlDocument.cpp
+++ b/src/frontends/controllers/ControlDocument.cpp
@@ -50,7 +50,7 @@ char const * ControlDocument::fontfamilies_gui[5] = {
 
 
 ControlDocument::ControlDocument(Dialog & parent)
-	: Dialog::Controller(parent)
+	: Controller(parent)
 {}
 
 
diff --git a/src/frontends/controllers/ControlDocument.h b/src/frontends/controllers/ControlDocument.h
index 2e725bfa0a..cd8f6fa1ec 100644
--- a/src/frontends/controllers/ControlDocument.h
+++ b/src/frontends/controllers/ControlDocument.h
@@ -28,7 +28,7 @@ typedef void const * BufferId;
 
 /** A controller for Document dialogs.
  */
-class ControlDocument : public Dialog::Controller {
+class ControlDocument : public Controller {
 public:
 	/// font family names for BufferParams::fontsDefaultFamily
 	static char const * const fontfamilies[5];
diff --git a/src/frontends/controllers/ControlERT.cpp b/src/frontends/controllers/ControlERT.cpp
index 48c92e1423..601a68af9e 100644
--- a/src/frontends/controllers/ControlERT.cpp
+++ b/src/frontends/controllers/ControlERT.cpp
@@ -21,7 +21,7 @@ namespace lyx {
 namespace frontend {
 
 ControlERT::ControlERT(Dialog & parent)
-	: Dialog::Controller(parent), status_(InsetERT::Collapsed)
+	: Controller(parent), status_(InsetERT::Collapsed)
 {}
 
 
diff --git a/src/frontends/controllers/ControlERT.h b/src/frontends/controllers/ControlERT.h
index b2b0d28693..7f3d5da7f0 100644
--- a/src/frontends/controllers/ControlERT.h
+++ b/src/frontends/controllers/ControlERT.h
@@ -20,7 +20,7 @@
 namespace lyx {
 namespace frontend {
 
-class ControlERT : public Dialog::Controller {
+class ControlERT : public Controller {
 public:
 	///
 	ControlERT(Dialog &);
diff --git a/src/frontends/controllers/ControlEmbeddedFiles.cpp b/src/frontends/controllers/ControlEmbeddedFiles.cpp
index 707a4609c6..e73d286642 100644
--- a/src/frontends/controllers/ControlEmbeddedFiles.cpp
+++ b/src/frontends/controllers/ControlEmbeddedFiles.cpp
@@ -35,7 +35,7 @@ using support::FileFilterList;
 namespace frontend {
 
 ControlEmbeddedFiles::ControlEmbeddedFiles(Dialog & parent)
-	: Dialog::Controller(parent)
+	: Controller(parent)
 {}
 
 
diff --git a/src/frontends/controllers/ControlEmbeddedFiles.h b/src/frontends/controllers/ControlEmbeddedFiles.h
index d0f9eabd69..79d0885a3b 100644
--- a/src/frontends/controllers/ControlEmbeddedFiles.h
+++ b/src/frontends/controllers/ControlEmbeddedFiles.h
@@ -19,7 +19,7 @@ namespace lyx {
 
 namespace frontend {
 
-class ControlEmbeddedFiles : public Dialog::Controller {
+class ControlEmbeddedFiles : public Controller {
 public:
 	///
 	ControlEmbeddedFiles(Dialog &);
diff --git a/src/frontends/controllers/ControlErrorList.cpp b/src/frontends/controllers/ControlErrorList.cpp
index 8686dab62c..431cd6dbb2 100644
--- a/src/frontends/controllers/ControlErrorList.cpp
+++ b/src/frontends/controllers/ControlErrorList.cpp
@@ -34,7 +34,7 @@ namespace lyx {
 namespace frontend {
 
 ControlErrorList::ControlErrorList(Dialog & d)
-	: Dialog::Controller(d)
+	: Controller(d)
 {}
 
 
diff --git a/src/frontends/controllers/ControlErrorList.h b/src/frontends/controllers/ControlErrorList.h
index 3670ab6987..a26eebdd9b 100644
--- a/src/frontends/controllers/ControlErrorList.h
+++ b/src/frontends/controllers/ControlErrorList.h
@@ -20,7 +20,7 @@ namespace frontend {
 
 /** A controller for the ErrorList dialog.
  */
-class ControlErrorList : public Dialog::Controller {
+class ControlErrorList : public Controller {
 public:
 	///
 	ControlErrorList(Dialog & parent);
diff --git a/src/frontends/controllers/ControlExternal.cpp b/src/frontends/controllers/ControlExternal.cpp
index 2f7f4eab0d..06874eb2ee 100644
--- a/src/frontends/controllers/ControlExternal.cpp
+++ b/src/frontends/controllers/ControlExternal.cpp
@@ -46,7 +46,7 @@ namespace frontend {
 
 
 ControlExternal::ControlExternal(Dialog & parent)
-	: Dialog::Controller(parent),
+	: Controller(parent),
 	  bb_changed_(false)
 {}
 
diff --git a/src/frontends/controllers/ControlExternal.h b/src/frontends/controllers/ControlExternal.h
index a2afd568a4..1c457f724e 100644
--- a/src/frontends/controllers/ControlExternal.h
+++ b/src/frontends/controllers/ControlExternal.h
@@ -38,7 +38,7 @@ class RotationDataType;
 
 namespace frontend {
 
-class ControlExternal : public Dialog::Controller {
+class ControlExternal : public Controller {
 public:
 	///
 	ControlExternal(Dialog &);
diff --git a/src/frontends/controllers/ControlFloat.cpp b/src/frontends/controllers/ControlFloat.cpp
index 036b7c4540..a6799147a6 100644
--- a/src/frontends/controllers/ControlFloat.cpp
+++ b/src/frontends/controllers/ControlFloat.cpp
@@ -21,7 +21,7 @@ namespace lyx {
 namespace frontend {
 
 ControlFloat::ControlFloat(Dialog & parent)
-	: Dialog::Controller(parent)
+	: Controller(parent)
 {}
 
 
diff --git a/src/frontends/controllers/ControlFloat.h b/src/frontends/controllers/ControlFloat.h
index dcc7eecd73..1cb285afff 100644
--- a/src/frontends/controllers/ControlFloat.h
+++ b/src/frontends/controllers/ControlFloat.h
@@ -20,7 +20,7 @@ class InsetFloatParams;
 
 namespace frontend {
 
-class ControlFloat : public Dialog::Controller {
+class ControlFloat : public Controller {
 public:
 	///
 	ControlFloat(Dialog &);
diff --git a/src/frontends/controllers/ControlGraphics.cpp b/src/frontends/controllers/ControlGraphics.cpp
index 960e99b75e..8f86c54db6 100644
--- a/src/frontends/controllers/ControlGraphics.cpp
+++ b/src/frontends/controllers/ControlGraphics.cpp
@@ -54,7 +54,7 @@ namespace frontend {
 
 
 ControlGraphics::ControlGraphics(Dialog & parent)
-	: Dialog::Controller(parent)
+	: Controller(parent)
 {}
 
 
diff --git a/src/frontends/controllers/ControlGraphics.h b/src/frontends/controllers/ControlGraphics.h
index ea43f88d6c..6ea6941119 100644
--- a/src/frontends/controllers/ControlGraphics.h
+++ b/src/frontends/controllers/ControlGraphics.h
@@ -33,7 +33,7 @@ class LyXView;
 
 /** A controller for Graphics dialogs.
  */
-class ControlGraphics : public Dialog::Controller {
+class ControlGraphics : public Controller {
 public:
 	///
 	ControlGraphics(Dialog &);
diff --git a/src/frontends/controllers/ControlInclude.cpp b/src/frontends/controllers/ControlInclude.cpp
index c42c98eded..1b92758743 100644
--- a/src/frontends/controllers/ControlInclude.cpp
+++ b/src/frontends/controllers/ControlInclude.cpp
@@ -43,7 +43,7 @@ using support::onlyPath;
 namespace frontend {
 
 ControlInclude::ControlInclude(Dialog & parent)
-	: Dialog::Controller(parent), params_("include")
+	: Controller(parent), params_("include")
 {}
 
 
diff --git a/src/frontends/controllers/ControlInclude.h b/src/frontends/controllers/ControlInclude.h
index 955321de18..4b140d84ad 100644
--- a/src/frontends/controllers/ControlInclude.h
+++ b/src/frontends/controllers/ControlInclude.h
@@ -25,7 +25,7 @@ namespace frontend {
 
 /** A controller for the Include file dialog.
  */
-class ControlInclude : public Dialog::Controller {
+class ControlInclude : public Controller {
 public:
 	///
 	enum Type {
diff --git a/src/frontends/controllers/ControlListings.cpp b/src/frontends/controllers/ControlListings.cpp
index dc4e56dd39..3bdc3a8760 100644
--- a/src/frontends/controllers/ControlListings.cpp
+++ b/src/frontends/controllers/ControlListings.cpp
@@ -22,7 +22,7 @@ namespace lyx {
 namespace frontend {
 
 ControlListings::ControlListings(Dialog & parent)
-	: Dialog::Controller(parent), params_()
+	: Controller(parent), params_()
 {}
 
 
diff --git a/src/frontends/controllers/ControlListings.h b/src/frontends/controllers/ControlListings.h
index 8e679eed94..9b2d051a08 100644
--- a/src/frontends/controllers/ControlListings.h
+++ b/src/frontends/controllers/ControlListings.h
@@ -21,7 +21,7 @@ class InsetListingsParams;
 
 namespace frontend {
 
-class ControlListings : public Dialog::Controller  {
+class ControlListings : public Controller  {
 public:
 	///
 	ControlListings(Dialog &);
diff --git a/src/frontends/controllers/ControlLog.cpp b/src/frontends/controllers/ControlLog.cpp
index d598cfe7a0..437cd969aa 100644
--- a/src/frontends/controllers/ControlLog.cpp
+++ b/src/frontends/controllers/ControlLog.cpp
@@ -30,7 +30,7 @@ using support::FileName;
 namespace frontend {
 
 ControlLog::ControlLog(Dialog & parent)
-	: Dialog::Controller(parent),
+	: Controller(parent),
 	  type_(LatexLog)
 {}
 
diff --git a/src/frontends/controllers/ControlLog.h b/src/frontends/controllers/ControlLog.h
index 0f4a8e0ad2..de76eafdae 100644
--- a/src/frontends/controllers/ControlLog.h
+++ b/src/frontends/controllers/ControlLog.h
@@ -23,7 +23,7 @@ namespace frontend {
 /**
  * A controller for a read-only text browser.
  */
-class ControlLog : public Dialog::Controller {
+class ControlLog : public Controller {
 public:
 	///
 	ControlLog(Dialog &);
diff --git a/src/frontends/controllers/ControlMath.cpp b/src/frontends/controllers/ControlMath.cpp
index cd62f2548b..5beb07624f 100644
--- a/src/frontends/controllers/ControlMath.cpp
+++ b/src/frontends/controllers/ControlMath.cpp
@@ -30,7 +30,7 @@ using support::subst;
 namespace frontend {
 
 ControlMath::ControlMath(Dialog & dialog)
-	: Dialog::Controller(dialog)
+	: Controller(dialog)
 {
 	// FIXME: Ideally, those unicode codepoints would be defined
 	// in "lib/symbols". Unfortunately, some of those are already
diff --git a/src/frontends/controllers/ControlMath.h b/src/frontends/controllers/ControlMath.h
index b4318e4017..68e3fb0ed7 100644
--- a/src/frontends/controllers/ControlMath.h
+++ b/src/frontends/controllers/ControlMath.h
@@ -32,7 +32,7 @@ struct MathSymbol {
 	Font::FONT_FAMILY fontfamily;
 };
 
-class ControlMath : public Dialog::Controller {
+class ControlMath : public Controller {
 public:
 	ControlMath(Dialog &);
 
diff --git a/src/frontends/controllers/ControlNote.cpp b/src/frontends/controllers/ControlNote.cpp
index fb264bee50..de25bf67df 100644
--- a/src/frontends/controllers/ControlNote.cpp
+++ b/src/frontends/controllers/ControlNote.cpp
@@ -22,7 +22,7 @@ namespace lyx {
 namespace frontend {
 
 ControlNote::ControlNote(Dialog & parent)
-	: Dialog::Controller(parent)
+	: Controller(parent)
 {}
 
 
diff --git a/src/frontends/controllers/ControlNote.h b/src/frontends/controllers/ControlNote.h
index 78bca29f90..966873467f 100644
--- a/src/frontends/controllers/ControlNote.h
+++ b/src/frontends/controllers/ControlNote.h
@@ -22,7 +22,7 @@ class InsetNoteParams;
 
 namespace frontend {
 
-class ControlNote : public Dialog::Controller {
+class ControlNote : public Controller {
 public:
 	///
 	ControlNote(Dialog &);
diff --git a/src/frontends/controllers/ControlParagraph.cpp b/src/frontends/controllers/ControlParagraph.cpp
index b2e262d0e9..1e56a707f9 100644
--- a/src/frontends/controllers/ControlParagraph.cpp
+++ b/src/frontends/controllers/ControlParagraph.cpp
@@ -31,7 +31,7 @@ namespace lyx {
 namespace frontend {
 
 ControlParagraph::ControlParagraph(Dialog & parent)
-	: Dialog::Controller(parent), ininset_(false)
+	: Controller(parent), ininset_(false)
 {}
 
 
diff --git a/src/frontends/controllers/ControlParagraph.h b/src/frontends/controllers/ControlParagraph.h
index 3dda1ede54..f7bdac472b 100644
--- a/src/frontends/controllers/ControlParagraph.h
+++ b/src/frontends/controllers/ControlParagraph.h
@@ -21,7 +21,7 @@ class ParagraphParameters;
 
 namespace frontend {
 
-class ControlParagraph : public Dialog::Controller {
+class ControlParagraph : public Controller {
 public:
 	///
 	ControlParagraph(Dialog &);
diff --git a/src/frontends/controllers/ControlPrefs.cpp b/src/frontends/controllers/ControlPrefs.cpp
index 7a20255e35..59f236dd61 100644
--- a/src/frontends/controllers/ControlPrefs.cpp
+++ b/src/frontends/controllers/ControlPrefs.cpp
@@ -37,7 +37,7 @@ namespace frontend {
 
 
 ControlPrefs::ControlPrefs(Dialog & parent)
-	: Dialog::Controller(parent),
+	: Controller(parent),
 	  update_screen_font_(false)
 {}
 
diff --git a/src/frontends/controllers/ControlPrefs.h b/src/frontends/controllers/ControlPrefs.h
index 205fa0be3f..e2730c5cdf 100644
--- a/src/frontends/controllers/ControlPrefs.h
+++ b/src/frontends/controllers/ControlPrefs.h
@@ -27,7 +27,7 @@ class Color_color;
 
 namespace frontend {
 
-class ControlPrefs : public Dialog::Controller {
+class ControlPrefs : public Controller {
 public:
 	ControlPrefs(Dialog &);
 	///
diff --git a/src/frontends/controllers/ControlPrint.cpp b/src/frontends/controllers/ControlPrint.cpp
index 21236906ee..fc775a5758 100644
--- a/src/frontends/controllers/ControlPrint.cpp
+++ b/src/frontends/controllers/ControlPrint.cpp
@@ -35,7 +35,7 @@ namespace frontend {
 
 
 ControlPrint::ControlPrint(Dialog & parent)
-	: Dialog::Controller(parent),
+	: Controller(parent),
 	  params_(0)
 {}
 
diff --git a/src/frontends/controllers/ControlPrint.h b/src/frontends/controllers/ControlPrint.h
index f6023ae0df..143ef1bcd0 100644
--- a/src/frontends/controllers/ControlPrint.h
+++ b/src/frontends/controllers/ControlPrint.h
@@ -27,7 +27,7 @@ namespace frontend {
 
 /** A controller for Print dialogs.
  */
-class ControlPrint : public Dialog::Controller {
+class ControlPrint : public Controller {
 public:
 	///
 	ControlPrint(Dialog &);
diff --git a/src/frontends/controllers/ControlSearch.cpp b/src/frontends/controllers/ControlSearch.cpp
index a9189c1415..19a56d9ae9 100644
--- a/src/frontends/controllers/ControlSearch.cpp
+++ b/src/frontends/controllers/ControlSearch.cpp
@@ -19,7 +19,7 @@ namespace lyx {
 namespace frontend {
 
 ControlSearch::ControlSearch(Dialog & parent)
-	: Dialog::Controller(parent)
+	: Controller(parent)
 {}
 
 
diff --git a/src/frontends/controllers/ControlSearch.h b/src/frontends/controllers/ControlSearch.h
index 5758dd5ae9..dffd467746 100644
--- a/src/frontends/controllers/ControlSearch.h
+++ b/src/frontends/controllers/ControlSearch.h
@@ -19,7 +19,7 @@ namespace frontend {
 
 /** A controller for Search dialogs.
  */
-class ControlSearch : public Dialog::Controller {
+class ControlSearch : public Controller {
 public:
 	ControlSearch(Dialog &);
 
diff --git a/src/frontends/controllers/ControlSendto.cpp b/src/frontends/controllers/ControlSendto.cpp
index a3c952767a..d8bbbb714b 100644
--- a/src/frontends/controllers/ControlSendto.cpp
+++ b/src/frontends/controllers/ControlSendto.cpp
@@ -32,7 +32,7 @@ namespace frontend {
 
 
 ControlSendto::ControlSendto(Dialog & parent)
-	: Dialog::Controller(parent)
+	: Controller(parent)
 {}
 
 
diff --git a/src/frontends/controllers/ControlSendto.h b/src/frontends/controllers/ControlSendto.h
index d49c902ae3..870034933f 100644
--- a/src/frontends/controllers/ControlSendto.h
+++ b/src/frontends/controllers/ControlSendto.h
@@ -24,7 +24,7 @@ namespace frontend {
 
 /** A controller for the Custom Export dialogs.
  */
-class ControlSendto : public Dialog::Controller {
+class ControlSendto : public Controller {
 public:
 	///
 	ControlSendto(Dialog &);
diff --git a/src/frontends/controllers/ControlShowFile.cpp b/src/frontends/controllers/ControlShowFile.cpp
index 7cec00aa9a..0bd0ebedc7 100644
--- a/src/frontends/controllers/ControlShowFile.cpp
+++ b/src/frontends/controllers/ControlShowFile.cpp
@@ -25,7 +25,7 @@ namespace frontend {
 
 
 ControlShowFile::ControlShowFile(Dialog & parent)
-	: Dialog::Controller(parent)
+	: Controller(parent)
 {}
 
 
diff --git a/src/frontends/controllers/ControlShowFile.h b/src/frontends/controllers/ControlShowFile.h
index 8aae5a3fd9..4f160b3dbc 100644
--- a/src/frontends/controllers/ControlShowFile.h
+++ b/src/frontends/controllers/ControlShowFile.h
@@ -21,7 +21,7 @@ namespace frontend {
 
 /** A controller for the ShowFile dialog. */
 
-class ControlShowFile : public Dialog::Controller {
+class ControlShowFile : public Controller {
 public:
 	///
 	ControlShowFile(Dialog &);
diff --git a/src/frontends/controllers/ControlSpellchecker.cpp b/src/frontends/controllers/ControlSpellchecker.cpp
index ba459536ad..4594a111ca 100644
--- a/src/frontends/controllers/ControlSpellchecker.cpp
+++ b/src/frontends/controllers/ControlSpellchecker.cpp
@@ -59,7 +59,7 @@ namespace frontend {
 
 
 ControlSpellchecker::ControlSpellchecker(Dialog & parent)
-	: Dialog::Controller(parent), exitEarly_(false),
+	: Controller(parent), exitEarly_(false),
 	  oldval_(0), newvalue_(0), count_(0)
 {
 }
diff --git a/src/frontends/controllers/ControlSpellchecker.h b/src/frontends/controllers/ControlSpellchecker.h
index 6b19f66175..d3caa3a9d0 100644
--- a/src/frontends/controllers/ControlSpellchecker.h
+++ b/src/frontends/controllers/ControlSpellchecker.h
@@ -24,7 +24,7 @@ namespace frontend {
 
 /** A controller for Spellchecker dialogs.
  */
-class ControlSpellchecker : public Dialog::Controller {
+class ControlSpellchecker : public Controller {
 public:
 	enum State {
 		SPELL_PROGRESSED, //< update progress bar
diff --git a/src/frontends/controllers/ControlTabular.cpp b/src/frontends/controllers/ControlTabular.cpp
index 6ae68801d2..c8d81507f0 100644
--- a/src/frontends/controllers/ControlTabular.cpp
+++ b/src/frontends/controllers/ControlTabular.cpp
@@ -24,7 +24,7 @@ namespace lyx {
 namespace frontend {
 
 ControlTabular::ControlTabular(Dialog & parent)
-	: Dialog::Controller(parent), active_cell_(Tabular::npos)
+	: Controller(parent), active_cell_(Tabular::npos)
 {}
 
 
diff --git a/src/frontends/controllers/ControlTabular.h b/src/frontends/controllers/ControlTabular.h
index 54da9d0898..670d7e25b9 100644
--- a/src/frontends/controllers/ControlTabular.h
+++ b/src/frontends/controllers/ControlTabular.h
@@ -22,7 +22,7 @@
 namespace lyx {
 namespace frontend {
 
-class ControlTabular : public Dialog::Controller {
+class ControlTabular : public Controller {
 public:
 
 	ControlTabular(Dialog &);
diff --git a/src/frontends/controllers/ControlTabularCreate.cpp b/src/frontends/controllers/ControlTabularCreate.cpp
index 0d8747b538..5e7320927e 100644
--- a/src/frontends/controllers/ControlTabularCreate.cpp
+++ b/src/frontends/controllers/ControlTabularCreate.cpp
@@ -22,7 +22,7 @@ namespace lyx {
 namespace frontend {
 
 ControlTabularCreate::ControlTabularCreate(Dialog & parent)
-	: Dialog::Controller(parent)
+	: Controller(parent)
 {}
 
 
diff --git a/src/frontends/controllers/ControlTabularCreate.h b/src/frontends/controllers/ControlTabularCreate.h
index c1da77bf16..fde42ec9d8 100644
--- a/src/frontends/controllers/ControlTabularCreate.h
+++ b/src/frontends/controllers/ControlTabularCreate.h
@@ -20,7 +20,7 @@ namespace frontend {
 
 /** A controller for the TabularCreate Dialog.
  */
-class ControlTabularCreate : public Dialog::Controller {
+class ControlTabularCreate : public Controller {
 public:
 	///
 	ControlTabularCreate(Dialog &);
diff --git a/src/frontends/controllers/ControlTexinfo.cpp b/src/frontends/controllers/ControlTexinfo.cpp
index c3d58a6293..44c5e82861 100644
--- a/src/frontends/controllers/ControlTexinfo.cpp
+++ b/src/frontends/controllers/ControlTexinfo.cpp
@@ -62,7 +62,7 @@ void getTexFileList(ControlTexinfo::texFileSuffix type,
 
 
 ControlTexinfo::ControlTexinfo(Dialog & parent)
-	: Dialog::Controller(parent)
+	: Controller(parent)
 {}
 
 
diff --git a/src/frontends/controllers/ControlTexinfo.h b/src/frontends/controllers/ControlTexinfo.h
index 7bb40282e4..f0165a09a3 100644
--- a/src/frontends/controllers/ControlTexinfo.h
+++ b/src/frontends/controllers/ControlTexinfo.h
@@ -21,7 +21,7 @@ namespace frontend {
 
 /** A controller for Texinfo dialogs. */
 
-class ControlTexinfo : public Dialog::Controller {
+class ControlTexinfo : public Controller {
 public:
 	///
 	ControlTexinfo(Dialog &);
diff --git a/src/frontends/controllers/ControlThesaurus.cpp b/src/frontends/controllers/ControlThesaurus.cpp
index b2f706e5d2..44bd0693ab 100644
--- a/src/frontends/controllers/ControlThesaurus.cpp
+++ b/src/frontends/controllers/ControlThesaurus.cpp
@@ -21,7 +21,7 @@ namespace lyx {
 namespace frontend {
 
 ControlThesaurus::ControlThesaurus(Dialog & parent)
-	: Dialog::Controller(parent)
+	: Controller(parent)
 {}
 
 
diff --git a/src/frontends/controllers/ControlThesaurus.h b/src/frontends/controllers/ControlThesaurus.h
index ba2440a032..9bbd936446 100644
--- a/src/frontends/controllers/ControlThesaurus.h
+++ b/src/frontends/controllers/ControlThesaurus.h
@@ -21,7 +21,7 @@ namespace frontend {
 
 /** A controller for Thesaurus dialogs.
  */
-class ControlThesaurus : public Dialog::Controller {
+class ControlThesaurus : public Controller {
 public:
 	///
 	ControlThesaurus(Dialog &);
diff --git a/src/frontends/controllers/ControlVSpace.cpp b/src/frontends/controllers/ControlVSpace.cpp
index e642fedd05..a487da11e6 100644
--- a/src/frontends/controllers/ControlVSpace.cpp
+++ b/src/frontends/controllers/ControlVSpace.cpp
@@ -24,7 +24,7 @@ namespace lyx {
 namespace frontend {
 
 ControlVSpace::ControlVSpace(Dialog & parent)
-	: Dialog::Controller(parent)
+	: Controller(parent)
 {}
 
 
diff --git a/src/frontends/controllers/ControlVSpace.h b/src/frontends/controllers/ControlVSpace.h
index 5dd5cf3165..104a3ad304 100644
--- a/src/frontends/controllers/ControlVSpace.h
+++ b/src/frontends/controllers/ControlVSpace.h
@@ -19,7 +19,7 @@
 namespace lyx {
 namespace frontend {
 
-class ControlVSpace : public Dialog::Controller {
+class ControlVSpace : public Controller {
 public:
 	///
 	ControlVSpace(Dialog &);
diff --git a/src/frontends/controllers/ControlViewSource.cpp b/src/frontends/controllers/ControlViewSource.cpp
index ededb0d98e..c09cb85794 100644
--- a/src/frontends/controllers/ControlViewSource.cpp
+++ b/src/frontends/controllers/ControlViewSource.cpp
@@ -28,7 +28,7 @@ namespace lyx {
 namespace frontend {
 
 ControlViewSource::ControlViewSource(Dialog & parent)
-	: Dialog::Controller(parent)
+	: Controller(parent)
 {}
 
 
diff --git a/src/frontends/controllers/ControlViewSource.h b/src/frontends/controllers/ControlViewSource.h
index c2a3a2b642..19b5839d59 100644
--- a/src/frontends/controllers/ControlViewSource.h
+++ b/src/frontends/controllers/ControlViewSource.h
@@ -22,7 +22,7 @@ namespace frontend {
 /**
  * A controller for a read-only text browser.
  */
-class ControlViewSource : public Dialog::Controller {
+class ControlViewSource : public Controller {
 public:
 	///
 	ControlViewSource(Dialog &);
diff --git a/src/frontends/controllers/ControlWrap.cpp b/src/frontends/controllers/ControlWrap.cpp
index 8efbb16b87..ddc9e03fbe 100644
--- a/src/frontends/controllers/ControlWrap.cpp
+++ b/src/frontends/controllers/ControlWrap.cpp
@@ -21,7 +21,7 @@ namespace lyx {
 namespace frontend {
 
 ControlWrap::ControlWrap(Dialog & parent)
-	: Dialog::Controller(parent)
+	: Controller(parent)
 {}
 
 
diff --git a/src/frontends/controllers/ControlWrap.h b/src/frontends/controllers/ControlWrap.h
index e21b2dba07..9460f5fa34 100644
--- a/src/frontends/controllers/ControlWrap.h
+++ b/src/frontends/controllers/ControlWrap.h
@@ -21,7 +21,7 @@ class InsetWrapParams;
 
 namespace frontend {
 
-class ControlWrap : public Dialog::Controller  {
+class ControlWrap : public Controller  {
 public:
 	///
 	ControlWrap(Dialog &);
diff --git a/src/frontends/controllers/Dialog.cpp b/src/frontends/controllers/Dialog.cpp
index 1c83637824..71fd5224d7 100644
--- a/src/frontends/controllers/Dialog.cpp
+++ b/src/frontends/controllers/Dialog.cpp
@@ -26,16 +26,14 @@ namespace lyx {
 namespace frontend {
 
 Dialog::Dialog(LyXView & lv, string const & name)
-	: is_closing_(false), kernel_(lv), name_(name)
+	: is_closing_(false), kernel_(lv), name_(name), controller_(0)
 {}
 
 
 Dialog::~Dialog()
-{}
-
-
-void Dialog::setButtonsValid(bool /*valid*/)
-{}
+{
+	delete controller_;
+}
 
 
 void Dialog::show(string const & data)
@@ -120,30 +118,31 @@ void Dialog::redraw()
 }
 
 
-void Dialog::setController(Controller * i)
+void Dialog::setController(Controller * controller)
 {
-	BOOST_ASSERT(i && !controller_ptr_.get());
-	controller_ptr_.reset(i);
+	BOOST_ASSERT(controller);
+	BOOST_ASSERT(!controller_);
+	controller_ = controller;
 }
 
 
-Dialog::Controller::Controller(Dialog & parent)
+Controller::Controller(Dialog & parent)
 	: parent_(parent)
 {}
 
 
-bool Dialog::Controller::canApply() const
+bool Controller::canApply() const
 {
-	FuncRequest const fr(getLfun(), dialog().name_);
+	FuncRequest const fr(getLfun(), dialog().name());
 	FuncStatus const fs(getStatus(fr));
 	return fs.enabled();
 }
 
 
-Dialog::Controller & Dialog::controller() const
+Controller & Dialog::controller() const
 {
-	BOOST_ASSERT(controller_ptr_.get());
-	return *controller_ptr_.get();
+	BOOST_ASSERT(controller_);
+	return *controller_;
 }
 
 
diff --git a/src/frontends/controllers/Dialog.h b/src/frontends/controllers/Dialog.h
index 2d508bce64..e2ce1d4d04 100644
--- a/src/frontends/controllers/Dialog.h
+++ b/src/frontends/controllers/Dialog.h
@@ -17,18 +17,23 @@
 
 #include "support/docstring.h"
 
-#include <boost/utility.hpp>
-#include <boost/scoped_ptr.hpp>
-
 namespace lyx {
 namespace frontend {
 
 class LyXView;
 
+/** Different dialogs will have different Controllers and Views.
+ *  deriving from these base classes.
+ */
+//@{
+class Controller;
+//@}
+
 /** \c Dialog collects the different parts of a Model-Controller-View
  *  split of a generic dialog together.
  */
-class Dialog /*: boost::noncopyable*/ {
+class Dialog 
+{
 public:
 	/// \param lv is the access point for the dialog to the LyX kernel.
 	/// \param name is the identifier given to the dialog by its parent
@@ -84,13 +89,6 @@ public:
 	Kernel & kernel() { return kernel_; }
 	Kernel const & kernel() const { return kernel_; }
 
-	/** Different dialogs will have different Controllers and Views.
-	 *  deriving from these base classes.
-	 */
-	//@{
-	class Controller;
-	//@}
-
 	/** \name Dialog Specialization
 	 *  Methods to set the Controller and View and so specialise
 	 *  to a particular dialog.
@@ -109,7 +107,7 @@ public:
 
 	/** \c Button controller part
 	 */
-	virtual void setButtonsValid(bool valid);
+	virtual void setButtonsValid(bool /*valid*/) {}
 
 
 	/** \c View part
@@ -151,6 +149,13 @@ public:
 	void setViewTitle(docstring const &);
 	/// gets the title of the dialog (window caption)
 	docstring const & getViewTitle() const;
+	///
+	std::string name() const { return name_; }
+
+private:
+	/// intentionally unimplemented, therefore uncopiable
+	Dialog(Dialog const &);
+	void operator=(Dialog const &);
 
 protected:
 	void apply();
@@ -161,16 +166,17 @@ protected:
 	 *  itself to the kernel.
 	 */
 	std::string name_;
-	boost::scoped_ptr<Controller> controller_ptr_;
+	Controller * controller_;
 
 	docstring title_;
 };
 
 
-/** \c Dialog::Controller is an abstract base class for the Controller
+/** \c Controller is an abstract base class for the Controller
  *  of a Model-Controller-View split of a generic dialog.
  */
-class Dialog::Controller : boost::noncopyable {
+class Controller 
+{
 public:
 	/// \param parent Dialog owning this Controller.
 	Controller(Dialog & parent);
@@ -257,6 +263,11 @@ protected:
 	Kernel const & kernel() const { return parent_.kernel(); }
 	//@}
 
+private:
+	/// intentionally unimplemented, therefore uncopiable
+	Controller(Controller const &);
+	void operator=(Controller const &);
+
 private:
 	Dialog & parent_;
 };
diff --git a/src/frontends/qt4/GuiAbout.cpp b/src/frontends/qt4/GuiAbout.cpp
index 99cb733ddc..158457a483 100644
--- a/src/frontends/qt4/GuiAbout.cpp
+++ b/src/frontends/qt4/GuiAbout.cpp
@@ -95,10 +95,10 @@ static QString version()
 }
 
 
-class ControlAbout : public Dialog::Controller
+class ControlAbout : public Controller
 {
 public:
-	ControlAbout(Dialog & parent) : Dialog::Controller(parent) {}
+	ControlAbout(Dialog & parent) : Controller(parent) {}
 	bool initialiseParams(std::string const &) { return true; }
 	void clearParams() {}
 	void dispatchParams() {}