From ec5859f4e85a8cb577e1c6aeecdce8d4526ecd0e Mon Sep 17 00:00:00 2001
From: Robert Sipka <rsipka.uszeged@partner.samsung.com>
Date: Thu, 11 Feb 2016 20:48:41 +0100
Subject: [PATCH 1/2] Add some fixes required by the C99 standard.

Use c-style cast instead of reinterpret_cast.
Use identifiers for function parameters.
Use type cast to avoid conversion error.

JerryScript-DCO-1.0-Signed-off-by: Robert Sipka rsipka.uszeged@partner.samsung.com
---
 jerry-core/ecma/operations/ecma-objects.cpp |  8 ++++----
 tests/unit/test-api.cpp                     | 13 ++++++++++---
 tests/unit/test-poolman.cpp                 |  8 ++++----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/jerry-core/ecma/operations/ecma-objects.cpp b/jerry-core/ecma/operations/ecma-objects.cpp
index 16ea3cd8f4..293028f482 100644
--- a/jerry-core/ecma/operations/ecma-objects.cpp
+++ b/jerry-core/ecma/operations/ecma-objects.cpp
@@ -616,7 +616,7 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */
 
       lit_string_hash_t hash = name_p->hash;
       uint32_t bitmap_row = (uint32_t) (hash / bitmap_row_size);
