diff --git a/ChartCtrl/ChartLegend.h b/ChartCtrl/ChartLegend.h
index 133e95f1f..5883f724e 100644
--- a/ChartCtrl/ChartLegend.h
+++ b/ChartCtrl/ChartLegend.h
@@ -28,8 +28,6 @@
 
 #include "ChartObject.h"
 
-#include <string>
-
 class CChartSerie;
 
 class CChartLegend : public CChartObject  
diff --git a/ChartCtrl/ChartTitle.cpp b/ChartCtrl/ChartTitle.cpp
index 442f6ed06..d302da485 100644
--- a/ChartCtrl/ChartTitle.cpp
+++ b/ChartCtrl/ChartTitle.cpp
@@ -21,7 +21,6 @@
 
 #include "stdafx.h"
 #include "ChartTitle.h"
-#include "Math.h"
 
 using namespace std;
 
diff --git a/ChartCtrl/ChartTitle.h b/ChartCtrl/ChartTitle.h
index e60747aa1..3962b2db4 100644
--- a/ChartCtrl/ChartTitle.h
+++ b/ChartCtrl/ChartTitle.h
@@ -28,10 +28,6 @@
 
 #include "ChartObject.h"
 
-#include <vector>
-#include <string>
-
-
 class CChartTitle : public CChartObject  
 {
 	friend CChartCtrl;
diff --git a/DeepSkyStacker/AHDDemosaicing.cpp b/DeepSkyStacker/AHDDemosaicing.cpp
index 7c78f970a..15d3609c4 100644
--- a/DeepSkyStacker/AHDDemosaicing.cpp
+++ b/DeepSkyStacker/AHDDemosaicing.cpp
@@ -1,6 +1,4 @@
 #include <stdafx.h>
-#include <vector>
-#include <omp.h>
 #include "AHDDemosaicing.h"
 #include "ColorBitmap.h"
 #include "Ztrace.h"
diff --git a/DeepSkyStacker/About.h b/DeepSkyStacker/About.h
index b380bec49..85cbf8258 100644
--- a/DeepSkyStacker/About.h
+++ b/DeepSkyStacker/About.h
@@ -1,8 +1,6 @@
 #ifndef ABOUT_H
 #define ABOUT_H
 
-#include <QDialog>
-
 namespace Ui {
 class About;
 }
diff --git a/DeepSkyStacker/BackgroundCalibration.cpp b/DeepSkyStacker/BackgroundCalibration.cpp
index 7f8046e42..48a7cb320 100644
--- a/DeepSkyStacker/BackgroundCalibration.cpp
+++ b/DeepSkyStacker/BackgroundCalibration.cpp
@@ -1,5 +1,4 @@
 #include <stdafx.h>
-#include <omp.h>
 #include "resource.h"
 #include "BitmapBase.h"
 #include "BackgroundCalibration.h"
diff --git a/DeepSkyStacker/BackgroundOptions.cpp b/DeepSkyStacker/BackgroundOptions.cpp
index a3b443487..e0cabe376 100644
--- a/DeepSkyStacker/BackgroundOptions.cpp
+++ b/DeepSkyStacker/BackgroundOptions.cpp
@@ -1,19 +1,7 @@
 #include "stdafx.h"
-#include <algorithm>
-using std::min;
-using std::max;
-
-#define _WIN32_WINNT _WIN32_WINNT_WIN7
-#include <afx.h>
-
 #include "BackgroundOptions.h"
 #include "ui/ui_BackgroundOptions.h"
-
-#include <ZExcept.h>
-#include <Ztrace.h>
-
-#include "DSSCommon.h"
-#include "StackingTasks.h"
+#include "../DeepSkyStackerTest/AvxAccumulateTest.h"
 #include "Workspace.h"
 
 
diff --git a/DeepSkyStacker/BackgroundOptions.h b/DeepSkyStacker/BackgroundOptions.h
index d636e8fe0..e17b0f840 100644
--- a/DeepSkyStacker/BackgroundOptions.h
+++ b/DeepSkyStacker/BackgroundOptions.h
@@ -1,8 +1,6 @@
 #ifndef BACKGROUNDOPTIONS_H
 #define BACKGROUNDOPTIONS_H
 
-#include <QDialog>
-
 enum BACKGROUNDCALIBRATIONMODE : short;
 enum BACKGROUNDCALIBRATIONINTERPOLATION : short;
 enum RGBBACKGROUNDCALIBRATIONMETHOD : short;
diff --git a/DeepSkyStacker/BaseDialog.cpp b/DeepSkyStacker/BaseDialog.cpp
index 158869a15..8ebacd161 100644
--- a/DeepSkyStacker/BaseDialog.cpp
+++ b/DeepSkyStacker/BaseDialog.cpp
@@ -36,9 +36,6 @@
 // BaseDialog.cpp : implementation file
 //
 #include "stdafx.h"
-#include <QShowEvent>
-#include <QSettings>
-
 #include "DeepSkyStacker.h"
 #include "BaseDialog.h"
 
diff --git a/DeepSkyStacker/BaseDialog.h b/DeepSkyStacker/BaseDialog.h
index f1e5c39b2..f1541fc28 100644
--- a/DeepSkyStacker/BaseDialog.h
+++ b/DeepSkyStacker/BaseDialog.h
@@ -1,6 +1,4 @@
 #pragma once
-#include <QDialog>
-#include <QFlags>
 
 namespace DSS
 {
diff --git a/DeepSkyStacker/BilinearParameters.h b/DeepSkyStacker/BilinearParameters.h
index 29aff6c20..391e94e9a 100644
--- a/DeepSkyStacker/BilinearParameters.h
+++ b/DeepSkyStacker/BilinearParameters.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <atlstr.h>
-
 typedef enum TRANSFORMATIONTYPE
 {
 	TT_LINEAR = 0,
diff --git a/DeepSkyStacker/BitmapExt.cpp b/DeepSkyStacker/BitmapExt.cpp
index d8f504282..1cb6ad878 100644
--- a/DeepSkyStacker/BitmapExt.cpp
+++ b/DeepSkyStacker/BitmapExt.cpp
@@ -835,14 +835,6 @@ bool ApplyGammaTransformation(C32BitsBitmap* pOutBitmap, CMemoryBitmap* pInBitma
 /* ------------------------------------------------------------------- */
 /* ------------------------------------------------------------------- */
 
-#pragma warning( push )
-#pragma warning( disable: 4996 ) // Remove this as soon as having switched to c++20.
-
-#include <concurrent_unordered_set.h>
-#include <shared_mutex>
-
-#pragma warning( pop )
-
 namespace {
 	//
 	// Fowler/Noll/Vo hash
diff --git a/DeepSkyStacker/BitmapInfo.cpp b/DeepSkyStacker/BitmapInfo.cpp
index 878dbe5de..50cf75347 100644
--- a/DeepSkyStacker/BitmapInfo.cpp
+++ b/DeepSkyStacker/BitmapInfo.cpp
@@ -2,13 +2,6 @@
 #include "BitmapInfo.h"
 #include "Ztrace.h"
 
-
-// Don't want these really.
-#include <atlcomcli.h>
-#include <atlstr.h>
-#include <GdiPlus.h>
-using namespace Gdiplus;
-
 bool RetrieveEXIFInfo(LPCTSTR szFileName, CBitmapInfo& BitmapInfo)
 {
 	ZFUNCTRACE_RUNTIME();
diff --git a/DeepSkyStacker/CometStacking.h b/DeepSkyStacker/CometStacking.h
index f55cc6b8b..3edc93c0e 100644
--- a/DeepSkyStacker/CometStacking.h
+++ b/DeepSkyStacker/CometStacking.h
@@ -3,7 +3,6 @@
 class QPixmap;
 
 #include "DSSCommon.h"
-#include <QWidget>
 
 namespace Ui {
 class CometStacking;
diff --git a/DeepSkyStacker/CosmeticEngine.cpp b/DeepSkyStacker/CosmeticEngine.cpp
index e590c8104..0eac8ba4f 100644
--- a/DeepSkyStacker/CosmeticEngine.cpp
+++ b/DeepSkyStacker/CosmeticEngine.cpp
@@ -1,5 +1,4 @@
 #include <stdafx.h>
-#include <omp.h>
 #include "CosmeticEngine.h"
 #include "MemoryBitmap.h"
 #include "Ztrace.h"
diff --git a/DeepSkyStacker/DarkFrame.cpp b/DeepSkyStacker/DarkFrame.cpp
index 7d51c08d2..d72201250 100644
--- a/DeepSkyStacker/DarkFrame.cpp
+++ b/DeepSkyStacker/DarkFrame.cpp
@@ -1,5 +1,4 @@
 #include <stdafx.h>
-#include <omp.h>
 #include "DarkFrame.h"
 #include "Ztrace.h"
 #include "DSSProgress.h"
diff --git a/DeepSkyStacker/DeepSkyStacker.cpp b/DeepSkyStacker/DeepSkyStacker.cpp
index c8b366099..e575e3d44 100644
--- a/DeepSkyStacker/DeepSkyStacker.cpp
+++ b/DeepSkyStacker/DeepSkyStacker.cpp
@@ -36,7 +36,6 @@
 // DeepSkyStacker.cpp : Defines the entry point for the console application.
 //
 #include <stdafx.h>
-#include <atlstr.h>
 
 #include "DeepSkyStacker.h"
 
diff --git a/DeepSkyStacker/DeepSkyStacker.vcxproj b/DeepSkyStacker/DeepSkyStacker.vcxproj
index 117fd2c6c..2ba5331d5 100644
--- a/DeepSkyStacker/DeepSkyStacker.vcxproj
+++ b/DeepSkyStacker/DeepSkyStacker.vcxproj
@@ -305,13 +305,13 @@ $(QtToolsPath)\windeployqt --pdb $(TargetPath)</Command>
     <ClCompile Include="GrayBitmap.cpp" />
     <ClCompile Include="GreyMultiBitmap.cpp" />
     <ClCompile Include="group.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="ImageSinks.cpp" />
     <ClCompile Include="imageview.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="MemoryBitmap.cpp" />
     <ClCompile Include="picturelist.cpp" />
@@ -337,12 +337,10 @@ $(QtToolsPath)\windeployqt --pdb $(TargetPath)</Command>
     <ClCompile Include="FrameInfo.cpp" />
     <ClCompile Include="FrameList.cpp" />
     <ClCompile Include="ImageListModel.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeaderFile>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeaderFile>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdafx.h</PrecompiledHeaderFile>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdafx.h</PrecompiledHeaderFile>
     </ClCompile>
     <ClCompile Include="imageloader.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
@@ -375,8 +373,8 @@ $(QtToolsPath)\windeployqt --pdb $(TargetPath)</Command>
     <ClCompile Include="ProcessingDlg.cpp" />
     <ClCompile Include="ProcessSettingsSheet.cpp" />
     <ClCompile Include="QLinearGradientCtrl.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="qwinhost.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
diff --git a/DeepSkyStacker/DeepStackerDlg.cpp b/DeepSkyStacker/DeepStackerDlg.cpp
index 796d2e3db..72409e736 100644
--- a/DeepSkyStacker/DeepStackerDlg.cpp
+++ b/DeepSkyStacker/DeepStackerDlg.cpp
@@ -1,24 +1,12 @@
 // DeepStackerDlg.cpp : implementation file
 //
-
 #include "stdafx.h"
 #include "DeepSkyStacker.h"
 #include "DeepStackerDlg.h"
 #include "DSS-versionhelpers.h"
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QSplitter>
-#include <QtWidgets/QStackedWidget>
-#include <QtWidgets/QWidget>
-#include <QRect>
-#include <QScreen>
-#include <QSettings>
-
 #include "ExplorerBar.h"
 #include "StackingDlg.h"
 
-
-
 /* ------------------------------------------------------------------- */
 
 static bool	GetDefaultSettingsFileName(CString & strFile)
diff --git a/DeepSkyStacker/DeepStackerDlg.h b/DeepSkyStacker/DeepStackerDlg.h
index 570b57b1a..845eb18f2 100644
--- a/DeepSkyStacker/DeepStackerDlg.h
+++ b/DeepSkyStacker/DeepStackerDlg.h
@@ -1,13 +1,9 @@
-
-
 #pragma once
-
 // DeepStackerDlg.h : header file
 //
 
 #include "DeepStack.h"
 #include "DeepSkyStacker.h"
-#include <list>
 
 class CDSSSetting
 {
diff --git a/DeepSkyStacker/Delaunay.h b/DeepSkyStacker/Delaunay.h
index e892cf5c9..abc135451 100644
--- a/DeepSkyStacker/Delaunay.h
+++ b/DeepSkyStacker/Delaunay.h
@@ -29,11 +29,7 @@
 // mailto:sjaak@sjaakpriester.nl
 
 #pragma once
-
-#include <set>
-#include <algorithm>
-#include <math.h>
-#include "ZExcept.h"
+#include "ZExcBase.h"
 
 //
 // changes to remove dependencies on Microsoft GDI+ 
diff --git a/DeepSkyStacker/ExceptionHandling.cpp b/DeepSkyStacker/ExceptionHandling.cpp
index 962b08e3f..64944919f 100644
--- a/DeepSkyStacker/ExceptionHandling.cpp
+++ b/DeepSkyStacker/ExceptionHandling.cpp
@@ -3,8 +3,6 @@
 
 #if defined(_WINDOWS)
 
-#include <thread>
-#include <inttypes.h>
 #include "StackWalker.h"
 #include "Ztrace.h"
 
diff --git a/DeepSkyStacker/ExplorerBar.cpp b/DeepSkyStacker/ExplorerBar.cpp
index 114179dcc..a48a1ceb4 100644
--- a/DeepSkyStacker/ExplorerBar.cpp
+++ b/DeepSkyStacker/ExplorerBar.cpp
@@ -2,8 +2,8 @@
 #include "ExplorerBar.h"
 #include "ui/ui_ExplorerBar.h"
 
-#include <Ztrace.h>
-#include <zexcept.h>
+#include "Ztrace.h"
+#include "zexcept.h"
 #include "DeepSkyStacker.h"
 #include "ProcessingDlg.h"
 #include "Workspace.h"
diff --git a/DeepSkyStacker/FITSUtil.cpp b/DeepSkyStacker/FITSUtil.cpp
index 467a2f54e..10b14c558 100644
--- a/DeepSkyStacker/FITSUtil.cpp
+++ b/DeepSkyStacker/FITSUtil.cpp
@@ -1,11 +1,4 @@
 #include <stdafx.h>
-#include <iostream>
-#include <QSettings>
-#include <omp.h>
-
-// Ouch :(
-#include <windows.h>
-
 #include "resource.h"
 #include "Workspace.h"
 #include "FITSUtil.h"
diff --git a/DeepSkyStacker/FITSUtil.h b/DeepSkyStacker/FITSUtil.h
index ffa161993..00d8dff8d 100644
--- a/DeepSkyStacker/FITSUtil.h
+++ b/DeepSkyStacker/FITSUtil.h
@@ -2,17 +2,11 @@
 #define __FITSUTIL_H__
 
 /* ------------------------------------------------------------------- */
-#include <filesystem>
 #include "cfa.h"
 #include "DSSCommon.h"
 #include "BitmapExtraInfo.h"
 #include "fitsio.h"
 
-// Want this out!
-#include <atlstr.h>
-
-namespace fs = std::filesystem;
-
 #pragma comment(lib, "cfitsio.lib")
 
 class CFITSHeader
diff --git a/DeepSkyStacker/File.cpp b/DeepSkyStacker/File.cpp
index 769a2e7ef..cd93780c9 100644
--- a/DeepSkyStacker/File.cpp
+++ b/DeepSkyStacker/File.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include <atlstr.h>
 #include "file.h"
 
 bool GetFileCreationDateTime(LPCTSTR szFileName, FILETIME& FileTime)
diff --git a/DeepSkyStacker/FlatFrame.cpp b/DeepSkyStacker/FlatFrame.cpp
index 13c20e254..d1c674ce6 100644
--- a/DeepSkyStacker/FlatFrame.cpp
+++ b/DeepSkyStacker/FlatFrame.cpp
@@ -1,7 +1,4 @@
 #include <stdafx.h>
-#include <omp.h>
-#include <atlstr.h>
-
 #include "FlatFrame.h"
 #include "Multitask.h"
 #include "DSSProgress.h"
diff --git a/DeepSkyStacker/MemoryBitmap.h b/DeepSkyStacker/MemoryBitmap.h
index 82fe7a7a9..8dc5c8d0b 100644
--- a/DeepSkyStacker/MemoryBitmap.h
+++ b/DeepSkyStacker/MemoryBitmap.h
@@ -4,9 +4,6 @@
 #include "ColorRef.h"
 #include "Bayer.h"
 
-// Not nice :(
-#include <wtypesbase.h>
-
 class CMultiBitmap;
 class CMedianFilterEngine;
 class CBitmapCharacteristics;
diff --git a/DeepSkyStacker/QLinearGradientCtrl.cpp b/DeepSkyStacker/QLinearGradientCtrl.cpp
index a0fd2c72c..aa0bad887 100644
--- a/DeepSkyStacker/QLinearGradientCtrl.cpp
+++ b/DeepSkyStacker/QLinearGradientCtrl.cpp
@@ -1,23 +1,11 @@
 // QLinearGradientCtrl.cpp 
 //
-#include <algorithm>
-using std::min;
-using std::max;
-
-#include <QColor>
-#include <QDebug>
-#include <QLinearGradient>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QPoint>
-#include <QRect>
-#include <QRegion>
-#include <QWidget>
-
-#include <Ztrace.h>
-
+#include <stdafx.h>
 #include "QLinearGradientCtrl.h"
 
+#include "Ztrace.h"
+#include "ZExcBase.h"
+
 /////////////////////////////////////////////////////////////////////////////
 // QLinearGradientCtrl
 
diff --git a/DeepSkyStacker/QLinearGradientCtrl.h b/DeepSkyStacker/QLinearGradientCtrl.h
index 3298f4cfa..bbfcea0ea 100644
--- a/DeepSkyStacker/QLinearGradientCtrl.h
+++ b/DeepSkyStacker/QLinearGradientCtrl.h
@@ -36,15 +36,6 @@
 ****************************************************************************/
 // QLinearGradientCtrl : header file
 //
-#include <zexcept.h>
-
-class QColor;
-class QString;
-
-#include <QWidget>
-#include <QGradient>
-
-
 #define GCW_AUTO -1
 
 #define GC_SELCHANGE			1
diff --git a/DeepSkyStacker/RenameGroup.h b/DeepSkyStacker/RenameGroup.h
index bacce0c9b..715c41bd8 100644
--- a/DeepSkyStacker/RenameGroup.h
+++ b/DeepSkyStacker/RenameGroup.h
@@ -37,7 +37,6 @@
 // RenameGroup.h  : header file
 //
 
-#include <QDialog>
 #include "ui/ui_RenameGroup.h"
 
 namespace DSS
diff --git a/DeepSkyStacker/StackingDlg.cpp b/DeepSkyStacker/StackingDlg.cpp
index 9beb3fa8b..6f4b2cd0b 100644
--- a/DeepSkyStacker/StackingDlg.cpp
+++ b/DeepSkyStacker/StackingDlg.cpp
@@ -62,6 +62,7 @@
 #include "BatchStacking.h"
 #include "StackRecap.h"
 #include "ProcessingDlg.h"
+#include "ZExcept.h"
 
 #define dssApp DeepSkyStacker::instance()
 
diff --git a/DeepSkyStacker/StdAfx.h b/DeepSkyStacker/StdAfx.h
index 4d513de0d..f7b1a9cc9 100644
--- a/DeepSkyStacker/StdAfx.h
+++ b/DeepSkyStacker/StdAfx.h
@@ -63,20 +63,31 @@
 #include <QActionGroup>
 #include <QNetworkReply>
 #include <QErrorMessage>
+#include <QDialog>
+//#include <QFlags>
 
 // Standard Libraries
+#pragma warning( push )
+#pragma warning( disable: 4996 ) // Remove this as soon as having switched to c++20.
+#include <concurrent_unordered_set.h>
+#include <shared_mutex>
+#pragma warning( pop )
+
 #include <iostream>
 #include <vector>
 #include <algorithm>
 #include <mutex>
 #include <deque>
 #include <set>
+#include <inttypes.h>
 #include <filesystem>
 namespace fs = std::filesystem;
 
 using std::min;
 using std::max;
 
+// Misc global headers.
+#include <omp.h>
 
 // Windows Files (eventaully to go!)
 #include <afx.h>
diff --git a/DeepSkyStacker/avx_filter.cpp b/DeepSkyStacker/avx_filter.cpp
index c276b75e0..2fa66cf3e 100644
--- a/DeepSkyStacker/avx_filter.cpp
+++ b/DeepSkyStacker/avx_filter.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include <tuple>
 #include "avx_filter.h"
 #include "avx_support.h"
 #include "MedianFilterEngine.h"
diff --git a/DeepSkyStacker/avx_luminance.h b/DeepSkyStacker/avx_luminance.h
index ad872b6f6..c2afcdfde 100644
--- a/DeepSkyStacker/avx_luminance.h
+++ b/DeepSkyStacker/avx_luminance.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "BitmapBase.h"
-#include <tuple>
 
 class AvxLuminance
 {
diff --git a/DeepSkyStacker/avx_output.cpp b/DeepSkyStacker/avx_output.cpp
index a9df7723c..bfb0db69d 100644
--- a/DeepSkyStacker/avx_output.cpp
+++ b/DeepSkyStacker/avx_output.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include <immintrin.h>
 #include "avx_output.h"
 #include "avx_support.h"
 #include "avx_median.h"
diff --git a/DeepSkyStacker/avx_output.h b/DeepSkyStacker/avx_output.h
index f31740d28..59a6d39aa 100644
--- a/DeepSkyStacker/avx_output.h
+++ b/DeepSkyStacker/avx_output.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "BitmapBase.h"
-#include <vector>
 
 class CMultiBitmap;
 class AvxOutputComposition
diff --git a/DeepSkyStacker/editstars.cpp b/DeepSkyStacker/editstars.cpp
index 3b193c5d5..a39823e90 100644
--- a/DeepSkyStacker/editstars.cpp
+++ b/DeepSkyStacker/editstars.cpp
@@ -42,6 +42,7 @@
 #include "RegisterEngine.h"
 #include "BackgroundCalibration.h"
 #include "DeepSkyStacker.h"
+#include "ZExcept.h"
 
 // Classes etc. private to this file
 namespace
diff --git a/DeepSkyStacker/imageview.cpp b/DeepSkyStacker/imageview.cpp
index f28f564e9..e9685d351 100644
--- a/DeepSkyStacker/imageview.cpp
+++ b/DeepSkyStacker/imageview.cpp
@@ -33,25 +33,8 @@
 **
 **
 ****************************************************************************/
-#include <algorithm>
-#include <cmath>
-#include <iostream>
-
+#include "stdafx.h"
 #include "imageview.h"
-
-#include <QCursor>
-#include <QDebug>
-#include <QGuiApplication>
-#include <QPainter>
-#include <QKeyEvent>
-#include <QMouseEvent>
-#include <QToolBar>
-#include <QToolTip>
-#include <QResizeEvent>
-#include <QRubberBand>
-#if QT_CONFIG(wheelevent)
-#include <QWheelEvent>
-#endif
 #include "Ztrace.h"
 
 namespace DSS
diff --git a/DeepSkyStacker/imageview.h b/DeepSkyStacker/imageview.h
index 2282574b3..31b410ba8 100644
--- a/DeepSkyStacker/imageview.h
+++ b/DeepSkyStacker/imageview.h
@@ -41,9 +41,6 @@ class QRubberBand;
 class QToolBar;
 class QWheelEvent;
 
-#include <QtWidgets/QWidget>
-#include <QDebug>
-
 namespace DSS
 {
     class EditStars;
diff --git a/DeepSkyStackerCL/DeepSkyStackerCL.cpp b/DeepSkyStackerCL/DeepSkyStackerCL.cpp
index a88c6f33c..ad4b85c57 100644
--- a/DeepSkyStackerCL/DeepSkyStackerCL.cpp
+++ b/DeepSkyStackerCL/DeepSkyStackerCL.cpp
@@ -2,11 +2,6 @@
 //
 
 #include <stdafx.h>
-#include <windows.h>
-#include <Gdiplus.h>
-using namespace Gdiplus;
-//#pragma comment(lib, "gdiplus.lib")
-
 #include "DeepSkyStackerCL.h"
 #include "QtProgressConsole.h"
 #include "FrameList.h"
diff --git a/DeepSkyStackerCL/stdafx.h b/DeepSkyStackerCL/stdafx.h
index a1a54345d..dfc22c7aa 100644
--- a/DeepSkyStackerCL/stdafx.h
+++ b/DeepSkyStackerCL/stdafx.h
@@ -19,6 +19,13 @@
 #include <QIcon>
 #include <QElapsedTimer>
 
+// Standard Libraries
+#pragma warning( push )
+#pragma warning( disable: 4996 ) // Remove this as soon as having switched to c++20.
+#include <concurrent_unordered_set.h>
+#include <shared_mutex>
+#pragma warning( pop )
+
 #include <tchar.h>
 #include <vector>
 #include <tuple>
@@ -33,9 +40,14 @@
 #include <numeric>
 #include <float.h>
 #include <cmath>
+#include <inttypes.h>
+
 using std::min;
 using std::max;
 
+// Misc global headers.
+#include <omp.h>
+
 // This is for CString's in BitmapExt.h :(
 //#include <atlstr.h>
 
diff --git a/DeepSkyStackerLive/ImageList.cpp b/DeepSkyStackerLive/ImageList.cpp
index 3a477d7cf..b93dbf93f 100644
--- a/DeepSkyStackerLive/ImageList.cpp
+++ b/DeepSkyStackerLive/ImageList.cpp
@@ -2,7 +2,6 @@
 //
 
 #include "stdafx.h"
-#include <QSettings>
 #include "resource.h"
 #include "DeepSkyStackerLive.h"
 #include "DeepSkyStackerLiveDlg.h"
diff --git a/DeepSkyStackerLive/ImageList.h b/DeepSkyStackerLive/ImageList.h
index 719fb5fb0..bd5000398 100644
--- a/DeepSkyStackerLive/ImageList.h
+++ b/DeepSkyStackerLive/ImageList.h
@@ -5,8 +5,8 @@
 
 #include "afxwin.h"
 #include "label.h"
-#include <ControlPos.h>
-#include <WndImage.h>
+#include "ControlPos.h"
+#include "WndImage.h"
 #include "DSSProgress.h"
 #include "DSSTools.h"
 #include "BitmapExt.h"
diff --git a/DeepSkyStackerLive/LiveSettings.cpp b/DeepSkyStackerLive/LiveSettings.cpp
index 229ed4198..1f95f0a3e 100644
--- a/DeepSkyStackerLive/LiveSettings.cpp
+++ b/DeepSkyStackerLive/LiveSettings.cpp
@@ -1,5 +1,4 @@
 #include <stdafx.h>
-#include <QSettings>
 #include "LiveSettings.h"
 
 /* ------------------------------------------------------------------- */
diff --git a/DeepSkyStackerLive/stdafx.h b/DeepSkyStackerLive/stdafx.h
index d0efb74f3..ccf81a937 100644
--- a/DeepSkyStackerLive/stdafx.h
+++ b/DeepSkyStackerLive/stdafx.h
@@ -56,18 +56,29 @@
 #include <QNetworkReply>
 
 // Standard Libraries
+#pragma warning( push )
+#pragma warning( disable: 4996 ) // Remove this as soon as having switched to c++20.
+#include <concurrent_unordered_set.h>
+#include <shared_mutex>
+#pragma warning( pop )
+
 #include <iostream>
 #include <vector>
 #include <algorithm>
 #include <mutex>
 #include <deque>
 #include <set>
+#include <tuple>
+#include <inttypes.h>
 #include <filesystem>
 namespace fs = std::filesystem;
 
 using std::min;
 using std::max;
 
+// Misc global headers.
+#include <omp.h>
+
 // Windows Files (eventaully to go!)
 #include <afx.h>
 #include <afxwin.h>         // MFC core and standard components
diff --git a/DeepSkyStackerTest/DssRectTest.cpp b/DeepSkyStackerTest/DssRectTest.cpp
index 10761caa5..3c2cb94ca 100644
--- a/DeepSkyStackerTest/DssRectTest.cpp
+++ b/DeepSkyStackerTest/DssRectTest.cpp
@@ -170,8 +170,6 @@ TEST_CASE("DSSRect", "[DSSRect]")
 	}
 }
 
-#include <atltypes.h>
-
 TEST_CASE("CRect", "[CRect]")
 {
 	SECTION("CRect")
diff --git a/DeepSkyStackerTest/stdafx.h b/DeepSkyStackerTest/stdafx.h
index c896908bc..d9b0b27ef 100644
--- a/DeepSkyStackerTest/stdafx.h
+++ b/DeepSkyStackerTest/stdafx.h
@@ -20,7 +20,7 @@
 using std::min;
 using std::max;
 
-// Other (should it be in here? Maybe!)
+// Misc global headers.
 #include <omp.h>
 
 #include "../ZCLass/zdefs.h"
@@ -31,4 +31,5 @@ using std::max;
 // Windows (to go!)
 #include <WTypesbase.h>
 #include <atlstr.h>
-#include <cassert>
\ No newline at end of file
+#include <cassert>
+#include <atltypes.h>