Index: _old/app/src/gue/Makefile
===================================================================
--- _old/app/src/gue/Makefile	(revision 57728c1d40118b66361f4d949f1ad6409070f9c6)
+++ _old/app/src/gue/Makefile	(revision 1e121f45e2d091fcd34a893291b8453e350d5884)
@@ -1,4 +1,4 @@
-PAR=-Wno-deprecated -O3 -fpermissive -m32 -static
-PAR2=-c -Wno-deprecated -O3 -fpermissive -m32
+PAR=-Wno-deprecated -O2 -fpermissive -static
+PAR2=-c -Wno-deprecated -O2 -fpermissive
 LIB_PATH=../lib
 COMMON_PATH=../common
@@ -6,6 +6,5 @@
 
 
-gue: main.cc guess.o $(LIB_PATH)/auttools.o $(LIB_PATH)/word.o \
-      cmdline.c common_guess.o common.o
+gue: main.cc guess.o auttools.o word.o cmdline.c common_guess.o common.o
 	g++ $(PAR) main.cc guess.o \
 	$(LIB_PATH)/auttools.o $(LIB_PATH)/word.o cmdline.c common.o common_guess.o \
@@ -18,6 +17,5 @@
 	g++ $(PAR2) common_guess.cc
 
-common.o: $(COMMON_PATH)/cmdline_common.ggo $(COMMON_PATH)/common.cc \
-	 $(COMMON_PATH)/common.h
+common.o: $(COMMON_PATH)/cmdline_common.ggo cmdline_common
 	g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) $(COMMON_PATH)/common.cc
 
@@ -41,2 +39,5 @@
 	cp gue ${UTT_BIN_DIR}
 endif
+
+include $(LIB_PATH)/lib.mk
+include $(COMMON_PATH)/common.mk
Index: _old/app/src/gue/guess.cc
===================================================================
--- _old/app/src/gue/guess.cc	(revision 57728c1d40118b66361f4d949f1ad6409070f9c6)
+++ _old/app/src/gue/guess.cc	(revision 1e121f45e2d091fcd34a893291b8453e350d5884)
@@ -2,9 +2,9 @@
 #include "guess.h"
 
-#include <string.h>
+#include <cstring>
 #include <iostream>
-#include <stdlib.h>
-#include <assert.h>
-#include <time.h>
+#include <cstdlib>
+#include <cassert>
+#include <ctime>
 
 #define DICT 1
@@ -18,7 +18,5 @@
 #define PREF_SIGN '_'
 
-
 using namespace std;
-
 
 Guess::Guess(const char* suf_file)