Remove additional system includes

57 files changed, 81 insertions, 77 deletions

diff --git a/ape/vectors.c b/ape/vectors.c
index 0c41bd0..ff296ab 100644
--- a/ape/vectors.c
+++ b/ape/vectors.c
@@ -42,7 +42,7 @@
 /// @endcond
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <stdint.h>
+#include <types.h>
 
 // Function pointer for vectors
 typedef void (*vector_t)(void) __attribute__((interrupt));
diff --git a/include/APE_APE.h b/include/APE_APE.h
index 9c83870..b8926ea 100644
--- a/include/APE_APE.h
+++ b/include/APE_APE.h
@@ -49,7 +49,7 @@
 #ifndef APE_APE_H
 #define APE_APE_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_APE_sim(void* base);
diff --git a/include/APE_APE_PERI.h b/include/APE_APE_PERI.h
index 0330dc4..0ed0752 100644
--- a/include/APE_APE_PERI.h
+++ b/include/APE_APE_PERI.h
@@ -49,7 +49,7 @@
 #ifndef APE_APE_PERI_H
 #define APE_APE_PERI_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_APE_PERI_sim(void* base);
diff --git a/include/APE_DEVICE.h b/include/APE_DEVICE.h
index 28835d0..3dfe4fa 100644
--- a/include/APE_DEVICE.h
+++ b/include/APE_DEVICE.h
@@ -49,7 +49,7 @@
 #ifndef APE_DEVICE_H
 #define APE_DEVICE_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_DEVICE_sim(void* base);
diff --git a/include/APE_DEVICE1.h b/include/APE_DEVICE1.h
index 59811db..8c6548e 100644
--- a/include/APE_DEVICE1.h
+++ b/include/APE_DEVICE1.h
@@ -49,7 +49,7 @@
 #ifndef APE_DEVICE1_H
 #define APE_DEVICE1_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_DEVICE.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_DEVICE2.h b/include/APE_DEVICE2.h
index b1605d9..7aeb330 100644
--- a/include/APE_DEVICE2.h
+++ b/include/APE_DEVICE2.h
@@ -49,7 +49,7 @@
 #ifndef APE_DEVICE2_H
 #define APE_DEVICE2_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_DEVICE.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_DEVICE3.h b/include/APE_DEVICE3.h
index e274848..7b3dfd7 100644
--- a/include/APE_DEVICE3.h
+++ b/include/APE_DEVICE3.h
@@ -49,7 +49,7 @@
 #ifndef APE_DEVICE3_H
 #define APE_DEVICE3_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_DEVICE.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_FILTERS.h b/include/APE_FILTERS.h
index 689e50d..e83b039 100644
--- a/include/APE_FILTERS.h
+++ b/include/APE_FILTERS.h
@@ -49,7 +49,7 @@
 #ifndef APE_FILTERS_H
 #define APE_FILTERS_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_FILTERS_sim(void* base);
diff --git a/include/APE_FILTERS1.h b/include/APE_FILTERS1.h
index dad4fdf..42e264f 100644
--- a/include/APE_FILTERS1.h
+++ b/include/APE_FILTERS1.h
@@ -49,7 +49,7 @@
 #ifndef APE_FILTERS1_H
 #define APE_FILTERS1_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_FILTERS.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_FILTERS2.h b/include/APE_FILTERS2.h
index 6262da5..e48d71b 100644
--- a/include/APE_FILTERS2.h
+++ b/include/APE_FILTERS2.h
@@ -49,7 +49,7 @@
 #ifndef APE_FILTERS2_H
 #define APE_FILTERS2_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_FILTERS.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_FILTERS3.h b/include/APE_FILTERS3.h
index 9b235a9..3f4b5e1 100644
--- a/include/APE_FILTERS3.h
+++ b/include/APE_FILTERS3.h
@@ -49,7 +49,7 @@
 #ifndef APE_FILTERS3_H
 #define APE_FILTERS3_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_FILTERS.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_NVIC.h b/include/APE_NVIC.h
