From 57044db0844cd1975ffcf819210955734b5ce998 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Mon, 10 Oct 2022 01:04:07 +0200
Subject: [PATCH] [Spread] Gui: remove unused includes

- also sort includes
---
 src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp | 21 ++++--------
 src/Mod/Spreadsheet/Gui/Command.cpp           | 27 +++++-----------
 src/Mod/Spreadsheet/Gui/DlgBindSheet.cpp      | 11 ++++---
 src/Mod/Spreadsheet/Gui/DlgSettingsImp.cpp    | 10 ++----
 src/Mod/Spreadsheet/Gui/DlgSheetConf.cpp      | 16 ++++++----
 src/Mod/Spreadsheet/Gui/LineEdit.cpp          |  5 +--
 src/Mod/Spreadsheet/Gui/LineEdit.h            |  4 +--
 src/Mod/Spreadsheet/Gui/PreCompiled.h         | 19 ++++++-----
 src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp  |  8 +++--
 src/Mod/Spreadsheet/Gui/SheetModel.cpp        | 16 ++++------
 src/Mod/Spreadsheet/Gui/SheetModel.h          |  3 +-
 src/Mod/Spreadsheet/Gui/SheetTableView.cpp    | 20 ++++++------
 src/Mod/Spreadsheet/Gui/SheetTableView.h      |  6 ++--
 .../Spreadsheet/Gui/SpreadsheetDelegate.cpp   | 12 +++----
 src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp   | 27 ++++++----------
 src/Mod/Spreadsheet/Gui/SpreadsheetView.h     |  7 ++--
 .../Gui/ViewProviderSpreadsheet.cpp           | 32 ++++++-------------
 .../Spreadsheet/Gui/ViewProviderSpreadsheet.h |  5 +--
 .../Gui/ViewProviderSpreadsheetPyImp.cpp      | 25 +++++++++++++--
 src/Mod/Spreadsheet/Gui/Workbench.cpp         | 21 ++++++------
 20 files changed, 141 insertions(+), 154 deletions(-)

diff --git a/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp b/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
index 3dd53f9bd2..d041ddc1ca 100644
--- a/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
+++ b/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
@@ -22,32 +22,23 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <QIcon>
-# include <QImage>
-# include <QFileInfo>
-#endif
-
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
 
+#include <App/Application.h>
+#include <App/Document.h>
 #include <Base/Console.h>
 #include <Base/Exception.h>
 #include <Base/FileInfo.h>
 #include <Base/Interpreter.h>
-#include <App/Application.h>
-#include <App/Document.h>
-#include <Gui/MainWindow.h>
-#include <Gui/Document.h>
 #include <Gui/Application.h>
-#include <Gui/BitmapFactory.h>
+#include <Gui/MainWindow.h>
 #include <Gui/WidgetFactory.h>
 #include <Gui/Language/Translator.h>
 #include <Mod/Spreadsheet/App/Sheet.h>
+
 #include "DlgSettingsImp.h"
-#include "Workbench.h"
-#include "ViewProviderSpreadsheet.h"
 #include "SpreadsheetView.h"
+#include "ViewProviderSpreadsheet.h"
+#include "Workbench.h"
 
 
 // use a different name to CreateCommand()
diff --git a/src/Mod/Spreadsheet/Gui/Command.cpp b/src/Mod/Spreadsheet/Gui/Command.cpp
index 2a6e2e96f1..ef558b3cca 100644
--- a/src/Mod/Spreadsheet/Gui/Command.cpp
+++ b/src/Mod/Spreadsheet/Gui/Command.cpp
@@ -20,37 +20,26 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
-# include <QAction>
-# include <QFileDialog>
-# include <QImage>
-# include <QImageReader>
-# include <QMessageBox>
-# include <QTextStream>
+# include <sstream>
 #endif
 
-#include <ctime>
 #if defined(FC_OS_WIN32)
-#include <sys/timeb.h>
+# include <sys/timeb.h>
 #endif
 
