From 62b915ee7b5807311203f7ee3824713ea7bc54ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Reitb=C3=B6ck?= <mrpilot@gmx.net>
Date: Mon, 15 Sep 2025 20:31:46 +0200
Subject: [PATCH] Spreadsheet: use CMake to generate precompiled headers on all
 platforms

"Professional CMake" book suggest the following:

"Targets should build successfully with or without compiler support for precompiled headers. It
 should be considered an optimization, not a requirement. In particular, do not explicitly include a
 precompile header (e.g. stdafx.h) in the source code, let CMake force-include an automatically
 generated precompile header on the compiler command line instead. This is more portable across
 the major compilers and is likely to be easier to maintain. It will also avoid warnings being
 generated from certain code checking tools like iwyu (include what you use)."

Therefore, removed the "#include <PreCompiled.h>" from sources, also
there is no need for the "#ifdef _PreComp_" anymore
---
 src/Mod/Spreadsheet/App/AppSpreadsheet.cpp    |  1 -
 src/Mod/Spreadsheet/App/CMakeLists.txt        | 13 +++++-----
 src/Mod/Spreadsheet/App/Cell.cpp              |  4 +---
 src/Mod/Spreadsheet/App/Cell.h                |  2 ++
 src/Mod/Spreadsheet/App/PreCompiled.cpp       | 24 -------------------
 src/Mod/Spreadsheet/App/PreCompiled.h         |  4 ----
 .../Spreadsheet/App/PropertyColumnWidths.cpp  |  1 -
 .../App/PropertyColumnWidthsPyImp.cpp         |  1 -
 .../Spreadsheet/App/PropertyRowHeights.cpp    |  1 -
 .../App/PropertyRowHeightsPyImp.cpp           |  1 -
 src/Mod/Spreadsheet/App/PropertySheet.cpp     |  3 ---
 src/Mod/Spreadsheet/App/PropertySheet.h       |  8 +++++++
 .../Spreadsheet/App/PropertySheetPyImp.cpp    |  1 -
 src/Mod/Spreadsheet/App/Sheet.cpp             |  4 ----
 src/Mod/Spreadsheet/App/Sheet.h               |  2 ++
 src/Mod/Spreadsheet/App/SheetObserver.cpp     |  1 -
 src/Mod/Spreadsheet/App/SheetPyImp.cpp        |  1 -
 src/Mod/Spreadsheet/App/Utils.cpp             |  4 +---
 src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp |  1 -
 src/Mod/Spreadsheet/Gui/CMakeLists.txt        |  7 +++++-
 src/Mod/Spreadsheet/Gui/Command.cpp           |  5 ++--
 src/Mod/Spreadsheet/Gui/DlgBindSheet.cpp      |  1 -
 src/Mod/Spreadsheet/Gui/DlgSettingsImp.cpp    |  1 -
 src/Mod/Spreadsheet/Gui/DlgSheetConf.cpp      |  1 -
 src/Mod/Spreadsheet/Gui/LineEdit.cpp          |  3 ---
 src/Mod/Spreadsheet/Gui/PreCompiled.cpp       | 24 -------------------
 src/Mod/Spreadsheet/Gui/PreCompiled.h         |  4 ----
 src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp  |  1 -
 src/Mod/Spreadsheet/Gui/SheetModel.cpp        |  4 +---
 src/Mod/Spreadsheet/Gui/SheetTableView.cpp    |  5 +---
 .../Gui/SheetTableViewAccessibleInterface.cpp |  4 +---
 .../Spreadsheet/Gui/SpreadsheetDelegate.cpp   |  4 +---
 src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp   |  4 +---
 src/Mod/Spreadsheet/Gui/SpreadsheetView.h     |  2 ++
 .../Gui/ViewProviderSpreadsheet.cpp           |  4 +---
 .../Gui/ViewProviderSpreadsheetPyImp.cpp      |  1 -
 src/Mod/Spreadsheet/Gui/Workbench.cpp         |  4 +---
 src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp     |  3 ---
 src/Mod/Spreadsheet/SpreadsheetGlobal.h       |  4 ++--
 39 files changed, 39 insertions(+), 124 deletions(-)
 delete mode 100644 src/Mod/Spreadsheet/App/PreCompiled.cpp
 delete mode 100644 src/Mod/Spreadsheet/Gui/PreCompiled.cpp