index e4a0b65..93a0038 100644
--- a/include/APE_NVIC.h
+++ b/include/APE_NVIC.h
@@ -49,7 +49,7 @@
 #ifndef APE_NVIC_H
 #define APE_NVIC_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_NVIC_sim(void* base);
diff --git a/include/APE_RX_PORT0.h b/include/APE_RX_PORT0.h
index c62d065..1ac06cd 100644
--- a/include/APE_RX_PORT0.h
+++ b/include/APE_RX_PORT0.h
@@ -49,7 +49,7 @@
 #ifndef APE_RX_PORT0_H
 #define APE_RX_PORT0_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_RX_PORT0_sim(void* base);
diff --git a/include/APE_RX_PORT1.h b/include/APE_RX_PORT1.h
index aaf57d6..f50c164 100644
--- a/include/APE_RX_PORT1.h
+++ b/include/APE_RX_PORT1.h
@@ -49,7 +49,7 @@
 #ifndef APE_RX_PORT1_H
 #define APE_RX_PORT1_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_RX_PORT0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_RX_PORT2.h b/include/APE_RX_PORT2.h
index 9792fb3..bb370e8 100644
--- a/include/APE_RX_PORT2.h
+++ b/include/APE_RX_PORT2.h
@@ -49,7 +49,7 @@
 #ifndef APE_RX_PORT2_H
 #define APE_RX_PORT2_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_RX_PORT0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_RX_PORT3.h b/include/APE_RX_PORT3.h
index 0f6fd81..16331a3 100644
--- a/include/APE_RX_PORT3.h
+++ b/include/APE_RX_PORT3.h
@@ -49,7 +49,7 @@
 #ifndef APE_RX_PORT3_H
 #define APE_RX_PORT3_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_RX_PORT0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_SHM.h b/include/APE_SHM.h
index f7b30d9..7865dc1 100644
--- a/include/APE_SHM.h
+++ b/include/APE_SHM.h
@@ -49,7 +49,7 @@
 #ifndef APE_SHM_H
 #define APE_SHM_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_SHM_sim(void* base);
diff --git a/include/APE_SHM1.h b/include/APE_SHM1.h
index cd2f495..05c5b2d 100644
--- a/include/APE_SHM1.h
+++ b/include/APE_SHM1.h
@@ -49,7 +49,7 @@
 #ifndef APE_SHM1_H
 #define APE_SHM1_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_SHM.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_SHM2.h b/include/APE_SHM2.h
index bd92e45..84443ea 100644
--- a/include/APE_SHM2.h
+++ b/include/APE_SHM2.h
@@ -49,7 +49,7 @@
 #ifndef APE_SHM2_H
 #define APE_SHM2_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_SHM.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_SHM3.h b/include/APE_SHM3.h
index d3deb09..d257cd8 100644
--- a/include/APE_SHM3.h
+++ b/include/APE_SHM3.h
@@ -49,7 +49,7 @@
 #ifndef APE_SHM3_H
 #define APE_SHM3_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_SHM.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_SHM_CHANNEL0.h b/include/APE_SHM_CHANNEL0.h
index 7669923..dbb66b3 100644
--- a/include/APE_SHM_CHANNEL0.h
+++ b/include/APE_SHM_CHANNEL0.h
@@ -49,7 +49,7 @@
 #ifndef APE_SHM_CHANNEL0_H
 #define APE_SHM_CHANNEL0_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_SHM_CHANNEL0_sim(void* base);
diff --git a/include/APE_SHM_CHANNEL1.h b/include/APE_SHM_CHANNEL1.h
index aa5838d..d2f6e15 100644
--- a/include/APE_SHM_CHANNEL1.h
+++ b/include/APE_SHM_CHANNEL1.h
@@ -49,7 +49,7 @@
 #ifndef APE_SHM_CHANNEL1_H
 #define APE_SHM_CHANNEL1_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_SHM_CHANNEL0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_SHM_CHANNEL2.h b/include/APE_SHM_CHANNEL2.h
