diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index 2361cc62c389..46be54473fd8 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -45,23 +45,6 @@
 #include <vcl/svapp.hxx>
 #include <rtl/ustrbuf.hxx>
 
-// #ifndef _RTL_UUID_H_
-// #include <rtl/uuid.h>
-// #endif
-// #ifndef _CPPUHELPER_QUERYINTERFACE_HXX_
-// #include <cppuhelper/queryinterface.hxx>
-// #endif
-// #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-// #include <toolkit/helper/vclunohelper.hxx>
-// #endif
-// #ifndef _SV_WINDOW_HXX
-// #include <vcl/window.hxx>
-// #endif
-
-// #ifndef _SVX_ACCESSILE_TEXT_HELPER_HXX_
-// #include <svx/AccessibleTextHelper.hxx>
-// #endif
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 338131c4f973..86c36ad1fb1b 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -39,7 +39,6 @@
 
 #include "LineProperties.hxx"
 #include "FillProperties.hxx"
-// #include "NamedProperties.hxx"
 #include "UserDefinedProperties.hxx"
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index f1d441921a6a..afc25fba9559 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -50,9 +50,6 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 
-// for storing/reading the position and size of the dialog
-// #include <svtools/viewoptions.hxx>
-
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::rtl::OUString;
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
index 8c104187797e..33988a83c921 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
@@ -30,9 +30,6 @@
 #include "ModifyListenerCallBack.hxx"
 #include "TimerTriggeredControllerLock.hxx"
 
-// #ifndef _COM_SUN_STAR_CHART2_SCENEDESCRIPTOR_HPP_
-// #include <com/sun/star/chart2/SceneDescriptor.hpp>
-// #endif
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 // header for class TabPage
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
index d80d37eff7da..bc4c66f9674f 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
@@ -33,13 +33,6 @@
 #include "macros.hxx"
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 
-// #ifndef _VOS_MUTEX_HXX_
-// #include <vos/mutex.hxx>
-// #endif
-// #ifndef _SV_SVAPP_HXX
-// #include <vcl/svapp.hxx>
-// #endif
-
 // for ressource strings STR_UNDO and STR_REDO
 #include <sfx2/sfx.hrc>
 
diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx
index fa773a6dab00..fc7082bb6f87 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -33,17 +33,11 @@
 #include <cppuhelper/weak.hxx>
 
 // interfaces and types
-// #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
-// #include <com/sun/star/lang/XServiceInfo.hpp>
-// #endif
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/style/XStyleSupplier.hpp>
-// #ifndef _COM_SUN_STAR_BEANS_XFASTPROPERTYSTATE_HPP_
-// #include <com/sun/star/beans/XFastPropertyState.hpp>
-// #endif
 #include <osl/mutex.hxx>
 #include "charttoolsdllapi.hxx"
 
diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx
index de721be48142..6bbbd1f7ee5a 100644
--- a/chart2/source/model/inc/ChartTypeManager.hxx
+++ b/chart2/source/model/inc/ChartTypeManager.hxx
@@ -34,14 +34,9 @@
 #include "ServiceMacros.hxx"
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-// #ifndef _COM_SUN_STAR_LANG_XMULTICOMPONENTFACTORY_HPP_
-// #include <com/sun/star/lang/XMultiComponentFactory.hpp>
-// #endif
 
 #include <com/sun/star/chart2/XChartTypeManager.hpp>
 
-// #include <map>
-
 namespace chart
 {
 
diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx
index 964f61b128ed..bcba4c8bd5a8 100644
--- a/chart2/source/model/main/DataPointProperties.cxx
+++ b/chart2/source/model/main/DataPointProperties.cxx
@@ -32,24 +32,15 @@
 #include "LineProperties.hxx"
 #include "FillProperties.hxx"
 
-// #ifndef _COM_SUN_STAR_AWT_GRADIENT_HPP_
-// #include <com/sun/star/awt/Gradient.hpp>
-// #endif
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
-// #ifndef _COM_SUN_STAR_DRAWING_HATCH_HPP_
-// #include <com/sun/star/drawing/Hatch.hpp>
-// #endif
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/drawing/BitmapMode.hpp>
 #include <com/sun/star/drawing/RectanglePoint.hpp>
 
-// #ifndef _COM_SUN_STAR_CHART2_FILLBITMAP_HPP_
-// #include <com/sun/star/chart2/FillBitmap.hpp>
-// #endif
 #include <com/sun/star/chart2/DataPointGeometry3D.hpp>
 #include <com/sun/star/chart2/DataPointLabel.hpp>
 #include <com/sun/star/chart2/Symbol.hpp>
diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
index 18e22f78e86e..652c4532ffbe 100644
--- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx
+++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
@@ -36,8 +36,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 
-// #include <deque>
-
 #include <vector>
 #include <algorithm>
 #include <iterator>
diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx
index 0d134516a1bb..a4070029e58e 100644
--- a/chart2/source/model/template/StockDataInterpreter.cxx
+++ b/chart2/source/model/template/StockDataInterpreter.cxx
@@ -37,8 +37,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 
-// #include <deque>
-
 #include <vector>
 #include <algorithm>
 #include <iterator>
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 44737e711090..5b398f7afb57 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -48,9 +48,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
-// #ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_
-// #include <com/sun/star/lang/XUnoTunnel.hpp>
-// #endif
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase6.hxx>
diff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxx
index 5449cf5093ed..dea401d7e167 100644
--- a/sc/source/core/inc/core_pch.hxx
+++ b/sc/source/core/inc/core_pch.hxx
@@ -34,10 +34,6 @@
 
 #define SC_PROGRESS_CXX
 
-//  Automatically generated by makepch
-// The following is not to be included:
-//      setjmp.h
-
 #include <tools/solar.h>
 #include <string.h>
 #include <tools/string.hxx>
@@ -146,7 +142,6 @@
 #include <vcl/prntypes.hxx>
 #include <vcl/jobset.hxx>
 #include <vcl/gdimtf.hxx>
-//#include <setjmp.h>
 #include <tools/urlobj.hxx>
 #include <vcl/print.hxx>
 #include <docoptio.hxx>
diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index 1e3a9a292f16..c514f15043a9 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -28,8 +28,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 
-// #include <math.h>
-
 #include <tools/debug.hxx>
 #include <rtl/logfile.hxx>
 #include "interpre.hxx"
diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx
index 1ef2f02d405b..dad459e5f315 100644
--- a/sc/source/ui/inc/ui_pch.hxx
+++ b/sc/source/ui/inc/ui_pch.hxx
@@ -184,7 +184,6 @@
 #include <scresid.hxx>
 #include <sfx2/ipfrm.hxx>
 #include <docsh.hxx>
-//REMOVE    #include <sfx2/interno.hxx>
 #include <vcl/wintypes.hxx>
 #include <sfx2/docfac.hxx>
 #include <scitems.hxx>
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 846e2ce53310..e5f459d5b335 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -30,7 +30,6 @@
 
 //------------------------------------------------------------------
 
-// #include <math.h>
 #include <rangelst.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>