-      uint32_t bitmap_column = hash % bitmap_row_size;
+      uint32_t bitmap_column = (uint32_t) (hash % bitmap_row_size);
 
       if ((own_names_hashes_bitmap[bitmap_row] & (1u << bitmap_column)) == 0)
       {
@@ -648,7 +648,7 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */
         {
           lit_string_hash_t hash = name_p->hash;
           uint32_t bitmap_row = (uint32_t) (hash / bitmap_row_size);
-          uint32_t bitmap_column = hash % bitmap_row_size;
+          uint32_t bitmap_column = (uint32_t) (hash % bitmap_row_size);
 
           bool is_add = true;
 
@@ -687,7 +687,7 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */
 
           lit_string_hash_t hash = name_p->hash;
           uint32_t bitmap_row = (uint32_t) (hash / bitmap_row_size);
-          uint32_t bitmap_column = hash % bitmap_row_size;
+          uint32_t bitmap_column = (uint32_t) (hash % bitmap_row_size);
 
           if ((names_hashes_bitmap[bitmap_row] & (1u << bitmap_column)) == 0)
           {
@@ -805,7 +805,7 @@ ecma_op_object_get_property_names (ecma_object_t *obj_p, /**< object */
 
       lit_string_hash_t hash = name_p->hash;
       uint32_t bitmap_row = (uint32_t) (hash / bitmap_row_size);
-      uint32_t bitmap_column = hash % bitmap_row_size;
+      uint32_t bitmap_column = (uint32_t) (hash % bitmap_row_size);
 
       if ((names_hashes_bitmap[bitmap_row] & (1u << bitmap_column)) == 0)
       {
diff --git a/tests/unit/test-api.cpp b/tests/unit/test-api.cpp
index c34f4b0981..7cb230bf7a 100644
--- a/tests/unit/test-api.cpp
+++ b/tests/unit/test-api.cpp
@@ -287,8 +287,12 @@ static bool foreach (const jerry_api_string_t *name,
   return true;
 } /* foreach */
 
-static bool foreach_exception (const jerry_api_string_t *name, const jerry_api_value_t *, void *)
+#define UNUSED(x) (void)(x)
+
+static bool foreach_exception (const jerry_api_string_t *name, const jerry_api_value_t *value, void * user_data)
 {
+  UNUSED (value);
+  UNUSED (user_data);
   char str_buf_p[128];
   ssize_t sz = jerry_api_string_to_char_buffer (name, (jerry_api_char_t *)str_buf_p, 128);
   str_buf_p[sz] = '\0';
@@ -300,9 +304,12 @@ static bool foreach_exception (const jerry_api_string_t *name, const jerry_api_v
   return true;
 } /* foreach_exception */
 
-static bool foreach_subset (const jerry_api_string_t *, const jerry_api_value_t *, void *user_data)
+static bool foreach_subset (const jerry_api_string_t *name, const jerry_api_value_t *value, void *user_data)
 {
-  int *count_p = reinterpret_cast<int *>(user_data);
+  UNUSED (name);
+  UNUSED (value);
+  int *count_p = (int *) (user_data);
+
   if (*count_p == 3)
   {
     return false;
diff --git a/tests/unit/test-poolman.cpp b/tests/unit/test-poolman.cpp
index e414a7d816..58f0e1369f 100644
--- a/tests/unit/test-poolman.cpp
+++ b/tests/unit/test-poolman.cpp
@@ -28,10 +28,10 @@
 const uint32_t test_iters = 1024;
 
 // Subiterations count
-const uint32_t test_max_sub_iters = 1024;
+#define TEST_MAX_SUB_ITERS  1024
 
-uint8_t *ptrs[test_max_sub_iters];
-uint8_t data[test_max_sub_iters][MEM_POOL_CHUNK_SIZE];
+uint8_t *ptrs[TEST_MAX_SUB_ITERS];
+uint8_t data[TEST_MAX_SUB_ITERS][MEM_POOL_CHUNK_SIZE];
 
 int
 main (int __attr_unused___ argc,
@@ -43,7 +43,7 @@ main (int __attr_unused___ argc,
 
   for (uint32_t i = 0; i < test_iters; i++)
   {
-    const size_t subiters = ((size_t) rand () % test_max_sub_iters) + 1;
+    const size_t subiters = ((size_t) rand () % TEST_MAX_SUB_ITERS) + 1;
 
     for (size_t j = 0; j < subiters; j++)
     {

From 977bfa5d2cc5c60eec587e8f406715f415a3c57b Mon Sep 17 00:00:00 2001
From: Robert Sipka <rsipka.uszeged@partner.samsung.com>
Date: Thu, 11 Feb 2016 22:37:57 +0100
Subject: [PATCH 2/2] Remove g++ support from the [C]Make files.

Move all '.cpp' files to '.c'.
Rename comments from 'cpp' to 'c'.

JerryScript-DCO-1.0-Signed-off-by: Roland Takacs rtakacs.u-szeged@partner.samsung.com
JerryScript-DCO-1.0-Signed-off-by: Robert Sipka rsipka.uszeged@partner.samsung.com
---
 CMakeLists.txt                                |  77 ++++-------
 Makefile                                      |   1 -
 build/configs/toolchain_afl_i686.cmake        |   1 -
 build/configs/toolchain_afl_x86_64.cmake      |   1 -
 build/configs/toolchain_darwin_x86_64.cmake   |   1 -
 build/configs/toolchain_external.cmake        |   1 -
 build/configs/toolchain_linux_armv7l-el.cmake |   1 -
 build/configs/toolchain_linux_armv7l-hf.cmake |   1 -
 build/configs/toolchain_linux_i686.cmake      |   1 -
 build/configs/toolchain_linux_x86_64.cmake    |   1 -
 build/configs/toolchain_mcu_stm32f3.cmake     |   1 -
 build/configs/toolchain_mcu_stm32f4.cmake     |   1 -
 build/configs/toolchain_openwrt_mips.cmake    |   1 -
 .../add_cppcheck_for_target.cmake             |   2 +-
 docs/API-EXAMPLE.md                           |  12 +-
 docs/API-REFERENCE.md                         | 122 +++++++++---------
 docs/DEVELOPMENT.md                           |   2 +-
 jerry-core/CMakeLists.txt                     |  28 ++--
 .../base/{ecma-alloc.cpp => ecma-alloc.c}     |   0
 .../ecma/base/{ecma-gc.cpp => ecma-gc.c}      |   0
 ...nversion.cpp => ecma-helpers-conversion.c} |   0
 ...s.cpp => ecma-helpers-external-pointers.c} |   0
 ...lpers-number.cpp => ecma-helpers-number.c} |   0
 ...lpers-string.cpp => ecma-helpers-string.c} |   0
 ...helpers-value.cpp => ecma-helpers-value.c} |   0
 ...n.cpp => ecma-helpers-values-collection.c} |   0
 .../base/{ecma-helpers.cpp => ecma-helpers.c} |   0
 jerry-core/ecma/base/ecma-helpers.h           |  12 +-
 ...init-finalize.cpp => ecma-init-finalize.c} |   0
 .../base/{ecma-lcache.cpp => ecma-lcache.c}   |   0
 ...ype.cpp => ecma-builtin-array-prototype.c} |   0
 ...builtin-array.cpp => ecma-builtin-array.c} |   0
 ...e.cpp => ecma-builtin-boolean-prototype.c} |   0
 ...tin-boolean.cpp => ecma-builtin-boolean.c} |   0
 ...p => ecma-builtin-compact-profile-error.c} |   0
 ...type.cpp => ecma-builtin-date-prototype.c} |   0
 ...a-builtin-date.cpp => ecma-builtin-date.c} |   0
 ...ype.cpp => ecma-builtin-error-prototype.c} |   0
 ...builtin-error.cpp => ecma-builtin-error.c} |   0
 ...cpp => ecma-builtin-evalerror-prototype.c} |   0
 ...evalerror.cpp => ecma-builtin-evalerror.c} |   0
 ....cpp => ecma-builtin-function-prototype.c} |   0
 ...n-function.cpp => ecma-builtin-function.c} |   0
 ...iltin-global.cpp => ecma-builtin-global.c} |   0
 ...s-date.cpp => ecma-builtin-helpers-date.c} |   0
 ...s-json.cpp => ecma-builtin-helpers-json.c} |   0
 ...tin-helpers.cpp => ecma-builtin-helpers.c} |   0
 .../builtin-objects/ecma-builtin-helpers.h    |   4 +-
 ...a-builtin-json.cpp => ecma-builtin-json.c} |   0
 ...a-builtin-math.cpp => ecma-builtin-math.c} |   0
 ...pe.cpp => ecma-builtin-number-prototype.c} |   0
 ...iltin-number.cpp => ecma-builtin-number.c} |   0
 ...pe.cpp => ecma-builtin-object-prototype.c} |   0
 ...iltin-object.cpp => ecma-builtin-object.c} |   0
 ...pp => ecma-builtin-rangeerror-prototype.c} |   0
 ...ngeerror.cpp => ecma-builtin-rangeerror.c} |   0
 ...> ecma-builtin-referenceerror-prototype.c} |   0
 ...rror.cpp => ecma-builtin-referenceerror.c} |   0
 ...pe.cpp => ecma-builtin-regexp-prototype.c} |   0
 ...iltin-regexp.cpp => ecma-builtin-regexp.c} |   0
 ...pe.cpp => ecma-builtin-string-prototype.c} |   0
 ...iltin-string.cpp => ecma-builtin-string.c} |   0
 ...p => ecma-builtin-syntaxerror-prototype.c} |   0
 ...axerror.cpp => ecma-builtin-syntaxerror.c} |   0
 ....cpp => ecma-builtin-type-error-thrower.c} |   0
 ...cpp => ecma-builtin-typeerror-prototype.c} |   0
 ...typeerror.cpp => ecma-builtin-typeerror.c} |   0
 ....cpp => ecma-builtin-urierror-prototype.c} |   0
 ...n-urierror.cpp => ecma-builtin-urierror.c} |   0
 .../{ecma-builtins.cpp => ecma-builtins.c}    |   0
 ...a-array-object.cpp => ecma-array-object.c} |   0
 ...olean-object.cpp => ecma-boolean-object.c} |   0
 ...{ecma-comparison.cpp => ecma-comparison.c} |   0
 ...{ecma-conversion.cpp => ecma-conversion.c} |   0
 .../operations/{ecma-eval.cpp => ecma-eval.c} |   0
 ...{ecma-exceptions.cpp => ecma-exceptions.c} |   0
 ...tion-object.cpp => ecma-function-object.c} |   0
 ...get-put-value.cpp => ecma-get-put-value.c} |   0
 .../{ecma-lex-env.cpp => ecma-lex-env.c}      |   0
 ...rithmetic.cpp => ecma-number-arithmetic.c} |   0
 ...number-object.cpp => ecma-number-object.c} |   0
 ...arguments.cpp => ecma-objects-arguments.c} |   0
 ...cts-general.cpp => ecma-objects-general.c} |   0
 .../{ecma-objects.cpp => ecma-objects.c}      |   0
 .../{ecma-reference.cpp => ecma-reference.c}  |   0
 ...regexp-object.cpp => ecma-regexp-object.c} |   0
 ...string-object.cpp => ecma-string-object.c} |   0
 jerry-core/{jerry-port.cpp => jerry-port.c}   |   0
 jerry-core/{jerry.cpp => jerry.c}             |   2 +-
 .../{jrt-bit-fields.cpp => jrt-bit-fields.c}  |   0
 .../jrt/{jrt-fatals.cpp => jrt-fatals.c}      |   0
 jerry-core/jrt/{jrt.cpp => jrt.c}             |   0
 ...it-char-helpers.cpp => lit-char-helpers.c} |   0
 ...eral-storage.cpp => lit-literal-storage.c} |   0
 .../lit/{lit-literal.cpp => lit-literal.c}    |   0
 ...-magic-strings.cpp => lit-magic-strings.c} |   0
 .../lit/{lit-snapshot.cpp => lit-snapshot.c}  |   0
 .../lit/{lit-strings.cpp => lit-strings.c}    |   0
 .../{mem-allocator.cpp => mem-allocator.c}    |   0
 jerry-core/mem/{mem-heap.cpp => mem-heap.c}   |   0
 .../mem/{mem-poolman.cpp => mem-poolman.c}    |   0
 .../parser/js/{byte-code.cpp => byte-code.c}  |   0
 jerry-core/parser/js/{common.cpp => common.c} |   0
 .../parser/js/{js-lexer.cpp => js-lexer.c}    |   0
 .../{js-parser-expr.cpp => js-parser-expr.c}  |   4 +-
 .../js/{js-parser-mem.cpp => js-parser-mem.c} |   0
 ...parser-scanner.cpp => js-parser-scanner.c} |   0
 ...{js-parser-statm.cpp => js-parser-statm.c} |   0
 .../{js-parser-util.cpp => js-parser-util.c}  |   0
 .../parser/js/{js-parser.cpp => js-parser.c}  |   0
 .../regexp/{re-compiler.cpp => re-compiler.c} |   0
 .../regexp/{re-parser.cpp => re-parser.c}     |   0
 .../{rcs-allocator.cpp => rcs-allocator.c}    |   0
 ...cs-chunked-list.cpp => rcs-chunked-list.c} |   0
 .../rcs/{rcs-cpointer.cpp => rcs-cpointer.c}  |   0
 .../rcs/{rcs-iterator.cpp => rcs-iterator.c}  |   0
 .../rcs/{rcs-records.cpp => rcs-records.c}    |   0
 ...hmetics.cpp => opcodes-ecma-arithmetics.c} |   0
 ...cma-bitwise.cpp => opcodes-ecma-bitwise.c} |   0
 ...a-equality.cpp => opcodes-ecma-equality.c} |   0
 ...lational.cpp => opcodes-ecma-relational.c} |   0
 jerry-core/vm/{opcodes.cpp => opcodes.c}      |   0
 jerry-core/vm/{vm-stack.cpp => vm-stack.c}    |   0
 jerry-core/vm/{vm.cpp => vm.c}                |   2 +-
 main-mcu.cpp => main-mcu.c                    |   0
 main-unix.cpp => main-unix.c                  |   0
 targets/esp8266/Makefile.esp8266              |   5 +-
 .../{jerry_extapi.cpp => jerry_extapi.c}      |   0
 .../source/{jerry_run.cpp => jerry_run.c}     |   0
 targets/mbedk64f/Makefile.mbedk64f            |   1 -
 targets/mbedk64f/readme.md                    |   4 +-
 .../{jerry_extapi.cpp => jerry_extapi.c}      |   0
 .../source/{jerry_port.cpp => jerry_port.c}   |   0
 .../source/{jerry_run.cpp => jerry_run.c}     |   0
 targets/mbedk64f/source/{main.cpp => main.c}  |   0
 ...{native_mbedk64f.cpp => native_mbedk64f.c} |   0
 targets/nuttx-stm32f4/Makefile.nuttx          |   3 +-
 .../{main-nuttx.cpp => main-nuttx.c}          |   0
 tests/unit/{test-api.cpp => test-api.c}       |   0
 ...t-date-helpers.cpp => test-date-helpers.c} |   0
 tests/unit/{test-heap.cpp => test-heap.c}     |   0
 ...ral-storage.cpp => test-literal-storage.c} |   0
 .../unit/{test-longjmp.cpp => test-longjmp.c} |   0
 ...o-integer.cpp => test-number-to-integer.c} |   0
 ...-to-string.cpp => test-number-to-string.c} |   0
 .../unit/{test-poolman.cpp => test-poolman.c} |   0
 ...-to-number.cpp => test-string-to-number.c} |   0
 .../unit/{test-strings.cpp => test-strings.c} |   0
 tools/cppcheck/suppressions-list              |   2 +-
 tools/precommit.sh                            |   3 +-
 150 files changed, 131 insertions(+), 166 deletions(-)
 rename jerry-core/ecma/base/{ecma-alloc.cpp => ecma-alloc.c} (100%)
 rename jerry-core/ecma/base/{ecma-gc.cpp => ecma-gc.c} (100%)
 rename jerry-core/ecma/base/{ecma-helpers-conversion.cpp => ecma-helpers-conversion.c} (100%)
 rename jerry-core/ecma/base/{ecma-helpers-external-pointers.cpp => ecma-helpers-external-pointers.c} (100%)
 rename jerry-core/ecma/base/{ecma-helpers-number.cpp => ecma-helpers-number.c} (100%)
 rename jerry-core/ecma/base/{ecma-helpers-string.cpp => ecma-helpers-string.c} (100%)
 rename jerry-core/ecma/base/{ecma-helpers-value.cpp => ecma-helpers-value.c} (100%)
 rename jerry-core/ecma/base/{ecma-helpers-values-collection.cpp => ecma-helpers-values-collection.c} (100%)
 rename jerry-core/ecma/base/{ecma-helpers.cpp => ecma-helpers.c} (100%)
 rename jerry-core/ecma/base/{ecma-init-finalize.cpp => ecma-init-finalize.c} (100%)
 rename jerry-core/ecma/base/{ecma-lcache.cpp => ecma-lcache.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-array-prototype.cpp => ecma-builtin-array-prototype.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-array.cpp => ecma-builtin-array.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-boolean-prototype.cpp => ecma-builtin-boolean-prototype.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-boolean.cpp => ecma-builtin-boolean.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-compact-profile-error.cpp => ecma-builtin-compact-profile-error.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-date-prototype.cpp => ecma-builtin-date-prototype.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-date.cpp => ecma-builtin-date.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-error-prototype.cpp => ecma-builtin-error-prototype.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-error.cpp => ecma-builtin-error.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-evalerror-prototype.cpp => ecma-builtin-evalerror-prototype.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-evalerror.cpp => ecma-builtin-evalerror.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-function-prototype.cpp => ecma-builtin-function-prototype.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-function.cpp => ecma-builtin-function.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-global.cpp => ecma-builtin-global.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-helpers-date.cpp => ecma-builtin-helpers-date.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-helpers-json.cpp => ecma-builtin-helpers-json.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-helpers.cpp => ecma-builtin-helpers.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-json.cpp => ecma-builtin-json.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-math.cpp => ecma-builtin-math.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-number-prototype.cpp => ecma-builtin-number-prototype.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-number.cpp => ecma-builtin-number.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-object-prototype.cpp => ecma-builtin-object-prototype.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-object.cpp => ecma-builtin-object.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-rangeerror-prototype.cpp => ecma-builtin-rangeerror-prototype.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-rangeerror.cpp => ecma-builtin-rangeerror.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-referenceerror-prototype.cpp => ecma-builtin-referenceerror-prototype.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-referenceerror.cpp => ecma-builtin-referenceerror.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-regexp-prototype.cpp => ecma-builtin-regexp-prototype.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-regexp.cpp => ecma-builtin-regexp.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-string-prototype.cpp => ecma-builtin-string-prototype.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-string.cpp => ecma-builtin-string.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-syntaxerror-prototype.cpp => ecma-builtin-syntaxerror-prototype.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-syntaxerror.cpp => ecma-builtin-syntaxerror.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-type-error-thrower.cpp => ecma-builtin-type-error-thrower.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-typeerror-prototype.cpp => ecma-builtin-typeerror-prototype.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-typeerror.cpp => ecma-builtin-typeerror.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-urierror-prototype.cpp => ecma-builtin-urierror-prototype.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtin-urierror.cpp => ecma-builtin-urierror.c} (100%)
 rename jerry-core/ecma/builtin-objects/{ecma-builtins.cpp => ecma-builtins.c} (100%)
 rename jerry-core/ecma/operations/{ecma-array-object.cpp => ecma-array-object.c} (100%)
 rename jerry-core/ecma/operations/{ecma-boolean-object.cpp => ecma-boolean-object.c} (100%)
 rename jerry-core/ecma/operations/{ecma-comparison.cpp => ecma-comparison.c} (100%)
 rename jerry-core/ecma/operations/{ecma-conversion.cpp => ecma-conversion.c} (100%)
 rename jerry-core/ecma/operations/{ecma-eval.cpp => ecma-eval.c} (100%)
 rename jerry-core/ecma/operations/{ecma-exceptions.cpp => ecma-exceptions.c} (100%)
 rename jerry-core/ecma/operations/{ecma-function-object.cpp => ecma-function-object.c} (100%)
 rename jerry-core/ecma/operations/{ecma-get-put-value.cpp => ecma-get-put-value.c} (100%)
 rename jerry-core/ecma/operations/{ecma-lex-env.cpp => ecma-lex-env.c} (100%)
 rename jerry-core/ecma/operations/{ecma-number-arithmetic.cpp => ecma-number-arithmetic.c} (100%)
 rename jerry-core/ecma/operations/{ecma-number-object.cpp => ecma-number-object.c} (100%)
 rename jerry-core/ecma/operations/{ecma-objects-arguments.cpp => ecma-objects-arguments.c} (100%)
 rename jerry-core/ecma/operations/{ecma-objects-general.cpp => ecma-objects-general.c} (100%)
 rename jerry-core/ecma/operations/{ecma-objects.cpp => ecma-objects.c} (100%)
 rename jerry-core/ecma/operations/{ecma-reference.cpp => ecma-reference.c} (100%)
 rename jerry-core/ecma/operations/{ecma-regexp-object.cpp => ecma-regexp-object.c} (100%)
 rename jerry-core/ecma/operations/{ecma-string-object.cpp => ecma-string-object.c} (100%)
 rename jerry-core/{jerry-port.cpp => jerry-port.c} (100%)
 rename jerry-core/{jerry.cpp => jerry.c} (99%)
 rename jerry-core/jrt/{jrt-bit-fields.cpp => jrt-bit-fields.c} (100%)
 rename jerry-core/jrt/{jrt-fatals.cpp => jrt-fatals.c} (100%)
 rename jerry-core/jrt/{jrt.cpp => jrt.c} (100%)
 rename jerry-core/lit/{lit-char-helpers.cpp => lit-char-helpers.c} (100%)
 rename jerry-core/lit/{lit-literal-storage.cpp => lit-literal-storage.c} (100%)
 rename jerry-core/lit/{lit-literal.cpp => lit-literal.c} (100%)
 rename jerry-core/lit/{lit-magic-strings.cpp => lit-magic-strings.c} (100%)
 rename jerry-core/lit/{lit-snapshot.cpp => lit-snapshot.c} (100%)
 rename jerry-core/lit/{lit-strings.cpp => lit-strings.c} (100%)
 rename jerry-core/mem/{mem-allocator.cpp => mem-allocator.c} (100%)
 rename jerry-core/mem/{mem-heap.cpp => mem-heap.c} (100%)
 rename jerry-core/mem/{mem-poolman.cpp => mem-poolman.c} (100%)
 rename jerry-core/parser/js/{byte-code.cpp => byte-code.c} (100%)
 rename jerry-core/parser/js/{common.cpp => common.c} (100%)
 rename jerry-core/parser/js/{js-lexer.cpp => js-lexer.c} (100%)
 rename jerry-core/parser/js/{js-parser-expr.cpp => js-parser-expr.c} (99%)
 rename jerry-core/parser/js/{js-parser-mem.cpp => js-parser-mem.c} (100%)
 rename jerry-core/parser/js/{js-parser-scanner.cpp => js-parser-scanner.c} (100%)
 rename jerry-core/parser/js/{js-parser-statm.cpp => js-parser-statm.c} (100%)
 rename jerry-core/parser/js/{js-parser-util.cpp => js-parser-util.c} (100%)
 rename jerry-core/parser/js/{js-parser.cpp => js-parser.c} (100%)
 rename jerry-core/parser/regexp/{re-compiler.cpp => re-compiler.c} (100%)
 rename jerry-core/parser/regexp/{re-parser.cpp => re-parser.c} (100%)
 rename jerry-core/rcs/{rcs-allocator.cpp => rcs-allocator.c} (100%)
 rename jerry-core/rcs/{rcs-chunked-list.cpp => rcs-chunked-list.c} (100%)
 rename jerry-core/rcs/{rcs-cpointer.cpp => rcs-cpointer.c} (100%)
 rename jerry-core/rcs/{rcs-iterator.cpp => rcs-iterator.c} (100%)
 rename jerry-core/rcs/{rcs-records.cpp => rcs-records.c} (100%)
 rename jerry-core/vm/{opcodes-ecma-arithmetics.cpp => opcodes-ecma-arithmetics.c} (100%)
 rename jerry-core/vm/{opcodes-ecma-bitwise.cpp => opcodes-ecma-bitwise.c} (100%)
 rename jerry-core/vm/{opcodes-ecma-equality.cpp => opcodes-ecma-equality.c} (100%)
 rename jerry-core/vm/{opcodes-ecma-relational.cpp => opcodes-ecma-relational.c} (100%)
 rename jerry-core/vm/{opcodes.cpp => opcodes.c} (100%)
 rename jerry-core/vm/{vm-stack.cpp => vm-stack.c} (100%)
 rename jerry-core/vm/{vm.cpp => vm.c} (99%)
 rename main-mcu.cpp => main-mcu.c (100%)
 rename main-unix.cpp => main-unix.c (100%)
 rename targets/esp8266/source/{jerry_extapi.cpp => jerry_extapi.c} (100%)
 rename targets/esp8266/source/{jerry_run.cpp => jerry_run.c} (100%)
 rename targets/mbedk64f/source/{jerry_extapi.cpp => jerry_extapi.c} (100%)
 rename targets/mbedk64f/source/{jerry_port.cpp => jerry_port.c} (100%)
 rename targets/mbedk64f/source/{jerry_run.cpp => jerry_run.c} (100%)
 rename targets/mbedk64f/source/{main.cpp => main.c} (100%)
 rename targets/mbedk64f/source/{native_mbedk64f.cpp => native_mbedk64f.c} (100%)
 rename targets/nuttx-stm32f4/{main-nuttx.cpp => main-nuttx.c} (100%)
 rename tests/unit/{test-api.cpp => test-api.c} (100%)
 rename tests/unit/{test-date-helpers.cpp => test-date-helpers.c} (100%)
 rename tests/unit/{test-heap.cpp => test-heap.c} (100%)
 rename tests/unit/{test-literal-storage.cpp => test-literal-storage.c} (100%)
 rename tests/unit/{test-longjmp.cpp => test-longjmp.c} (100%)
 rename tests/unit/{test-number-to-integer.cpp => test-number-to-integer.c} (100%)
 rename tests/unit/{test-number-to-string.cpp => test-number-to-string.c} (100%)
 rename tests/unit/{test-poolman.cpp => test-poolman.c} (100%)
 rename tests/unit/{test-string-to-number.cpp => test-string-to-number.c} (100%)
 rename tests/unit/{test-strings.cpp => test-strings.c} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b10c0d9d60..3ea705f2a8 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 cmake_minimum_required (VERSION 2.8.12)