-#include <Base/Exception.h>
-#include <Base/Interpreter.h>
-#include <Base/Tools.h>
 #include <App/Document.h>
 #include <Gui/Application.h>
-#include <Gui/MainWindow.h>
 #include <Gui/Command.h>
 #include <Gui/Document.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/BitmapFactory.h>
-# include <Gui/FileDialog.h>
+#include <Gui/FileDialog.h>
+#include <Gui/MainWindow.h>
+#include <Mod/Spreadsheet/App/Sheet.h>
 
-#include "SpreadsheetView.h"
-#include "../App/Sheet.h"
-#include <App/Range.h>
-#include "ViewProviderSpreadsheet.h"
 #include "PropertiesDialog.h"
+#include "SpreadsheetView.h"
+
 
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
diff --git a/src/Mod/Spreadsheet/Gui/DlgBindSheet.cpp b/src/Mod/Spreadsheet/Gui/DlgBindSheet.cpp
index 5d81dbb497..a375a404b2 100644
--- a/src/Mod/Spreadsheet/Gui/DlgBindSheet.cpp
+++ b/src/Mod/Spreadsheet/Gui/DlgBindSheet.cpp
@@ -21,17 +21,20 @@
  ****************************************************************************/
 
 #include "PreCompiled.h"
+
 #include <boost/algorithm/string.hpp>
 #include <QMessageBox>
-#include "DlgBindSheet.h"
-#include <Base/Tools.h>
-#include <App/Range.h>
-#include <App/Document.h>
+
 #include <App/Application.h>
+#include <App/Document.h>
 #include <App/ExpressionParser.h>
+#include <App/Range.h>
 #include <Gui/CommandT.h>
+
+#include "DlgBindSheet.h"
 #include "ui_DlgBindSheet.h"
 
+
 using namespace App;
 using namespace Spreadsheet;
 using namespace SpreadsheetGui;
diff --git a/src/Mod/Spreadsheet/Gui/DlgSettingsImp.cpp b/src/Mod/Spreadsheet/Gui/DlgSettingsImp.cpp
index 8311835c98..ff8908dcc4 100644
--- a/src/Mod/Spreadsheet/Gui/DlgSettingsImp.cpp
+++ b/src/Mod/Spreadsheet/Gui/DlgSettingsImp.cpp
@@ -20,17 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <QApplication>
-#endif
+
+#include <Gui/Application.h>
 
 #include "DlgSettingsImp.h"
 #include "ui_DlgSettings.h"
-#include <Gui/Application.h>
-#include <Gui/PrefWidgets.h>
-#include <Base/Console.h>
+
 
 using namespace SpreadsheetGui;
 
diff --git a/src/Mod/Spreadsheet/Gui/DlgSheetConf.cpp b/src/Mod/Spreadsheet/Gui/DlgSheetConf.cpp
index 79873d57ac..bd364cb81f 100644
--- a/src/Mod/Spreadsheet/Gui/DlgSheetConf.cpp
+++ b/src/Mod/Spreadsheet/Gui/DlgSheetConf.cpp
@@ -21,18 +21,20 @@
  ****************************************************************************/
 
 #include "PreCompiled.h"
-#include <boost/algorithm/string/predicate.hpp>
+
 #include <QMessageBox>
-#include "DlgSheetConf.h"
-#include <Base/Tools.h>
-#include <App/Range.h>
-#include <App/Document.h>
-#include <App/Application.h>
-#include <App/ExpressionParser.h>
+
 #include <App/AutoTransaction.h>
+#include <App/Document.h>
+#include <App/ExpressionParser.h>
+#include <App/Range.h>
+#include <Base/Tools.h>
 #include <Gui/CommandT.h>
+
+#include "DlgSheetConf.h"
 #include "ui_DlgSheetConf.h"
 
+
 using namespace App;
 using namespace Spreadsheet;
 using namespace SpreadsheetGui;
