diff --git a/src/runtime/include/iec_array.hpp b/src/runtime/include/iec_array.hpp
index af28cf4..ddee3cb 100644
--- a/src/runtime/include/iec_array.hpp
+++ b/src/runtime/include/iec_array.hpp
@@ -12,9 +12,8 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
 #include <array>
+#include <cstdint>
 #include <stdexcept>
 #include "iec_var.hpp"
 
diff --git a/src/runtime/include/iec_char.hpp b/src/runtime/include/iec_char.hpp
index 9b47369..cf26bb0 100644
--- a/src/runtime/include/iec_char.hpp
+++ b/src/runtime/include/iec_char.hpp
@@ -12,8 +12,7 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
+#include <cstdint>
 #include "iec_types.hpp"
 
 namespace strucpp {
diff --git a/src/runtime/include/iec_date.hpp b/src/runtime/include/iec_date.hpp
index 70a68ef..9e3024d 100644
--- a/src/runtime/include/iec_date.hpp
+++ b/src/runtime/include/iec_date.hpp
@@ -12,8 +12,7 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
+#include <cstdint>
 #include "iec_types.hpp"
 
 namespace strucpp {
diff --git a/src/runtime/include/iec_dt.hpp b/src/runtime/include/iec_dt.hpp
index 76e0fb0..199c416 100644
--- a/src/runtime/include/iec_dt.hpp
+++ b/src/runtime/include/iec_dt.hpp
@@ -12,8 +12,7 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
+#include <cstdint>
 #include "iec_types.hpp"
 #include "iec_date.hpp"
 #include "iec_tod.hpp"
diff --git a/src/runtime/include/iec_enum.hpp b/src/runtime/include/iec_enum.hpp
index 0e8a91d..c51354e 100644
--- a/src/runtime/include/iec_enum.hpp
+++ b/src/runtime/include/iec_enum.hpp
@@ -12,8 +12,7 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
+#include <cstdint>
 #include <ostream>
 #include <type_traits>
 #include "iec_var.hpp"
diff --git a/src/runtime/include/iec_located.hpp b/src/runtime/include/iec_located.hpp
index c194055..842d628 100644
--- a/src/runtime/include/iec_located.hpp
+++ b/src/runtime/include/iec_located.hpp
@@ -15,8 +15,7 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
+#include <cstdint>
 #include <stdexcept>
 
 namespace strucpp {
diff --git a/src/runtime/include/iec_memory.hpp b/src/runtime/include/iec_memory.hpp
index 907104a..caea52b 100644
--- a/src/runtime/include/iec_memory.hpp
+++ b/src/runtime/include/iec_memory.hpp
@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
+#include <cstdlib>
+#include <cstddef>
 #include <new>
 #include "iec_ptr.hpp"
 
diff --git a/src/runtime/include/iec_platform.hpp b/src/runtime/include/iec_platform.hpp
deleted file mode 100644
index 9486048..0000000
--- a/src/runtime/include/iec_platform.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later WITH STruCpp-runtime-exception
-// Copyright (C) 2025 Autonomy / OpenPLC Project
-// This file is part of the STruC++ Runtime Library and is covered by the
-// STruC++ Runtime Library Exception. See COPYING.RUNTIME for details.
-/**
- * STruC++ Runtime - Platform Compatibility Header
- *
- * AVR (Arduino) toolchains don't ship C++ standard library wrappers like
- * <cstdint>, <cstring>, etc. This header provides a single compatibility
- * shim that maps to the correct C headers on AVR and C++ headers elsewhere.
- *
- * All other runtime headers should include this instead of <cstdint> etc.
- */
-
-#pragma once
-
-#if defined(__AVR__) || defined(ARDUINO)
-  // AVR libc provides C headers only, not C++ wrappers
-  #include <stdint.h>
-  #include <stddef.h>
-  #include <string.h>
-  #include <stdlib.h>
-  #include <math.h>
-#else
-  #include <cstdint>
-  #include <cstddef>
-  #include <cstring>
-  #include <cstdlib>
-  #include <cmath>
-#endif
diff --git a/src/runtime/include/iec_pointer.hpp b/src/runtime/include/iec_pointer.hpp
index fb29ccb..879c430 100644
--- a/src/runtime/include/iec_pointer.hpp
+++ b/src/runtime/include/iec_pointer.hpp
@@ -45,8 +45,7 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
+#include <cstddef>
 #include <stdexcept>
 #include <string>
 #include "iec_var.hpp"
diff --git a/src/runtime/include/iec_ptr.hpp b/src/runtime/include/iec_ptr.hpp
index 0c78b23..f3228ad 100644
--- a/src/runtime/include/iec_ptr.hpp
+++ b/src/runtime/include/iec_ptr.hpp
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
+#include <cstdint>
+#include <cstddef>
 #include <type_traits>
 
 namespace strucpp {
diff --git a/src/runtime/include/iec_retain.hpp b/src/runtime/include/iec_retain.hpp
index f8f98e9..c8c636d 100644
--- a/src/runtime/include/iec_retain.hpp
+++ b/src/runtime/include/iec_retain.hpp
@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
+#include <cstddef>
+#include <cstdint>
 
 namespace strucpp {
 
diff --git a/src/runtime/include/iec_std_lib.hpp b/src/runtime/include/iec_std_lib.hpp
index 64549c7..7198848 100644
--- a/src/runtime/include/iec_std_lib.hpp
+++ b/src/runtime/include/iec_std_lib.hpp
@@ -20,13 +20,14 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
 #include "iec_var.hpp"
 #include "iec_traits.hpp"
 #include "iec_retain.hpp"
 #include "iec_ptr.hpp"
+#include <cmath>
 #include <algorithm>
+#include <cstddef>
+#include <cstring>
 #include <type_traits>
 
 namespace strucpp {
diff --git a/src/runtime/include/iec_string.hpp b/src/runtime/include/iec_string.hpp
index fb3dbe8..69938cc 100644
--- a/src/runtime/include/iec_string.hpp
+++ b/src/runtime/include/iec_string.hpp
@@ -12,9 +12,10 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
+#include <cstdint>
 #include <cstdio>
+#include <cstring>
+#include <cstdlib>
 #include <algorithm>
 #include <type_traits>
 #include "iec_types.hpp"
diff --git a/src/runtime/include/iec_subrange.hpp b/src/runtime/include/iec_subrange.hpp
index 343db4e..c784cd0 100644
--- a/src/runtime/include/iec_subrange.hpp
+++ b/src/runtime/include/iec_subrange.hpp
@@ -12,8 +12,7 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
+#include <cstdint>
 #include "iec_var.hpp"
 
 namespace strucpp {
diff --git a/src/runtime/include/iec_time.hpp b/src/runtime/include/iec_time.hpp
index 5205120..a05ca50 100644
--- a/src/runtime/include/iec_time.hpp
+++ b/src/runtime/include/iec_time.hpp
@@ -12,8 +12,8 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
+#include <cstdint>
+#include <cmath>
 #include "iec_types.hpp"
 
 namespace strucpp {
diff --git a/src/runtime/include/iec_tod.hpp b/src/runtime/include/iec_tod.hpp
index 5e9835c..f5d6456 100644
--- a/src/runtime/include/iec_tod.hpp
+++ b/src/runtime/include/iec_tod.hpp
@@ -12,8 +12,7 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
+#include <cstdint>
 #include "iec_types.hpp"
 
 namespace strucpp {
diff --git a/src/runtime/include/iec_traits.hpp b/src/runtime/include/iec_traits.hpp
index 2101350..588b338 100644
--- a/src/runtime/include/iec_traits.hpp
+++ b/src/runtime/include/iec_traits.hpp
@@ -12,9 +12,9 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
 #include <type_traits>
+#include <cstdint>
+#include <cstddef>
 #include "iec_types.hpp"
 
 namespace strucpp {
diff --git a/src/runtime/include/iec_types.hpp b/src/runtime/include/iec_types.hpp
index c37a014..6742652 100644
--- a/src/runtime/include/iec_types.hpp
+++ b/src/runtime/include/iec_types.hpp
@@ -12,8 +12,8 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
+#include <cstdint>
+#include <cstddef>
 
 namespace strucpp {
 
diff --git a/src/runtime/include/iec_wstring.hpp b/src/runtime/include/iec_wstring.hpp
index d5ff7b0..2af9e6c 100644
--- a/src/runtime/include/iec_wstring.hpp
+++ b/src/runtime/include/iec_wstring.hpp
@@ -13,8 +13,8 @@
 
 #pragma once
 
-#include "iec_platform.hpp"
-
+#include <cstdint>
+#include <cstring>
 #include <algorithm>
 #include "iec_types.hpp"