-project (Jerry CXX C ASM)
+project (Jerry C ASM)
 
 # Determining platform
  set(PLATFORM "${CMAKE_SYSTEM_NAME}")
@@ -21,21 +21,22 @@ project (Jerry CXX C ASM)
 
 # Compiler configuration
  if(NOT ("${PLATFORM}" STREQUAL "DARWIN"))
-  if(NOT CMAKE_COMPILER_IS_GNUCXX)
-   message(FATAL_ERROR "g++ compiler is required")
+  if(NOT CMAKE_COMPILER_IS_GNUCC)
+   message(FATAL_ERROR "gcc compiler is required")
   endif()
  endif()
 
- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-  # Require g++ of version >= 4.7.0
-   execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
-                   OUTPUT_VARIABLE GNU_CXX_VERSION
+ if(CMAKE_COMPILER_IS_GNUCC)
+  # Require gcc of version >= 4.7.0
+   execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                   OUTPUT_VARIABLE GNU_CC_VERSION
                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-   if(${GNU_CXX_VERSION} VERSION_LESS 4.7.0)
-    message(FATAL_ERROR "g++ compiler version 4.7.0 or higher required")
+   if(${GNU_CC_VERSION} VERSION_LESS 4.7.0)
+    message(FATAL_ERROR "gcc compiler version 4.7.0 or higher required")
    endif()
  endif()
 
+
 # Imported and third-party targets prefix
  set(PREFIX_IMPORTED_LIB imported_)
  set(SUFFIX_THIRD_PARTY_LIB .third_party.lib)
@@ -49,13 +50,11 @@ project (Jerry CXX C ASM)
 # Architecture-specific compile/link flags
  foreach(FLAG ${FLAGS_COMMON_ARCH})
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAG}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAG}")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${FLAG}")
  endforeach()
 
 # Remove rdynamic option
  set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS )
- set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS )
 
 # Defining options
  option(ENABLE_VALGRIND       "Enable valgrind helpers in memory allocators" OFF)
@@ -102,7 +101,7 @@ project (Jerry CXX C ASM)
   message(FATAL_ERROR "Platform '${PLATFORM}' is not supported")
  endif()
 
- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+ if(CMAKE_COMPILER_IS_GNUCC)
   if("${ENABLE_LTO}" STREQUAL "ON")
    # Use gcc-ar and gcc-ranlib to support LTO
    get_filename_component(PATH_TO_GCC ${CMAKE_C_COMPILER} REALPATH)
@@ -273,7 +272,7 @@ project (Jerry CXX C ASM)
   macro(add_jerry_compile_warnings)
     foreach(_warning ${ARGV})
       add_jerry_compile_flags(-W${_warning})
-      if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+      if(CMAKE_COMPILER_IS_GNUCC)
         add_jerry_compile_flags(-Werror=${_warning})
       endif()
     endforeach()
@@ -281,7 +280,7 @@ project (Jerry CXX C ASM)
 
   add_jerry_compile_warnings(all extra format-nonliteral init-self conversion sign-conversion format-security missing-declarations)
   add_jerry_compile_flags(-pedantic -Wno-stack-protector -Wno-attributes)
-  if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+  if(CMAKE_COMPILER_IS_GNUCC)
     add_jerry_compile_warnings(logical-op)
   else()
     add_jerry_compile_flags(-Wno-nested-anon-types)
@@ -298,13 +297,6 @@ project (Jerry CXX C ASM)
    set(LINKER_FLAGS_STATIC "-static")
   endif()
 
- # C++
-  set(CXX_FLAGS_JERRY "-std=c++11 -fno-exceptions -fno-rtti")
-  # Turn off implicit template instantiation
-   if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-    set(CXX_FLAGS_JERRY "${CXX_FLAGS_JERRY} -fno-implicit-templates -fno-implicit-inline-templates")
-   endif()
-
  # C
   set(C_FLAGS_JERRY "-std=c99")
 
@@ -333,23 +325,23 @@ project (Jerry CXX C ASM)
  # Platform-specific
   # Jerry standalone
    # Linux
-    set(SOURCE_JERRY_STANDALONE_MAIN_LINUX main-unix.cpp)
+    set(SOURCE_JERRY_STANDALONE_MAIN_LINUX main-unix.c)
 
    # Darwin
-    set(SOURCE_JERRY_STANDALONE_MAIN_DARWIN main-unix.cpp)
+    set(SOURCE_JERRY_STANDALONE_MAIN_DARWIN main-unix.c)
 
    # MCU
     # stm32f3
-     set(SOURCE_JERRY_STANDALONE_MAIN_MCU_STM32F3 main-mcu.cpp)
+     set(SOURCE_JERRY_STANDALONE_MAIN_MCU_STM32F3 main-mcu.c)
 
     # stm32f4
-     set(SOURCE_JERRY_STANDALONE_MAIN_MCU_STM32F4 main-mcu.cpp)
+     set(SOURCE_JERRY_STANDALONE_MAIN_MCU_STM32F4 main-mcu.c)
 
  # Unit tests main modules
