Reduce #include scope

Change-Id: I0dc8e00d65078ba910516a9b4473988fdbfe2cc1

4 files changed, 27 insertions, 15 deletions

diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 2b41ff910a95..3bbfd6d4b1a3 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -18,15 +18,10 @@
  */
 
 #include "global.hxx"
-#include "scresid.hxx"
-#include "impex.hxx"
 #include "asciiopt.hxx"
 #include "asciiopt.hrc"
 #include <comphelper/string.hxx>
 #include <osl/thread.h>
-#include <rtl/tencinfo.h>
-#include <unotools/transliterationwrapper.hxx>
-#include "editutil.hxx"
 
 static const sal_Char pStrFix[] = "FIX";
 static const sal_Char pStrMrg[] = "MRG";
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 263e460a7789..295edd1eddea 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -19,11 +19,20 @@
 
 #undef SC_DLLIMPLEMENTATION
 
+#include <svx/txencbox.hxx>
+#include <vcl/button.hxx>
+#include <vcl/combobox.hxx>
+#include <vcl/edit.hxx>
+#include <vcl/field.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/lstbox.hxx>
+
 #include "global.hxx"
 #include "scresid.hxx"
 #include "impex.hxx"
 #include "scuiasciiopt.hxx"
 #include "asciiopt.hrc"
+#include "csvtablebox.hxx"
 #include <comphelper/string.hxx>
 #include <osl/thread.h>
 #include <rtl/tencinfo.h>
diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx
index 6099fdac1afe..03e5bcfd371e 100644
--- a/sc/source/ui/inc/asciiopt.hxx
+++ b/sc/source/ui/inc/asciiopt.hxx
@@ -20,17 +20,11 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_ASCIIOPT_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_ASCIIOPT_HXX
 
-#include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/combobox.hxx>
-#include <vcl/field.hxx>
-#include <tools/stream.hxx>
-#include <svx/txencbox.hxx>
-#include "csvtablebox.hxx"
+#include <rtl/ustring.hxx>
 #include <i18nlangtag/lang.h>
 
+#include "csvcontrol.hxx"
+
 class ScAsciiOptions
 {
 private:
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx
index 8eada1ac8aee..6851d7345fda 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -20,9 +20,23 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_SCUIASCIIOPT_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_SCUIASCIIOPT_HXX
 
-#include "asciiopt.hxx"
+#include <vcl/dialog.hxx>
 #include <svx/langbox.hxx>
 
+#include "asciiopt.hxx"
+
+class Button;
+class CheckBox;
+class ComboBox;
+class Edit;
+class FixedText;
+class ListBox;
+class NumericField;
+class RadioButton;
+
+class ScCsvTableBox;
+class SvxTextEncodingBox;
+
 class ScImportAsciiDlg : public ModalDialog
 {
     SvStream*                   mpDatStream;