more headers
diff --git a/include/rive/core.hpp b/include/rive/core.hpp
index 6996963..2bee8cd 100644
--- a/include/rive/core.hpp
+++ b/include/rive/core.hpp
@@ -1,9 +1,9 @@
 #ifndef _RIVE_CORE_HPP_
 #define _RIVE_CORE_HPP_
 
+#include "rive/rive_types.hpp"
 #include "rive/core/binary_reader.hpp"
 #include "rive/status_code.hpp"
-#include <cassert>
 
 namespace rive {
     class CoreContext;
@@ -55,4 +55,4 @@
         }
     };
 } // namespace rive
-#endif
\ No newline at end of file
+#endif
diff --git a/include/rive/math/circle_constant.hpp b/include/rive/math/circle_constant.hpp
index 61250b3..da7c9c5 100644
--- a/include/rive/math/circle_constant.hpp
+++ b/include/rive/math/circle_constant.hpp
@@ -1,8 +1,11 @@
 #ifndef _RIVE_CIRCLE_CONSTANT_HPP_
 #define _RIVE_CIRCLE_CONSTANT_HPP_
+
+#include "rive/rive_types.hpp"
+
 namespace rive {
     constexpr float circleConstant = 0.552284749831;
     constexpr float icircleConstant = 1.0 - circleConstant;
 } // namespace rive
 
-#endif
\ No newline at end of file
+#endif
diff --git a/include/rive/math/color.hpp b/include/rive/math/color.hpp
index 408c70e..ca8144b 100644
--- a/include/rive/math/color.hpp
+++ b/include/rive/math/color.hpp
@@ -1,7 +1,7 @@
 #ifndef _RIVE_COLOR_HPP_
 #define _RIVE_COLOR_HPP_
 
-#include <cstddef>
+#include "rive/rive_types.hpp"
 
 namespace rive {
     class Color {
diff --git a/include/rive/math/transform_components.hpp b/include/rive/math/transform_components.hpp
index 078d9f1..2087f30 100644
--- a/include/rive/math/transform_components.hpp
+++ b/include/rive/math/transform_components.hpp
@@ -2,7 +2,6 @@
 #define _RIVE_TRANSFORMCOMPONENTS_HPP_
 
 #include "rive/math/vec2d.hpp"
-#include <cstddef>
 
 namespace rive {
     class TransformComponents {
@@ -63,4 +62,4 @@
         }
     };
 } // namespace rive
-#endif
\ No newline at end of file
+#endif
diff --git a/include/rive/math/vec2d.hpp b/include/rive/math/vec2d.hpp
index 073ddcc..8756e1a 100644
--- a/include/rive/math/vec2d.hpp
+++ b/include/rive/math/vec2d.hpp
@@ -1,7 +1,7 @@
 #ifndef _RIVE_VEC2D_HPP_
 #define _RIVE_VEC2D_HPP_
 
-#include <cstddef>
+#include "rive/rive_types.hpp"
 
 namespace rive {
     class Mat2D;
diff --git a/include/rive/rive_types.hpp b/include/rive/rive_types.hpp
index 4d39b6f..4be73b4 100644
--- a/include/rive/rive_types.hpp
+++ b/include/rive/rive_types.hpp
@@ -34,7 +34,7 @@
 
 // We really like these headers, so we include them all the time.
 
-#include <assert.h>
+#include <cassert>
 #include <cstddef>
 #include <cstdint>
 
diff --git a/include/rive/status_code.hpp b/include/rive/status_code.hpp
index e1a5e5a..e6f7847 100644
--- a/include/rive/status_code.hpp
+++ b/include/rive/status_code.hpp
@@ -1,5 +1,8 @@
 #ifndef _RIVE_STATUS_CODE_HPP_
 #define _RIVE_STATUS_CODE_HPP_
+
+#include "rive/rive_types.hpp"
+
 namespace rive {
     enum class StatusCode : unsigned char {
         Ok,
@@ -8,4 +11,4 @@
         FailedInversion
     };
 }
-#endif
\ No newline at end of file
+#endif