diff --git a/src/nft.h b/src/nft.h
index f6b2d67..419f2c1 100644
--- a/src/nft.h
+++ b/src/nft.h
@@ -6,7 +6,7 @@
 
 // We defined the collection name max length to be the size of a `tokenDefinition_t` and remove the
 // `ADDRESS_LENGTH` which corresponds to `sizeof(contractAddress`).
-#define COLLECTION_NAME_MAX_LEN sizeof(tokenDefinition_t) - ADDRESS_LENGTH
+#define COLLECTION_NAME_MAX_LEN (sizeof(tokenDefinition_t) - ADDRESS_LENGTH)
 
 typedef struct nftInfo_t {
     char collectionName[COLLECTION_NAME_MAX_LEN];
diff --git a/src_features/provideNFTInformation/cmd_provideNFTInfo.c b/src_features/provideNFTInformation/cmd_provideNFTInfo.c
index a4256a3..55f26cf 100644
--- a/src_features/provideNFTInformation/cmd_provideNFTInfo.c
+++ b/src_features/provideNFTInformation/cmd_provideNFTInfo.c
@@ -9,7 +9,7 @@
 #define TYPE_SIZE        1
 #define VERSION_SIZE     1
 #define NAME_LENGTH_SIZE 1
-#define HEADER_SIZE      TYPE_SIZE + VERSION_SIZE + NAME_LENGTH_SIZE
+#define HEADER_SIZE      (TYPE_SIZE + VERSION_SIZE + NAME_LENGTH_SIZE)
 
 #define CHAIN_ID_SIZE         8
 #define KEY_ID_SIZE           1
diff --git a/src_features/setPlugin/cmd_setPlugin.c b/src_features/setPlugin/cmd_setPlugin.c
index d2969f7..7f4f042 100644
--- a/src_features/setPlugin/cmd_setPlugin.c
+++ b/src_features/setPlugin/cmd_setPlugin.c
@@ -18,7 +18,7 @@
 #define ALGORITHM_ID_SIZE       1
 #define SIGNATURE_LENGTH_SIZE   1
 
-#define HEADER_SIZE TYPE_SIZE + VERSION_SIZE + PLUGIN_NAME_LENGTH_SIZE
+#define HEADER_SIZE (TYPE_SIZE + VERSION_SIZE + PLUGIN_NAME_LENGTH_SIZE)
 
 #define MIN_DER_SIG_SIZE 67
 #define MAX_DER_SIG_SIZE 72