diff --git a/jerry-core/ecma/base/ecma-helpers-value.c b/jerry-core/ecma/base/ecma-helpers-value.c
index e345c00a0..4ad11474e 100644
--- a/jerry-core/ecma/base/ecma-helpers-value.c
+++ b/jerry-core/ecma/base/ecma-helpers-value.c
@@ -336,9 +336,9 @@ ecma_is_value_prop_name (ecma_value_t value) /**< ecma value */
 {
 #ifndef CONFIG_DISABLE_ES2015_SYMBOL_BUILTIN
   return ecma_is_value_string (value) || ecma_is_value_symbol (value);
-#endif /* !CONFIG_DISABLE_ES2015_SYMBOL_BUILTIN */
-
+#else /* CONFIG_DISABLE_ES2015_SYMBOL_BUILTIN */
   return ecma_is_value_string (value);
+#endif /* !CONFIG_DISABLE_ES2015_SYMBOL_BUILTIN */
 } /* ecma_is_value_prop_name */
 
 /**
diff --git a/jerry-core/ecma/base/ecma-property-hashmap.c b/jerry-core/ecma/base/ecma-property-hashmap.c
index 5da1d10a9..45029969f 100644
--- a/jerry-core/ecma/base/ecma-property-hashmap.c
+++ b/jerry-core/ecma/base/ecma-property-hashmap.c
@@ -415,8 +415,9 @@ ecma_property_hashmap_delete (ecma_object_t *object_p, /**< object */
   JERRY_UNUSED (object_p);
   JERRY_UNUSED (name_cp);
   JERRY_UNUSED (property_p);
-#endif /* !CONFIG_ECMA_PROPERTY_HASHMAP_DISABLE */
+
   return ECMA_PROPERTY_HASHMAP_DELETE_HAS_HASHMAP;
+#endif /* !CONFIG_ECMA_PROPERTY_HASHMAP_DISABLE */
 } /* ecma_property_hashmap_delete */
 
 #ifndef CONFIG_ECMA_PROPERTY_HASHMAP_DISABLE
diff --git a/jerry-core/ecma/operations/ecma-objects.c b/jerry-core/ecma/operations/ecma-objects.c
index c5cb351e5..b63bdef29 100644
--- a/jerry-core/ecma/operations/ecma-objects.c
+++ b/jerry-core/ecma/operations/ecma-objects.c
@@ -1211,8 +1211,9 @@ ecma_op_object_define_own_property (ecma_object_t *obj_p, /**< the object */
                                                          property_name_p,
                                                          property_desc_p,
                                                          is_throw);
-#endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
+#else /* CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
       break;
+#endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
     }
   }
 } /* ecma_op_object_define_own_property */