diff --git a/CPP/Clipper2Lib/include/clipper2/clipper.core.h b/CPP/Clipper2Lib/include/clipper2/clipper.core.h
index cee2946f..ab71aeb0 100644
--- a/CPP/Clipper2Lib/include/clipper2/clipper.core.h
+++ b/CPP/Clipper2Lib/include/clipper2/clipper.core.h
@@ -10,17 +10,14 @@
 #ifndef CLIPPER_CORE_H
 #define CLIPPER_CORE_H
 
+#include "clipper2/clipper.version.h"
 #include <cstdint>
-#include <cstdlib>
-#include <cmath>
 #include <vector>
 #include <string>
 #include <iostream>
 #include <algorithm>
-#include <climits>
 #include <numeric>
-#include <optional>
-#include "clipper2/clipper.version.h"
+#include <cmath>
 
 namespace Clipper2Lib
 {
diff --git a/CPP/Clipper2Lib/include/clipper2/clipper.engine.h b/CPP/Clipper2Lib/include/clipper2/clipper.engine.h
index 76317f2d..f4e1e183 100644
--- a/CPP/Clipper2Lib/include/clipper2/clipper.engine.h
+++ b/CPP/Clipper2Lib/include/clipper2/clipper.engine.h
@@ -10,17 +10,11 @@
 #ifndef CLIPPER_ENGINE_H
 #define CLIPPER_ENGINE_H
 
-#include <cstdlib>
-#include <stdint.h> //#541
-#include <iostream>
+#include "clipper2/clipper.core.h"
 #include <queue>
-#include <vector>
 #include <functional>
-#include <numeric>
 #include <memory>
 
-#include "clipper2/clipper.core.h"
-
 namespace Clipper2Lib {
 
 	struct Scanline;
diff --git a/CPP/Clipper2Lib/include/clipper2/clipper.export.h b/CPP/Clipper2Lib/include/clipper2/clipper.export.h
index 6fa57bc4..79856e2e 100644
--- a/CPP/Clipper2Lib/include/clipper2/clipper.export.h
+++ b/CPP/Clipper2Lib/include/clipper2/clipper.export.h
@@ -112,12 +112,11 @@ the four vertices that define the two segments that are intersecting.
 #ifndef CLIPPER2_EXPORT_H
 #define CLIPPER2_EXPORT_H
 
-#include <cstdlib>
-#include <vector>
 #include "clipper2/clipper.core.h"
 #include "clipper2/clipper.engine.h"
 #include "clipper2/clipper.offset.h"
 #include "clipper2/clipper.rectclip.h"
+#include <cstdlib>
 
 namespace Clipper2Lib {
 
diff --git a/CPP/Clipper2Lib/include/clipper2/clipper.h b/CPP/Clipper2Lib/include/clipper2/clipper.h
index b857c945..b75bbd35 100644
--- a/CPP/Clipper2Lib/include/clipper2/clipper.h
+++ b/CPP/Clipper2Lib/include/clipper2/clipper.h
@@ -10,15 +10,12 @@
 #ifndef CLIPPER_H
 #define CLIPPER_H
 
-#include <cstdlib>
-#include <type_traits>
-#include <vector>
-
 #include "clipper2/clipper.core.h"
 #include "clipper2/clipper.engine.h"
 #include "clipper2/clipper.offset.h"
 #include "clipper2/clipper.minkowski.h"
 #include "clipper2/clipper.rectclip.h"
+#include <type_traits>
 
 namespace Clipper2Lib {
 
diff --git a/CPP/Clipper2Lib/include/clipper2/clipper.minkowski.h b/CPP/Clipper2Lib/include/clipper2/clipper.minkowski.h
index 5962e4fa..3a85ba5d 100644
--- a/CPP/Clipper2Lib/include/clipper2/clipper.minkowski.h
+++ b/CPP/Clipper2Lib/include/clipper2/clipper.minkowski.h
@@ -10,9 +10,6 @@
 #ifndef CLIPPER_MINKOWSKI_H
 #define CLIPPER_MINKOWSKI_H
 
-#include <cstdlib>
-#include <vector>
-#include <string>
 #include "clipper2/clipper.core.h"
 
 namespace Clipper2Lib
diff --git a/CPP/Clipper2Lib/include/clipper2/clipper.offset.h b/CPP/Clipper2Lib/include/clipper2/clipper.offset.h
index 0125dc2d..90ccd5ec 100644
--- a/CPP/Clipper2Lib/include/clipper2/clipper.offset.h
+++ b/CPP/Clipper2Lib/include/clipper2/clipper.offset.h
@@ -12,6 +12,7 @@
 
 #include "clipper.core.h"
 #include "clipper.engine.h"
+#include <optional>
 
 namespace Clipper2Lib {
 
diff --git a/CPP/Clipper2Lib/include/clipper2/clipper.rectclip.h b/CPP/Clipper2Lib/include/clipper2/clipper.rectclip.h
index 40cf3632..e7cf2f45 100644
--- a/CPP/Clipper2Lib/include/clipper2/clipper.rectclip.h
+++ b/CPP/Clipper2Lib/include/clipper2/clipper.rectclip.h
@@ -10,10 +10,8 @@
 #ifndef CLIPPER_RECTCLIP_H
 #define CLIPPER_RECTCLIP_H
 
-#include <cstdlib>
-#include <vector>
-#include <queue>
 #include "clipper2/clipper.core.h"
+#include <queue>
 
 namespace Clipper2Lib
 {
diff --git a/CPP/Clipper2Lib/src/clipper.engine.cpp b/CPP/Clipper2Lib/src/clipper.engine.cpp
index 1da5aad7..927e7a75 100644
--- a/CPP/Clipper2Lib/src/clipper.engine.cpp
+++ b/CPP/Clipper2Lib/src/clipper.engine.cpp
@@ -7,15 +7,9 @@
 * License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************/
 
-#include <cstdlib>
-#include <cmath>
-#include <stdexcept>
-#include <vector>
-#include <numeric>
-#include <algorithm>
-
 #include "clipper2/clipper.engine.h"
 #include "clipper2/clipper.h"
+#include <stdexcept>
 
 // https://github.com/AngusJohnson/Clipper2/discussions/334
 // #discussioncomment-4248602
diff --git a/CPP/Clipper2Lib/src/clipper.offset.cpp b/CPP/Clipper2Lib/src/clipper.offset.cpp
index 0c30d700..23e405ed 100644
--- a/CPP/Clipper2Lib/src/clipper.offset.cpp
+++ b/CPP/Clipper2Lib/src/clipper.offset.cpp
@@ -7,7 +7,6 @@
 * License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************/
 
-#include <cmath>
 #include "clipper2/clipper.h"
 #include "clipper2/clipper.offset.h"
 
diff --git a/CPP/Clipper2Lib/src/clipper.rectclip.cpp b/CPP/Clipper2Lib/src/clipper.rectclip.cpp
index 620e2814..a5d66df4 100644
--- a/CPP/Clipper2Lib/src/clipper.rectclip.cpp
+++ b/CPP/Clipper2Lib/src/clipper.rectclip.cpp
@@ -7,7 +7,6 @@
 * License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************/
 
-#include <cmath>
 #include "clipper2/clipper.h"
 #include "clipper2/clipper.rectclip.h"