diff --git a/src/eth_plugin_internal.c b/src/eth_plugin_internal.c
index c9858a8..0e28ca6 100644
--- a/src/eth_plugin_internal.c
+++ b/src/eth_plugin_internal.c
@@ -1,3 +1,4 @@
+#include <string.h>
 #include "eth_plugin_internal.h"
 
 bool erc20_plugin_available_check(void);
diff --git a/src/eth_plugin_internal.h b/src/eth_plugin_internal.h
index f475797..4d26130 100644
--- a/src/eth_plugin_internal.h
+++ b/src/eth_plugin_internal.h
@@ -1,6 +1,8 @@
 #ifndef _ETH_PLUGIN_INTERNAL_H_
 #define _ETH_PLUGIN_INTERNAL_H_
 
+#include <stdint.h>
+#include <stdbool.h>
 #include "eth_plugin_interface.h"
 
 #define SELECTOR_SIZE    4
diff --git a/src/handle_swap_sign_transaction.c b/src/handle_swap_sign_transaction.c
index d610e9e..75e4d3a 100644
--- a/src/handle_swap_sign_transaction.c
+++ b/src/handle_swap_sign_transaction.c
@@ -1,6 +1,6 @@
-#include "handle_swap_sign_transaction.h"
-#include "usbd_core.h"
+#include "os_io_seproxyhal.h"
 #include "ux.h"
+#include "handle_swap_sign_transaction.h"
 #include "shared_context.h"
 #include "utils.h"
 
@@ -79,4 +79,4 @@ void handle_swap_sign_transaction(chain_config_t* config) {
     BLE_power(1, "Nano X");
 #endif  // HAVE_BLE
     app_main();
-}
\ No newline at end of file
+}
diff --git a/src/nft.h b/src/nft.h
index 7c8b836..b8b9435 100644
--- a/src/nft.h
+++ b/src/nft.h
@@ -1,8 +1,6 @@
 #ifndef _NFT_H_
 #define _NFT_H_
 