index 2cf6d4a..8719902 100644
--- a/include/APE_SHM_CHANNEL2.h
+++ b/include/APE_SHM_CHANNEL2.h
@@ -49,7 +49,7 @@
 #ifndef APE_SHM_CHANNEL2_H
 #define APE_SHM_CHANNEL2_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_SHM_CHANNEL0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_SHM_CHANNEL3.h b/include/APE_SHM_CHANNEL3.h
index 907d2dc..470e808 100644
--- a/include/APE_SHM_CHANNEL3.h
+++ b/include/APE_SHM_CHANNEL3.h
@@ -49,7 +49,7 @@
 #ifndef APE_SHM_CHANNEL3_H
 #define APE_SHM_CHANNEL3_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_SHM_CHANNEL0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_TX_PORT0.h b/include/APE_TX_PORT0.h
index f397178..c3e3c56 100644
--- a/include/APE_TX_PORT0.h
+++ b/include/APE_TX_PORT0.h
@@ -49,7 +49,7 @@
 #ifndef APE_TX_PORT0_H
 #define APE_TX_PORT0_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_APE_TX_PORT0_sim(void* base);
diff --git a/include/APE_TX_PORT1.h b/include/APE_TX_PORT1.h
index 124dffd..e07b369 100644
--- a/include/APE_TX_PORT1.h
+++ b/include/APE_TX_PORT1.h
@@ -49,7 +49,7 @@
 #ifndef APE_TX_PORT1_H
 #define APE_TX_PORT1_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_TX_PORT0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_TX_PORT2.h b/include/APE_TX_PORT2.h
index a288f08..a733046 100644
--- a/include/APE_TX_PORT2.h
+++ b/include/APE_TX_PORT2.h
@@ -49,7 +49,7 @@
 #ifndef APE_TX_PORT2_H
 #define APE_TX_PORT2_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_TX_PORT0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/APE_TX_PORT3.h b/include/APE_TX_PORT3.h
index 01109a5..cefd987 100644
--- a/include/APE_TX_PORT3.h
+++ b/include/APE_TX_PORT3.h
@@ -49,7 +49,7 @@
 #ifndef APE_TX_PORT3_H
 #define APE_TX_PORT3_H
 
-#include <stdint.h>
+#include <types.h>
 #include "APE_TX_PORT0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/bcm5719_APE.h b/include/bcm5719_APE.h
index 30d4a03..891bf6c 100644
--- a/include/bcm5719_APE.h
+++ b/include/bcm5719_APE.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_APE_H
 #define BCM5719_APE_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_APE_sim(void* base);
diff --git a/include/bcm5719_APE_PERI.h b/include/bcm5719_APE_PERI.h
index 734339b..ec13bd8 100644
--- a/include/bcm5719_APE_PERI.h
+++ b/include/bcm5719_APE_PERI.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_APE_PERI_H
 #define BCM5719_APE_PERI_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_APE_PERI_sim(void* base);
diff --git a/include/bcm5719_BOOTCODE.h b/include/bcm5719_BOOTCODE.h
index 023303b..83b81b2 100644
--- a/include/bcm5719_BOOTCODE.h
+++ b/include/bcm5719_BOOTCODE.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_BOOTCODE_H
 #define BCM5719_BOOTCODE_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_BOOTCODE_sim(void* base);
diff --git a/include/bcm5719_DEVICE.h b/include/bcm5719_DEVICE.h
index d25c2f2..b900f85 100644
--- a/include/bcm5719_DEVICE.h
+++ b/include/bcm5719_DEVICE.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_DEVICE_H
 #define BCM5719_DEVICE_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_DEVICE_sim(void* base);
diff --git a/include/bcm5719_GEN.h b/include/bcm5719_GEN.h
index 865f602..3be821d 100644
--- a/include/bcm5719_GEN.h
+++ b/include/bcm5719_GEN.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_GEN_H
 #define BCM5719_GEN_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_GEN_sim(void* base);