diff --git a/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp b/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp
index db92e460c9..0b11145c78 100644
--- a/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp
+++ b/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp
@@ -21,7 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/Spreadsheet/App/CMakeLists.txt b/src/Mod/Spreadsheet/App/CMakeLists.txt
index 6c8fbbe046..f230be3e19 100644
--- a/src/Mod/Spreadsheet/App/CMakeLists.txt
+++ b/src/Mod/Spreadsheet/App/CMakeLists.txt
@@ -10,7 +10,6 @@ set(Spreadsheet_SRCS
     Cell.cpp
     Cell.h
     DisplayUnit.h
-    PreCompiled.cpp
     PreCompiled.h
     PropertySheet.cpp
     PropertySheet.h
@@ -40,14 +39,14 @@ generate_from_py(PropertySheet)
 generate_from_py(PropertyColumnWidths)
 generate_from_py(PropertyRowHeights)
 
-if(FREECAD_USE_PCH)
-    add_definitions(-D_PreComp_)
-    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${Spreadsheet_SRCS})
-    ADD_MSVC_PRECOMPILED_HEADER(Spreadsheet PreCompiled.h PreCompiled.cpp PCH_SRCS)
-endif(FREECAD_USE_PCH)
-
 add_library(Spreadsheet SHARED ${Spreadsheet_SRCS})
 
