diff --git a/app/src/items.c b/app/src/items.c
index 72156ee..6bf6f1d 100644
--- a/app/src/items.c
+++ b/app/src/items.c
@@ -14,11 +14,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  ********************************************************************************/
-#include "crypto_helper.h"
 #include "items.h"
+
+#include <base64.h>
+
+#include "crypto_helper.h"
 #include "items_format.h"
 #include "parser_impl.h"
-#include <base64.h>
 
 static items_error_t items_storeSigningTransaction();
 static items_error_t items_storeNetwork();
diff --git a/app/src/items.h b/app/src/items.h
index 97d6dae..afb1474 100644
--- a/app/src/items.h
+++ b/app/src/items.h
@@ -16,10 +16,11 @@
 #pragma once
 
 #include <zxmacros.h>
-#include "zxtypes.h"
-#include "parser_common.h"
+
 #include "items_defs.h"
 #include "json_parser.h"
+#include "parser_common.h"
+#include "zxtypes.h"
 
 void items_initItems();
 void items_storeItems();
diff --git a/app/src/items_format.c b/app/src/items_format.c
index ac8a231..0b93610 100644
--- a/app/src/items_format.c
+++ b/app/src/items_format.c
@@ -15,10 +15,12 @@
  ********************************************************************************/
 
 #include "items_format.h"
-#include "parser.h"
-#include "crypto.h"
+
 #include <zxformat.h>
 
+#include "crypto.h"
+#include "parser.h"
+
 extern char base64_hash[44];
 
 items_error_t items_stdToDisplayString(item_t item, char *outVal, uint16_t *outValLen) {
diff --git a/app/src/items_format.h b/app/src/items_format.h
index 396c196..4f85b2b 100644
--- a/app/src/items_format.h
+++ b/app/src/items_format.h
@@ -16,8 +16,9 @@
 #pragma once
 
 #include <zxmacros.h>
-#include "zxtypes.h"
+
 #include "items_defs.h"
+#include "zxtypes.h"
 
 #define WARNING_TEXT                                                                                                   \
     "UNSAFE TRANSACTION. This transaction's code was not recognized and does not limit capabilities for all signers. " \
diff --git a/app/src/json/json_parser.c b/app/src/json/json_parser.c
index f847b91..0bdac97 100644
--- a/app/src/json/json_parser.c
+++ b/app/src/json/json_parser.c
@@ -13,10 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  ********************************************************************************/
-#include <zxmacros.h>
+#include "json_parser.h"
+
 #include "../common/parser_common.h"
 #include "jsmn/jsmn.h"
-#include "json_parser.h"
 
 #define EQUALS(_P, _Q, _LEN) (MEMCMP((const void *)PIC(_P), (const void *)PIC(_Q), (_LEN)) == 0)
 
diff --git a/app/src/json/json_parser.h b/app/src/json/json_parser.h
index 9cb01a9..a13f51f 100644
--- a/app/src/json/json_parser.h
+++ b/app/src/json/json_parser.h
@@ -15,11 +15,13 @@
  ********************************************************************************/
 #pragma once
 
-#include "jsmn.h"
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <string.h>
-#include "common/parser_common.h"
+#include <zxmacros.h>
+
+#include "jsmn.h"
+#include "parser_common.h"
 
 /// Max number of accepted tokens in the JSON input
 #define MAX_NUMBER_OF_TOKENS 768
diff --git a/app/src/parser.c b/app/src/parser.c
index 1f9a11e..3152f02 100644
--- a/app/src/parser.c
+++ b/app/src/parser.c
@@ -14,17 +14,18 @@
  *  limitations under the License.
  ********************************************************************************/
 
+#include "parser.h"
+
 #include <stdio.h>
 #include <zxformat.h>
 #include <zxmacros.h>
 #include <zxtypes.h>
 
-#include "items.h"
 #include "coin.h"
 #include "crypto.h"
 #include "crypto_helper.h"
+#include "items.h"
 #include "parser_impl.h"
-#include "parser.h"
 
 #define MAX_ITEM_LENGTH_IN_PAGE 40
 
diff --git a/app/src/parser_impl.c b/app/src/parser_impl.c
index 33eb134..baa0e7d 100644
--- a/app/src/parser_impl.c
+++ b/app/src/parser_impl.c
@@ -15,6 +15,7 @@
  ********************************************************************************/
 
 #include "parser_impl.h"
+
 #include "crypto_helper.h"
 #include "items.h"
 
diff --git a/app/src/parser_txdef.h b/app/src/parser_txdef.h
index 87eb62d..11a28be 100644
--- a/app/src/parser_txdef.h
+++ b/app/src/parser_txdef.h
@@ -19,9 +19,10 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
-#include <stddef.h>
 #include <json/json_parser.h>
+#include <stddef.h>
+#include <stdint.h>
+
 #include "coin.h"
 
 typedef struct {
diff --git a/tests/json_parser.cpp b/tests/json_parser.cpp
index 66d5141..b034cf4 100644
--- a/tests/json_parser.cpp
+++ b/tests/json_parser.cpp
@@ -14,8 +14,6 @@
  *  limitations under the License.
  ********************************************************************************/
 
-#include "parser_impl.h"
-
 #include <hexutils.h>
 
 #include <iostream>
@@ -23,6 +21,7 @@
 
 #include "gmock/gmock.h"
 #include "parser.h"
+#include "parser_impl.h"
 #include "parser_txdef.h"
 #include "utils/common.h"
 
diff --git a/tests/utils/common.h b/tests/utils/common.h
index 10b5c04..1160005 100644
--- a/tests/utils/common.h
+++ b/tests/utils/common.h
@@ -15,14 +15,14 @@
  ********************************************************************************/
 #pragma once
 
+#include <coin.h>
+#include <json/json_parser.h>
+
 #include <string>
 #include <vector>
 
-#include "parser_impl.h"
 #include "parser_common.h"
-
-#include <json/json_parser.h>
-#include <coin.h>
+#include "parser_impl.h"
 
 #define EXPECT_EQ_STR(_STR1, _STR2, _ERROR_MESSAGE)                                            \
     {                                                                                          \