From 4c0ef382009943bca43caf691614be81d513a135 Mon Sep 17 00:00:00 2001
From: Pavel Sanda <sanda@lyx.org>
Date: Sun, 19 May 2013 18:07:53 -0700
Subject: [PATCH] Header cleanup cont.

---
 src/ServerSocket.h                    | 1 -
 src/TextClass.h                       | 1 -
 src/frontends/Clipboard.h             | 1 -
 src/frontends/Painter.h               | 2 --
 src/frontends/qt4/FindAndReplace.cpp  | 4 ++++
 src/frontends/qt4/FindAndReplace.h    | 6 ------
 src/frontends/qt4/GuiClipboard.cpp    | 1 +
 src/frontends/qt4/GuiCompareHistory.h | 1 -
 src/frontends/qt4/GuiCompleter.cpp    | 1 +
 src/frontends/qt4/GuiCompleter.h      | 3 ---
 src/lyxfind.cpp                       | 1 +
 11 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/ServerSocket.h b/src/ServerSocket.h
index 2b2ddd11d2..7364250e17 100644
--- a/src/ServerSocket.h
+++ b/src/ServerSocket.h
@@ -15,7 +15,6 @@
 #define LYXSERVERSOCKET_H
 
 #include "support/FileName.h"
-#include "support/socktools.h"
 
 #include "support/shared_ptr.h"
 
diff --git a/src/TextClass.h b/src/TextClass.h
index e4c2461543..faacfa0bbd 100644
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -11,7 +11,6 @@
 #define TEXTCLASS_H
 
 #include "Citation.h"
-#include "ColorCode.h"
 #include "Counters.h"
 #include "DocumentClassPtr.h"
 #include "FloatList.h"
diff --git a/src/frontends/Clipboard.h b/src/frontends/Clipboard.h
index 282ac1ddf1..980c6bcbf7 100644
--- a/src/frontends/Clipboard.h
+++ b/src/frontends/Clipboard.h
@@ -16,7 +16,6 @@
 
 #include "Cursor.h"
 
-#include "support/FileName.h"
 #include "support/strfwd.h"
 
 using lyx::support::FileName;
diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h
index d219b1b85e..e7f01af9d6 100644
--- a/src/frontends/Painter.h
+++ b/src/frontends/Painter.h
@@ -13,8 +13,6 @@
 #ifndef PAINTER_H
 #define PAINTER_H
 
-#include "Color.h"
-
 #include "support/strfwd.h"
 
 namespace lyx {
diff --git a/src/frontends/qt4/FindAndReplace.cpp b/src/frontends/qt4/FindAndReplace.cpp
index 3d3bfa7da2..1a390ec4b2 100644
--- a/src/frontends/qt4/FindAndReplace.cpp
+++ b/src/frontends/qt4/FindAndReplace.cpp
@@ -19,11 +19,15 @@
 #include "qt_helpers.h"
 #include "Language.h"
 
+#include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferList.h"
+#include "BufferView.h"
+#include "Text.h"
 #include "TextClass.h"
 #include "Cursor.h"
 #include "FuncRequest.h"
+#include "LyX.h"
 #include "lyxfind.h"
 
 #include "frontends/alert.h"
diff --git a/src/frontends/qt4/FindAndReplace.h b/src/frontends/qt4/FindAndReplace.h
index d1a6a38e8b..93af535702 100644
--- a/src/frontends/qt4/FindAndReplace.h
+++ b/src/frontends/qt4/FindAndReplace.h
@@ -12,17 +12,11 @@
 #ifndef QSEARCHADV_H
 #define QSEARCHADV_H
 
-#include "GuiWorkArea.h"
-
 #include "DockView.h"
 // This is needed so that ui_FindAndReplaceUi.h can find qt_()
 #include "qt_helpers.h"
 #include "ui_FindAndReplaceUi.h"
 
-#include "BufferView.h"
-#include "Buffer.h"
-#include "LyX.h"
-#include "Text.h"
 #include "lyxfind.h"
 
 #include <string>
diff --git a/src/frontends/qt4/GuiClipboard.cpp b/src/frontends/qt4/GuiClipboard.cpp
index 445fa4a633..2df20a0cba 100644
--- a/src/frontends/qt4/GuiClipboard.cpp
+++ b/src/frontends/qt4/GuiClipboard.cpp
@@ -14,6 +14,7 @@
 
 #include "FileDialog.h"
 
+#include "support/FileName.h"
 #include "GuiClipboard.h"
 #include "qt_helpers.h"
 
diff --git a/src/frontends/qt4/GuiCompareHistory.h b/src/frontends/qt4/GuiCompareHistory.h
index ce75f40333..5204eee1da 100644
--- a/src/frontends/qt4/GuiCompareHistory.h
+++ b/src/frontends/qt4/GuiCompareHistory.h
@@ -14,7 +14,6 @@
 
 #include "GuiDialog.h"
 #include "ui_CompareHistoryUi.h"
-#include "qt_helpers.h"
 
 
 namespace lyx {
diff --git a/src/frontends/qt4/GuiCompleter.cpp b/src/frontends/qt4/GuiCompleter.cpp
index fb02cf0230..87c5aa9007 100644
--- a/src/frontends/qt4/GuiCompleter.cpp
+++ b/src/frontends/qt4/GuiCompleter.cpp
@@ -22,6 +22,7 @@
 #include "LyX.h"
 #include "LyXRC.h"
 #include "Paragraph.h"
+#include "qt_helpers.h"
 #include "version.h"
 
 #include "support/lassert.h"
diff --git a/src/frontends/qt4/GuiCompleter.h b/src/frontends/qt4/GuiCompleter.h
index dcc5b04038..a02a2c5dd6 100644
--- a/src/frontends/qt4/GuiCompleter.h
+++ b/src/frontends/qt4/GuiCompleter.h
@@ -12,10 +12,7 @@
 #ifndef GUICOMPLETER_H
 #define GUICOMPLETER_H
 
-#include "frontends/WorkArea.h"
-
 #include "DocIterator.h"
-#include "qt_helpers.h"
 #include "support/docstring.h"
 
 #include <QCompleter>
diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 36b663e5e3..269b212370 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -45,6 +45,7 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
+#include "support/FileName.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"