diff --git a/src/chainConfig.h b/src/chainConfig.h
index ee0bf67..d87123d 100644
--- a/src/chainConfig.h
+++ b/src/chainConfig.h
@@ -18,6 +18,8 @@
 #ifndef _CHAIN_CONFIG_H_
 #define _CHAIN_CONFIG_H_
 
+#include <stdint.h>
+
 #include "os.h"
 
 typedef enum chain_kind_e {
diff --git a/src/main.c b/src/main.c
index fb33580..dbc21b4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -15,9 +15,12 @@
 *  limitations under the License.
 ********************************************************************************/
 
+#include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
+
 #include "os.h"
 #include "cx.h"
-#include "stdbool.h"
 #include "ethUstream.h"
 #include "ethUtils.h"
 #include "uint256.h"
@@ -25,7 +28,6 @@
 #include "chainConfig.h"
 
 #include "os_io_seproxyhal.h"
-#include "string.h"
 
 #include "glyphs.h"
 
diff --git a/src/tokens.h b/src/tokens.h
index db91718..3a8333d 100644
--- a/src/tokens.h
+++ b/src/tokens.h
@@ -18,7 +18,7 @@
 #ifndef _TOKENS_H_
 #define _TOKENS_H_
 
-#include "os.h"
+#include <stdint.h>
 
 typedef struct tokenDefinition_t {
     uint8_t address[20];
diff --git a/src_common/ethUstream.c b/src_common/ethUstream.c
index 48c59fd..09e5de6 100644
--- a/src_common/ethUstream.c
+++ b/src_common/ethUstream.c
@@ -15,6 +15,8 @@
 *  limitations under the License.
 ********************************************************************************/
 
+#include <stdint.h>
+
 #include "ethUstream.h"
 #include "ethUtils.h"
 
diff --git a/src_common/ethUstream.h b/src_common/ethUstream.h
index 269c552..c630596 100644
--- a/src_common/ethUstream.h
+++ b/src_common/ethUstream.h
@@ -18,9 +18,11 @@
 #ifndef _ETHUSTREAM_H_
 #define _ETHUSTREAM_H_
 
+#include <stdbool.h>
+#include <stdint.h>
+
 #include "os.h"
 #include "cx.h"
-#include <stdbool.h>
 
 struct txContext_t;
 
diff --git a/src_common/ethUtils.c b/src_common/ethUtils.c
index ed8546d..438daf9 100644
--- a/src_common/ethUtils.c
+++ b/src_common/ethUtils.c
@@ -23,9 +23,12 @@
  * @date 8th of March 2016
  */
 
+#include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
+
 #include "os.h"
 #include "cx.h"
-#include <stdbool.h>
 #include "ethUtils.h"
 #include "chainConfig.h"
 
diff --git a/src_common/ethUtils.h b/src_common/ethUtils.h
index 720a6ca..9cdda12 100644
--- a/src_common/ethUtils.h
+++ b/src_common/ethUtils.h
@@ -18,7 +18,8 @@
 #ifndef _ETHUTILS_H_
 #define _ETHUTILS_H_
 
-#include "os.h"
+#include <stdint.h>
+
 #include "cx.h"
 
 /**
diff --git a/src_common/uint256.c b/src_common/uint256.c
index 96b5c2a..54ac8ba 100644
--- a/src_common/uint256.c
+++ b/src_common/uint256.c
@@ -19,6 +19,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+
 #include "uint256.h"
 
 static const char HEXDIGITS[] = "0123456789abcdef";