diff --git a/src/libcoreint/interpreter.c b/src/libcoreint/interpreter.c
index 7d9aa4d21..a7e295de7 100644
--- a/src/libcoreint/interpreter.c
+++ b/src/libcoreint/interpreter.c
@@ -119,7 +119,7 @@ run_int_from_pos (opcode_counter_t start_pos,
   __memset (regs, 0, sizeof (regs));
   JERRY_ASSERT (ecma_is_value_empty (regs[0]));
 
-  __int_data int_data;
+  int_data_t int_data;
   int_data.pos = (opcode_counter_t) (start_pos + 1);
   int_data.this_binding = this_binding_value;
   int_data.lex_env_p = lex_env_p;
diff --git a/src/libcoreint/opcodes-agnostic.c b/src/libcoreint/opcodes-agnostic.c
index 635895865..55d62c96c 100644
--- a/src/libcoreint/opcodes-agnostic.c
+++ b/src/libcoreint/opcodes-agnostic.c
@@ -25,7 +25,7 @@
  */
 ecma_completion_value_t
 opfunc_is_true_jmp (opcode_t opdata, /**< operation data */
-                    __int_data *int_data) /**< interpreter context */
+                    int_data_t *int_data) /**< interpreter context */
 {
   const idx_t cond_var_idx = opdata.data.is_true_jmp.value;
   const idx_t dst_opcode_idx = opdata.data.is_true_jmp.opcode;
@@ -62,7 +62,7 @@ opfunc_is_true_jmp (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_is_false_jmp (opcode_t opdata, /**< operation data */
-                     __int_data *int_data) /**< interpreter context */
+                     int_data_t *int_data) /**< interpreter context */
 {
   const idx_t cond_var_idx = opdata.data.is_false_jmp.value;
   const idx_t dst_opcode_idx = opdata.data.is_false_jmp.opcode;
@@ -98,7 +98,7 @@ opfunc_is_false_jmp (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_jmp (opcode_t opdata, /**< operation data */
-            __int_data *int_data) /**< interpreter context */
+            int_data_t *int_data) /**< interpreter context */
 {
   int_data->pos = opdata.data.jmp.opcode_idx;
 
@@ -113,7 +113,7 @@ opfunc_jmp (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_jmp_down (opcode_t opdata, /**< operation data */
-                 __int_data *int_data) /**< interpreter context */
+                 int_data_t *int_data) /**< interpreter context */
 {
   JERRY_ASSERT (int_data->pos <= int_data->pos + opdata.data.jmp_up.opcode_count);
 
@@ -130,7 +130,7 @@ opfunc_jmp_down (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_jmp_up (opcode_t opdata, /**< operation data */
-               __int_data *int_data) /**< interpreter context */
+               int_data_t *int_data) /**< interpreter context */
 {
   JERRY_ASSERT (int_data->pos >= opdata.data.jmp_up.opcode_count);
 
diff --git a/src/libcoreint/opcodes-ecma-arithmetics.c b/src/libcoreint/opcodes-ecma-arithmetics.c
index 5b386e6ca..1f24e61c0 100644
--- a/src/libcoreint/opcodes-ecma-arithmetics.c
+++ b/src/libcoreint/opcodes-ecma-arithmetics.c
@@ -16,6 +16,7 @@
 #include "opcodes.h"
 #include "opcodes-ecma-support.h"
 #include "ecma-number-arithmetic.h"
+#include "jerry-libc.h"
 
 /**
  * Number arithmetic operations.
@@ -41,7 +42,7 @@ typedef enum
  *         Returned value must be freed with ecma_free_completion_value
  */
 static ecma_completion_value_t
-do_number_arithmetic (__int_data *int_data, /**< interpreter context */
+do_number_arithmetic (int_data_t *int_data, /**< interpreter context */
                       idx_t dst_var_idx, /**< destination variable identifier */
                       number_arithmetic_op op, /**< number arithmetic operation */
                       ecma_value_t left_value, /**< left value */
@@ -109,7 +110,7 @@ do_number_arithmetic (__int_data *int_data, /**< interpreter context */
  */
 ecma_completion_value_t
 opfunc_addition (opcode_t opdata, /**< operation data */
-                 __int_data *int_data) /**< interpreter context */
+                 int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.addition.dst;
   const idx_t left_var_idx = opdata.data.addition.var_left;
@@ -156,7 +157,7 @@ opfunc_addition (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_substraction (opcode_t opdata, /**< operation data */
-                     __int_data *int_data) /**< interpreter context */
+                     int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.substraction.dst;
   const idx_t left_var_idx = opdata.data.substraction.var_left;
@@ -191,7 +192,7 @@ opfunc_substraction (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_multiplication (opcode_t opdata, /**< operation data */
-                       __int_data *int_data) /**< interpreter context */
+                       int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.multiplication.dst;
   const idx_t left_var_idx = opdata.data.multiplication.var_left;
@@ -226,7 +227,7 @@ opfunc_multiplication (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_division (opcode_t opdata, /**< operation data */
-                 __int_data *int_data) /**< interpreter context */
+                 int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.division.dst;
   const idx_t left_var_idx = opdata.data.division.var_left;
@@ -261,7 +262,7 @@ opfunc_division (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_remainder (opcode_t opdata, /**< operation data */
-                  __int_data *int_data) /**< interpreter context */
+                  int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.remainder.dst;
   const idx_t left_var_idx = opdata.data.remainder.var_left;
diff --git a/src/libcoreint/opcodes-bitwise.c b/src/libcoreint/opcodes-ecma-bitwise.c
similarity index 95%
rename from src/libcoreint/opcodes-bitwise.c
rename to src/libcoreint/opcodes-ecma-bitwise.c
index f384b75da..f8204a376 100644
--- a/src/libcoreint/opcodes-bitwise.c
+++ b/src/libcoreint/opcodes-ecma-bitwise.c
@@ -42,7 +42,7 @@ typedef enum
  *         Returned value must be freed with ecma_free_completion_value
  */
 static ecma_completion_value_t
-do_number_bitwise_logic (__int_data *int_data, /**< interpreter context */
+do_number_bitwise_logic (int_data_t *int_data, /**< interpreter context */
                          idx_t dst_var_idx, /**< destination variable identifier */
                          number_bitwise_logic_op op, /**< number bitwise logic operation */
                          ecma_value_t left_value, /**< left value */
@@ -126,7 +126,7 @@ do_number_bitwise_logic (__int_data *int_data, /**< interpreter context */
  */
 ecma_completion_value_t
 opfunc_b_and (opcode_t opdata, /**< operation data */
-              __int_data *int_data) /**< interpreter context */
+              int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.b_and.dst;
   const idx_t left_var_idx = opdata.data.b_and.var_left;
@@ -161,7 +161,7 @@ opfunc_b_and (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_b_or (opcode_t opdata, /**< operation data */
-             __int_data *int_data) /**< interpreter context */
+             int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.b_or.dst;
   const idx_t left_var_idx = opdata.data.b_or.var_left;
@@ -196,7 +196,7 @@ opfunc_b_or (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_b_xor (opcode_t opdata, /**< operation data */
-              __int_data *int_data) /**< interpreter context */
+              int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.b_xor.dst;
   const idx_t left_var_idx = opdata.data.b_xor.var_left;
@@ -231,7 +231,7 @@ opfunc_b_xor (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_b_shift_left (opcode_t opdata, /**< operation data */
-                     __int_data *int_data) /**< interpreter context */
+                     int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.b_shift_left.dst;
   const idx_t left_var_idx = opdata.data.b_shift_left.var_left;
@@ -266,7 +266,7 @@ opfunc_b_shift_left (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_b_shift_right (opcode_t opdata, /**< operation data */
-                      __int_data *int_data) /**< interpreter context */
+                      int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.b_shift_right.dst;
   const idx_t left_var_idx = opdata.data.b_shift_right.var_left;
@@ -301,7 +301,7 @@ opfunc_b_shift_right (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_b_shift_uright (opcode_t opdata, /**< operation data */
-                      __int_data *int_data) /**< interpreter context */
+                      int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.b_shift_uright.dst;
   const idx_t left_var_idx = opdata.data.b_shift_uright.var_left;
@@ -336,7 +336,7 @@ opfunc_b_shift_uright (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_b_not (opcode_t opdata, /**< operation data */
-              __int_data *int_data) /**< interpreter context */
+              int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.b_not.dst;
   const idx_t right_var_idx = opdata.data.b_not.var_right;
diff --git a/src/libcoreint/opcodes-equality.c b/src/libcoreint/opcodes-ecma-equality.c
similarity index 95%
rename from src/libcoreint/opcodes-equality.c
rename to src/libcoreint/opcodes-ecma-equality.c
index 843c1acfb..79842c2c1 100644
--- a/src/libcoreint/opcodes-equality.c
+++ b/src/libcoreint/opcodes-ecma-equality.c
@@ -26,7 +26,7 @@
  */
 ecma_completion_value_t
 opfunc_equal_value (opcode_t opdata, /**< operation data */
-                    __int_data *int_data) /**< interpreter context */
+                    int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.equal_value.dst;
   const idx_t left_var_idx = opdata.data.equal_value.var_left;
@@ -60,7 +60,7 @@ opfunc_equal_value (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_not_equal_value (opcode_t opdata, /**< operation data */
-                        __int_data *int_data) /**< interpreter context */
+                        int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.not_equal_value.dst;
   const idx_t left_var_idx = opdata.data.not_equal_value.var_left;
@@ -95,7 +95,7 @@ opfunc_not_equal_value (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_equal_value_type (opcode_t opdata, /**< operation data */
-                         __int_data *int_data) /**< interpreter context */
+                         int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.equal_value_type.dst;
   const idx_t left_var_idx = opdata.data.equal_value_type.var_left;
@@ -129,7 +129,7 @@ opfunc_equal_value_type (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_not_equal_value_type (opcode_t opdata, /**< operation data */
-                             __int_data *int_data) /**< interpreter context */
+                             int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.not_equal_value_type.dst;
   const idx_t left_var_idx = opdata.data.not_equal_value_type.var_left;
diff --git a/src/libcoreint/opcodes-relational.c b/src/libcoreint/opcodes-ecma-relational.c
similarity index 96%
rename from src/libcoreint/opcodes-relational.c
rename to src/libcoreint/opcodes-ecma-relational.c
index c641539ea..86479c748 100644
--- a/src/libcoreint/opcodes-relational.c
+++ b/src/libcoreint/opcodes-ecma-relational.c
@@ -26,7 +26,7 @@
  */
 ecma_completion_value_t
 opfunc_less_than (opcode_t opdata, /**< operation data */
-                  __int_data *int_data) /**< interpreter context */
+                  int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.less_than.dst;
   const idx_t left_var_idx = opdata.data.less_than.var_left;
@@ -76,7 +76,7 @@ opfunc_less_than (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_greater_than (opcode_t opdata, /**< operation data */
-                     __int_data *int_data) /**< interpreter context */
+                     int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.greater_than.dst;
   const idx_t left_var_idx = opdata.data.greater_than.var_left;
@@ -126,7 +126,7 @@ opfunc_greater_than (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_less_or_equal_than (opcode_t opdata, /**< operation data */
-                           __int_data *int_data) /**< interpreter context */
+                           int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.less_or_equal_than.dst;
   const idx_t left_var_idx = opdata.data.less_or_equal_than.var_left;
@@ -183,7 +183,7 @@ opfunc_less_or_equal_than (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_greater_or_equal_than (opcode_t opdata, /**< operation data */
-                              __int_data *int_data) /**< interpreter context */
+                              int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.greater_or_equal_than.dst;
   const idx_t left_var_idx = opdata.data.greater_or_equal_than.var_left;
@@ -240,7 +240,7 @@ opfunc_greater_or_equal_than (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_instanceof (opcode_t opdata __unused, /**< operation data */
-                   __int_data *int_data __unused) /**< interpreter context */
+                   int_data_t *int_data __unused) /**< interpreter context */
 {
   const idx_t dst_idx = opdata.data.instanceof.dst;
   const idx_t left_var_idx = opdata.data.instanceof.var_left;
@@ -285,7 +285,7 @@ opfunc_instanceof (opcode_t opdata __unused, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_in (opcode_t opdata __unused, /**< operation data */
-           __int_data *int_data __unused) /**< interpreter context */
+           int_data_t *int_data __unused) /**< interpreter context */
 {
   const idx_t dst_idx = opdata.data.in.dst;
   const idx_t left_var_idx = opdata.data.in.var_left;
diff --git a/src/libcoreint/opcodes-ecma-support.h b/src/libcoreint/opcodes-ecma-support.h
index 1b46f7ce7..92c89bb65 100644
--- a/src/libcoreint/opcodes-ecma-support.h
+++ b/src/libcoreint/opcodes-ecma-support.h
@@ -32,8 +32,8 @@
 #include "opcodes.h"
 
 static bool do_strict_eval_arguments_check (ecma_reference_t) __unused;
-static ecma_completion_value_t get_variable_value (__int_data *, idx_t, bool) __unused;
-static ecma_completion_value_t set_variable_value (__int_data *, idx_t, ecma_value_t) __unused;
+static ecma_completion_value_t get_variable_value (int_data_t *, idx_t, bool) __unused;
+static ecma_completion_value_t set_variable_value (int_data_t *, idx_t, ecma_value_t) __unused;
 
 /**
  * Perform so-called 'strict eval or arguments reference' check
@@ -81,7 +81,7 @@ do_strict_eval_arguments_check (ecma_reference_t ref) /**< ECMA-reference */
  *         Returned value must be freed with ecma_free_completion_value
  */
 static ecma_completion_value_t
-get_variable_value (__int_data *int_data, /**< interpreter context */
+get_variable_value (int_data_t *int_data, /**< interpreter context */
                     idx_t var_idx, /**< variable identifier */
                     bool do_eval_or_arguments_check) /** run 'strict eval or arguments reference' check
                                                         See also: do_strict_eval_arguments_check */
@@ -133,7 +133,7 @@ get_variable_value (__int_data *int_data, /**< interpreter context */
  *         Returned value must be freed with ecma_free_completion_value
  */
 static ecma_completion_value_t
-set_variable_value (__int_data *int_data, /**< interpreter context */
+set_variable_value (int_data_t *int_data, /**< interpreter context */
                     idx_t var_idx, /**< variable identifier */
                     ecma_value_t value) /**< value to set */
 {
diff --git a/src/libcoreint/opcodes.c b/src/libcoreint/opcodes.c
index a0adf8047..d32f382da 100644
--- a/src/libcoreint/opcodes.c
+++ b/src/libcoreint/opcodes.c
@@ -136,7 +136,7 @@ free_string_literal_copy (string_literal_copy *str_lit_descr_p) /**< string lite
     static char __unused unimplemented_list_end
 
 #define DEFINE_UNIMPLEMENTED_OP(op) \
-  ecma_completion_value_t opfunc_ ## op (opcode_t opdata, __int_data *int_data) \
+  ecma_completion_value_t opfunc_ ## op (opcode_t opdata, int_data_t *int_data) \
   { \
     JERRY_UNIMPLEMENTED_REF_UNUSED_VARS (opdata, int_data); \
   }
@@ -149,7 +149,7 @@ OP_UNIMPLEMENTED_LIST (DEFINE_UNIMPLEMENTED_OP);
  */
 ecma_completion_value_t
 opfunc_nop (opcode_t opdata __unused, /**< operation data */
-            __int_data *int_data) /**< interpreter context */
+            int_data_t *int_data) /**< interpreter context */
 {
   int_data->pos++;
 
@@ -157,7 +157,7 @@ opfunc_nop (opcode_t opdata __unused, /**< operation data */
 } /* opfunc_nop */
 
 ecma_completion_value_t
-opfunc_call_1 (opcode_t opdata __unused, __int_data *int_data)
+opfunc_call_1 (opcode_t opdata __unused, int_data_t *int_data)
 {
   ecma_completion_value_t ret_value;
   ret_value = ecma_make_empty_completion_value ();
@@ -299,7 +299,7 @@ opfunc_call_1 (opcode_t opdata __unused, __int_data *int_data)
  */
 ecma_completion_value_t
 opfunc_assignment (opcode_t opdata, /**< operation data */
-                   __int_data *int_data) /**< interpreter context */
+                   int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.assignment.var_left;
   const opcode_arg_type_operand type_value_right = opdata.data.assignment.type_value_right;
@@ -385,7 +385,7 @@ opfunc_assignment (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_pre_incr (opcode_t opdata, /**< operation data */
-                 __int_data *int_data) /**< interpreter context */
+                 int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.pre_incr.dst;
   const idx_t incr_var_idx = opdata.data.pre_incr.var_right;
@@ -435,7 +435,7 @@ opfunc_pre_incr (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_pre_decr (opcode_t opdata, /**< operation data */
-                 __int_data *int_data) /**< interpreter context */
+                 int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.pre_decr.dst;
   const idx_t decr_var_idx = opdata.data.pre_decr.var_right;
@@ -485,7 +485,7 @@ opfunc_pre_decr (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_post_incr (opcode_t opdata, /**< operation data */
-                  __int_data *int_data) /**< interpreter context */
+                  int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.post_incr.dst;
   const idx_t incr_var_idx = opdata.data.post_incr.var_right;
@@ -533,7 +533,7 @@ opfunc_post_incr (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_post_decr (opcode_t opdata, /**< operation data */
-                  __int_data *int_data) /**< interpreter context */
+                  int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.post_decr.dst;
   const idx_t decr_var_idx = opdata.data.post_decr.var_right;
@@ -578,7 +578,7 @@ opfunc_post_decr (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_reg_var_decl (opcode_t opdata __unused, /**< operation data */
-                     __int_data *int_data __unused) /**< interpreter context */
+                     int_data_t *int_data __unused) /**< interpreter context */
 {
   JERRY_UNREACHABLE ();
 } /* opfunc_reg_var_decl */
@@ -594,7 +594,7 @@ opfunc_reg_var_decl (opcode_t opdata __unused, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_var_decl (opcode_t opdata, /**< operation data */
-                 __int_data *int_data) /**< interpreter context */
+                 int_data_t *int_data) /**< interpreter context */
 {
   ecma_string_t *var_name_string_p = ecma_new_ecma_string_from_lit_index (opdata.data.var_decl.variable_name);
 
@@ -632,7 +632,7 @@ opfunc_var_decl (opcode_t opdata, /**< operation data */
  *         returned value must be freed with ecma_free_completion_value.
  */
 static ecma_completion_value_t
-function_declaration (__int_data *int_data, /**< interpreter context */
+function_declaration (int_data_t *int_data, /**< interpreter context */
                       idx_t function_name_lit_idx, /**< identifier of literal with function name */
                       ecma_string_t* args_names[], /**< names of arguments */
                       ecma_length_t args_number) /**< number of arguments */
@@ -671,7 +671,7 @@ function_declaration (__int_data *int_data, /**< interpreter context */
  */
 ecma_completion_value_t
 opfunc_func_decl_0 (opcode_t opdata, /**< operation data */
-                    __int_data *int_data) /**< interpreter context */
+                    int_data_t *int_data) /**< interpreter context */
 {
   int_data->pos++;
 
@@ -689,7 +689,7 @@ opfunc_func_decl_0 (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_func_decl_1 (opcode_t opdata, /**< operation data */
-                    __int_data *int_data) /**< interpreter context */
+                    int_data_t *int_data) /**< interpreter context */
 {
   int_data->pos++;
 
@@ -713,7 +713,7 @@ opfunc_func_decl_1 (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_func_decl_2 (opcode_t opdata, /**< operation data */
-                    __int_data *int_data) /**< interpreter context */
+                    int_data_t *int_data) /**< interpreter context */
 {
   int_data->pos++;
 
@@ -744,7 +744,7 @@ opfunc_func_decl_2 (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_call_0 (opcode_t opdata, /**< operation data */
-               __int_data *int_data) /**< interpreter context */
+               int_data_t *int_data) /**< interpreter context */
 {
   const idx_t func_name_lit_idx = opdata.data.call_0.name_lit_idx;
   const idx_t lhs_var_idx = opdata.data.call_0.lhs;
@@ -790,7 +790,7 @@ opfunc_call_0 (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_ret (opcode_t opdata __unused, /**< operation data */
-            __int_data *int_data __unused) /**< interpreter context */
+            int_data_t *int_data __unused) /**< interpreter context */
 {
   return ecma_make_completion_value (ECMA_COMPLETION_TYPE_RETURN,
                                      ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED),
@@ -808,7 +808,7 @@ opfunc_ret (opcode_t opdata __unused, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_retval (opcode_t opdata __unused, /**< operation data */
-               __int_data *int_data __unused) /**< interpreter context */
+               int_data_t *int_data __unused) /**< interpreter context */
 {
   ecma_completion_value_t ret_value;
 
@@ -834,7 +834,7 @@ opfunc_retval (opcode_t opdata __unused, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_prop_getter (opcode_t opdata __unused, /**< operation data */
-                    __int_data *int_data __unused) /**< interpreter context */
+                    int_data_t *int_data __unused) /**< interpreter context */
 {
   const idx_t lhs_var_idx = opdata.data.prop_getter.lhs;
   const idx_t base_var_idx = opdata.data.prop_getter.obj;
@@ -881,7 +881,7 @@ opfunc_prop_getter (opcode_t opdata __unused, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_prop_setter (opcode_t opdata __unused, /**< operation data */
-                    __int_data *int_data __unused) /**< interpreter context */
+                    int_data_t *int_data __unused) /**< interpreter context */
 {
   const idx_t base_var_idx = opdata.data.prop_setter.obj;
   const idx_t prop_name_var_idx = opdata.data.prop_setter.prop;
@@ -930,7 +930,7 @@ opfunc_prop_setter (opcode_t opdata __unused, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_exitval (opcode_t opdata, /**< operation data */
-                __int_data *int_data __unused) /**< interpreter context */
+                int_data_t *int_data __unused) /**< interpreter context */
 {
   JERRY_ASSERT (opdata.data.exitval.status_code == 0
                 || opdata.data.exitval.status_code == 1);
@@ -952,7 +952,7 @@ opfunc_exitval (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_logical_not (opcode_t opdata, /**< operation data */
-                    __int_data *int_data) /**< interpreter context */
+                    int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.logical_not.dst;
   const idx_t right_var_idx = opdata.data.logical_not.var_right;
@@ -990,7 +990,7 @@ opfunc_logical_not (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_logical_or (opcode_t opdata, /**< operation data */
-                   __int_data *int_data) /**< interpreter context */
+                   int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.logical_or.dst;
   const idx_t left_var_idx = opdata.data.logical_or.var_left;
@@ -1034,7 +1034,7 @@ opfunc_logical_or (opcode_t opdata, /**< operation data */
  */
 ecma_completion_value_t
 opfunc_logical_and (opcode_t opdata, /**< operation data */
-                   __int_data *int_data) /**< interpreter context */
+                   int_data_t *int_data) /**< interpreter context */
 {
   const idx_t dst_var_idx = opdata.data.logical_and.dst;
   const idx_t left_var_idx = opdata.data.logical_and.var_left;
@@ -1070,7 +1070,7 @@ opfunc_logical_and (opcode_t opdata, /**< operation data */
 
 
 #define GETOP_DEF_1(a, name, field1) \
-        opcode_t getop_##name (idx_t arg1) \
+        inline opcode_t getop_##name (idx_t arg1) \
         { \
           opcode_t opdata; \
           opdata.op_idx = __op__idx_##name; \
@@ -1079,7 +1079,7 @@ opfunc_logical_and (opcode_t opdata, /**< operation data */
         }
 
 #define GETOP_DEF_2(a, name, field1, field2) \
-        opcode_t getop_##name (idx_t arg1, idx_t arg2) \
+        inline opcode_t getop_##name (idx_t arg1, idx_t arg2) \
         { \
           opcode_t opdata; \
           opdata.op_idx = __op__idx_##name; \
@@ -1089,7 +1089,7 @@ opfunc_logical_and (opcode_t opdata, /**< operation data */
         }
 
 #define GETOP_DEF_3(a, name, field1, field2, field3) \
-        opcode_t getop_##name (idx_t arg1, idx_t arg2, idx_t arg3) \
+        inline opcode_t getop_##name (idx_t arg1, idx_t arg2, idx_t arg3) \
         { \
           opcode_t opdata; \
           opdata.op_idx = __op__idx_##name; \
diff --git a/src/libcoreint/opcodes.h b/src/libcoreint/opcodes.h
index 5e9f47935..73ddf4c58 100644
--- a/src/libcoreint/opcodes.h
+++ b/src/libcoreint/opcodes.h
@@ -57,7 +57,7 @@ typedef struct
   idx_t min_reg_num; /**< minimum idx used for register identification */
   idx_t max_reg_num; /**< maximum idx used for register identification */
   ecma_value_t *regs_p; /**< register variables */
-} __int_data;
+} int_data_t;
 
 #define OP_CALLS_AND_ARGS(p, a)                                              \
         p##_2 (a, call_0, lhs, name_lit_idx)                                 \
@@ -206,11 +206,11 @@ enum __opcode_idx
 };
 #undef __OP_ENUM_FIELD
 
-#define __OP_FUNC_DECL(name, arg1, arg2, arg3) ecma_completion_value_t opfunc_##name (opcode_t, __int_data*);
+#define __OP_FUNC_DECL(name, arg1, arg2, arg3) ecma_completion_value_t opfunc_##name (opcode_t, int_data_t*);
 OP_LIST (OP_FUNC_DECL)
 #undef __OP_FUNC_DECL
 
-typedef ecma_completion_value_t (*opfunc) (opcode_t, __int_data *);
+typedef ecma_completion_value_t (*opfunc) (opcode_t, int_data_t *);
 
 #define GETOP_DECL_0(a, name) \
         opcode_t getop_##name (void);
diff --git a/src/liboptimizer/pretty-printer.c b/src/liboptimizer/pretty-printer.c
index 835352f25..73904776a 100644
--- a/src/liboptimizer/pretty-printer.c
+++ b/src/liboptimizer/pretty-printer.c
@@ -354,7 +354,7 @@ pp_opcode (opcode_counter_t oc, opcode_t opcode, bool is_rewrite)
   uint8_t i = 1;
   uint8_t opcode_num = opcode.op_idx;
 
-  __printf ("%03d: %20s ", oc, opcode_names[opcode_num]);
+  __printf ("%3d: %20s ", oc, opcode_names[opcode_num]);
   if (opcode_num != NAME_TO_ID (nop) && opcode_num != NAME_TO_ID (ret)
       && opcode_num != NAME_TO_ID (end_with))
   {