Re-org the headers a bit. In column?.cxx, column.hxx must be the first.

Change-Id: I5014c06a8dd8335b5dd5c127f86a59331d54af88

sc/source/core/data/column2.cxx

@@ -17,25 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "scitems.hxx"
-#include <editeng/eeitem.hxx>
-
-#include <svx/algitem.hxx>
-#include <editeng/editobj.hxx>
-#include <editeng/editstat.hxx>
-#include <editeng/emphasismarkitem.hxx>
-#include <editeng/fhgtitem.hxx>
-#include <editeng/forbiddencharacterstable.hxx>
-#include <svx/rotmodit.hxx>
-#include <editeng/scripttypeitem.hxx>
-#include <editeng/unolingu.hxx>
-#include <editeng/justifyitem.hxx>
-#include <svl/zforlist.hxx>
-#include <svl/broadcast.hxx>
-#include <svl/listeneriter.hxx>
-#include <vcl/outdev.hxx>
-
 #include "column.hxx"
+#include "scitems.hxx"
 #include "cell.hxx"
 #include "formulacell.hxx"
 #include "document.hxx"
@@ -62,6 +45,23 @@
 
 #include <math.h>
 
+#include <editeng/eeitem.hxx>
+
+#include <svx/algitem.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editstat.hxx>
+#include <editeng/emphasismarkitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
+#include <svx/rotmodit.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/unolingu.hxx>
+#include <editeng/justifyitem.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/broadcast.hxx>
+#include <svl/listeneriter.hxx>
+#include <vcl/outdev.hxx>
+
 #include <boost/scoped_ptr.hpp>
 
 #if DEBUG_COLUMN_STORAGE

sc/source/core/data/column3.cxx

@@ -17,17 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <boost/scoped_ptr.hpp>
-
-#include <mdds/flat_segment_tree.hpp>
-
-#include <sfx2/objsh.hxx>
-#include <svl/zforlist.hxx>
-#include <svl/zformat.hxx>
-#include <svl/broadcast.hxx>
+#include "column.hxx"
 
 #include "scitems.hxx"
-#include "column.hxx"
 #include "cell.hxx"
 #include "formulacell.hxx"
 #include "document.hxx"
@@ -53,6 +45,14 @@
 
 #include <com/sun/star/i18n/LocaleDataItem.hpp>
 
+#include <boost/scoped_ptr.hpp>
+
+#include <mdds/flat_segment_tree.hpp>
+
+#include <sfx2/objsh.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
+#include <svl/broadcast.hxx>
 #include <cstdio>
 
 using ::com::sun::star::i18n::LocaleDataItem;