diff --git a/src/BufferParams.h b/src/BufferParams.h
index 620b78e2a9..4ded0b7cbf 100644
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -26,8 +26,6 @@
 #include "support/FileName.h"
 #include "support/types.h"
 
-#include "frontends/controllers/frontend_helpers.h"
-
 #include <vector>
 
 namespace lyx {
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 4fee7fdf1e..a76cceda9e 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -29,8 +29,6 @@
 #include "support/docstream.h"
 #include "support/filetools.h"
 
-#include "frontends/controllers/frontend_helpers.h"
-
 using std::endl;
 using std::find;
 using std::string;
diff --git a/src/factory.cpp b/src/factory.cpp
index 681b8e5fbc..cb5c15d36d 100644
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -407,8 +407,7 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
 		// the various \\footcite commands. We should increase the
 		// file format number and read these commands here, too.
 		// Then we should use is_possible_cite_command() in
-		// src/frontends/controllers/frontend_helpers.cpp to test for valid cite
-		// commands.
+		// InsetCitation to test for valid cite commands.
 		if (compare_ascii_no_case(cmdName.substr(0,4), "cite") == 0) {
 			inset.reset(new InsetCitation(inscmd));
 		} else if (cmdName == "bibitem") {
diff --git a/src/insets/InsetCommandParams.cpp b/src/insets/InsetCommandParams.cpp
index 7c0807793c..19a557077f 100644
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -68,7 +68,7 @@ InsetCommandParams::findInfo(std::string const & name)
 
 	// InsetCitation
 	// FIXME: Use is_possible_cite_command() in
-	// src/frontends/controllers/frontend_helpers.cpp, see comment in src/factory.cpp.
+	// InsetCitation, see comment in src/factory.cpp.
 	if (name == "cite" || name == "citet" || name == "citep" || name == "citealt" ||
 	    name == "citealp" || name == "citeauthor" || name == "citeyear" ||
 	    name == "citeyearpar" || name == "citet*" || name == "citep*" ||