diff --git a/src/frontends/Application.h b/src/frontends/Application.h
index 6c11007bbb..8350b5cc46 100644
--- a/src/frontends/Application.h
+++ b/src/frontends/Application.h
@@ -8,14 +8,14 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef LYX_APPLICATION_H
-#define LYX_APPLICATION_H
+#ifndef APPLICATION_H
+#define APPLICATION_H
 
 #include "ColorCode.h"
 
-#include <boost/function.hpp>
+#include "support/strfwd.h"
 
-#include <string>
+#include <boost/function.hpp>
 
 namespace lyx {
 
@@ -243,4 +243,4 @@ frontend::Application * createApplication(int & argc, char * argv[]);
 } // namespace lyx
 
 
-#endif // LYX_APPLICATION_H
+#endif // APPLICATION_H
diff --git a/src/frontends/Dialog.h b/src/frontends/Dialog.h
index 49e036ec13..6a168382e0 100644
--- a/src/frontends/Dialog.h
+++ b/src/frontends/Dialog.h
@@ -14,8 +14,7 @@
 
 #include "lfuns.h"
 
-#include "support/docstring.h"
-#include <string>
+#include "support/strfwd.h"
 
 namespace lyx {