diff --git a/include/bcm5719_RXMBUF.h b/include/bcm5719_RXMBUF.h
index 56730ee..8324631 100644
--- a/include/bcm5719_RXMBUF.h
+++ b/include/bcm5719_RXMBUF.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_RXMBUF_H
 #define BCM5719_RXMBUF_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_RXMBUF_sim(void* base);
diff --git a/include/bcm5719_SDBCACHE.h b/include/bcm5719_SDBCACHE.h
index 96b95f5..e390daa 100644
--- a/include/bcm5719_SDBCACHE.h
+++ b/include/bcm5719_SDBCACHE.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_SDBCACHE_H
 #define BCM5719_SDBCACHE_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_SDBCACHE_sim(void* base);
diff --git a/include/bcm5719_SHM.h b/include/bcm5719_SHM.h
index 24eec7d..a7b5309 100644
--- a/include/bcm5719_SHM.h
+++ b/include/bcm5719_SHM.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_SHM_H
 #define BCM5719_SHM_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_SHM_sim(void* base);
diff --git a/include/bcm5719_SHM_CHANNEL0.h b/include/bcm5719_SHM_CHANNEL0.h
index f91f3fc..d68bce6 100644
--- a/include/bcm5719_SHM_CHANNEL0.h
+++ b/include/bcm5719_SHM_CHANNEL0.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_SHM_CHANNEL0_H
 #define BCM5719_SHM_CHANNEL0_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_SHM_CHANNEL0_sim(void* base);
diff --git a/include/bcm5719_SHM_CHANNEL1.h b/include/bcm5719_SHM_CHANNEL1.h
index 3211bfc..637e3bd 100644
--- a/include/bcm5719_SHM_CHANNEL1.h
+++ b/include/bcm5719_SHM_CHANNEL1.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_SHM_CHANNEL1_H
 #define BCM5719_SHM_CHANNEL1_H
 
-#include <stdint.h>
+#include <types.h>
 #include "bcm5719_SHM_CHANNEL0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/bcm5719_SHM_CHANNEL2.h b/include/bcm5719_SHM_CHANNEL2.h
index b4222b2..2f3423c 100644
--- a/include/bcm5719_SHM_CHANNEL2.h
+++ b/include/bcm5719_SHM_CHANNEL2.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_SHM_CHANNEL2_H
 #define BCM5719_SHM_CHANNEL2_H
 
-#include <stdint.h>
+#include <types.h>
 #include "bcm5719_SHM_CHANNEL0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/bcm5719_SHM_CHANNEL3.h b/include/bcm5719_SHM_CHANNEL3.h
index bf1db4e..8d82547 100644
--- a/include/bcm5719_SHM_CHANNEL3.h
+++ b/include/bcm5719_SHM_CHANNEL3.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_SHM_CHANNEL3_H
 #define BCM5719_SHM_CHANNEL3_H
 
-#include <stdint.h>
+#include <types.h>
 #include "bcm5719_SHM_CHANNEL0.h"
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
diff --git a/include/bcm5719_TXMBUF.h b/include/bcm5719_TXMBUF.h
index 0b43c1c..2778cf3 100644
--- a/include/bcm5719_TXMBUF.h
+++ b/include/bcm5719_TXMBUF.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_TXMBUF_H
 #define BCM5719_TXMBUF_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_TXMBUF_sim(void* base);
diff --git a/include/bcm5719_eeprom.h b/include/bcm5719_eeprom.h
index 204d8d4..4086898 100644
--- a/include/bcm5719_eeprom.h
+++ b/include/bcm5719_eeprom.h
@@ -1,12 +1,17 @@
 #ifndef BCMNVRAM
 #define BCMNVRAM
 
-#include <stdint.h>
+#ifdef CXX_SIMULATOR
 #include <stddef.h>     /* offsetof */
+#define ELEMENT_OFFSET(__struct__, __elememnt__)        offsetof(__struct__, __elememnt__)
+#else
+#define _Static_assert(...)
+#define ELEMENT_OFFSET(__struct__, __elememnt__)        
+#endif
+
 #include <types.h>
 #include <vpd.h>
 
