diff --git a/src/frontends/controllers/ButtonPolicy.cpp b/src/frontends/ButtonPolicy.cpp
similarity index 100%
rename from src/frontends/controllers/ButtonPolicy.cpp
rename to src/frontends/ButtonPolicy.cpp
diff --git a/src/frontends/controllers/ButtonPolicy.h b/src/frontends/ButtonPolicy.h
similarity index 100%
rename from src/frontends/controllers/ButtonPolicy.h
rename to src/frontends/ButtonPolicy.h
diff --git a/src/frontends/controllers/Dialog.cpp b/src/frontends/Dialog.cpp
similarity index 100%
rename from src/frontends/controllers/Dialog.cpp
rename to src/frontends/Dialog.cpp
diff --git a/src/frontends/controllers/Dialog.h b/src/frontends/Dialog.h
similarity index 100%
rename from src/frontends/controllers/Dialog.h
rename to src/frontends/Dialog.h
diff --git a/src/frontends/Dialogs.cpp b/src/frontends/Dialogs.cpp
index ac3467e0ab..1d04db58c7 100644
--- a/src/frontends/Dialogs.cpp
+++ b/src/frontends/Dialogs.cpp
@@ -13,7 +13,7 @@
 #include <config.h>
 
 #include "Dialogs.h"
-#include "controllers/Dialog.h"
+#include "Dialog.h"
 
 #include <boost/signal.hpp>
 #include <boost/bind.hpp>
diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index 4387df5853..b18690c243 100644
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -1,8 +1,8 @@
 include $(top_srcdir)/config/common.am
 
-SUBDIRS = controllers $(FRONTENDS_SUBDIRS)
+SUBDIRS = $(FRONTENDS_SUBDIRS)
 
-DIST_SUBDIRS = controllers qt4
+DIST_SUBDIRS = qt4
 
 EXTRA_DIST = pch.h
 
@@ -13,6 +13,12 @@ noinst_LTLIBRARIES = liblyxfrontends.la
 AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/..  $(BOOST_INCLUDES)
 
 liblyxfrontends_la_SOURCES = \
+	ButtonPolicy.cpp \
+	ButtonPolicy.h \
+	Dialog.cpp \
+	Dialog.h \
+	frontend_helpers.cpp \
+	frontend_helpers.h \
 	alert.cpp \
 	alert.h \
 	Alert_pimpl.h \
diff --git a/src/frontends/controllers/Makefile.am b/src/frontends/controllers/Makefile.am
index 42b3989eca..4dd8e30f53 100644
--- a/src/frontends/controllers/Makefile.am
+++ b/src/frontends/controllers/Makefile.am
@@ -6,15 +6,9 @@ EXTRA_DIST = tests/regfiles/biblio
 
 noinst_LTLIBRARIES = liblyxcontrollers.la
 
-SOURCEFILES = \
-	Dialog.cpp \
-	ButtonPolicy.cpp \
-	frontend_helpers.cpp 
+SOURCEFILES = 
 
-HEADERFILES = \
-	Dialog.h \
-	ButtonPolicy.h \
-	frontend_helpers.h
+HEADERFILES =
 
 if MONOLITHIC_CONTROLLERS
 
diff --git a/src/frontends/controllers/frontend_helpers.cpp b/src/frontends/frontend_helpers.cpp
similarity index 100%
rename from src/frontends/controllers/frontend_helpers.cpp
rename to src/frontends/frontend_helpers.cpp
diff --git a/src/frontends/controllers/frontend_helpers.h b/src/frontends/frontend_helpers.h
similarity index 100%
rename from src/frontends/controllers/frontend_helpers.h
rename to src/frontends/frontend_helpers.h
diff --git a/src/frontends/qt4/GuiBibitem.h b/src/frontends/qt4/GuiBibitem.h
index 5429fef806..489f86af28 100644
--- a/src/frontends/qt4/GuiBibitem.h
+++ b/src/frontends/qt4/GuiBibitem.h
@@ -16,8 +16,6 @@
 #include "GuiDialog.h"
 #include "ui_BibitemUi.h"
 
-#include "controllers/Dialog.h"
-
 #include "insets/InsetCommandParams.h"
 
 namespace lyx {