diff --git a/src/frontends/gtk/GuiClipboard.h b/src/frontends/gtk/GuiClipboard.h
index 36b264dc7c..1b481a2d98 100644
--- a/src/frontends/gtk/GuiClipboard.h
+++ b/src/frontends/gtk/GuiClipboard.h
@@ -32,7 +32,7 @@ public:
 
 	virtual ~GuiClipboard() {}
 
-	/** ClipBoard overloaded methods
+	/** Clipboard overloaded methods
 	 */
 	//@{
 	void haveSelection(bool own)
diff --git a/src/frontends/gtk/GuiImplementation.C b/src/frontends/gtk/GuiImplementation.C
index 056a677296..c61aa6aa9a 100644
--- a/src/frontends/gtk/GuiImplementation.C
+++ b/src/frontends/gtk/GuiImplementation.C
@@ -9,6 +9,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
+#include <config.h>
+
 #include "GuiImplementation.h"
 
 #include "GView.h"
diff --git a/src/frontends/qt3/GuiClipboard.h b/src/frontends/qt3/GuiClipboard.h
index 2323f8346c..f79c697d56 100644
--- a/src/frontends/qt3/GuiClipboard.h
+++ b/src/frontends/qt3/GuiClipboard.h
@@ -34,7 +34,7 @@ public:
 
 	virtual ~GuiClipboard() {}
 
-	/** ClipBoard overloaded methods
+	/** Clipboard overloaded methods
 	 */
 	//@{
 	void haveSelection(bool own)
diff --git a/src/frontends/qt4/GuiClipboard.C b/src/frontends/qt4/GuiClipboard.C
index 6f0238a023..483fa81414 100644
--- a/src/frontends/qt4/GuiClipboard.C
+++ b/src/frontends/qt4/GuiClipboard.C
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file GuiClipboard.C
+ * \file qt4/GuiClipboard.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,6 +10,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
+#include <config.h>
+
 #include "GuiClipboard.h"
 #include "qt_helpers.h"
 
diff --git a/src/frontends/qt4/GuiClipboard.h b/src/frontends/qt4/GuiClipboard.h
index cce918c9f0..e821b2a4d6 100644
--- a/src/frontends/qt4/GuiClipboard.h
+++ b/src/frontends/qt4/GuiClipboard.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file GuiClipboard.h
+ * \file qt4/GuiClipboard.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -29,7 +29,7 @@ public:
 
 	virtual ~GuiClipboard() {}
 
-	/** ClipBoard overloaded methods
+	/** Clipboard overloaded methods
 	 */
 	//@{
 	void haveSelection(bool own);
diff --git a/src/frontends/qt4/GuiImplementation.C b/src/frontends/qt4/GuiImplementation.C
index 09bf245d03..d85fa83512 100644
--- a/src/frontends/qt4/GuiImplementation.C
+++ b/src/frontends/qt4/GuiImplementation.C
@@ -10,6 +10,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
+#include <config.h>
+
 // This include must be declared before everything else because
 // of boost/Qt/LyX clash...
 #include "GuiView.h"
diff --git a/src/frontends/qt4/TocModel.C b/src/frontends/qt4/TocModel.C
index 7363dc9951..72fce8f1a6 100644
--- a/src/frontends/qt4/TocModel.C
+++ b/src/frontends/qt4/TocModel.C
@@ -9,6 +9,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
+#include <config.h>
+
 #include "TocModel.h"
 
 #include "debug.h"