-#define ELEMENT_OFFSET(__struct__, __elememnt__)        offsetof(__struct__, __elememnt__)
 #define BCM_NVRAM_MAGIC	(0x669955AAu)
 
 #define BCM_CODE_DIRECTORY_TYPE_BC2             (0x00u)  /*< Second-phase bootcode */
diff --git a/include/types.h b/include/types.h
index f594686..e95c213 100644
--- a/include/types.h
+++ b/include/types.h
@@ -19,6 +19,8 @@ typedef long long signed int int64_t;
 
 typedef _Bool    bool;
 
+typedef uint32_t size_t;
+
 #define true (1)
 #define false (0)
 #else
diff --git a/libs/Compress/CMakeLists.txt b/libs/Compress/CMakeLists.txt
index 3b9f373..8d5c388 100644
--- a/libs/Compress/CMakeLists.txt
+++ b/libs/Compress/CMakeLists.txt
@@ -46,5 +46,6 @@ project(Compress)
 
 
 # Host library
-add_library(${PROJECT_NAME} STATIC decompress.c compress.c)
-target_include_directories(${PROJECT_NAME} PUBLIC include)
\ No newline at end of file
+simulator_add_library(${PROJECT_NAME} STATIC decompress.c compress.c)
+target_include_directories(${PROJECT_NAME} PUBLIC include)
+target_include_directories(${PROJECT_NAME} PUBLIC ../../include)
diff --git a/libs/Compress/compress.c b/libs/Compress/compress.c
index c8385ba..1cb63ff 100644
--- a/libs/Compress/compress.c
+++ b/libs/Compress/compress.c
@@ -215,7 +215,7 @@ int32_t compress(uint8_t *outBuffer, int32_t outBytes, const uint8_t *inBuffer,
                  int32_t inBytes)
 {
     const uint8_t *inEnd = inBuffer + inBytes;
-    size_t bytesWritten_ = 0;
+    uint32_t bytesWritten_ = 0;
 
     compressor_state st;
 
@@ -283,7 +283,7 @@ int32_t compress(uint8_t *outBuffer, int32_t outBytes, const uint8_t *inBuffer,
             // Send position and length pair. Note that matchLen > THRESHOLD.
             // printf("  REF off=%4u  len=%4u\n", st.matchPos, st.matchLen);
             // printf("    ");
-            // for (size_t j=0; j<st.matchLen; ++j)
+            // for (uint32_t j=0; j<st.matchLen; ++j)
             //  printf("%02x ", st.dict[st.matchPos+j]);
             // printf("\n");
             codeBuf[codeBufPtr++] = (uint8_t)st.matchPos;
diff --git a/libs/Compress/include/Compress.h b/libs/Compress/include/Compress.h
index 5676e72..ebbdadd 100644
--- a/libs/Compress/include/Compress.h
+++ b/libs/Compress/include/Compress.h
@@ -45,8 +45,7 @@
 #ifndef COMPRESS_H
 #define COMPRESS_H
 
-#include <stdint.h>
-#include <stddef.h>
+#include <types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/libs/MII/include/MII.h b/libs/MII/include/MII.h
index 85e9f9d..2eda373 100644
--- a/libs/MII/include/MII.h
+++ b/libs/MII/include/MII.h
@@ -45,7 +45,7 @@
 #define MII_H
 
 #include <bcm5719_MII.h>
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR
 typedef uint64_t    mii_reg_t;
diff --git a/libs/MII/include/bcm5719_MII.h b/libs/MII/include/bcm5719_MII.h
index 065c14f..86ad024 100644
--- a/libs/MII/include/bcm5719_MII.h
+++ b/libs/MII/include/bcm5719_MII.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_MII_H
 #define BCM5719_MII_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_MII_sim(void* base);
diff --git a/libs/NCSI/include/Ethernet.h b/libs/NCSI/include/Ethernet.h
index 632499b..304eaee 100644
--- a/libs/NCSI/include/Ethernet.h
+++ b/libs/NCSI/include/Ethernet.h
@@ -45,7 +45,7 @@
 #ifndef ETHERNET_H
 #define ETHERNET_H
 
-#include <stdint.h>
+#include <types.h>
 
 #define ETHERNET_FRAME_MIN      64
 
diff --git a/libs/NCSI/include/NCSI.h b/libs/NCSI/include/NCSI.h
index a26ac51..ca315fd 100644
--- a/libs/NCSI/include/NCSI.h
+++ b/libs/NCSI/include/NCSI.h
@@ -45,7 +45,7 @@
 #ifndef NCSI_H
 #define NCSI_H
 
-#include <stdint.h>
+#include <types.h>
 #include <Ethernet.h>
 
 void handleNCSIFrame(NetworkFrame_t* frame);
diff --git a/libs/NCSI/tests/valid_commands.c b/libs/NCSI/tests/valid_commands.c
index 5288f4f..0346093 100644
--- a/libs/NCSI/tests/valid_commands.c
+++ b/libs/NCSI/tests/valid_commands.c
@@ -1,4 +1,4 @@
-#include <stdint.h>
+#include <types.h>
 
 // Select Packate
 uint8_t select_package1[] = {
diff --git a/libs/NVRam/bcm5719_NVM.h b/libs/NVRam/bcm5719_NVM.h
index 056e20d..c7f4178 100644
--- a/libs/NVRam/bcm5719_NVM.h
+++ b/libs/NVRam/bcm5719_NVM.h
@@ -49,7 +49,7 @@
 #ifndef BCM5719_NVM_H
 #define BCM5719_NVM_H
 
-#include <stdint.h>
+#include <types.h>
 
 #ifdef CXX_SIMULATOR /* Compiling c++ simulator code - uses register wrappers */
 void init_bcm5719_NVM_sim(void* base);
diff --git a/libs/VPD/include/vpd.h b/libs/VPD/include/vpd.h
index 7245ed3..3d6d5ef 100644
--- a/libs/VPD/include/vpd.h
+++ b/libs/VPD/include/vpd.h
@@ -85,10 +85,10 @@ typedef union {
 
 const char *vpd_get_field_name(uint16_t field);
 
-uint8_t *vpd_get_identifier(uint8_t *buffer, size_t *len);
-uint8_t *vpd_get_resource_by_name(uint8_t *buffer, size_t *len, uint16_t name);
-uint8_t *vpd_get_resource_by_index(uint8_t *buffer, size_t *len, uint16_t *name,
-                                   size_t index);
-bool vpd_set_resource(uint8_t *buffer, size_t len, uint16_t resource,
-                      uint8_t *add_data, size_t add_len);
-bool vpd_is_valid(uint8_t *buffer, size_t len);
+uint8_t *vpd_get_identifier(uint8_t *buffer, uint32_t *len);
+uint8_t *vpd_get_resource_by_name(uint8_t *buffer, uint32_t *len, uint16_t name);
+uint8_t *vpd_get_resource_by_index(uint8_t *buffer, uint32_t *len, uint16_t *name,
+                                   uint32_t index);
+bool vpd_set_resource(uint8_t *buffer, uint32_t len, uint16_t resource,
+                      uint8_t *add_data, uint32_t add_len);
+bool vpd_is_valid(uint8_t *buffer, uint32_t len);
diff --git a/libs/VPD/vpd.c b/libs/VPD/vpd.c
index 824c9b1..c37c909 100644
--- a/libs/VPD/vpd.c
+++ b/libs/VPD/vpd.c
@@ -87,7 +87,7 @@ const char *vpd_get_field_name(uint16_t field)
     return NULL;
 }
 
-static uint8_t *get_next_tag(uint8_t *buffer, size_t *len)
+static uint8_t *get_next_tag(uint8_t *buffer, uint32_t *len)
 {
     if (!len)
     {
@@ -112,7 +112,7 @@ static uint8_t *get_next_tag(uint8_t *buffer, size_t *len)
     return &buffer[tag_len];
 }
 
-static uint8_t *get_tag_data(uint8_t *buffer, size_t *len)
+static uint8_t *get_tag_data(uint8_t *buffer, uint32_t *len)
 {
     if (!len)
     {
@@ -132,16 +132,16 @@ static uint8_t *get_tag_data(uint8_t *buffer, size_t *len)
     }
 }
 
-uint8_t *vpd_get_resource_by_name(uint8_t *buffer, size_t *len, uint16_t type)
+uint8_t *vpd_get_resource_by_name(uint8_t *buffer, uint32_t *len, uint16_t type)
 {
     return NULL;
 }
 
-uint8_t *vpd_get_resource_by_index(uint8_t *buffer, size_t *len, uint16_t *name,
-                                   size_t index)
+uint8_t *vpd_get_resource_by_index(uint8_t *buffer, uint32_t *len, uint16_t *name,
+                                   uint32_t index)
 {
     index++;
-    size_t new_len = *len;
+    uint32_t new_len = *len;
     uint8_t *new_buf = get_next_tag(buffer, &new_len);
     new_buf = get_tag_data(new_buf, &new_len);
 
@@ -169,12 +169,12 @@ uint8_t *vpd_get_resource_by_index(uint8_t *buffer, size_t *len, uint16_t *name,
     *len = field->length;
     return &field->data;
 }
-bool vpd_set_resource(uint8_t *buffer, size_t len, uint16_t resource,
-                      uint8_t *add_data, size_t add_len)
+bool vpd_set_resource(uint8_t *buffer, uint32_t len, uint16_t resource,
+                      uint8_t *add_data, uint32_t add_len)
 {
     return false;
 }
-bool vpd_is_valid(uint8_t *buffer, size_t len)
+bool vpd_is_valid(uint8_t *buffer, uint32_t len)
 {
     if (!len)
     {
@@ -190,7 +190,7 @@ bool vpd_is_valid(uint8_t *buffer, size_t len)
     return len != 0;
 }
 
-uint8_t *vpd_get_identifier(uint8_t *buffer, size_t *len)
+uint8_t *vpd_get_identifier(uint8_t *buffer, uint32_t *len)
 {
     if (!len)
         return NULL;
diff --git a/simulator/HAL.cpp b/simulator/HAL.cpp
index e2f5161..f5c8857 100644
--- a/simulator/HAL.cpp
+++ b/simulator/HAL.cpp
@@ -50,8 +50,6 @@ using namespace std;
 #define DEVICE_CONFIG   "config"
 #define BAR_STR         "resource"
 
-#define ARRAY_ELEMENTS(__x__) (sizeof(__x__) / sizeof(__x__[0]))
-
 typedef struct
 {
     uint16_t vendor_id;
diff --git a/stage1/init_hw.c b/stage1/init_hw.c
index 6369bec..68f6348 100644
--- a/stage1/init_hw.c
+++ b/stage1/init_hw.c
@@ -51,8 +51,7 @@
 #include <bcm5719_RXMBUF.h>
 #include <bcm5719_TXMBUF.h>
 #include <bcm5719_SDBCACHE.h>
-#include <stdbool.h>
-#include <stdint.h>
+#include <types.h>
 
 void *memset(void *s, int c, size_t n)
 {
diff --git a/utils/bcmflash/main.cpp b/utils/bcmflash/main.cpp
index de468d5..3e4f304 100644
--- a/utils/bcmflash/main.cpp
+++ b/utils/bcmflash/main.cpp
@@ -544,7 +544,7 @@ int main(int argc, char const *argv[])
     printf("\n=== VPD ===\n");
     if (vpd_is_valid(nvram.contents.vpd.bytes, sizeof(nvram.contents.vpd)))
     {
-        size_t vpd_len = sizeof(nvram.contents.vpd);
+        uint32_t vpd_len = sizeof(nvram.contents.vpd);
         printf("Identifier: %s\n",
                vpd_get_identifier(nvram.contents.vpd.bytes, &vpd_len));