diff --git a/src/Main/FreeCADGuiPy.cpp b/src/Main/FreeCADGuiPy.cpp
index a3e31ac31b..165493d682 100644
--- a/src/Main/FreeCADGuiPy.cpp
+++ b/src/Main/FreeCADGuiPy.cpp
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include <FCConfig.h>
 
 #if HAVE_CONFIG_H
@@ -33,19 +32,18 @@
 
 #include <QApplication>
 #include <QIcon>
-#include <QThread>
 #if defined(Q_OS_WIN)
 #include <windows.h>
 #elif defined(Q_WS_X11)
 #include <QX11EmbedWidget>
 #endif
 #include <thread>
+
 // FreeCAD Base header
-#include <CXX/WrapPython.h>
+#include <App/Application.h>
 #include <Base/Exception.h>
 #include <Base/Factory.h>
 #include <Base/Interpreter.h>
-#include <App/Application.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/MainWindow.h>
@@ -55,6 +53,7 @@
 #include <Inventor/SoInteraction.h>
 #include <Inventor/nodekits/SoNodeKit.h>
 
+
 static bool _isSetupWithoutGui = false;
 
 static
diff --git a/src/Main/MainCmd.cpp b/src/Main/MainCmd.cpp
index 12a60b4be8..5631ca97c8 100644
--- a/src/Main/MainCmd.cpp
+++ b/src/Main/MainCmd.cpp
@@ -37,14 +37,11 @@
 
 #include <stdio.h>
 #include <sstream>
-#include <iostream>
 
 // FreeCAD Base header
 #include <Base/Console.h>
-#include <Base/Interpreter.h>
-#include <Base/Parameter.h>
 #include <Base/Exception.h>
-#include <Base/Factory.h>
+#include <Base/Interpreter.h>
 
 // FreeCAD doc header
 #include <App/Application.h>
diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp
index bef6ffae9b..0adb53818c 100644
--- a/src/Main/MainGui.cpp
+++ b/src/Main/MainGui.cpp
@@ -35,28 +35,24 @@
 #   include <config.h>
 #endif // HAVE_CONFIG_H
 
+#include <cstdio>
 #include <map>
-#include <vector>
-#include <algorithm>
 #include <stdexcept>
 
-#include <cstdio>
 #include <QApplication>
-#include <QFile>
-#include <QMessageBox>
 #include <QLocale>
+#include <QMessageBox>
 #include <QTextCodec>
 
 // FreeCAD header
+#include <App/Application.h>
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
 #include <Base/Parameter.h>
 #include <Base/Exception.h>
-#include <Base/Factory.h>
-#include <App/Application.h>
-#include <Gui/BitmapFactory.h>
 #include <Gui/Application.h>
 
+
 void PrintInitHelp(void);
 
 const char sBanner[] = "\xc2\xa9 Juergen Riegel, Werner Mayer, Yorik van Havre and others 2001-2022\n"\