diff --git a/jerry-core/ecma/base/ecma-literal-storage.c b/jerry-core/ecma/base/ecma-literal-storage.c
index 3c805ca942..edae62d9ca 100644
--- a/jerry-core/ecma/base/ecma-literal-storage.c
+++ b/jerry-core/ecma/base/ecma-literal-storage.c
@@ -203,7 +203,7 @@ ecma_find_empty_literal_string_slot (void)
 
   return ecma_allocate_new_string_slot ();
 } /* ecma_find_empty_literal_string_slot */
-#endif
+#endif /* JERRY_LIT_HASHMAP */
 
 /**
  * Find an empty or similar a literal string slot.
@@ -251,7 +251,7 @@ ecma_find_empty_or_same_literal_string_slot (ecma_string_t *string_p /**< string
 
   return ecma_allocate_new_string_slot ();
 } /* ecma_find_empty_or_same_literal_string_slot */
-#endif
+#endif /* !JERRY_LIT_HASHMAP */
 
 /**
  * Find or create a literal string.
diff --git a/jerry-core/lit/lit-hashmap.c b/jerry-core/lit/lit-hashmap.c
index 656927cef3..1befc99dad 100644
--- a/jerry-core/lit/lit-hashmap.c
+++ b/jerry-core/lit/lit-hashmap.c
@@ -194,11 +194,11 @@ hashmap_iterate_pairs (struct hashmap_s *const m,
                        void *const context)
 {
   hashmap_uint32_t i;
-  struct hashmap_element_s *p;
   int r;
 
   for (i = 0; i < (hashmap_capacity (m) + HASHMAP_LINEAR_PROBE_LENGTH); i++)
   {
+    struct hashmap_element_s *p;
     p = &m->data[i];
     if (p->data)
     {
diff --git a/jerry-core/lit/lit-hashmap.h b/jerry-core/lit/lit-hashmap.h
index d1e71d7231..c03370be78 100644
--- a/jerry-core/lit/lit-hashmap.h
+++ b/jerry-core/lit/lit-hashmap.h
@@ -46,10 +46,10 @@ typedef struct hashmap_element_s
 typedef struct hashmap_s
 {
   hashmap_uint32_t log2_capacity; /**< hashmap capacity */
-  hashmap_uint32_t size;          /**< hashmap size*/
+  hashmap_uint32_t size; /**< hashmap size*/
   struct hashmap_element_s *data; /**< element array */
-  size_t alloc_size;              /**< allocated size */
-  uint8_t initialized;            /**< 0 if not initialized */
+  size_t alloc_size; /**< allocated size */
+  uint8_t initialized; /**< 0 if not initialized */
 } hashmap_t;
 
 /// @brief Initialize the hashmap.