diff --git a/src/Mod/Spreadsheet/Gui/LineEdit.cpp b/src/Mod/Spreadsheet/Gui/LineEdit.cpp
index 681be3370c..ee29cf5e44 100644
--- a/src/Mod/Spreadsheet/Gui/LineEdit.cpp
+++ b/src/Mod/Spreadsheet/Gui/LineEdit.cpp
@@ -21,15 +21,16 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
+# include <QApplication>
 # include <QEvent>
 # include <QKeyEvent>
 #endif
 
-#include <QCoreApplication>
-
 #include "LineEdit.h"
 
+
 using namespace SpreadsheetGui;
 
 LineEdit::LineEdit(QWidget *parent)
diff --git a/src/Mod/Spreadsheet/Gui/LineEdit.h b/src/Mod/Spreadsheet/Gui/LineEdit.h
index 8f253f7b09..3f508f8048 100644
--- a/src/Mod/Spreadsheet/Gui/LineEdit.h
+++ b/src/Mod/Spreadsheet/Gui/LineEdit.h
@@ -23,9 +23,9 @@
 #ifndef LINEEDIT_H
 #define LINEEDIT_H
 
-#include <Gui/ExpressionCompleter.h>
 #include <QWidget>
-#include <QModelIndex>
+#include <Gui/ExpressionCompleter.h>
+
 
 namespace SpreadsheetGui {
 
diff --git a/src/Mod/Spreadsheet/Gui/PreCompiled.h b/src/Mod/Spreadsheet/Gui/PreCompiled.h
index 338ee0d498..20d3d55371 100644
--- a/src/Mod/Spreadsheet/Gui/PreCompiled.h
+++ b/src/Mod/Spreadsheet/Gui/PreCompiled.h
@@ -21,7 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SPREADSHEET_PRECOMPILED_H
 #define SPREADSHEET_PRECOMPILED_H
 
@@ -39,20 +38,21 @@
 #ifdef _PreComp_
 
 // standard
-#include <iostream>
 #include <cassert>
 #include <cmath>
+#include <iostream>
 
 // STL
-#include <vector>
-#include <map>
-#include <string>
-#include <list>
-#include <set>
 #include <algorithm>
-#include <stack>
-#include <queue>
 #include <bitset>
+#include <list>
+#include <map>
+#include <queue>
+#include <set>
+#include <sstream>
+#include <stack>
+#include <string>
+#include <vector>
 
 #ifdef FC_OS_WIN32
 # include <windows.h>
@@ -63,7 +63,6 @@
 # include <Gui/QtAll.h>
 #endif
 
-
 #endif //_PreComp_
 
 #endif // SPREADSHEET_PRECOMPILED_H
diff --git a/src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp b/src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp
index ccbc7411d1..fae212ee3b 100644
--- a/src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp
+++ b/src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp
@@ -20,16 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#include "PropertiesDialog.h"
-#include <Base/Tools.h>
+
 #include <App/Range.h>
 #include <App/Document.h>
 #include <App/ExpressionParser.h>
+#include <Base/Tools.h>
 #include <Gui/CommandT.h>
+
+#include "PropertiesDialog.h"
 #include "ui_PropertiesDialog.h"
 
+
 using namespace App;
 using namespace Spreadsheet;
 using namespace SpreadsheetGui;
diff --git a/src/Mod/Spreadsheet/Gui/SheetModel.cpp b/src/Mod/Spreadsheet/Gui/SheetModel.cpp
index bcde0eff56..ce358e202b 100644
--- a/src/Mod/Spreadsheet/Gui/SheetModel.cpp
+++ b/src/Mod/Spreadsheet/Gui/SheetModel.cpp
@@ -23,22 +23,20 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <QtCore>
-# include <QApplication>
+# include <QFont>
 # include <QLocale>
-# include <QMessageBox>
-# include <QTextDocument>
 #endif
 
 #include <App/Document.h>
-#include <Gui/Application.h>
-#include "SheetModel.h"
-#include <Mod/Spreadsheet/App/Utils.h>
-#include "../App/Sheet.h"
-#include <Gui/Command.h>
 #include <Base/Interpreter.h>
 #include <Base/Tools.h>
 #include <Base/UnitsApi.h>
+#include <Gui/Application.h>
+#include <Gui/Command.h>
+#include <Mod/Spreadsheet/App/Sheet.h>
+
+#include "SheetModel.h"
+
 
 using namespace SpreadsheetGui;
 using namespace Spreadsheet;
diff --git a/src/Mod/Spreadsheet/Gui/SheetModel.h b/src/Mod/Spreadsheet/Gui/SheetModel.h
index dd71b8748c..fd968c90fa 100644
--- a/src/Mod/Spreadsheet/Gui/SheetModel.h
+++ b/src/Mod/Spreadsheet/Gui/SheetModel.h
@@ -24,9 +24,10 @@
 #define SHEETMODEL_H
 
 #include <QAbstractTableModel>
-#include <Mod/Spreadsheet/App/Utils.h>
+
 #include <App/Range.h>
 
+
 namespace Spreadsheet {
 class Sheet;
 }
diff --git a/src/Mod/Spreadsheet/Gui/SheetTableView.cpp b/src/Mod/Spreadsheet/Gui/SheetTableView.cpp
index 82f82bb7bd..19e2c42b86 100644
--- a/src/Mod/Spreadsheet/Gui/SheetTableView.cpp
+++ b/src/Mod/Spreadsheet/Gui/SheetTableView.cpp
@@ -21,36 +21,36 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
-# include <QKeyEvent>
 # include <QAction>
-# include <QMenu>
 # include <QApplication>
 # include <QClipboard>
-# include <QMenu>
+# include <QKeyEvent>
 # include <QMessageBox>
+# include <QMenu>
 # include <QMimeData>
-# include <QTextStream>
 #endif
 # include <QTextTableCell>
 
 #include <App/Application.h>
 #include <App/AutoTransaction.h>
 #include <App/Document.h>
+#include <App/Range.h>
 #include <Base/Reader.h>
 #include <Base/Stream.h>
 #include <Base/Writer.h>
-#include <Gui/CommandT.h>
 #include <Gui/Application.h>
+#include <Gui/CommandT.h>
 #include <Gui/MainWindow.h>
-#include "../App/Utils.h"
-#include "../App/Cell.h"
-#include <App/Range.h>
+#include <Mod/Spreadsheet/App/Cell.h>
+
 #include "SheetTableView.h"
-#include "LineEdit.h"
-#include "PropertiesDialog.h"
 #include "DlgBindSheet.h"
 #include "DlgSheetConf.h"
+#include "LineEdit.h"
+#include "PropertiesDialog.h"
+
 
 using namespace SpreadsheetGui;
 using namespace Spreadsheet;
diff --git a/src/Mod/Spreadsheet/Gui/SheetTableView.h b/src/Mod/Spreadsheet/Gui/SheetTableView.h
index 76ad63b897..c537d70f2d 100644
--- a/src/Mod/Spreadsheet/Gui/SheetTableView.h
+++ b/src/Mod/Spreadsheet/Gui/SheetTableView.h
@@ -23,11 +23,11 @@
 #ifndef SHEETTABLEVIEW_H
 #define SHEETTABLEVIEW_H
 
-#include <QTableView>
 #include <QHeaderView>
-#include <QKeyEvent>
+#include <QTableView>
+
 #include <Mod/Spreadsheet/App/Sheet.h>
-#include <Mod/Spreadsheet/App/Utils.h>
+
 
 namespace SpreadsheetGui {
 
diff --git a/src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.cpp b/src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.cpp
index 4d9a9cde71..2b5c37d281 100644
--- a/src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.cpp
+++ b/src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.cpp
@@ -23,21 +23,21 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
 # include <QLineEdit>
 # include <QPainter>
 #endif
 
+#include <App/DocumentObject.h>
 #include <Base/Console.h>
+#include <Mod/Spreadsheet/App/Sheet.h>
+
 #include "SpreadsheetDelegate.h"
 #include "LineEdit.h"
-#include <Base/Console.h>
-#include <App/DocumentObject.h>
-#include <Mod/Spreadsheet/App/Sheet.h>
-#include <Gui/ExpressionCompleter.h>
-#include "DlgBindSheet.h"
 
-FC_LOG_LEVEL_INIT("Spreadsheet",true,true)
+
+FC_LOG_LEVEL_INIT("Spreadsheet", true, true)
 
 using namespace Spreadsheet;
 using namespace SpreadsheetGui;
diff --git a/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp b/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp
index 24e94b7881..b7e8e37ade 100644
--- a/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp
+++ b/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp
@@ -21,44 +21,35 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+
 #ifndef _PreComp_
-# include <QAction>
-# include <QApplication>
-# include <QMenu>
-# include <QMouseEvent>
+# include <cmath>
+# include <QPalette>
 # include <QPrinter>
 # include <QPrintDialog>
 # include <QPrintPreviewDialog>
-# include <QSlider>
-# include <QStatusBar>
-# include <QToolBar>
-# include <QTableWidgetItem>
 # include <QTextDocument>
-# include <QMessageBox>
-# include <QPalette>
-# include <cmath>
 #endif
 
 #include <App/DocumentObject.h>
-#include <App/PropertyStandard.h>
 #include <App/Range.h>
 #include <Base/Tools.h>
-#include <Gui/MainWindow.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
 #include <Gui/CommandT.h>
 #include <Gui/Document.h>
-#include <Gui/ExpressionCompleter.h>
 #include <Gui/FileDialog.h>
-#include <LineEdit.h>
+#include <Gui/MainWindow.h>
+
 #include <Mod/Spreadsheet/App/Sheet.h>
 #include <Mod/Spreadsheet/App/SheetPy.h>
-#include <Mod/Spreadsheet/App/Utils.h>
-#include "qtcolorpicker.h"
 
 #include "SpreadsheetView.h"
-#include "SpreadsheetDelegate.h"
 #include "ui_Sheet.h"
+#include "LineEdit.h"
+#include "qtcolorpicker.h"
+#include "SpreadsheetDelegate.h"
+
 
 using namespace SpreadsheetGui;
 using namespace Spreadsheet;
diff --git a/src/Mod/Spreadsheet/Gui/SpreadsheetView.h b/src/Mod/Spreadsheet/Gui/SpreadsheetView.h
index 445a87b0fc..46bb880409 100644
--- a/src/Mod/Spreadsheet/Gui/SpreadsheetView.h
+++ b/src/Mod/Spreadsheet/Gui/SpreadsheetView.h
@@ -23,12 +23,15 @@
 #ifndef SpreadsheetView_H
 #define SpreadsheetView_H
 
+#include <QHeaderView>
+
 #include <Gui/MDIView.h>
 #include <Gui/MDIViewPy.h>
-#include <QHeaderView>
-#include "SheetModel.h"
 #include <Mod/Spreadsheet/App/Sheet.h>
 
+#include "SheetModel.h"
+
+
 class QSlider;
 class QAction;
 class QActionGroup;
diff --git a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp
index 25abd9bb3d..e5e73facfe 100644
--- a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp
+++ b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp
@@ -21,36 +21,25 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <QApplication>
-# include <QFile>
-# include <QFileInfo>
-# include <QImage>
-# include <QString>
-# include <QMdiSubWindow>
+# include <sstream>
 # include <QMenu>
+# include <QString>
 #endif
 
-#include "ViewProviderSpreadsheet.h"
-#include "SpreadsheetView.h"
-#include "ViewProviderSpreadsheetPy.h"
-
-#include <Mod/Spreadsheet/App/Sheet.h>
-#include <App/Range.h>
-#include <App/Document.h>
-#include <Gui/BitmapFactory.h>
 #include <Gui/Application.h>
-#include <Gui/MainWindow.h>
-#include <Gui/Command.h>
+#include <Gui/BitmapFactory.h>
 #include <Gui/Document.h>
+#include <Gui/MainWindow.h>
 #include <Gui/View3DInventor.h>
-#include <Base/FileInfo.h>
-#include <Base/Stream.h>
-#include <Base/Console.h>
-#include <sstream>
+#include <Mod/Spreadsheet/App/Sheet.h>
+
+#include "ViewProviderSpreadsheet.h"
+#include "ViewProviderSpreadsheetPy.h"
+#include "SpreadsheetView.h"
+
 
 using namespace Base;
 using namespace Gui;
@@ -58,7 +47,6 @@ using namespace App;
 using namespace SpreadsheetGui;
 using namespace Spreadsheet;
 
-
 PROPERTY_SOURCE(SpreadsheetGui::ViewProviderSheet, Gui::ViewProviderDocumentObject)
 
 ViewProviderSheet::ViewProviderSheet()
diff --git a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h
index 2f14ecebd8..e34650871d 100644
--- a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h
+++ b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h
@@ -21,14 +21,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef SPREADSHEET_ViewProviderImagePlane_H
 #define SPREADSHEET_ViewProviderImagePlane_H
 
+#include <QPointer>
+
 #include <Gui/ViewProviderDocumentObject.h>
 #include <Gui/ViewProviderPythonFeature.h>
 #include <Mod/Spreadsheet/SpreadsheetGlobal.h>
-#include <QPointer>
+
 
 namespace Spreadsheet {
 class Sheet;
diff --git a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheetPyImp.cpp b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheetPyImp.cpp
index 12ba9d5684..933d39b99a 100644
--- a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheetPyImp.cpp
+++ b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheetPyImp.cpp
@@ -1,10 +1,31 @@
+/***************************************************************************
+ *   Copyright (c) 2021 Jose Luis Cercos-Pita                              *
+ *                                                                         *
+ *   This file is part of the FreeCAD CAx development system.              *
+ *                                                                         *
+ *   This library is free software; you can redistribute it and/or         *
+ *   modify it under the terms of the GNU Library General Public           *
+ *   License as published by the Free Software Foundation; either          *
+ *   version 2 of the License, or (at your option) any later version.      *
+ *                                                                         *
+ *   This library  is distributed in the hope that it will be useful,      *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU Library General Public License for more details.                  *
+ *                                                                         *
+ *   You should have received a copy of the GNU Library General Public     *
+ *   License along with this library; see the file COPYING.LIB. If not,    *
+ *   write to the Free Software Foundation, Inc., 59 Temple Place,         *
+ *   Suite 330, Boston, MA  02111-1307, USA                                *
+ *                                                                         *
+ ***************************************************************************/
+
 #include "PreCompiled.h"
 
+#include "SpreadsheetView.h"
 #include "ViewProviderSpreadsheetPy.h"
 #include "ViewProviderSpreadsheetPy.cpp"
-#include <CXX/Objects.hxx>
 
-#include "SpreadsheetView.h"
 
 using namespace SpreadsheetGui;
 
diff --git a/src/Mod/Spreadsheet/Gui/Workbench.cpp b/src/Mod/Spreadsheet/Gui/Workbench.cpp
index 2d3a92271a..4fadf9cd7f 100644
--- a/src/Mod/Spreadsheet/Gui/Workbench.cpp
+++ b/src/Mod/Spreadsheet/Gui/Workbench.cpp
@@ -21,25 +21,26 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
 # include <qobject.h>
+# include <QToolBar>
 #endif
 
-#include "Workbench.h"
-#include <Gui/ToolBarManager.h>
-#include <Gui/MenuManager.h>
-#include <Gui/Application.h>
-#include <Gui/MainWindow.h>
-#include <Gui/Command.h>
-#include <QToolBar>
-#include "qtcolorpicker.h"
-#include "Mod/Spreadsheet/App/Sheet.h"
 #include <App/Range.h>
+#include <Gui/Application.h>
+#include <Gui/Command.h>
+#include <Gui/MainWindow.h>
+#include <Gui/MenuManager.h>
+#include <Gui/ToolBarManager.h>
+#include "Mod/Spreadsheet/App/Sheet.h"
 #include "Mod/Spreadsheet/Gui/SpreadsheetView.h"
 
+#include "Workbench.h"
+#include "qtcolorpicker.h"
+
+
 using namespace Base;
 using namespace App;
 using namespace SpreadsheetGui;