+if(FREECAD_USE_PCH)
+    target_precompile_headers(Spreadsheet PRIVATE
+            $<$<COMPILE_LANGUAGE:CXX>:"${CMAKE_CURRENT_LIST_DIR}/PreCompiled.h">
+    )
+endif(FREECAD_USE_PCH)
+
 target_include_directories(
     Spreadsheet
     PRIVATE
diff --git a/src/Mod/Spreadsheet/App/Cell.cpp b/src/Mod/Spreadsheet/App/Cell.cpp
index 80c6cd13ee..f58fc9ccfe 100644
--- a/src/Mod/Spreadsheet/App/Cell.cpp
+++ b/src/Mod/Spreadsheet/App/Cell.cpp
@@ -20,15 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <QLocale>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/tokenizer.hpp>
 #include <iomanip>
 #include <sstream>
-#endif
+
 
 #include <App/ExpressionParser.h>
 #include <Base/Console.h>
diff --git a/src/Mod/Spreadsheet/App/Cell.h b/src/Mod/Spreadsheet/App/Cell.h
index 97bf1c496d..5c7710136d 100644
--- a/src/Mod/Spreadsheet/App/Cell.h
+++ b/src/Mod/Spreadsheet/App/Cell.h
@@ -29,6 +29,8 @@
 #include <App/Expression.h>
 #include <App/Material.h>
 
+#include <Mod/Spreadsheet/SpreadsheetGlobal.h>
+
 #include "DisplayUnit.h"
 #include "Utils.h"
 
diff --git a/src/Mod/Spreadsheet/App/PreCompiled.cpp b/src/Mod/Spreadsheet/App/PreCompiled.cpp
deleted file mode 100644
index 7b200a1bf2..0000000000
--- a/src/Mod/Spreadsheet/App/PreCompiled.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/***************************************************************************
- *   Copyright (c) 2002 Jürgen Riegel <juergen.riegel@web.de>              *
- *                                                                         *
- *   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"
diff --git a/src/Mod/Spreadsheet/App/PreCompiled.h b/src/Mod/Spreadsheet/App/PreCompiled.h
index f9c4e19b4f..e83c123319 100644
--- a/src/Mod/Spreadsheet/App/PreCompiled.h
+++ b/src/Mod/Spreadsheet/App/PreCompiled.h
@@ -26,8 +26,6 @@
 
 #include <FCConfig.h>
 
-#ifdef _PreComp_
-
 // STL
 #include <algorithm>
 #include <deque>
@@ -48,6 +46,4 @@
 // Qt
 #include <QLocale>
 
-#endif  //_PreComp_
-
 #endif  // SPREADSHEET_PRECOMPILED_H
diff --git a/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp b/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp
index 909e692d8d..c81e70032c 100644
--- a/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp
+++ b/src/Mod/Spreadsheet/App/PropertyColumnWidths.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/Range.h>
 #include <Base/Reader.h>
diff --git a/src/Mod/Spreadsheet/App/PropertyColumnWidthsPyImp.cpp b/src/Mod/Spreadsheet/App/PropertyColumnWidthsPyImp.cpp
index 2b23495cfe..99d5ddd734 100644
--- a/src/Mod/Spreadsheet/App/PropertyColumnWidthsPyImp.cpp
+++ b/src/Mod/Spreadsheet/App/PropertyColumnWidthsPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "PropertyColumnWidths.h"
 // inclusion of the generated files (generated out of PropertyColumnWidthsPy.xml)
diff --git a/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp b/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp
index 21395f86cd..5f7a2962c3 100644
--- a/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp
+++ b/src/Mod/Spreadsheet/App/PropertyRowHeights.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/Range.h>
 #include <Base/Reader.h>
diff --git a/src/Mod/Spreadsheet/App/PropertyRowHeightsPyImp.cpp b/src/Mod/Spreadsheet/App/PropertyRowHeightsPyImp.cpp
index bccc4c89a3..ecc2cfccfd 100644
--- a/src/Mod/Spreadsheet/App/PropertyRowHeightsPyImp.cpp
+++ b/src/Mod/Spreadsheet/App/PropertyRowHeightsPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "PropertyRowHeights.h"
 // inclusion of the generated files (generated out of PropertyRowHeightsPy.xml)
diff --git a/src/Mod/Spreadsheet/App/PropertySheet.cpp b/src/Mod/Spreadsheet/App/PropertySheet.cpp
index 66fda50643..5f386add40 100644
--- a/src/Mod/Spreadsheet/App/PropertySheet.cpp
+++ b/src/Mod/Spreadsheet/App/PropertySheet.cpp
@@ -20,14 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <algorithm>
 
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/regex.hpp>
-#endif
 
 #include <App/Document.h>
 #include <App/DocumentObject.h>
diff --git a/src/Mod/Spreadsheet/App/PropertySheet.h b/src/Mod/Spreadsheet/App/PropertySheet.h
index 236b180baf..5268036eb1 100644
--- a/src/Mod/Spreadsheet/App/PropertySheet.h
+++ b/src/Mod/Spreadsheet/App/PropertySheet.h
@@ -23,11 +23,19 @@
 #ifndef PROPERTYSHEET_H
 #define PROPERTYSHEET_H
 
+#ifdef _MSC_VER
+#ifdef PropertySheet
+#undef PropertySheet  // Microsoft's #define conflicts with the use below
+#endif
+#endif
+
 #include <map>
 
 #include <App/DocumentObject.h>
 #include <App/PropertyLinks.h>
 
+#include <Mod/Spreadsheet/SpreadsheetGlobal.h>
+
 #include "Cell.h"
 
 
diff --git a/src/Mod/Spreadsheet/App/PropertySheetPyImp.cpp b/src/Mod/Spreadsheet/App/PropertySheetPyImp.cpp
index 1a014ebf0d..b785774fd3 100644
--- a/src/Mod/Spreadsheet/App/PropertySheetPyImp.cpp
+++ b/src/Mod/Spreadsheet/App/PropertySheetPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "PropertySheet.h"
 // inclusion of the generated files (generated out of PropertySheetPy.xml)
diff --git a/src/Mod/Spreadsheet/App/Sheet.cpp b/src/Mod/Spreadsheet/App/Sheet.cpp
index 6fd311dfa7..fb21b12819 100644
--- a/src/Mod/Spreadsheet/App/Sheet.cpp
+++ b/src/Mod/Spreadsheet/App/Sheet.cpp
@@ -20,9 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-
-#ifndef _PreComp_
 #include <boost/tokenizer.hpp>
 #include <boost/regex.hpp>
 #include <deque>
@@ -34,7 +31,6 @@
 #include <string>
 #include <set>
 #include <vector>
-#endif
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/Spreadsheet/App/Sheet.h b/src/Mod/Spreadsheet/App/Sheet.h
index f08a3d35fe..4bfdeb3edc 100644
--- a/src/Mod/Spreadsheet/App/Sheet.h
+++ b/src/Mod/Spreadsheet/App/Sheet.h
@@ -41,6 +41,8 @@
 #include <App/Range.h>
 #include <Base/Unit.h>
 
+#include <Mod/Spreadsheet/SpreadsheetGlobal.h>
+
 #include "PropertyColumnWidths.h"
 #include "PropertyRowHeights.h"
 #include "PropertySheet.h"
diff --git a/src/Mod/Spreadsheet/App/SheetObserver.cpp b/src/Mod/Spreadsheet/App/SheetObserver.cpp
index 4007ccafae..45ff751cab 100644
--- a/src/Mod/Spreadsheet/App/SheetObserver.cpp
+++ b/src/Mod/Spreadsheet/App/SheetObserver.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include "PropertySheet.h"
 #include "SheetObserver.h"
diff --git a/src/Mod/Spreadsheet/App/SheetPyImp.cpp b/src/Mod/Spreadsheet/App/SheetPyImp.cpp
index 79f9c6db6e..221bd9557a 100644
--- a/src/Mod/Spreadsheet/App/SheetPyImp.cpp
+++ b/src/Mod/Spreadsheet/App/SheetPyImp.cpp
@@ -21,7 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <boost/tokenizer.hpp>
 
diff --git a/src/Mod/Spreadsheet/App/Utils.cpp b/src/Mod/Spreadsheet/App/Utils.cpp
index e31d4a8962..5d0a1d8573 100644
--- a/src/Mod/Spreadsheet/App/Utils.cpp
+++ b/src/Mod/Spreadsheet/App/Utils.cpp
@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <sstream>
-#endif
+
 
 #include "Sheet.h"
 #include "Utils.h"
diff --git a/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp b/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
index eb98e4d70f..413b5e0137 100644
--- a/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
+++ b/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
@@ -21,7 +21,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/Application.h>
 #include <App/Document.h>
diff --git a/src/Mod/Spreadsheet/Gui/CMakeLists.txt b/src/Mod/Spreadsheet/Gui/CMakeLists.txt
index 507c96fe42..ecc71341ce 100644
--- a/src/Mod/Spreadsheet/Gui/CMakeLists.txt
+++ b/src/Mod/Spreadsheet/Gui/CMakeLists.txt
@@ -64,7 +64,6 @@ SET(SpreadsheetGui_SRCS
     SheetTableViewAccessibleInterface.cpp
     SheetModel.h
     SheetModel.cpp
-    PreCompiled.cpp
     PreCompiled.h
     Workbench.cpp
     Workbench.h
@@ -105,6 +104,12 @@ add_library(SpreadsheetGui SHARED
     ${SpreadsheetGuiIcon_SVG}
 )
 
+if(FREECAD_USE_PCH)
+    target_precompile_headers(SpreadsheetGui PRIVATE
+            $<$<COMPILE_LANGUAGE:CXX>:"${CMAKE_CURRENT_LIST_DIR}/PreCompiled.h">
+    )
+endif(FREECAD_USE_PCH)
+
 target_include_directories(
     SpreadsheetGui
     PRIVATE
diff --git a/src/Mod/Spreadsheet/Gui/Command.cpp b/src/Mod/Spreadsheet/Gui/Command.cpp
index 094831c932..db3c291360 100644
--- a/src/Mod/Spreadsheet/Gui/Command.cpp
+++ b/src/Mod/Spreadsheet/Gui/Command.cpp
@@ -19,11 +19,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <sstream>
-#endif
+
+#include <FCConfig.h>
 
 #if defined(FC_OS_WIN32)
 #include <sys/timeb.h>
diff --git a/src/Mod/Spreadsheet/Gui/DlgBindSheet.cpp b/src/Mod/Spreadsheet/Gui/DlgBindSheet.cpp
index a58d7c4eb8..3fc3119b79 100644
--- a/src/Mod/Spreadsheet/Gui/DlgBindSheet.cpp
+++ b/src/Mod/Spreadsheet/Gui/DlgBindSheet.cpp
@@ -20,7 +20,6 @@
  *                                                                          *
  ****************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <QMessageBox>
 #include <boost/algorithm/string.hpp>
diff --git a/src/Mod/Spreadsheet/Gui/DlgSettingsImp.cpp b/src/Mod/Spreadsheet/Gui/DlgSettingsImp.cpp
index f301917e46..ee85189bc9 100644
--- a/src/Mod/Spreadsheet/Gui/DlgSettingsImp.cpp
+++ b/src/Mod/Spreadsheet/Gui/DlgSettingsImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <Gui/Application.h>
 
diff --git a/src/Mod/Spreadsheet/Gui/DlgSheetConf.cpp b/src/Mod/Spreadsheet/Gui/DlgSheetConf.cpp
index c30b227a42..6537eb729c 100644
--- a/src/Mod/Spreadsheet/Gui/DlgSheetConf.cpp
+++ b/src/Mod/Spreadsheet/Gui/DlgSheetConf.cpp
@@ -20,7 +20,6 @@
  *                                                                          *
  ****************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <QMessageBox>
 
diff --git a/src/Mod/Spreadsheet/Gui/LineEdit.cpp b/src/Mod/Spreadsheet/Gui/LineEdit.cpp
index 3410433b47..bf06632ce7 100644
--- a/src/Mod/Spreadsheet/Gui/LineEdit.cpp
+++ b/src/Mod/Spreadsheet/Gui/LineEdit.cpp
@@ -20,14 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <QApplication>
 #include <QEvent>
 #include <QKeyEvent>
 #include <QGraphicsProxyWidget>
-#endif
 
 #include "LineEdit.h"
 #include <Gui/MainWindow.h>
diff --git a/src/Mod/Spreadsheet/Gui/PreCompiled.cpp b/src/Mod/Spreadsheet/Gui/PreCompiled.cpp
deleted file mode 100644
index 7b200a1bf2..0000000000
--- a/src/Mod/Spreadsheet/Gui/PreCompiled.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/***************************************************************************
- *   Copyright (c) 2002 Jürgen Riegel <juergen.riegel@web.de>              *
- *                                                                         *
- *   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"
diff --git a/src/Mod/Spreadsheet/Gui/PreCompiled.h b/src/Mod/Spreadsheet/Gui/PreCompiled.h
index bd8a17bab9..832bbfe9bf 100644
--- a/src/Mod/Spreadsheet/Gui/PreCompiled.h
+++ b/src/Mod/Spreadsheet/Gui/PreCompiled.h
@@ -26,8 +26,6 @@
 
 #include <FCConfig.h>
 
-#ifdef _PreComp_
-
 // standard
 #include <cmath>
 
@@ -42,6 +40,4 @@
 // Qt Toolkit
 #include <Gui/QtAll.h>
 
-#endif  //_PreComp_
-
 #endif  // SPREADSHEET_PRECOMPILED_H
diff --git a/src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp b/src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp
index 35a6bc2e16..ae8feab3d7 100644
--- a/src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp
+++ b/src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 #include <App/Document.h>
 #include <App/ExpressionParser.h>
diff --git a/src/Mod/Spreadsheet/Gui/SheetModel.cpp b/src/Mod/Spreadsheet/Gui/SheetModel.cpp
index befa29c199..7f28e345a6 100644
--- a/src/Mod/Spreadsheet/Gui/SheetModel.cpp
+++ b/src/Mod/Spreadsheet/Gui/SheetModel.cpp
@@ -20,12 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <QFont>
 #include <QLocale>
-#endif
+
 
 #include <App/Document.h>
 #include <Base/Interpreter.h>
diff --git a/src/Mod/Spreadsheet/Gui/SheetTableView.cpp b/src/Mod/Spreadsheet/Gui/SheetTableView.cpp
index 8773bdb9e6..86a7caee02 100644
--- a/src/Mod/Spreadsheet/Gui/SheetTableView.cpp
+++ b/src/Mod/Spreadsheet/Gui/SheetTableView.cpp
@@ -20,9 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-
-#ifndef _PreComp_
 #include <limits>
 #include <QAction>
 #include <QApplication>
@@ -31,7 +28,7 @@
 #include <QMenu>
 #include <QMessageBox>
 #include <QMimeData>
-#endif
+
 #include <QTextTableCell>
 
 #include <App/Application.h>
diff --git a/src/Mod/Spreadsheet/Gui/SheetTableViewAccessibleInterface.cpp b/src/Mod/Spreadsheet/Gui/SheetTableViewAccessibleInterface.cpp
index 8e9d1e6401..162edfbd24 100644
--- a/src/Mod/Spreadsheet/Gui/SheetTableViewAccessibleInterface.cpp
+++ b/src/Mod/Spreadsheet/Gui/SheetTableViewAccessibleInterface.cpp
@@ -21,9 +21,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <QAction>
 #include <QApplication>
 #include <QClipboard>
@@ -31,7 +29,7 @@
 #include <QMenu>
 #include <QMessageBox>
 #include <QMimeData>
-#endif
+
 
 #include "SheetTableViewAccessibleInterface.h"
 
diff --git a/src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.cpp b/src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.cpp
index b86cbb44c7..52f47496b9 100644
--- a/src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.cpp
+++ b/src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.cpp
@@ -22,12 +22,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <QLineEdit>
 #include <QPainter>
-#endif
+
 
 #include <App/DocumentObject.h>
 #include <Base/Console.h>
diff --git a/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp b/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp
index 65717f1ed1..7e37cf17c3 100644
--- a/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp
+++ b/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp
@@ -20,15 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <QPalette>
 #include <QPrintDialog>
 #include <QPrintPreviewDialog>
 #include <QPrinter>
 #include <QTextDocument>
-#endif
+
 
 #include <App/Application.h>
 #include <App/DocumentObject.h>
diff --git a/src/Mod/Spreadsheet/Gui/SpreadsheetView.h b/src/Mod/Spreadsheet/Gui/SpreadsheetView.h
index 4ec2620041..82b720c103 100644
--- a/src/Mod/Spreadsheet/Gui/SpreadsheetView.h
+++ b/src/Mod/Spreadsheet/Gui/SpreadsheetView.h
@@ -29,6 +29,8 @@
 #include <Gui/MDIViewPy.h>
 #include <Mod/Spreadsheet/App/Sheet.h>
 
+#include <Mod/Spreadsheet/SpreadsheetGlobal.h>
+
 #include "SheetModel.h"
 
 
diff --git a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp
index b7a8461bc1..41b44720d6 100644
--- a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp
+++ b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp
@@ -21,13 +21,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <QMenu>
 #include <QString>
 #include <sstream>
-#endif
+
 
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
diff --git a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheetPyImp.cpp b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheetPyImp.cpp
index a52ef87c86..a78451d766 100644
--- a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheetPyImp.cpp
+++ b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheetPyImp.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
 // clang-format off
 #include "ViewProviderSpreadsheetPy.h"
diff --git a/src/Mod/Spreadsheet/Gui/Workbench.cpp b/src/Mod/Spreadsheet/Gui/Workbench.cpp
index 19cbaf235a..36bf4f8e1d 100644
--- a/src/Mod/Spreadsheet/Gui/Workbench.cpp
+++ b/src/Mod/Spreadsheet/Gui/Workbench.cpp
@@ -21,12 +21,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "PreCompiled.h"
 
-#ifndef _PreComp_
 #include <QToolBar>
 #include <qobject.h>
-#endif
+
 
 #include "Mod/Spreadsheet/App/Sheet.h"
 #include "Mod/Spreadsheet/Gui/SpreadsheetView.h"
diff --git a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp
index 0c82215f86..673d43a00c 100644
--- a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp
+++ b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp
@@ -45,8 +45,6 @@
 **
 ****************************************************************************/
 
-#include "PreCompiled.h"
-#ifndef _PreComp_
 #include <cmath>
 
 #include <QApplication>
@@ -64,7 +62,6 @@
 #include <QtGui/QPaintEvent>
 #include <QtGui/QPixmap>
 #include <QtGui/QShowEvent>
-#endif
 
 #include <Gui/FileDialog.h>
 
diff --git a/src/Mod/Spreadsheet/SpreadsheetGlobal.h b/src/Mod/Spreadsheet/SpreadsheetGlobal.h
index a8741c9dd0..0182ac0c48 100644
--- a/src/Mod/Spreadsheet/SpreadsheetGlobal.h
+++ b/src/Mod/Spreadsheet/SpreadsheetGlobal.h
@@ -20,11 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <FCGlobal.h>
-
 #ifndef SPREADSHEET_GLOBAL_H
 #define SPREADSHEET_GLOBAL_H
 
+#include <FCGlobal.h>
+
 
 // Spreadsheet
 #ifndef SpreadsheetExport