diff --git a/include/sj4common/sj_types.h b/include/sj4common/sj_types.h
new file mode 100644
index 0000000..bf09370
--- /dev/null
+++ b/include/sj4common/sj_types.h
@@ -0,0 +1,8 @@
+#ifndef __SJ_TYPES_H__
+#define __SJ_TYPES_H__
+
+typedef unsigned char  u_char;
+typedef unsigned short u_short;
+typedef unsigned int   u_int;
+
+#endif
diff --git a/include/sj4core/sj_typedef.h b/include/sj4core/sj_typedef.h
index d1295e0..281e555 100644
--- a/include/sj4core/sj_typedef.h
+++ b/include/sj4core/sj_typedef.h
@@ -42,9 +42,7 @@
 
 #define RECURS
 
-typedef unsigned char  u_char;
-typedef unsigned short u_short;
-typedef unsigned int   u_int;
+#include <sj_types.h>
 
 typedef void (*VFunc)(
 #ifndef SJ4_GLOBAL
diff --git a/include/sj4rkcv/rk.h b/include/sj4rkcv/rk.h
index ba9a52a..0dcb1b1 100644
--- a/include/sj4rkcv/rk.h
+++ b/include/sj4rkcv/rk.h
@@ -40,6 +40,8 @@
 #include "wchar16.h"
 #include "sj_string.h"
 
+#include <sj_types.h>
+
 #define SPACE 0x20
 #define TAB 0x09
 #define EOL 0x0a
diff --git a/lib/sj4rkcv/sj4_rkcv.c b/lib/sj4rkcv/sj4_rkcv.c
index 27cb4db..c2d2a75 100644
--- a/lib/sj4rkcv/sj4_rkcv.c
+++ b/lib/sj4rkcv/sj4_rkcv.c
@@ -776,6 +776,8 @@ int sj_htok(wchar16_t* s1, wchar16_t* s2) {
 			*s1++ = c;
 	}
 	*s1 = (wchar16_t)'\0';
+
+	return 0;
 }
 
 int sj_ktoh(wchar16_t* s1, wchar16_t* s2) {
@@ -790,4 +792,6 @@ int sj_ktoh(wchar16_t* s1, wchar16_t* s2) {
 			*s1++ = c;
 	}
 	*s1 = (wchar16_t)'\0';
+
+	return 0;
 }
diff --git a/win32.sh b/win32.sh
index ed409ea..c4ede06 100755
--- a/win32.sh
+++ b/win32.sh
@@ -26,7 +26,7 @@ library() {
 		echo $i
 
 		if [ "$cmp" = "watcom" ]; then
-			owcc -Iinclude/sj4common /Iinclude/sj4compat -Iinclude/$N -bnt -c -o $i.obj $i || exit 1
+			owcc -Iinclude/sj4common -Iinclude/sj4compat -Iinclude/$N -bnt -c -o $i.obj $i || exit 1
 		elif [ "$cmp" = "msvc" ]; then
 			cl.exe /nologo /Iinclude/sj4common /Iinclude/sj4compat /Iinclude/$N /c /Fo$i.obj $i || exit 1
 		fi
@@ -63,7 +63,9 @@ executable() {
 	fi
 }
 
+library sj4common
 library sj4core
+library sj4rkcv
 
 executable sj4mkdic
-executable sj4test sj4core.lib
+executable sj4test "sj4common.lib sj4core.lib"