-  file(GLOB SOURCE_UNIT_TEST_MAIN_MODULES tests/unit/*.cpp)
+  file(GLOB SOURCE_UNIT_TEST_MAIN_MODULES tests/unit/*.c)
 
 # Imported libraries
-if(("${PLATFORM}" STREQUAL "DARWIN") AND (NOT (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)))
+if(("${PLATFORM}" STREQUAL "DARWIN") AND (NOT CMAKE_COMPILER_IS_GNUCC))
  # libclang_rt.osx
   add_library(${PREFIX_IMPORTED_LIB}libclang_rt.osx STATIC IMPORTED)
   execute_process(COMMAND ${CMAKE_C_COMPILER} ${FLAGS_COMMON_ARCH} -print-file-name=
@@ -366,19 +358,6 @@ else()
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
   set_property(TARGET ${PREFIX_IMPORTED_LIB}libgcc
                PROPERTY IMPORTED_LOCATION ${IMPORTED_LIBGCC_LOCATION})
- # libgcc_eh
-  add_library(${PREFIX_IMPORTED_LIB}libgcc_eh STATIC IMPORTED)
-  execute_process(COMMAND ${CMAKE_C_COMPILER} ${FLAGS_COMMON_ARCH} -print-file-name=libgcc_eh.a
-                  OUTPUT_VARIABLE IMPORTED_LIBGCC_EH_LOCATION
-                  OUTPUT_STRIP_TRAILING_WHITESPACE)
-  if(EXISTS "${IMPORTED_LIBGCC_EH_LOCATION}")
-   set_property(TARGET ${PREFIX_IMPORTED_LIB}libgcc_eh
-                PROPERTY IMPORTED_LOCATION ${IMPORTED_LIBGCC_EH_LOCATION})
-  else()
-   # If libgcc_eh not found, reference libgcc instead
-   set_property(TARGET ${PREFIX_IMPORTED_LIB}libgcc_eh
-                PROPERTY IMPORTED_LOCATION ${IMPORTED_LIBGCC_LOCATION})
-  endif()
 endif()
 
 # Platform-specific configuration
@@ -436,19 +415,19 @@ endif()
     endif()
 
     set_property(TARGET ${TARGET_NAME}
-                 PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS_JERRY} ${CXX_FLAGS_JERRY} ${FLAGS_COMMON_${BUILD_MODE}}")
+                 PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS_JERRY} ${FLAGS_COMMON_${BUILD_MODE}} ${C_FLAGS_JERRY}")
     set_property(TARGET ${TARGET_NAME}
-                 PROPERTY LINK_FLAGS "${COMPILE_FLAGS_JERRY} ${CXX_FLAGS_JERRY} ${FLAGS_COMMON_${BUILD_MODE}} ${LINKER_FLAGS_COMMON} ${LINKER_FLAGS_STATIC}")
+                 PROPERTY LINK_FLAGS "${COMPILE_FLAGS_JERRY} ${FLAGS_COMMON_${BUILD_MODE}} ${LINKER_FLAGS_COMMON} ${LINKER_FLAGS_STATIC}")
     target_compile_definitions(${TARGET_NAME} PRIVATE ${DEFINES_JERRY})
     target_include_directories(${TARGET_NAME} PRIVATE ${INCLUDE_CORE_INTERFACE})
     target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${INCLUDE_LIBC_INTERFACE})
     target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${INCLUDE_EXTERNAL_LIBS_INTERFACE})
-    if(("${PLATFORM}" STREQUAL "DARWIN") AND (NOT (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)))
+    if(("${PLATFORM}" STREQUAL "DARWIN") AND (NOT (CMAKE_COMPILER_IS_GNUCC)))
      target_link_libraries(${TARGET_NAME} ${CORE_TARGET_NAME} ${LIBC_TARGET_NAME}
                            ${FDLIBM_TARGET_NAME} ${PREFIX_IMPORTED_LIB}libclang_rt.osx)
     else()
      target_link_libraries(${TARGET_NAME} ${CORE_TARGET_NAME} ${LIBC_TARGET_NAME}
-                           ${FDLIBM_TARGET_NAME} ${PREFIX_IMPORTED_LIB}libgcc ${PREFIX_IMPORTED_LIB}libgcc_eh)
+                           ${FDLIBM_TARGET_NAME} ${PREFIX_IMPORTED_LIB}libgcc)
     endif()
 
     add_cppcheck_target(${TARGET_NAME})
@@ -483,7 +462,7 @@ endif()
     if(DEFINED EXTERNAL_BUILD_ENTRY_FILE)
      add_library(${TARGET_NAME}-entry STATIC ${EXTERNAL_BUILD_ENTRY_FILE})
      set_property(TARGET ${TARGET_NAME}-entry
-                  PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS_JERRY} ${CXX_FLAGS_JERRY} ${FLAGS_COMMON_${BUILD_MODE}}")
+                  PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS_JERRY} ${FLAGS_COMMON_${BUILD_MODE}}")
      target_compile_definitions(${TARGET_NAME}-entry PRIVATE ${DEFINES_JERRY})
      target_include_directories(${TARGET_NAME}-entry PRIVATE ${INCLUDE_CORE_INTERFACE})
      target_include_directories(${TARGET_NAME}-entry SYSTEM PRIVATE ${CMAKE_SOURCE_DIR})
@@ -530,18 +509,18 @@ endif()
 
     add_executable(${TARGET_NAME} ${SOURCE_UNIT_TEST_MAIN})
     set_property(TARGET ${TARGET_NAME}
-                 PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS_JERRY} ${CXX_FLAGS_JERRY} ${FLAGS_COMMON_UNITTESTS}")
+                 PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS_JERRY} ${C_FLAGS_JERRY} ${FLAGS_COMMON_UNITTESTS}")
     set_property(TARGET ${TARGET_NAME}
-                 PROPERTY LINK_FLAGS "${COMPILE_FLAGS_JERRY} ${CXX_FLAGS_JERRY} ${FLAGS_COMMON_UNITTESTS} ${LINKER_FLAGS_COMMON}")
+                 PROPERTY LINK_FLAGS "${COMPILE_FLAGS_JERRY} ${FLAGS_COMMON_UNITTESTS} ${LINKER_FLAGS_COMMON}")
     target_include_directories(${TARGET_NAME} PRIVATE ${INCLUDE_CORE_INTERFACE})
     target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${INCLUDE_LIBC_INTERFACE})
 
-    if(("${PLATFORM}" STREQUAL "DARWIN") AND (NOT (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)))
+    if(("${PLATFORM}" STREQUAL "DARWIN") AND (NOT (CMAKE_COMPILER_IS_GNUCC)))
       target_link_libraries(${TARGET_NAME} ${CORE_TARGET_NAME} ${LIBC_TARGET_NAME} ${FDLIBM_TARGET_NAME}
                             ${PREFIX_IMPORTED_LIB}libclang_rt.osx)
     else()
       target_link_libraries(${TARGET_NAME} ${CORE_TARGET_NAME} ${LIBC_TARGET_NAME} ${FDLIBM_TARGET_NAME}
-                            ${PREFIX_IMPORTED_LIB}libgcc ${PREFIX_IMPORTED_LIB}libgcc_eh)
+                            ${PREFIX_IMPORTED_LIB}libgcc)
     endif()
 
     add_cppcheck_target(${TARGET_NAME})
diff --git a/Makefile b/Makefile
index 9b0d570214..9bc0c11b0a 100644
--- a/Makefile
+++ b/Makefile
@@ -115,7 +115,6 @@ export TARGET_NATIVE_SYSTEMS = $(shell uname -s | tr '[:upper:]' '[:lower:]')
   endif
  # Compiler to use for external build
  EXTERNAL_C_COMPILER ?= arm-none-eabi-gcc
- EXTERNAL_CXX_COMPILER ?= arm-none-eabi-g++
 
 export TARGET_DEBUG_MODES = debug
 export TARGET_RELEASE_MODES = release
diff --git a/build/configs/toolchain_afl_i686.cmake b/build/configs/toolchain_afl_i686.cmake
index 582a2d1ff1..f4287b2231 100644
--- a/build/configs/toolchain_afl_i686.cmake
+++ b/build/configs/toolchain_afl_i686.cmake
@@ -18,4 +18,3 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR i686)
 
 CMAKE_FORCE_C_COMPILER(afl-gcc GNU)
-CMAKE_FORCE_CXX_COMPILER(afl-g++ GNU)
diff --git a/build/configs/toolchain_afl_x86_64.cmake b/build/configs/toolchain_afl_x86_64.cmake
index a638f30de0..bfa4722d91 100644
--- a/build/configs/toolchain_afl_x86_64.cmake
+++ b/build/configs/toolchain_afl_x86_64.cmake
@@ -18,6 +18,5 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
 
 CMAKE_FORCE_C_COMPILER(afl-gcc GNU)
-CMAKE_FORCE_CXX_COMPILER(afl-g++ GNU)
 
 set(FLAGS_COMMON_ARCH -ffixed-rbp)
diff --git a/build/configs/toolchain_darwin_x86_64.cmake b/build/configs/toolchain_darwin_x86_64.cmake
index 6d13a5d3f2..1290619176 100644
--- a/build/configs/toolchain_darwin_x86_64.cmake
+++ b/build/configs/toolchain_darwin_x86_64.cmake
@@ -16,7 +16,6 @@ set(CMAKE_SYSTEM_NAME Darwin)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
 
 find_program(CMAKE_C_COMPILER NAMES gcc cc) 
-find_program(CMAKE_CXX_COMPILER NAMES g++ c++)
 # FIXME: This could break cross compilation, when the strip is not for the target architecture
 find_program(CMAKE_STRIP NAMES strip)
 
diff --git a/build/configs/toolchain_external.cmake b/build/configs/toolchain_external.cmake
index 97b4df29ef..30f004d71c 100644
--- a/build/configs/toolchain_external.cmake
+++ b/build/configs/toolchain_external.cmake
@@ -18,4 +18,3 @@ set(CMAKE_SYSTEM_NAME EXTERNAL)
 set(CMAKE_SYSTEM_PROCESSOR "${EXTERNAL_CMAKE_SYSTEM_PROCESSOR}")
 
 CMAKE_FORCE_C_COMPILER(${EXTERNAL_CMAKE_C_COMPILER} GNU)
-CMAKE_FORCE_CXX_COMPILER(${EXTERNAL_CMAKE_CXX_COMPILER} GNU)
diff --git a/build/configs/toolchain_linux_armv7l-el.cmake b/build/configs/toolchain_linux_armv7l-el.cmake
index 7ae74d3d57..78cdec0ca5 100644
--- a/build/configs/toolchain_linux_armv7l-el.cmake
+++ b/build/configs/toolchain_linux_armv7l-el.cmake
@@ -16,7 +16,6 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR armv7l-el)
 
 set(CMAKE_C_COMPILER arm-linux-gnueabi-gcc)
-set(CMAKE_CXX_COMPILER arm-linux-gnueabi-g++)
 # FIXME: This could break cross compilation, when the strip is not for the target architecture
 find_program(CMAKE_STRIP NAMES arm-linux-gnueabi-strip strip)
 
diff --git a/build/configs/toolchain_linux_armv7l-hf.cmake b/build/configs/toolchain_linux_armv7l-hf.cmake
index 80ebe41edf..53d5205c16 100644
--- a/build/configs/toolchain_linux_armv7l-hf.cmake
+++ b/build/configs/toolchain_linux_armv7l-hf.cmake
@@ -16,7 +16,6 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR armv7l-hf)
 
 set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
-set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
 # FIXME: This could break cross compilation, when the strip is not for the target architecture
 find_program(CMAKE_STRIP NAMES arm-linux-gnueabihf-strip strip)
 #
diff --git a/build/configs/toolchain_linux_i686.cmake b/build/configs/toolchain_linux_i686.cmake
index 030c479917..d139c52f0b 100644
--- a/build/configs/toolchain_linux_i686.cmake
+++ b/build/configs/toolchain_linux_i686.cmake
@@ -16,6 +16,5 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR i686)
 
 find_program(CMAKE_C_COMPILER NAMES i686-linux-gnu-gcc i686-unknown-linux-gnu-gcc)
-find_program(CMAKE_CXX_COMPILER NAMES i686-linux-gnu-g++ i686-unknown-linux-gnu-g++)
 # FIXME: This could break cross compilation, when the strip is not for the target architecture
 find_program(CMAKE_STRIP NAMES i686-linux-gnu-strip i686-unknown-linux-gnu-strip strip)
diff --git a/build/configs/toolchain_linux_x86_64.cmake b/build/configs/toolchain_linux_x86_64.cmake
index d899f6a803..8c85e6385b 100644
--- a/build/configs/toolchain_linux_x86_64.cmake
+++ b/build/configs/toolchain_linux_x86_64.cmake
@@ -16,7 +16,6 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
 
 find_program(CMAKE_C_COMPILER NAMES x86_64-linux-gnu-gcc x86_64-unknown-linux-gnu-gcc)
-find_program(CMAKE_CXX_COMPILER NAMES x86_64-linux-gnu-g++ x86_64-unknown-linux-gnu-g++)
 # FIXME: This could break cross compilation, when the strip is not for the target architecture
 find_program(CMAKE_STRIP NAMES x86_64-linux-gnu-strip x86_64-unknown-linux-gnu-strip strip)
 
diff --git a/build/configs/toolchain_mcu_stm32f3.cmake b/build/configs/toolchain_mcu_stm32f3.cmake
index 0844f43f41..ae97427b3f 100644
--- a/build/configs/toolchain_mcu_stm32f3.cmake
+++ b/build/configs/toolchain_mcu_stm32f3.cmake
@@ -21,4 +21,3 @@ set(CMAKE_SYSTEM_VERSION STM32F3)
 set(FLAGS_COMMON_ARCH -mlittle-endian -mthumb -mcpu=cortex-m4 -march=armv7e-m -mfpu=fpv4-sp-d16 -mfloat-abi=hard)
 
 CMAKE_FORCE_C_COMPILER(arm-none-eabi-gcc GNU)
-CMAKE_FORCE_CXX_COMPILER(arm-none-eabi-g++ GNU)
diff --git a/build/configs/toolchain_mcu_stm32f4.cmake b/build/configs/toolchain_mcu_stm32f4.cmake
index 9ca1453487..7b7ca7c6b9 100644
--- a/build/configs/toolchain_mcu_stm32f4.cmake
+++ b/build/configs/toolchain_mcu_stm32f4.cmake
@@ -21,4 +21,3 @@ set(CMAKE_SYSTEM_VERSION STM32F4)
 set(FLAGS_COMMON_ARCH -mlittle-endian -mthumb -mcpu=cortex-m4 -march=armv7e-m -mfpu=fpv4-sp-d16 -mfloat-abi=hard)
 
 CMAKE_FORCE_C_COMPILER(arm-none-eabi-gcc GNU)
-CMAKE_FORCE_CXX_COMPILER(arm-none-eabi-g++ GNU)
diff --git a/build/configs/toolchain_openwrt_mips.cmake b/build/configs/toolchain_openwrt_mips.cmake
index ce76b82d8f..690d381677 100755
--- a/build/configs/toolchain_openwrt_mips.cmake
+++ b/build/configs/toolchain_openwrt_mips.cmake
@@ -16,6 +16,5 @@ set(CMAKE_SYSTEM_NAME Openwrt)
 set(CMAKE_SYSTEM_PROCESSOR mips)
 
 set(CMAKE_C_COMPILER mipsel-openwrt-linux-gcc)
-set(CMAKE_CXX_COMPILER mipsel-openwrt-linux-g++)
 # FIXME: This could break cross compilation, when the strip is not for the target architecture
 find_program(CMAKE_STRIP NAMES mipsel-openwrt-linux-strip strip)
diff --git a/build/static-checkers/add_cppcheck_for_target.cmake b/build/static-checkers/add_cppcheck_for_target.cmake
index 9a7bd34836..7156dc5646 100644
--- a/build/static-checkers/add_cppcheck_for_target.cmake
+++ b/build/static-checkers/add_cppcheck_for_target.cmake
@@ -43,7 +43,7 @@
    foreach(SOURCE ${TARGET_SOURCES})
     # Add to list if it is C or C++ source
     get_filename_component(SOURCE_EXTENSION ${SOURCE} EXT)
-    if("${SOURCE_EXTENSION}" STREQUAL ".c" OR "${SOURCE_EXTENSION}" STREQUAL ".cpp")
+    if("${SOURCE_EXTENSION}" STREQUAL ".c")
      set(CPPCHECK_SOURCES_LIST ${CPPCHECK_SOURCES_LIST} ${SOURCE})
 
      set(ADD_CPPCHECK_COMMAND true)
diff --git a/docs/API-EXAMPLE.md b/docs/API-EXAMPLE.md
index 40011a5b11..1f3e6d3f44 100644
--- a/docs/API-EXAMPLE.md
+++ b/docs/API-EXAMPLE.md
@@ -4,7 +4,7 @@ This guide is intended to introduce you to JerryScript embedding API through cre
 
 ## Step 1. Execute JavaScript from your application
 
-```cpp
+```c
 #include <string.h>
 #include "jerry.h"
 
@@ -34,7 +34,7 @@ Here we perform the same actions, as `jerry_run_simple`, while splitting into se
 - engine cleanup
 
 
-```cpp
+```c
 #include <string.h>
 #include "jerry.h"
 
@@ -60,7 +60,7 @@ Our code is more complex now, but it introduces possibilities to interact with J
 
 ## Step 3. Execution in 'eval'-mode
 
-```cpp
+```c
 #include <string.h>
 #include "jerry.h"
 
@@ -95,7 +95,7 @@ This way, we execute two independent script parts in one execution environment.
 
 ## Step 4. Interaction with JavaScript environment
 
-```cpp
+```c
 #include <string.h>
 #include "jerry.h"
 
@@ -164,7 +164,7 @@ Pointers to strings or objects and values should be released just when become un
 
 The following example function will output a JavaScript value:
 
-```cpp
+```c
 static void
 print_value (const jerry_api_value_t * value_p)
 {
@@ -234,7 +234,7 @@ Shell operation can be described with the following loop:
   - print result of eval;
   - loop.
 
-```cpp
+```c
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/docs/API-REFERENCE.md b/docs/API-REFERENCE.md
index 9d510d37b0..fd5cb2b085 100644
--- a/docs/API-REFERENCE.md
+++ b/docs/API-REFERENCE.md
@@ -5,7 +5,7 @@ The simplest way to run JavaScript.
 
 **Prototype**
 
-```cpp
+```c
 jerry_completion_code_t
 jerry_run_simple (const char * script_source,
                   size_t script_source_size,
@@ -18,7 +18,7 @@ jerry_run_simple (const char * script_source,
 
 **Example**
 
-```cpp
+```c
 {
   const char * script = "print ('Hello, World!');";
 
@@ -41,7 +41,7 @@ Initializes JerryScript engine, making possible to run JavaScript code and perfo
 
 **Prototype**
 
-```cpp
+```c
 void
 jerry_init (jerry_flag_t flags);
 ```
@@ -55,7 +55,7 @@ jerry_init (jerry_flag_t flags);
 
 **Example**
 
-```cpp
+```c
 {
   jerry_init (JERRY_FLAG_ENABLE_LOG);
 
@@ -79,7 +79,7 @@ JavaScript values, received from engine, are inaccessible after the cleanup.
 
 **Prototype**
 
-```cpp
+```c
 void
 jerry_cleanup (void);
 ```
@@ -98,7 +98,7 @@ so `jerry_parse` could be invoked only once between `jerry_init` and `jerry_clea
 
 **Prototype**
 
-```cpp
+```c
 bool
 jerry_parse (const char* source_p, size_t source_size);
 ```
@@ -107,7 +107,7 @@ jerry_parse (const char* source_p, size_t source_size);
 
 **Example**
 
-```cpp
+```c
 {
   jerry_init (JERRY_FLAG_ENABLE_LOG);
 
@@ -133,7 +133,7 @@ The code should be previously registered through `jerry_parse`.
 
 **Prototype**
 
-```cpp
+```c
 jerry_completion_code_t
 jerry_run (void);
 ```
@@ -142,7 +142,7 @@ jerry_run (void);
 
 **Example**
 
-```cpp
+```c
 {
   jerry_init (JERRY_FLAG_ENABLE_LOG);
 
@@ -175,7 +175,7 @@ Type of value is identified by `jerry_api_value_t::type`, and can be one of the
 
 **Structure**
 
-```cpp
+```c
 typedef struct jerry_api_value_t
 {
   jerry_api_data_type_t type;
@@ -212,7 +212,7 @@ Perform JavaScript `eval`.
 
 **Prototype**
 
-```cpp
+```c
 jerry_completion_code_t
 jerry_api_eval (const char * source_p,
                 size_t source_size,
@@ -230,7 +230,7 @@ jerry_api_eval (const char * source_p,
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_value_t ret_val;
 
@@ -256,7 +256,7 @@ Upon the JavaScript string becomes unused, all pointers to it should be released
 
 **Prototype**
 
-```cpp
+```c
 jerry_api_string_t*
 jerry_api_create_string (const char * v);
 ```
@@ -266,7 +266,7 @@ jerry_api_create_string (const char * v);
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_string_t * string_p = jerry_api_create_string ("abc");
 
@@ -289,7 +289,7 @@ Copy string characters to specified buffer, append zero character at end of the
 
 **Prototype**
 
-```cpp
+```c
 ssize_t
 jerry_api_string_to_char_buffer (const jerry_api_string_t * string_p,
                                  char * buffer_p,
@@ -305,7 +305,7 @@ jerry_api_string_to_char_buffer (const jerry_api_string_t * string_p,
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_object_t * obj_p = jerry_api_get_global ();
   jerry_api_value_t val;
@@ -355,7 +355,7 @@ The acquired pointer should be released with [jerry_api_release_string](#jerryap
 
 **Prototype**
 
-```cpp
+```c
 jerry_api_string_t*
 jerry_api_acquire_string (jerry_api_string_t * string_p);
 ```
@@ -365,7 +365,7 @@ jerry_api_acquire_string (jerry_api_string_t * string_p);
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_string_t * str_ptr1_p = jerry_api_create_string ("abc");
   jerry_api_string_t * str_ptr2_p = jerry_api_acquire_string (str_ptr1_p);
@@ -392,7 +392,7 @@ Release specified pointer to the string.
 
 **Prototype**
 
-```cpp
+```c
 void
 jerry_api_release_string (jerry_api_string_t * string_p);
 ```
@@ -401,7 +401,7 @@ jerry_api_release_string (jerry_api_string_t * string_p);
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_string_t * str_ptr1_p = jerry_api_create_string ("abc");
   jerry_api_string_t * str_ptr2_p = jerry_api_acquire_string (str_ptr1_p);
@@ -430,7 +430,7 @@ Upon the JavaScript object becomes unused, all pointers to it should be released
 
 **Prototype**
 
-```cpp
+```c
 jerry_api_object_t*
 jerry_api_create_object ();
 ```
@@ -439,7 +439,7 @@ jerry_api_create_object ();
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_object_t * object_p = jerry_api_create_object ();
 
@@ -469,7 +469,7 @@ The acquired pointer should be released with [jerry_api_release_object](#jerryap
 
 **Prototype**
 
-```cpp
+```c
 jerry_api_object_t*
 jerry_api_acquire_object (jerry_api_object_t * object_p);
 ```
@@ -479,7 +479,7 @@ jerry_api_acquire_object (jerry_api_object_t * object_p);
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_object_t * obj_ptr1_p = jerry_api_create_object ();
   jerry_api_object_t * obj_ptr2_p = jerry_api_acquire_object (obj_ptr1_p);
@@ -506,7 +506,7 @@ Release specified pointer to the object.
 
 **Prototype**
 
-```cpp
+```c
 void
 jerry_api_release_object (jerry_api_object_t * object_p);
 ```
@@ -515,7 +515,7 @@ jerry_api_release_object (jerry_api_object_t * object_p);
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_object_t * obj_ptr1_p = jerry_api_create_object ();
   jerry_api_object_t * obj_ptr2_p = jerry_api_acquire_object (obj_ptr1_p);
@@ -542,7 +542,7 @@ Get the Global object.
 
 **Prototype**
 
-```cpp
+```c
 jerry_api_object_t*
 jerry_api_get_global (void);
 ```
@@ -553,7 +553,7 @@ Received pointer should be released with [jerry_api_release_object](#jerryapirel
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_object_t * glob_obj_p = jerry_api_get_global ();
 
@@ -585,7 +585,7 @@ Create field (named data property) in an object
 
 **Prototype**
 
-```cpp
+```c
 bool
 jerry_api_add_object_field (jerry_api_object_t * object_p,
                             const char * field_name_p,
@@ -603,7 +603,7 @@ jerry_api_add_object_field (jerry_api_object_t * object_p,
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_object_t * obj_p = jerry_api_create_object ();
 
@@ -629,7 +629,7 @@ Delete field (property) in the specified object
 
 **Prototype**
 
-```cpp
+```c
 bool
 jerry_api_delete_object_field (jerry_api_object_t * object_p,
                                const char * field_name_p);
@@ -642,7 +642,7 @@ jerry_api_delete_object_field (jerry_api_object_t * object_p,
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_object_t* obj_p;
   ... // receive or construct obj_p
@@ -663,7 +663,7 @@ Get value of field (property) in the specified object, i.e. perform [[Get]] oper
 
 **Prototype**
 
-```cpp
+```c
 bool
 jerry_api_get_object_field_value (jerry_api_object_t * object_p,
                                   const char * field_name_p,
@@ -680,7 +680,7 @@ If value was retrieved successfully, it should be freed with [jerry_api_release_
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_object_t* obj_p;
   ... // receive or construct obj_p
@@ -708,7 +708,7 @@ Set value of a field (property) in the specified object, i.e. perform [[Put]] op
 
 **Prototype**
 
-```cpp
+```c
 bool
 jerry_api_set_object_field_value (jerry_api_object_t * object_p,
                                   const char * field_name_p,
@@ -723,7 +723,7 @@ jerry_api_set_object_field_value (jerry_api_object_t * object_p,
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_object_t* obj_p;
   jerry_api_value_t val;
@@ -747,7 +747,7 @@ Get native handle, previously associated with specified object.
 
 **Prototype**
 
-```cpp
+```c
 bool
 jerry_api_get_object_native_handle (jerry_api_object_t * object_p,
                                     uintptr_t* out_handle_p);
@@ -759,7 +759,7 @@ jerry_api_get_object_native_handle (jerry_api_object_t * object_p,
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_object_t* obj_p;
   uintptr_t handle_set;
@@ -791,7 +791,7 @@ If native handle or "free" callback were already set for the object, correspondi
 
 **Prototype**
 
-```cpp
+```c
 void
 jerry_api_set_object_native_handle (jerry_api_object_t * object_p,
                                     uintptr_t handle,
@@ -804,7 +804,7 @@ jerry_api_set_object_native_handle (jerry_api_object_t * object_p,
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_object_t* obj_p;
   uintptr_t handle_set;
@@ -833,7 +833,7 @@ Check whether the specified object is a function object.
 
 **Prototype**
 
-```cpp
+```c
 bool
 jerry_api_is_function (const jerry_api_object_t* object_p);
 ```
@@ -843,7 +843,7 @@ jerry_api_is_function (const jerry_api_object_t* object_p);
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_value_t val;
 
@@ -870,7 +870,7 @@ Check whether the specified object is a constructor function object.
 
 **Prototype**
 
-```cpp
+```c
 bool
 jerry_api_is_constructor (const jerry_api_object_t* object_p);
 ```
@@ -880,7 +880,7 @@ jerry_api_is_constructor (const jerry_api_object_t* object_p);
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_value_t val;
 
@@ -907,7 +907,7 @@ Call function object.
 
 **Prototype**
 
-```cpp
+```c
 bool
 jerry_api_call_function (jerry_api_object_t * function_object_p,
                          jerry_api_object_t * this_arg_p,
@@ -928,7 +928,7 @@ jerry_api_call_function (jerry_api_object_t * function_object_p,
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_value_t val;
 
@@ -966,7 +966,7 @@ Construct object invoking specified function object as constructor.
 
 **Prototype**
 
-```cpp
+```c
 bool
 jerry_api_construct_object (jerry_api_object_t * function_object_p,
                             jerry_api_value_t * retval_p,
@@ -985,7 +985,7 @@ If call was performed successfully, returned value should be freed with [jerry_a
 
 **Example**
 
-```cpp
+```c
 {
   jerry_api_value_t val;
 
@@ -1022,7 +1022,7 @@ The data type represents pointer to call handler of a native function object.
 
 **Structure**
 
-```cpp
+```c
 typedef bool (* jerry_external_handler_t) (const jerry_api_object_t * function_obj_p,
                                           const jerry_api_value_t * this_p,
                                           jerry_api_value_t * ret_val_p,
@@ -1041,7 +1041,7 @@ Create an external function object.
 
 **Prototype**
 
-```cpp
+```c
 jerry_api_object_t*
 jerry_api_create_external_function (jerry_external_handler_t handler_p);
 ```
@@ -1053,7 +1053,7 @@ Received pointer should be released with [jerry_api_release_object](#jerryapirel
 
 **Example**
 
-```cpp
+```c
 static bool
 handler (const jerry_api_object_t * function_obj_p,
          const jerry_api_value_t * this_p,
@@ -1099,7 +1099,7 @@ Upon the JavaScript array object becomes unused, all pointers to it should be re
 
 **Prototype**
 
-```cpp
+```c
 jerry_api_object_t*
 jerry_api_create_array_object (jerry_api_size_t array_size);
 ```
@@ -1109,7 +1109,7 @@ jerry_api_create_array_object (jerry_api_size_t array_size);
 
  **Example**
 
-```cpp
+```c
 {
     jerry_api_object_t * array_object_p = jerry_api_create_array_object (10);
 
@@ -1139,7 +1139,7 @@ Set value of an indexed element in the specified array object.
 
 **Prototype**
 
-```cpp
+```c
 bool
 jerry_api_set_array_index_value (jerry_api_object_t * array_object_p,
                                  jerry_api_length_t index,
@@ -1153,7 +1153,7 @@ jerry_api_set_array_index_value (jerry_api_object_t * array_object_p,
 
 **Example**
 
-```cpp
+```c
 {
     jerry_api_object_t * array_object_p = jerry_api_create_array_object (10);
     jerry_api_value_t val;
@@ -1178,7 +1178,7 @@ Get value of an indexed element in the specified array object.
 
 **Prototype**
 
-```cpp
+```c
 bool
 jerry_api_get_array_index_value (jerry_api_object_t * array_object_p,
                                  jerry_api_length_t index,
@@ -1192,7 +1192,7 @@ jerry_api_get_array_index_value (jerry_api_object_t * array_object_p,
 
 **Example**
 
-```cpp
+```c
 {
     jerry_api_object_t* array_object_p;
     ... // receive or construct array_object_p
@@ -1218,7 +1218,7 @@ Release specified pointer to the value.
 
 **Prototype**
 
-```cpp
+```c
 void
 jerry_api_release_value (jerry_api_value_t * value_p);
 ```
@@ -1226,7 +1226,7 @@ jerry_api_release_value (jerry_api_value_t * value_p);
 - `value_p` - pointer to the value.
 
 **Example**
-```cpp
+```c
 {
     jerry_api_value_t val1;
     jerry_api_value_t val2;
@@ -1259,7 +1259,7 @@ it should be throwed inside of handle attached to external function object.
 
 **Prototype**
 
-```cpp
+```c
 jerry_api_object_t*
 jerry_api_create_error (jerry_api_error_t error_type,
                         const jerry_api_char_t * message_p);
@@ -1271,7 +1271,7 @@ jerry_api_create_error (jerry_api_error_t error_type,
 
 **Example**
 
-```cpp
+```c
 static bool
 handler (const jerry_api_object_t * function_obj_p,
          const jerry_api_value_t * this_p,
diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
index 6a55e07188..77f8f23b0b 100644
--- a/docs/DEVELOPMENT.md
+++ b/docs/DEVELOPMENT.md
@@ -3,7 +3,7 @@
 Currently, only Ubuntu 14.04+ is officially supported as primary development environment.
 
 There are several dependencies, that should be installed manually. The following list is required for building:
-- `gcc` or `g++` higher than `4.8.2`
+- `gcc` higher than `4.8.2`
   - native
   - arm-none-eabi
 - `cmake` higher than `2.8.12.2`
diff --git a/jerry-core/CMakeLists.txt b/jerry-core/CMakeLists.txt
index 664475c969..dbe3c4713d 100644
--- a/jerry-core/CMakeLists.txt
+++ b/jerry-core/CMakeLists.txt
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 cmake_minimum_required (VERSION 2.8.12)
-project (JerryCore CXX C ASM)
+project (JerryCore C ASM)
 
 # Definitions
  # Get version information from git
@@ -122,17 +122,17 @@ project (JerryCore CXX C ASM)
 
 # Sources
  # Jerry core
-  file(GLOB SOURCE_CORE_API                   *.cpp)
-  file(GLOB SOURCE_CORE_LIT                   lit/*.cpp)
-  file(GLOB SOURCE_CORE_RCS                   rcs/*.cpp)
-  file(GLOB SOURCE_CORE_MEM                   mem/*.cpp)
-  file(GLOB SOURCE_CORE_VM                    vm/*.cpp)
-  file(GLOB SOURCE_CORE_ECMA_BUILTINS         ecma/builtin-objects/*.cpp)
-  file(GLOB SOURCE_CORE_ECMA_BASE             ecma/base/*.cpp)
-  file(GLOB SOURCE_CORE_ECMA_OPERATIONS       ecma/operations/*.cpp)
-  file(GLOB SOURCE_CORE_PARSER_JS             parser/js/*.cpp)
-  file(GLOB SOURCE_CORE_PARSER_REGEXP         parser/regexp/*.cpp)
-  file(GLOB SOURCE_CORE_JRT                   jrt/*.cpp)
+  file(GLOB SOURCE_CORE_API                   *.c)
+  file(GLOB SOURCE_CORE_LIT                   lit/*.c)
+  file(GLOB SOURCE_CORE_RCS                   rcs/*.c)
+  file(GLOB SOURCE_CORE_MEM                   mem/*.c)
+  file(GLOB SOURCE_CORE_VM                    vm/*.c)
+  file(GLOB SOURCE_CORE_ECMA_BUILTINS         ecma/builtin-objects/*.c)
+  file(GLOB SOURCE_CORE_ECMA_BASE             ecma/base/*.c)
+  file(GLOB SOURCE_CORE_ECMA_OPERATIONS       ecma/operations/*.c)
+  file(GLOB SOURCE_CORE_PARSER_JS             parser/js/*.c)
+  file(GLOB SOURCE_CORE_PARSER_REGEXP         parser/regexp/*.c)
+  file(GLOB SOURCE_CORE_JRT                   jrt/*.c)
 
   set(SOURCE_CORE_FILES
       ${SOURCE_CORE_API}
@@ -149,7 +149,7 @@ project (JerryCore CXX C ASM)
 
  # All-in-one build
  if("${ENABLE_ALL_IN_ONE}" STREQUAL "ON")
-  set(ALL_IN_FILE "${CMAKE_BINARY_DIR}/jerry-all-in.cpp")
+  set(ALL_IN_FILE "${CMAKE_BINARY_DIR}/jerry-all-in.c")
   list(SORT SOURCE_CORE_FILES)
   file(REMOVE ${ALL_IN_FILE})
 
@@ -201,7 +201,7 @@ project (JerryCore CXX C ASM)
 
    add_library(${TARGET_NAME}.jerry-core STATIC ${SOURCE_CORE})
    set_property(TARGET ${TARGET_NAME}.jerry-core
-                PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS_JERRY} ${CXX_FLAGS_JERRY} ${FLAGS_COMMON_${BUILD_MODE}}")
+                PROPERTY COMPILE_FLAGS "${COMPILE_FLAGS_JERRY} ${C_FLAGS_JERRY} ${FLAGS_COMMON_${BUILD_MODE}}")
    target_compile_definitions(${TARGET_NAME}.jerry-core PRIVATE ${DEFINES_JERRY})
    target_include_directories(${TARGET_NAME}.jerry-core PRIVATE ${INCLUDE_CORE})
    target_include_directories(${TARGET_NAME}.jerry-core PRIVATE ${INCLUDE_FDLIBM})
diff --git a/jerry-core/ecma/base/ecma-alloc.cpp b/jerry-core/ecma/base/ecma-alloc.c
similarity index 100%
rename from jerry-core/ecma/base/ecma-alloc.cpp
rename to jerry-core/ecma/base/ecma-alloc.c
diff --git a/jerry-core/ecma/base/ecma-gc.cpp b/jerry-core/ecma/base/ecma-gc.c
similarity index 100%
rename from jerry-core/ecma/base/ecma-gc.cpp
rename to jerry-core/ecma/base/ecma-gc.c
diff --git a/jerry-core/ecma/base/ecma-helpers-conversion.cpp b/jerry-core/ecma/base/ecma-helpers-conversion.c
similarity index 100%
rename from jerry-core/ecma/base/ecma-helpers-conversion.cpp
rename to jerry-core/ecma/base/ecma-helpers-conversion.c
diff --git a/jerry-core/ecma/base/ecma-helpers-external-pointers.cpp b/jerry-core/ecma/base/ecma-helpers-external-pointers.c
similarity index 100%
rename from jerry-core/ecma/base/ecma-helpers-external-pointers.cpp
rename to jerry-core/ecma/base/ecma-helpers-external-pointers.c
diff --git a/jerry-core/ecma/base/ecma-helpers-number.cpp b/jerry-core/ecma/base/ecma-helpers-number.c
similarity index 100%
rename from jerry-core/ecma/base/ecma-helpers-number.cpp
rename to jerry-core/ecma/base/ecma-helpers-number.c
diff --git a/jerry-core/ecma/base/ecma-helpers-string.cpp b/jerry-core/ecma/base/ecma-helpers-string.c
similarity index 100%
rename from jerry-core/ecma/base/ecma-helpers-string.cpp
rename to jerry-core/ecma/base/ecma-helpers-string.c
diff --git a/jerry-core/ecma/base/ecma-helpers-value.cpp b/jerry-core/ecma/base/ecma-helpers-value.c
similarity index 100%
rename from jerry-core/ecma/base/ecma-helpers-value.cpp
rename to jerry-core/ecma/base/ecma-helpers-value.c
diff --git a/jerry-core/ecma/base/ecma-helpers-values-collection.cpp b/jerry-core/ecma/base/ecma-helpers-values-collection.c
similarity index 100%
rename from jerry-core/ecma/base/ecma-helpers-values-collection.cpp
rename to jerry-core/ecma/base/ecma-helpers-values-collection.c
diff --git a/jerry-core/ecma/base/ecma-helpers.cpp b/jerry-core/ecma/base/ecma-helpers.c
similarity index 100%
rename from jerry-core/ecma/base/ecma-helpers.cpp
rename to jerry-core/ecma/base/ecma-helpers.c
diff --git a/jerry-core/ecma/base/ecma-helpers.h b/jerry-core/ecma/base/ecma-helpers.h
index 63c609971b..8e545c6a49 100644
--- a/jerry-core/ecma/base/ecma-helpers.h
+++ b/jerry-core/ecma/base/ecma-helpers.h
@@ -51,7 +51,7 @@
  */
 #define ECMA_SET_POINTER(field, non_compressed_pointer) MEM_CP_SET_POINTER (field, non_compressed_pointer)
 
-/* ecma-helpers-value.cpp */
+/* ecma-helpers-value.c */
 extern ecma_type_t ecma_get_value_type_field (ecma_value_t) __attr_pure___;
 
 extern bool ecma_is_value_empty (ecma_value_t);
@@ -137,7 +137,7 @@ extern lit_string_hash_t ecma_string_hash (const ecma_string_t *);
 extern ecma_string_t *ecma_string_substr (const ecma_string_t *, ecma_length_t, ecma_length_t);
 extern ecma_string_t *ecma_string_trim (const ecma_string_t *);
 
-/* ecma-helpers-number.cpp */
+/* ecma-helpers-number.c */
 extern const ecma_number_t ecma_number_relative_eps;
 
 extern ecma_number_t ecma_number_make_nan (void);
@@ -163,7 +163,7 @@ extern ecma_number_t ecma_number_multiply (ecma_number_t, ecma_number_t);
 extern ecma_number_t ecma_number_divide (ecma_number_t, ecma_number_t);
 extern void ecma_number_to_decimal (ecma_number_t, uint64_t *, int32_t *, int32_t *);
 
-/* ecma-helpers-values-collection.cpp */
+/* ecma-helpers-values-collection.c */
 extern ecma_collection_header_t *ecma_new_values_collection (const ecma_value_t[], ecma_length_t, bool);
 extern void ecma_free_values_collection (ecma_collection_header_t *, bool);
 extern void ecma_append_to_values_collection (ecma_collection_header_t *, ecma_value_t, bool);
@@ -188,7 +188,7 @@ ecma_collection_iterator_init (ecma_collection_iterator_t *, ecma_collection_hea
 extern bool
 ecma_collection_iterator_next (ecma_collection_iterator_t *);
 
-/* ecma-helpers.cpp */
+/* ecma-helpers.c */
 extern ecma_object_t *ecma_create_object (ecma_object_t *, bool, ecma_object_type_t);
 extern ecma_object_t *ecma_create_decl_lex_env (ecma_object_t *);
 extern ecma_object_t *ecma_create_object_lex_env (ecma_object_t *, ecma_object_t *, bool);
@@ -250,7 +250,7 @@ extern ecma_property_descriptor_t ecma_get_property_descriptor_from_property (ec
 extern void ecma_bytecode_ref (ecma_compiled_code_t *);
 extern void ecma_bytecode_deref (ecma_compiled_code_t *);
 
-/* ecma-helpers-external-pointers.cpp */
+/* ecma-helpers-external-pointers.c */
 extern bool
 ecma_create_external_pointer_property (ecma_object_t *, ecma_internal_property_id_t, ecma_external_pointer_t);
 extern bool
@@ -258,7 +258,7 @@ ecma_get_external_pointer_value (ecma_object_t *, ecma_internal_property_id_t, e
 extern void
 ecma_free_external_pointer_in_property (ecma_property_t *);
 
-/* ecma-helpers-conversion.cpp */
+/* ecma-helpers-conversion.c */
 extern ecma_number_t ecma_utf8_string_to_number (const lit_utf8_byte_t *, lit_utf8_size_t);
 extern ssize_t ecma_uint32_to_utf8_string (uint32_t, lit_utf8_byte_t *, ssize_t);
 extern uint32_t ecma_number_to_uint32 (ecma_number_t);
diff --git a/jerry-core/ecma/base/ecma-init-finalize.cpp b/jerry-core/ecma/base/ecma-init-finalize.c
similarity index 100%
rename from jerry-core/ecma/base/ecma-init-finalize.cpp
rename to jerry-core/ecma/base/ecma-init-finalize.c
diff --git a/jerry-core/ecma/base/ecma-lcache.cpp b/jerry-core/ecma/base/ecma-lcache.c
similarity index 100%
rename from jerry-core/ecma/base/ecma-lcache.cpp
rename to jerry-core/ecma/base/ecma-lcache.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-array.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-array.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-array.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-array.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-boolean.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-boolean.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-boolean.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-compact-profile-error.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-compact-profile-error.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-compact-profile-error.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-compact-profile-error.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-date-prototype.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-date.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-date.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-date.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-error-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-error-prototype.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-error-prototype.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-error-prototype.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-error.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-error.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-error.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-error.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-evalerror-prototype.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-function.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-function.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-function.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-function.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-global.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-global.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-global.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-global.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-json.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-json.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-helpers-json.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-helpers-json.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-helpers.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-helpers.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h
index 023d9b2721..eccba17844 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.h
@@ -83,7 +83,7 @@ typedef enum
   ECMA_DATE_LOCAL /**< date vaule is in local time */
 } ecma_date_timezone_t;
 
-/* ecma-builtin-helpers-date.cpp */
+/* ecma-builtin-helpers-date.c */
 extern ecma_number_t ecma_date_day (ecma_number_t);
 extern ecma_number_t ecma_date_time_within_day (ecma_number_t);
 extern ecma_number_t ecma_date_days_in_year (ecma_number_t);
@@ -121,7 +121,7 @@ extern ecma_completion_value_t ecma_date_get_primitive_value (ecma_value_t);
 
 #endif /* !CONFIG_ECMA_COMPACT_PROFILE_DISABLE_DATE_BUILTIN */
 
-/* ecma-builtin-helper-json.cpp */
+/* ecma-builtin-helper-json.c */
 
 /**
  * Context for JSON.stringify()
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-json.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-json.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-json.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-json.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-math.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-math.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-math.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-math.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-number.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-number.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-number.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-number.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-object-prototype.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-object.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-object.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-object.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-object.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror-prototype.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror-prototype.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-regexp-prototype.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-regexp.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-regexp.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-regexp.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-string.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-string.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-string.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-string.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-type-error-thrower.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-type-error-thrower.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-type-error-thrower.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-type-error-thrower.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-typeerror-prototype.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-urierror-prototype.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-urierror.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtin-urierror.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtin-urierror.c
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtins.cpp b/jerry-core/ecma/builtin-objects/ecma-builtins.c
similarity index 100%
rename from jerry-core/ecma/builtin-objects/ecma-builtins.cpp
rename to jerry-core/ecma/builtin-objects/ecma-builtins.c
diff --git a/jerry-core/ecma/operations/ecma-array-object.cpp b/jerry-core/ecma/operations/ecma-array-object.c
similarity index 100%
rename from jerry-core/ecma/operations/ecma-array-object.cpp
rename to jerry-core/ecma/operations/ecma-array-object.c
diff --git a/jerry-core/ecma/operations/ecma-boolean-object.cpp b/jerry-core/ecma/operations/ecma-boolean-object.c
similarity index 100%
rename from jerry-core/ecma/operations/ecma-boolean-object.cpp
rename to jerry-core/ecma/operations/ecma-boolean-object.c
diff --git a/jerry-core/ecma/operations/ecma-comparison.cpp b/jerry-core/ecma/operations/ecma-comparison.c
similarity index 100%
rename from jerry-core/ecma/operations/ecma-comparison.cpp
rename to jerry-core/ecma/operations/ecma-comparison.c
diff --git a/jerry-core/ecma/operations/ecma-conversion.cpp b/jerry-core/ecma/operations/ecma-conversion.c
similarity index 100%
rename from jerry-core/ecma/operations/ecma-conversion.cpp
rename to jerry-core/ecma/operations/ecma-conversion.c
diff --git a/jerry-core/ecma/operations/ecma-eval.cpp b/jerry-core/ecma/operations/ecma-eval.c
similarity index 100%
rename from jerry-core/ecma/operations/ecma-eval.cpp
rename to jerry-core/ecma/operations/ecma-eval.c
diff --git a/jerry-core/ecma/operations/ecma-exceptions.cpp b/jerry-core/ecma/operations/ecma-exceptions.c
similarity index 100%
rename from jerry-core/ecma/operations/ecma-exceptions.cpp
rename to jerry-core/ecma/operations/ecma-exceptions.c
diff --git a/jerry-core/ecma/operations/ecma-function-object.cpp b/jerry-core/ecma/operations/ecma-function-object.c
similarity index 100%
rename from jerry-core/ecma/operations/ecma-function-object.cpp
rename to jerry-core/ecma/operations/ecma-function-object.c
diff --git a/jerry-core/ecma/operations/ecma-get-put-value.cpp b/jerry-core/ecma/operations/ecma-get-put-value.c
similarity index 100%
rename from jerry-core/ecma/operations/ecma-get-put-value.cpp
rename to jerry-core/ecma/operations/ecma-get-put-value.c
diff --git a/jerry-core/ecma/operations/ecma-lex-env.cpp b/jerry-core/ecma/operations/ecma-lex-env.c
similarity index 100%
rename from jerry-core/ecma/operations/ecma-lex-env.cpp
rename to jerry-core/ecma/operations/ecma-lex-env.c
diff --git a/jerry-core/ecma/operations/ecma-number-arithmetic.cpp b/jerry-core/ecma/operations/ecma-number-arithmetic.c
similarity index 100%
rename from jerry-core/ecma/operations/ecma-number-arithmetic.cpp
rename to jerry-core/ecma/operations/ecma-number-arithmetic.c
diff --git a/jerry-core/ecma/operations/ecma-number-object.cpp b/jerry-core/ecma/operations/ecma-number-object.c
similarity index 100%
rename from jerry-core/ecma/operations/ecma-number-object.cpp
rename to jerry-core/ecma/operations/ecma-number-object.c
diff --git a/jerry-core/ecma/operations/ecma-objects-arguments.cpp b/jerry-core/ecma/operations/ecma-objects-arguments.c
similarity index 100%
rename from jerry-core/ecma/operations/ecma-objects-arguments.cpp
rename to jerry-core/ecma/operations/ecma-objects-arguments.c
diff --git a/jerry-core/ecma/operations/ecma-objects-general.cpp b/jerry-core/ecma/operations/ecma-objects-general.c
similarity index 100%
rename from jerry-core/ecma/operations/ecma-objects-general.cpp
rename to jerry-core/ecma/operations/ecma-objects-general.c
diff --git a/jerry-core/ecma/operations/ecma-objects.cpp b/jerry-core/ecma/operations/ecma-objects.c
similarity index 100%
rename from jerry-core/ecma/operations/ecma-objects.cpp
rename to jerry-core/ecma/operations/ecma-objects.c
diff --git a/jerry-core/ecma/operations/ecma-reference.cpp b/jerry-core/ecma/operations/ecma-reference.c
similarity index 100%
rename from jerry-core/ecma/operations/ecma-reference.cpp
rename to jerry-core/ecma/operations/ecma-reference.c
diff --git a/jerry-core/ecma/operations/ecma-regexp-object.cpp b/jerry-core/ecma/operations/ecma-regexp-object.c
similarity index 100%
rename from jerry-core/ecma/operations/ecma-regexp-object.cpp
rename to jerry-core/ecma/operations/ecma-regexp-object.c
diff --git a/jerry-core/ecma/operations/ecma-string-object.cpp b/jerry-core/ecma/operations/ecma-string-object.c
similarity index 100%
rename from jerry-core/ecma/operations/ecma-string-object.cpp
rename to jerry-core/ecma/operations/ecma-string-object.c
diff --git a/jerry-core/jerry-port.cpp b/jerry-core/jerry-port.c
similarity index 100%
rename from jerry-core/jerry-port.cpp
rename to jerry-core/jerry-port.c
diff --git a/jerry-core/jerry.cpp b/jerry-core/jerry.c
similarity index 99%
rename from jerry-core/jerry.cpp
rename to jerry-core/jerry.c
index f3192d29e4..7a9006a816 100644
--- a/jerry-core/jerry.cpp
+++ b/jerry-core/jerry.c
@@ -69,7 +69,7 @@ static bool jerry_api_available;
 #ifdef JERRY_ENABLE_LOG
 /**
  * TODO:
- *      Move logging-related functionality to separate module, like jerry-log.cpp
+ *      Move logging-related functionality to separate module, like jerry-log.c
  */
 
 /**
diff --git a/jerry-core/jrt/jrt-bit-fields.cpp b/jerry-core/jrt/jrt-bit-fields.c
similarity index 100%
rename from jerry-core/jrt/jrt-bit-fields.cpp
rename to jerry-core/jrt/jrt-bit-fields.c
diff --git a/jerry-core/jrt/jrt-fatals.cpp b/jerry-core/jrt/jrt-fatals.c
similarity index 100%
rename from jerry-core/jrt/jrt-fatals.cpp
rename to jerry-core/jrt/jrt-fatals.c
diff --git a/jerry-core/jrt/jrt.cpp b/jerry-core/jrt/jrt.c
similarity index 100%
rename from jerry-core/jrt/jrt.cpp
rename to jerry-core/jrt/jrt.c
diff --git a/jerry-core/lit/lit-char-helpers.cpp b/jerry-core/lit/lit-char-helpers.c
similarity index 100%
rename from jerry-core/lit/lit-char-helpers.cpp
rename to jerry-core/lit/lit-char-helpers.c
diff --git a/jerry-core/lit/lit-literal-storage.cpp b/jerry-core/lit/lit-literal-storage.c
similarity index 100%
rename from jerry-core/lit/lit-literal-storage.cpp
rename to jerry-core/lit/lit-literal-storage.c
diff --git a/jerry-core/lit/lit-literal.cpp b/jerry-core/lit/lit-literal.c
similarity index 100%
rename from jerry-core/lit/lit-literal.cpp
rename to jerry-core/lit/lit-literal.c
diff --git a/jerry-core/lit/lit-magic-strings.cpp b/jerry-core/lit/lit-magic-strings.c
similarity index 100%
rename from jerry-core/lit/lit-magic-strings.cpp
rename to jerry-core/lit/lit-magic-strings.c
diff --git a/jerry-core/lit/lit-snapshot.cpp b/jerry-core/lit/lit-snapshot.c
similarity index 100%
rename from jerry-core/lit/lit-snapshot.cpp
rename to jerry-core/lit/lit-snapshot.c
diff --git a/jerry-core/lit/lit-strings.cpp b/jerry-core/lit/lit-strings.c
similarity index 100%
rename from jerry-core/lit/lit-strings.cpp
rename to jerry-core/lit/lit-strings.c
diff --git a/jerry-core/mem/mem-allocator.cpp b/jerry-core/mem/mem-allocator.c
similarity index 100%
rename from jerry-core/mem/mem-allocator.cpp
rename to jerry-core/mem/mem-allocator.c
diff --git a/jerry-core/mem/mem-heap.cpp b/jerry-core/mem/mem-heap.c
similarity index 100%
rename from jerry-core/mem/mem-heap.cpp
rename to jerry-core/mem/mem-heap.c
diff --git a/jerry-core/mem/mem-poolman.cpp b/jerry-core/mem/mem-poolman.c
similarity index 100%
rename from jerry-core/mem/mem-poolman.cpp
rename to jerry-core/mem/mem-poolman.c
diff --git a/jerry-core/parser/js/byte-code.cpp b/jerry-core/parser/js/byte-code.c
similarity index 100%
rename from jerry-core/parser/js/byte-code.cpp
rename to jerry-core/parser/js/byte-code.c
diff --git a/jerry-core/parser/js/common.cpp b/jerry-core/parser/js/common.c
similarity index 100%
rename from jerry-core/parser/js/common.cpp
rename to jerry-core/parser/js/common.c
diff --git a/jerry-core/parser/js/js-lexer.cpp b/jerry-core/parser/js/js-lexer.c
similarity index 100%
rename from jerry-core/parser/js/js-lexer.cpp
rename to jerry-core/parser/js/js-lexer.c
diff --git a/jerry-core/parser/js/js-parser-expr.cpp b/jerry-core/parser/js/js-parser-expr.c
similarity index 99%
rename from jerry-core/parser/js/js-parser-expr.cpp
rename to jerry-core/parser/js/js-parser-expr.c
index 608d73e386..ef84d74dc8 100644
--- a/jerry-core/parser/js/js-parser-expr.cpp
+++ b/jerry-core/parser/js/js-parser-expr.c
@@ -61,7 +61,7 @@ parser_push_result (parser_context_t *context_p) /**< context */
       if (context_p->stack_depth >= context_p->stack_limit)
       {
         /* Stack limit is increased for CBC_POST_INCR_PUSH_RESULT
-         * and CBC_POST_DECR_PUSH_RESULT opcodes. Needed by vm.cpp. */
+         * and CBC_POST_DECR_PUSH_RESULT opcodes. Needed by vm.c. */
         JERRY_ASSERT (context_p->stack_depth == context_p->stack_limit);
 
         context_p->stack_limit++;
@@ -1254,7 +1254,7 @@ parser_process_binary_opcodes (parser_context_t *context_p, /**< context */
         if (opcode == CBC_ASSIGN_PROP_THIS_LITERAL
             && (context_p->stack_depth >= context_p->stack_limit))
         {
-          /* Stack limit is increased for VM_OC_ASSIGN_PROP_THIS. Needed by vm.cpp. */
+          /* Stack limit is increased for VM_OC_ASSIGN_PROP_THIS. Needed by vm.c. */
           JERRY_ASSERT (context_p->stack_depth == context_p->stack_limit);
 
           context_p->stack_limit++;
diff --git a/jerry-core/parser/js/js-parser-mem.cpp b/jerry-core/parser/js/js-parser-mem.c
similarity index 100%
rename from jerry-core/parser/js/js-parser-mem.cpp
rename to jerry-core/parser/js/js-parser-mem.c
diff --git a/jerry-core/parser/js/js-parser-scanner.cpp b/jerry-core/parser/js/js-parser-scanner.c
similarity index 100%
rename from jerry-core/parser/js/js-parser-scanner.cpp
rename to jerry-core/parser/js/js-parser-scanner.c
diff --git a/jerry-core/parser/js/js-parser-statm.cpp b/jerry-core/parser/js/js-parser-statm.c
similarity index 100%
rename from jerry-core/parser/js/js-parser-statm.cpp
rename to jerry-core/parser/js/js-parser-statm.c
diff --git a/jerry-core/parser/js/js-parser-util.cpp b/jerry-core/parser/js/js-parser-util.c
similarity index 100%
rename from jerry-core/parser/js/js-parser-util.cpp
rename to jerry-core/parser/js/js-parser-util.c
diff --git a/jerry-core/parser/js/js-parser.cpp b/jerry-core/parser/js/js-parser.c
similarity index 100%
rename from jerry-core/parser/js/js-parser.cpp
rename to jerry-core/parser/js/js-parser.c
diff --git a/jerry-core/parser/regexp/re-compiler.cpp b/jerry-core/parser/regexp/re-compiler.c
similarity index 100%
rename from jerry-core/parser/regexp/re-compiler.cpp
rename to jerry-core/parser/regexp/re-compiler.c
diff --git a/jerry-core/parser/regexp/re-parser.cpp b/jerry-core/parser/regexp/re-parser.c
similarity index 100%
rename from jerry-core/parser/regexp/re-parser.cpp
rename to jerry-core/parser/regexp/re-parser.c
diff --git a/jerry-core/rcs/rcs-allocator.cpp b/jerry-core/rcs/rcs-allocator.c
similarity index 100%
rename from jerry-core/rcs/rcs-allocator.cpp
rename to jerry-core/rcs/rcs-allocator.c
diff --git a/jerry-core/rcs/rcs-chunked-list.cpp b/jerry-core/rcs/rcs-chunked-list.c
similarity index 100%
rename from jerry-core/rcs/rcs-chunked-list.cpp
rename to jerry-core/rcs/rcs-chunked-list.c
diff --git a/jerry-core/rcs/rcs-cpointer.cpp b/jerry-core/rcs/rcs-cpointer.c
similarity index 100%
rename from jerry-core/rcs/rcs-cpointer.cpp
rename to jerry-core/rcs/rcs-cpointer.c
diff --git a/jerry-core/rcs/rcs-iterator.cpp b/jerry-core/rcs/rcs-iterator.c
similarity index 100%
rename from jerry-core/rcs/rcs-iterator.cpp
rename to jerry-core/rcs/rcs-iterator.c
diff --git a/jerry-core/rcs/rcs-records.cpp b/jerry-core/rcs/rcs-records.c
similarity index 100%
rename from jerry-core/rcs/rcs-records.cpp
rename to jerry-core/rcs/rcs-records.c
diff --git a/jerry-core/vm/opcodes-ecma-arithmetics.cpp b/jerry-core/vm/opcodes-ecma-arithmetics.c
similarity index 100%
rename from jerry-core/vm/opcodes-ecma-arithmetics.cpp
rename to jerry-core/vm/opcodes-ecma-arithmetics.c
diff --git a/jerry-core/vm/opcodes-ecma-bitwise.cpp b/jerry-core/vm/opcodes-ecma-bitwise.c
similarity index 100%
rename from jerry-core/vm/opcodes-ecma-bitwise.cpp
rename to jerry-core/vm/opcodes-ecma-bitwise.c
diff --git a/jerry-core/vm/opcodes-ecma-equality.cpp b/jerry-core/vm/opcodes-ecma-equality.c
similarity index 100%
rename from jerry-core/vm/opcodes-ecma-equality.cpp
rename to jerry-core/vm/opcodes-ecma-equality.c
diff --git a/jerry-core/vm/opcodes-ecma-relational.cpp b/jerry-core/vm/opcodes-ecma-relational.c
similarity index 100%
rename from jerry-core/vm/opcodes-ecma-relational.cpp
rename to jerry-core/vm/opcodes-ecma-relational.c
diff --git a/jerry-core/vm/opcodes.cpp b/jerry-core/vm/opcodes.c
similarity index 100%
rename from jerry-core/vm/opcodes.cpp
rename to jerry-core/vm/opcodes.c
diff --git a/jerry-core/vm/vm-stack.cpp b/jerry-core/vm/vm-stack.c
similarity index 100%
rename from jerry-core/vm/vm-stack.cpp
rename to jerry-core/vm/vm-stack.c
diff --git a/jerry-core/vm/vm.cpp b/jerry-core/vm/vm.c
similarity index 99%
rename from jerry-core/vm/vm.cpp
rename to jerry-core/vm/vm.c
index 3ac64c4e29..8d10080d2c 100644
--- a/jerry-core/vm/vm.cpp
+++ b/jerry-core/vm/vm.c
@@ -1155,7 +1155,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
               else
               {
                 /* The parser ensures there is enough space for the
-                 * extra value on the stack. See js-parser-expr.cpp. */
+                 * extra value on the stack. See js-parser-expr.c. */
 
                 JERRY_ASSERT (opcode == CBC_POST_INCR_PUSH_RESULT
                                || opcode == CBC_POST_DECR_PUSH_RESULT);
diff --git a/main-mcu.cpp b/main-mcu.c
similarity index 100%
rename from main-mcu.cpp
rename to main-mcu.c
diff --git a/main-unix.cpp b/main-unix.c
similarity index 100%
rename from main-unix.cpp
rename to main-unix.c
diff --git a/targets/esp8266/Makefile.esp8266 b/targets/esp8266/Makefile.esp8266
index 00b5d5cda5..7abf4adfe9 100644
--- a/targets/esp8266/Makefile.esp8266
+++ b/targets/esp8266/Makefile.esp8266
@@ -44,8 +44,8 @@ ESP_LIBS_INC :=$(ESP_LIBS_INC);$(ESP_INC2)/lwip
 ESP_LIBS_INC :=$(ESP_LIBS_INC);$(ESP_INC2)/ssl
 
 # jerry related source files
-JERRY_BUILD_FILES := $(SRCPATH)/jerry_extapi.cpp
-JERRY_BUILD_FILES := $(JERRY_BUILD_FILES);$(SRCPATH)/jerry_run.cpp
+JERRY_BUILD_FILES := $(SRCPATH)/jerry_extapi.c
+JERRY_BUILD_FILES := $(JERRY_BUILD_FILES);$(SRCPATH)/jerry_run.c
 
 
 .PHONY: jerry js2c mbed check-env flash clean
@@ -64,7 +64,6 @@ jerry:
 	 -DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \
 	 -DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=xtensia-lx106 \
 	 -DEXTERNAL_CMAKE_C_COMPILER=xtensa-lx106-elf-gcc \
-	 -DEXTERNAL_CMAKE_CXX_COMPILER=xtensa-lx106-elf-g++ \
 	 -DEXTERNAL_BUILD_ENTRY_FILE="$(JERRY_BUILD_FILES)" \
 	 -DEXTERNAL_COMPILE_FLAGS="$(ESP_CFLAGS)" \
 	 -DEXTERNAL_LIBC_INTERFACE="$(ESP_INC)" \
diff --git a/targets/esp8266/source/jerry_extapi.cpp b/targets/esp8266/source/jerry_extapi.c
similarity index 100%
rename from targets/esp8266/source/jerry_extapi.cpp
rename to targets/esp8266/source/jerry_extapi.c
diff --git a/targets/esp8266/source/jerry_run.cpp b/targets/esp8266/source/jerry_run.c
similarity index 100%
rename from targets/esp8266/source/jerry_run.cpp
rename to targets/esp8266/source/jerry_run.c
diff --git a/targets/mbedk64f/Makefile.mbedk64f b/targets/mbedk64f/Makefile.mbedk64f
index a027aadf79..45345339ed 100644
--- a/targets/mbedk64f/Makefile.mbedk64f
+++ b/targets/mbedk64f/Makefile.mbedk64f
@@ -44,7 +44,6 @@ jerry:
 	 -DUSE_COMPILER_DEFAULT_LIBC=YES \
 	 -DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=arm7-m \
 	 -DEXTERNAL_CMAKE_C_COMPILER=arm-none-eabi-gcc \
-	 -DEXTERNAL_CMAKE_CXX_COMPILER=arm-none-eabi-g++ \
 	 -DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \
 	 -DEXTERNAL_MEM_HEAP_SIZE_KB=$(JERRYHEAP)
 
diff --git a/targets/mbedk64f/readme.md b/targets/mbedk64f/readme.md
index cde55279b1..4f284a5b0b 100644
--- a/targets/mbedk64f/readme.md
+++ b/targets/mbedk64f/readme.md
@@ -73,8 +73,8 @@ JerryScript led flashing sample program in js folder.
 
 All `.js` files in `js` folder are executed, with `main.js` in first order.
 `sysloop()` function in main.js is called periodically in every 100msec by
-below code in `main.cpp` `jerry_loop()`, which calls `js_loop()` in
-`jerry_mbedk64f.cpp`
+below code in `main.c` `jerry_loop()`, which calls `js_loop()` in
+`jerry_mbedk64f.c`
 
 ```
   minar::Scheduler::postCallback(jerry_loop)
diff --git a/targets/mbedk64f/source/jerry_extapi.cpp b/targets/mbedk64f/source/jerry_extapi.c
similarity index 100%
rename from targets/mbedk64f/source/jerry_extapi.cpp
rename to targets/mbedk64f/source/jerry_extapi.c
diff --git a/targets/mbedk64f/source/jerry_port.cpp b/targets/mbedk64f/source/jerry_port.c
similarity index 100%
rename from targets/mbedk64f/source/jerry_port.cpp
rename to targets/mbedk64f/source/jerry_port.c
diff --git a/targets/mbedk64f/source/jerry_run.cpp b/targets/mbedk64f/source/jerry_run.c
similarity index 100%
rename from targets/mbedk64f/source/jerry_run.cpp
rename to targets/mbedk64f/source/jerry_run.c
diff --git a/targets/mbedk64f/source/main.cpp b/targets/mbedk64f/source/main.c
similarity index 100%
rename from targets/mbedk64f/source/main.cpp
rename to targets/mbedk64f/source/main.c
diff --git a/targets/mbedk64f/source/native_mbedk64f.cpp b/targets/mbedk64f/source/native_mbedk64f.c
similarity index 100%
rename from targets/mbedk64f/source/native_mbedk64f.cpp
rename to targets/mbedk64f/source/native_mbedk64f.c
diff --git a/targets/nuttx-stm32f4/Makefile.nuttx b/targets/nuttx-stm32f4/Makefile.nuttx
index 5780667410..b9469b9ae6 100644
--- a/targets/nuttx-stm32f4/Makefile.nuttx
+++ b/targets/nuttx-stm32f4/Makefile.nuttx
@@ -42,8 +42,7 @@ all:
 	 -DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \
 	 -DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=armv7l-hf \
 	 -DEXTERNAL_CMAKE_C_COMPILER=arm-none-eabi-gcc \
-	 -DEXTERNAL_CMAKE_CXX_COMPILER=arm-none-eabi-g++ \
-	 -DEXTERNAL_BUILD_ENTRY_FILE=./targets/nuttx-stm32f4/main-nuttx.cpp \
+	 -DEXTERNAL_BUILD_ENTRY_FILE=./targets/nuttx-stm32f4/main-nuttx.c \
 	 -DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \
 	 -DEXTERNAL_LIBC_INTERFACE=$(NUTTXINC) \
 	 -DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=arm \
diff --git a/targets/nuttx-stm32f4/main-nuttx.cpp b/targets/nuttx-stm32f4/main-nuttx.c
similarity index 100%
rename from targets/nuttx-stm32f4/main-nuttx.cpp
rename to targets/nuttx-stm32f4/main-nuttx.c
diff --git a/tests/unit/test-api.cpp b/tests/unit/test-api.c
similarity index 100%
rename from tests/unit/test-api.cpp
rename to tests/unit/test-api.c
diff --git a/tests/unit/test-date-helpers.cpp b/tests/unit/test-date-helpers.c
similarity index 100%
rename from tests/unit/test-date-helpers.cpp
rename to tests/unit/test-date-helpers.c
diff --git a/tests/unit/test-heap.cpp b/tests/unit/test-heap.c
similarity index 100%
rename from tests/unit/test-heap.cpp
rename to tests/unit/test-heap.c
diff --git a/tests/unit/test-literal-storage.cpp b/tests/unit/test-literal-storage.c
similarity index 100%
rename from tests/unit/test-literal-storage.cpp
rename to tests/unit/test-literal-storage.c
diff --git a/tests/unit/test-longjmp.cpp b/tests/unit/test-longjmp.c
similarity index 100%
rename from tests/unit/test-longjmp.cpp
rename to tests/unit/test-longjmp.c
diff --git a/tests/unit/test-number-to-integer.cpp b/tests/unit/test-number-to-integer.c
similarity index 100%
rename from tests/unit/test-number-to-integer.cpp
rename to tests/unit/test-number-to-integer.c
diff --git a/tests/unit/test-number-to-string.cpp b/tests/unit/test-number-to-string.c
similarity index 100%
rename from tests/unit/test-number-to-string.cpp
rename to tests/unit/test-number-to-string.c
diff --git a/tests/unit/test-poolman.cpp b/tests/unit/test-poolman.c
similarity index 100%
rename from tests/unit/test-poolman.cpp
rename to tests/unit/test-poolman.c
diff --git a/tests/unit/test-string-to-number.cpp b/tests/unit/test-string-to-number.c
similarity index 100%
rename from tests/unit/test-string-to-number.cpp
rename to tests/unit/test-string-to-number.c
diff --git a/tests/unit/test-strings.cpp b/tests/unit/test-strings.c
similarity index 100%
rename from tests/unit/test-strings.cpp
rename to tests/unit/test-strings.c
diff --git a/tools/cppcheck/suppressions-list b/tools/cppcheck/suppressions-list
index cc7b68551a..8dbc0744fb 100644
--- a/tools/cppcheck/suppressions-list
+++ b/tools/cppcheck/suppressions-list
@@ -3,4 +3,4 @@ noConstructor
 duplicateExpression
 
 // FIXME: false positive in cppcheck 1.61 (will disappear once distro ships with 1.69)
-variableScope:*/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.cpp
+variableScope:*/jerry-core/ecma/builtin-objects/ecma-builtin-helpers.c
diff --git a/tools/precommit.sh b/tools/precommit.sh
index 519f28c740..5eafcf0a48 100755
--- a/tools/precommit.sh
+++ b/tools/precommit.sh
@@ -39,8 +39,9 @@ fi
 VERA_DIRECTORIES_EXCLUDE_LIST="-path ./third-party -o -path tests -o -path ./targets"
 VERA_CONFIGURATION_PATH="./tools/vera++"
 
-SOURCES_AND_HEADERS_LIST=`find . -type d \( $VERA_DIRECTORIES_EXCLUDE_LIST \) -prune -or -name "*.c" -or -name "*.cpp" -or -name "*.h"`
+SOURCES_AND_HEADERS_LIST=`find . -type d \( $VERA_DIRECTORIES_EXCLUDE_LIST \) -prune -or -name "*.c" -or -name "*.h"`
 vera++ -r $VERA_CONFIGURATION_PATH -p jerry $SOURCES_AND_HEADERS_LIST -e --no-duplicate
+
 STATUS_CODE=$?
 
 if [ $STATUS_CODE -ne 0 ]