diff --git a/Makefile b/Makefile
index 0fc2108..e6b3644 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-OBJS=emul.o emul_inst_exec.o emul_inst_decipher.o emul_reg.o emul_mem.o emul_label.o emul_io_std.o emul_opt.o emul_repl.o
+OBJS=emul.o emul_inst_exec.o emul_inst_decipher.o emul_reg.o emul_mem.o emul_label.o emul_opt.o emul_repl.o emul_io_std.o 
 PROGRAM=emul
 CC=gcc
 CCOPT=-lncurses
diff --git a/emul_inst_decipher.h b/emul_inst_decipher.h
index 73c7273..4f2e8f9 100644
--- a/emul_inst_decipher.h
+++ b/emul_inst_decipher.h
@@ -10,17 +10,17 @@
 #define LOAD_TOKEN_MAX 32
 
 typedef struct {
-    EMUL_ISA opecode;
+    int opecode;
     char string[32];
 } emul_isa_t;
 
 typedef struct {
-    EMUL_REG operand;
+    int operand;
     char string[32];
 } emul_reg_t;
 
 typedef struct {
-    EMUL_PSEUDO pseudo;
+    int pseudo;
     char string[32];
 } emul_pseudo_t;
 
diff --git a/emul_inst_exec.c b/emul_inst_exec.c
index 7d1dedd..179e06b 100644
--- a/emul_inst_exec.c
+++ b/emul_inst_exec.c
@@ -288,7 +288,7 @@
     char label[LABEL_NAME_LENGTH_MAX];
     char temp[LOAD_TOKEN_MAX];
     // execute pseudocode.
-    EMUL_PSEUDO ps_id;
+    int ps_id;
 
     // 疑似コードIDを取得
     ps_id = emul_inst_dec_get_pseudo(token);
@@ -429,7 +429,7 @@
 	    break;
 	case SLTI:
         temp_op[0] = emul_inst_dec_get_next_operand();
-        temp_op[1] = emul_inst_dec_get_next_operand(token);
+        temp_op[1] = emul_inst_dec_get_next_operand();
         temp_op[2] = emul_inst_dec_get_next_immediate();
         emul_inst_exec_slti(temp_op[0], temp_op[1], temp_op[2]);
 	    break;
@@ -507,7 +507,7 @@
  *   failed  : 0 */
 exitcode_t emul_inst_exec_run() {
     // step関数を終わるまで呼び出せばよい
-    int exit_code;
+    exitcode_t exit_code;
     emul_out_std_debug(">>>Start run\n");
     while ( (exit_code = emul_inst_exec_step()) == Success ) {
         if (RunMode == Step) {
diff --git a/emul_reg.c b/emul_reg.c
index ca0a014..ab760f3 100644
--- a/emul_reg.c
+++ b/emul_reg.c
@@ -7,10 +7,10 @@
     reg[Spc] = 0;
 }
 
-int emul_reg_get(EMUL_REG r) {
+int emul_reg_get(int r) {
     return reg[r];
 }
 
-void emul_reg_set(EMUL_REG r, int value) {
+void emul_reg_set(int r, int value) {
     reg[r] = value;
 }
diff --git a/emul_reg.h b/emul_reg.h
index bd5cd73..803ad3f 100644
--- a/emul_reg.h
+++ b/emul_reg.h
@@ -55,7 +55,7 @@
  * this must be called */
 void emul_reg_init();
 
-int emul_reg_get(EMUL_REG r);
-void emul_reg_set(EMUL_REG r, int value);
+int emul_reg_get(int r);
+void emul_reg_set(int r, int value);
 
 #endif
diff --git a/emul_repl.c b/emul_repl.c
index 9302b2c..5db784e 100644
--- a/emul_repl.c
+++ b/emul_repl.c
@@ -42,7 +42,7 @@
     getmaxyx(win, y, x);
     move(y/2-2, (x-strlen(title))/2);
     printw("%s", title);
-    for (int i = 0; i < 2; i++) {
+    for (i = 0; i < 2; i++) {
         move(y/2+i, (x-strlen(menu[i]))/2);
         printw("%s", menu[i]);
     }