-#include "tokens.h"
-
 #define COLLECTION_NAME_MAX_LEN 70
 
 typedef struct nftInfo_t {
diff --git a/src/shared_context.h b/src/shared_context.h
index b8ea64b..12b21f5 100644
--- a/src/shared_context.h
+++ b/src/shared_context.h
@@ -3,13 +3,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <string.h>
-
-#include "os.h"
-#include "cx.h"
-#include "os_io_seproxyhal.h"
 #include "ethUstream.h"
-#include "uint256.h"
 #include "tokens.h"
 #include "chainConfig.h"
 #include "nft.h"
diff --git a/src_features/getEth2PublicKey/logic_getEth2PublicKey.c b/src_features/getEth2PublicKey/logic_getEth2PublicKey.c
index 9b112e2..6a0fc92 100644
--- a/src_features/getEth2PublicKey/logic_getEth2PublicKey.c
+++ b/src_features/getEth2PublicKey/logic_getEth2PublicKey.c
@@ -1,5 +1,6 @@
 #ifdef HAVE_ETH2
 
+#include <string.h>
 #include "shared_context.h"
 
 uint32_t set_result_get_eth2_publicKey() {
@@ -9,4 +10,4 @@ uint32_t set_result_get_eth2_publicKey() {
     return tx;
 }
 
-#endif
+#endif  // HAVE_ETH2
diff --git a/src_features/getPublicKey/logic_getPublicKey.c b/src_features/getPublicKey/logic_getPublicKey.c
index d80896c..bc58e92 100644
--- a/src_features/getPublicKey/logic_getPublicKey.c
+++ b/src_features/getPublicKey/logic_getPublicKey.c
@@ -1,3 +1,4 @@
+#include <string.h>
 #include "shared_context.h"
 
 uint32_t set_result_get_publicKey() {
diff --git a/src_features/signMessage/ui_common_signMessage.c b/src_features/signMessage/ui_common_signMessage.c
index 02b15c3..e2a901b 100644
--- a/src_features/signMessage/ui_common_signMessage.c
+++ b/src_features/signMessage/ui_common_signMessage.c
@@ -1,3 +1,4 @@
+#include "os_io_seproxyhal.h"
 #include "shared_context.h"
 #include "ui_callbacks.h"
 
diff --git a/src_features/signMessageEIP712/ui_common_signMessage712.c b/src_features/signMessageEIP712/ui_common_signMessage712.c
index db97137..e67cc4e 100644
--- a/src_features/signMessageEIP712/ui_common_signMessage712.c
+++ b/src_features/signMessageEIP712/ui_common_signMessage712.c
@@ -1,3 +1,4 @@
+#include "os_io_seproxyhal.h"
 #include "shared_context.h"
 #include "ui_callbacks.h"
 
diff --git a/src_features/signTx/ui_common_signTx.c b/src_features/signTx/ui_common_signTx.c
index 36a0bd9..3d27197 100644
--- a/src_features/signTx/ui_common_signTx.c
+++ b/src_features/signTx/ui_common_signTx.c
@@ -1,3 +1,4 @@
+#include "os_io_seproxyhal.h"
 #include "shared_context.h"
 #include "utils.h"
 #include "ui_callbacks.h"
diff --git a/src_features/stark_getPublicKey/logic_stark_getPublicKey.c b/src_features/stark_getPublicKey/logic_stark_getPublicKey.c
index 8c99cfd..9338cc4 100644
--- a/src_features/stark_getPublicKey/logic_stark_getPublicKey.c
+++ b/src_features/stark_getPublicKey/logic_stark_getPublicKey.c
@@ -1,5 +1,6 @@
 #ifdef HAVE_STARKWARE
 
+#include <string.h>
 #include "shared_context.h"
 #include "feature_stark_getPublicKey.h"
 
@@ -10,4 +11,4 @@ uint32_t set_result_get_stark_publicKey() {
     return tx;
 }
 
-#endif
+#endif  // HAVE_STARKWARE
diff --git a/src_features/stark_sign/ui_common_stark_sign.c b/src_features/stark_sign/ui_common_stark_sign.c
index b5feede..533f67f 100644
--- a/src_features/stark_sign/ui_common_stark_sign.c
+++ b/src_features/stark_sign/ui_common_stark_sign.c
@@ -1,5 +1,6 @@
 #ifdef HAVE_STARKWARE
 
+#include "os_io_seproxyhal.h"
 #include "shared_context.h"
 #include "stark_utils.h"
 #include "ui_callbacks.h"
@@ -32,4 +33,4 @@ unsigned int io_seproxyhal_touch_stark_ok(__attribute__((unused)) const bagl_ele
     return 0;  // do not redraw the widget
 }
 
-#endif
+#endif  // HAVE_STARKWARE
diff --git a/src_features/stark_unsafe_sign/ui_common_stark_unsafe_sign.c b/src_features/stark_unsafe_sign/ui_common_stark_unsafe_sign.c
index 2a75200..4c84e0b 100644
--- a/src_features/stark_unsafe_sign/ui_common_stark_unsafe_sign.c
+++ b/src_features/stark_unsafe_sign/ui_common_stark_unsafe_sign.c
@@ -1,5 +1,6 @@
 #ifdef HAVE_STARKWARE
 
+#include "os_io_seproxyhal.h"
 #include "shared_context.h"
 #include "stark_utils.h"
 #include "ui_callbacks.h"
@@ -38,4 +39,4 @@ unsigned int io_seproxyhal_touch_stark_unsafe_sign_ok(__attribute__((unused))
     return 0;  // do not redraw the widget
 }
 
-#endif
+#endif  // HAVE_STARKWARE
diff --git a/src_plugins/erc1155/erc1155_plugin.c b/src_plugins/erc1155/erc1155_plugin.c
index ea65515..9554497 100644
--- a/src_plugins/erc1155/erc1155_plugin.c
+++ b/src_plugins/erc1155/erc1155_plugin.c
@@ -1,7 +1,9 @@
 #ifdef HAVE_NFT_SUPPORT
 
+#include <string.h>
 #include "erc1155_plugin.h"
 #include "eth_plugin_internal.h"
+#include "ethUtils.h"
 
 static const uint8_t ERC1155_APPROVE_FOR_ALL_SELECTOR[SELECTOR_SIZE] = {0xa2, 0x2c, 0xb4, 0x65};
 static const uint8_t ERC1155_SAFE_TRANSFER_SELECTOR[SELECTOR_SIZE] = {0xf2, 0x42, 0x43, 0x2a};
diff --git a/src_plugins/erc1155/erc1155_plugin.h b/src_plugins/erc1155/erc1155_plugin.h
index 691ebdf..cb100c7 100644
--- a/src_plugins/erc1155/erc1155_plugin.h
+++ b/src_plugins/erc1155/erc1155_plugin.h
@@ -3,12 +3,11 @@
 
 #ifdef HAVE_NFT_SUPPORT
 
-#include <string.h>
-#include "eth_plugin_handler.h"
-#include "shared_context.h"
-#include "ethUtils.h"
-#include "utils.h"
+#include <stdbool.h>
+#include <stdint.h>
+#include "ethUstream.h"
 #include "uint256.h"
+#include "nft.h"
 
 // Internal plugin for EIP 1155: https://eips.ethereum.org/EIPS/eip-1155
 
diff --git a/src_plugins/erc1155/erc1155_provide_parameters.c b/src_plugins/erc1155/erc1155_provide_parameters.c
index 800aafb..8b5e1ca 100644
--- a/src_plugins/erc1155/erc1155_provide_parameters.c
+++ b/src_plugins/erc1155/erc1155_provide_parameters.c
@@ -1,7 +1,10 @@
 #ifdef HAVE_NFT_SUPPORT
 
+#include <string.h>
 #include "erc1155_plugin.h"
 #include "eth_plugin_internal.h"
+#include "utils.h"
+#include "ethUtils.h"
 
 static void handle_safe_transfer(ethPluginProvideParameter_t *msg, erc1155_context_t *context) {
     uint8_t new_value[INT256_LENGTH];
diff --git a/src_plugins/erc1155/erc1155_ui.c b/src_plugins/erc1155/erc1155_ui.c
index e2679d4..2386793 100644
--- a/src_plugins/erc1155/erc1155_ui.c
+++ b/src_plugins/erc1155/erc1155_ui.c
@@ -1,6 +1,10 @@
 #ifdef HAVE_NFT_SUPPORT
 
+#include <string.h>
 #include "erc1155_plugin.h"
+#include "eth_plugin_interface.h"
+#include "ethUtils.h"
+#include "utils.h"
 
 static void set_approval_for_all_ui(ethQueryContractUI_t *msg, erc1155_context_t *context) {
     switch (msg->screenIndex) {
diff --git a/src_plugins/erc721/erc721_plugin.c b/src_plugins/erc721/erc721_plugin.c
index badddb3..449aa96 100644
--- a/src_plugins/erc721/erc721_plugin.c
+++ b/src_plugins/erc721/erc721_plugin.c
@@ -1,7 +1,10 @@
 #ifdef HAVE_NFT_SUPPORT
 
+#include <string.h>
 #include "erc721_plugin.h"
 #include "eth_plugin_internal.h"
+#include "eth_plugin_interface.h"
+#include "ethUtils.h"
 
 static const uint8_t ERC721_APPROVE_SELECTOR[SELECTOR_SIZE] = {0x09, 0x5e, 0xa7, 0xb3};
 static const uint8_t ERC721_APPROVE_FOR_ALL_SELECTOR[SELECTOR_SIZE] = {0xa2, 0x2c, 0xb4, 0x65};
diff --git a/src_plugins/erc721/erc721_plugin.h b/src_plugins/erc721/erc721_plugin.h
index 9c0f5c3..17515f3 100644
--- a/src_plugins/erc721/erc721_plugin.h
+++ b/src_plugins/erc721/erc721_plugin.h
@@ -3,11 +3,10 @@
 
 #ifdef HAVE_NFT_SUPPORT
 
-#include <string.h>
-#include "eth_plugin_handler.h"
-#include "shared_context.h"
-#include "ethUtils.h"
-#include "utils.h"
+#include <stdbool.h>
+#include <stdint.h>
+#include "ethUstream.h"
+#include "nft.h"
 
 // Internal plugin for EIP 721: https://eips.ethereum.org/EIPS/eip-721
 
diff --git a/src_plugins/erc721/erc721_ui.c b/src_plugins/erc721/erc721_ui.c
index ce0c4f5..a968aa6 100644
--- a/src_plugins/erc721/erc721_ui.c
+++ b/src_plugins/erc721/erc721_ui.c
@@ -1,6 +1,10 @@
 #ifdef HAVE_NFT_SUPPORT
 
+#include <string.h>
 #include "erc721_plugin.h"
+#include "eth_plugin_interface.h"
+#include "ethUtils.h"
+#include "utils.h"
 
 static void set_approval_ui(ethQueryContractUI_t *msg, erc721_context_t *context) {
     switch (msg->screenIndex) {
diff --git a/src_plugins/starkware/starkware_plugin.c b/src_plugins/starkware/starkware_plugin.c
index 11f7d8e..9800f7c 100644
--- a/src_plugins/starkware/starkware_plugin.c
+++ b/src_plugins/starkware/starkware_plugin.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include "os_io_seproxyhal.h"
 #include "eth_plugin_interface.h"
 #include "shared_context.h"       // TODO : rewrite as independant code
 #include "eth_plugin_internal.h"  // TODO : rewrite as independant code