cleanup headers for better portability

CMakeLists.txt

@@ -30,7 +30,6 @@ target_compile_features(python_rgbcx PUBLIC cxx_std_20 c_std_11)
 target_compile_features(test_rgbcx PUBLIC cxx_std_20 c_std_11)
 
 set_property(TARGET python_rgbcx test_rgbcx PROPERTY INTERPROCEDURAL_OPTIMIZATION True) #enable FLTO if available
-
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set_property(TARGET python_rgbcx test_rgbcx PROPERTY OSX_ARCHITECTURES_RELEASE x86_64 arm64) #Mach-O fat binary for arm and x86
 endif ()

src/blocks.cpp

@@ -18,8 +18,5 @@
  */
 
 #include "blocks.h"
-#include "color.h"
-#include <algorithm>
-#include <cassert>
 
 // endregion

src/blocks.h

@@ -25,7 +25,6 @@
 #include <cstdlib>
 
 #include "color.h"
-#include "util.h"
 
 #pragma pack(push, 1)
 class BC1Block {

src/color.cpp

@@ -18,9 +18,12 @@
  */
 
 #include "color.h"
+
 #include <algorithm>
 #include <cassert>
 
+#include "util.h"
+
 // region Color32 implementation
 Color32::Color32() { set(0, 0, 0, 0xFF); }
 

src/color.h

@@ -18,14 +18,11 @@
  */
 
 #pragma once
-#include "util.h"
-#include <cassert>
 #include <cstdint>
-#include <cstdlib>
 
 #pragma pack(push, 1)
 class Color32 {
-  public:
+   public:
     union {
         struct {
             uint8_t R;

src/rgbcx.cpp

@@ -4,11 +4,12 @@
 #include "rgbcx.h"
 
 #include <algorithm>
+#include <array>
 #include <cassert>
 #include <climits>
 #include <cmath>
-#include <cstdlib>
 #include <cstring>
+#include <type_traits>
 
 #include "blocks.h"
 #include "color.h"