12 files changed, 22 insertions, 7 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 0a98818c7f42..0d63e3bad1e6 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -37,19 +37,21 @@
 #include "scdllapi.h"
 #include "rangelst.hxx"
 #include "rangenam.hxx"
-#include "table.hxx"
 #include "brdcst.hxx"
 #include "tabopparams.hxx"
+#include "sortparam.hxx"
 #include "types.hxx"
 #include "formula/grammar.hxx"
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include "scdllapi.h"
 #include "typedstrdata.hxx"
+#include "compressedarray.hxx"
+#include <tools/fract.hxx>
+#include <tools/gen.hxx>
 
 #include <memory>
 #include <map>
 #include <set>
-#include <list>
 #include <vector>
 #include <boost/ptr_container/ptr_vector.hpp>
 
@@ -150,6 +152,11 @@ struct ScSetStringParam;
 class ScDocRowHeightUpdater;
 struct ScColWidthParam;
 struct ScCopyBlockFromClipParams;
+class ScSheetEvents;
+class ScProgress;
+class SvtListener;
+class ScNotes;
+class ScEditDataArray;
 
 namespace com { namespace sun { namespace star {
     namespace lang {
@@ -206,9 +213,6 @@ const sal_uInt8 SC_DDE_ENGLISH       = 1;
 const sal_uInt8 SC_DDE_TEXT          = 2;
 const sal_uInt8 SC_DDE_IGNOREMODE    = 255;       /// For usage in FindDdeLink() only!
 
-typedef std::pair<SCCOL, SCROW> ScAddress2D;
-typedef std::map<ScAddress2D, ScPostIt*> ScNoteMap;
-
 class ScDocument
 {
 friend class ScDocumentIterator;
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 10c3e5d427fa..9ae787b33986 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1302,8 +1302,8 @@ void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, bool bM
                     // empty cell.
                     if (pNew->GetCellType() == CELLTYPE_STRING)
                     {
-                        String aStr = static_cast<ScStringCell*>(pNew)->GetString();
-                        if (aStr.Len() == 0)
+                        rtl::OUString aStr = static_cast<ScStringCell*>(pNew)->GetString();
+                        if (aStr.isEmpty())
                             // A string cell with empty string.  Delete the cell itself.
                             rColumn.Delete(maItems[i].nRow);
                         else
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index bfb379f6f149..3cdade0807b2 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -48,6 +48,7 @@
 #include <svx/svdpage.hxx>
 
 #include "document.hxx"
+#include "table.hxx"
 #include "drwlayer.hxx"
 #include "chartarr.hxx"
 #include "chartlis.hxx"
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 19fa5477885f..f058d0792a91 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -37,6 +37,7 @@
 #include <svl/PasswordHelper.hxx>
 #include <unotools/transliterationwrapper.hxx>
 
+#include "table.hxx"
 #include "patattr.hxx"
 #include "docpool.hxx"
 #include "cell.hxx"
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index f77f4e7e3c9a..9b11a183d756 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -64,6 +64,7 @@
 #include "patattr.hxx"
 #include "docoptio.hxx"
 #include "tabprotection.hxx"
+#include "postit.hxx"
 
 #include "excdoc.hxx"
 #include "namebuff.hxx"
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index d3bd84b18832..39b2b80f7799 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -66,6 +66,7 @@
 #include "hints.hxx"
 #include "miscuno.hxx"
 #include "chgtrack.hxx"
+#include "column.hxx"
 
 using namespace com::sun::star;
 
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 62c8633f7832..88bad72a9797 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -84,6 +84,8 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "cell.hxx"
+#include "column.hxx"
+#include "postit.hxx"
 #include "global.hxx"
 #include "filter.hxx"
 #include "scmod.hxx"
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index d0e5890be984..a6bb9160dbbe 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -69,6 +69,7 @@
 #include "filter.hxx"
 #include "progress.hxx"
 #include "cell.hxx"
+#include "column.hxx"
 #include "editutil.hxx"
 #include "cellform.hxx"
 #include "dbdocutl.hxx"
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index dd1ed0336731..6dc095b1ec2e 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -63,6 +63,7 @@ class StarBASIC;
 #include "filter.hxx"
 #include "asciiopt.hxx"
 #include "cell.hxx"
+#include "column.hxx"
 #include "docoptio.hxx"
 #include "progress.hxx"
 #include "scitems.hxx"
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 3ab1978bd452..39926f44296b 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -96,6 +96,7 @@
 #include "olinefun.hxx"
 #include "hints.hxx"
 #include "cell.hxx"
+#include "column.hxx"
 #include "undocell.hxx"
 #include "undotab.hxx"
 #include "undoblk.hxx"      // fuer lcl_ApplyBorder - nach docfunc verschieben!
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 147c10d49de1..823974acbc6b 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -83,6 +83,7 @@
 #include "docsh.hxx"
 #include "hints.hxx"
 #include "docfunc.hxx"
+#include "postit.hxx"
 #include "dociter.hxx"
 #include "cell.hxx"
 #include "drwlayer.hxx"
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 5ef7d4f727be..1ab49401bde6 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -98,6 +98,7 @@
 #include "tabvwsh.hxx"
 #include "undostyl.hxx"
 #include "markdata.hxx"
+#include "markarr.hxx"
 
 
 #define ScFormatShell