diff --git a/.gitignore b/.gitignore
index b41e90f..5ca8635 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /build
 *.obj
+*.exe
+*.lib
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83ba500..343334c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,9 +2,11 @@ cmake_minimum_required(VERSION 3.11)
 
 project(sj3)
 
-configure_file(config.h.in config.h)
-
 file(GLOB_RECURSE SJ3CORE_SRCS lib/sj3core/**.c)
 add_library(sj3core STATIC ${SJ3CORE_SRCS})
 target_include_directories(sj3core PUBLIC include/sj3common include/sj3core)
 target_include_directories(sj3core PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+
+file(GLOB_RECURSE SJ3MKDIC_SRCS src/sj3mkdic/**.c)
+add_executable(sj3mkdic ${SJ3MKDIC_SRCS})
+target_include_directories(sj3mkdic PRIVATE include/sj3common include/sj3core)
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index ce5f56b..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifdef __CONFIG_H__
-#define __CONFIG_H__
-
-#define HAVE_STRING_H 1
-
-#endif
diff --git a/src/sj3mkdic/char.c b/src/sj3mkdic/char.c
index 9273b23..82792f9 100644
--- a/src/sj3mkdic/char.c
+++ b/src/sj3mkdic/char.c
@@ -34,8 +34,6 @@
  */
 
 
-#include <stdio.h>
-#include <sys/types.h>
 #include "sj_euc.h"
 #include "sj3_dict_const.h"
 
diff --git a/src/sj3mkdic/cnvhinsi.c b/src/sj3mkdic/cnvhinsi.c
index e218341..81575ff 100644
--- a/src/sj3mkdic/cnvhinsi.c
+++ b/src/sj3mkdic/cnvhinsi.c
@@ -34,9 +34,7 @@
  */
 
 
-#include <stdio.h>
-#include <sys/types.h>
-
+#include "sj3mkdic.h"
 
 
 static struct gram_code {
diff --git a/src/sj3mkdic/file.c b/src/sj3mkdic/file.c
index 9cac8a0..16eaceb 100644
--- a/src/sj3mkdic/file.c
+++ b/src/sj3mkdic/file.c
@@ -33,13 +33,6 @@
  * $SonyDate: 1995/02/03 07:38:32 $
  */
 
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
 #include "sj3mkdic.h"
 
 typedef	struct filelist {
diff --git a/src/sj3mkdic/global.c b/src/sj3mkdic/global.c
index 0161de7..f343a69 100644
--- a/src/sj3mkdic/global.c
+++ b/src/sj3mkdic/global.c
@@ -34,8 +34,6 @@
  */
 
 
-#include <stdio.h>
-#include <sys/types.h>
 #include "sj3_dict_struct.h"
 
 #include "sj3mkdic.h"
diff --git a/src/sj3mkdic/hindo.c b/src/sj3mkdic/hindo.c
index a69f53e..3625bb1 100644
--- a/src/sj3mkdic/hindo.c
+++ b/src/sj3mkdic/hindo.c
@@ -37,10 +37,6 @@
 
 
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
 #include "sj3_dict_struct.h"
 
 #include "sj3mkdic.h"
diff --git a/src/sj3mkdic/knjcvt.c b/src/sj3mkdic/knjcvt.c
index ccd3c46..b07fdb1 100644
--- a/src/sj3mkdic/knjcvt.c
+++ b/src/sj3mkdic/knjcvt.c
@@ -33,10 +33,6 @@
  * $SonyDate: 1994/06/03 08:00:37 $
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
 #include "sj3_dict_const.h"
 #include "sj3_dict_struct.h"
 
diff --git a/src/sj3mkdic/makedict.c b/src/sj3mkdic/makedict.c
index c2f8cef..6ce73d4 100644
--- a/src/sj3mkdic/makedict.c
+++ b/src/sj3mkdic/makedict.c
@@ -33,15 +33,6 @@
  * $SonyDate: 1994/12/09 11:27:05 $
  */
 
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <locale.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
 #include "sj3_dict_const.h"
 
 #include "sj3mkdic.h"
@@ -200,7 +191,7 @@ getch()
 void
 mark_file(FILE *out)
 {
-	static	char	pathname[MAXPATHLEN];
+	static	char	pathname[512];
 	static	long	pos;
 
 	if (out) {
diff --git a/src/sj3mkdic/makelist.c b/src/sj3mkdic/makelist.c
index 1f07fba..c68f9bd 100644
--- a/src/sj3mkdic/makelist.c
+++ b/src/sj3mkdic/makelist.c
@@ -33,10 +33,6 @@
  * $SonyDate: 1994/06/03 08:00:39 $
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
 #include "sj3_dict_struct.h"
 
 #include "sj3mkdic.h"
diff --git a/src/sj3mkdic/makeseg.c b/src/sj3mkdic/makeseg.c
index a3bf707..6cbf43d 100644
--- a/src/sj3mkdic/makeseg.c
+++ b/src/sj3mkdic/makeseg.c
@@ -33,12 +33,6 @@
  * $SonyDate: 1994/12/09 11:27:05 $
  */
 
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <sys/types.h>
 #include "sj3_dict_struct.h"
 #include "Dict.h"
 
diff --git a/src/sj3mkdic/memory.c b/src/sj3mkdic/memory.c
index aebe4bf..f686161 100644
--- a/src/sj3mkdic/memory.c
+++ b/src/sj3mkdic/memory.c
@@ -33,10 +33,7 @@
  * $SonyDate: 1994/06/03 08:00:42 $
  */
 
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "sj3mkdic.h"
 
 void *
 Malloc(unsigned size)
diff --git a/src/sj3mkdic/offset.c b/src/sj3mkdic/offset.c
index e7ea54c..efd1266 100644
--- a/src/sj3mkdic/offset.c
+++ b/src/sj3mkdic/offset.c
@@ -33,10 +33,6 @@
  * $SonyDate: 1994/08/17 01:50:26 $
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
 #include "sj3_dict_struct.h"
 
 #include "sj3mkdic.h"
diff --git a/src/sj3mkdic/readline.c b/src/sj3mkdic/readline.c
index 77b5330..3953894 100644
--- a/src/sj3mkdic/readline.c
+++ b/src/sj3mkdic/readline.c
@@ -33,11 +33,6 @@
  * $SonyDate: 1994/06/03 08:00:44 $
  */
 
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <ctype.h>
-
 #include "sj_euc.h"
 #include "sj3_dict_const.h"
 
@@ -277,7 +272,7 @@ readline()
 
 
 void
-setline(int (*func)())
+setline(void (*func)(int*, int*, int, int*))
 {
 	int	i;
 
diff --git a/src/sj3mkdic/sj3_dict_struct.h b/src/sj3mkdic/sj3_dict_struct.h
index 35584b4..78b587c 100644
--- a/src/sj3mkdic/sj3_dict_struct.h
+++ b/src/sj3mkdic/sj3_dict_struct.h
@@ -41,6 +41,8 @@
 #ifndef	SJ3_DICT_STRUCT_H
 #define	SJ3_DICT_STRUCT_H
 
+#include <sj_typedef.h>
+
 typedef struct kanji_rec {
 	int	klen;
 	u_char	*kptr;
diff --git a/src/sj3mkdic/sj3mkdic.h b/src/sj3mkdic/sj3mkdic.h
index 51d6aae..68536d1 100644
--- a/src/sj3mkdic/sj3mkdic.h
+++ b/src/sj3mkdic/sj3mkdic.h
@@ -18,6 +18,12 @@
 #define SJ3MKDIC_H
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <locale.h>
+#include <time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include "sj3_dict_struct.h"
 
@@ -107,7 +113,7 @@ OffsetRec *real_ofsrec(u_char *);
 
 /* readline.c */
 int *readline();
-void setline(int (*)());
+void setline(void (*)(int*, int*, int, int*));
 
 /* string.c */
 int bubun_str(u_char *, int, u_char *, int);
diff --git a/src/sj3mkdic/string.c b/src/sj3mkdic/string.c
index c9e0816..af77633 100644
--- a/src/sj3mkdic/string.c
+++ b/src/sj3mkdic/string.c
@@ -33,9 +33,6 @@
  * $SonyDate: 1994/06/03 08:00:45 $
  */
 
-
-#include <stdio.h>
-#include <sys/types.h>
 #include "sj3_dict_const.h"
 
 #include "sj3mkdic.h"
diff --git a/watcom.sh b/watcom.sh
index e3d0489..7422697 100755
--- a/watcom.sh
+++ b/watcom.sh
@@ -11,3 +11,13 @@ done
 find lib/sj3core -name "*.obj" | while read a; do
 	echo "+$a"
 done | xargs wlib -q -b -fo -n sj3core.lib
+
+for i in src/sj3mkdic/*.c; do
+	if [ -f $i.obj ]; then
+		continue
+	fi
+	echo $i
+	owcc -Iinclude/sj3common -Iinclude/sj3core -bnt -c -o $i.obj $i || exit 1
+done
+
+owcc -bnt -o sj3mkdic.exe src/sj3mkdic/*.obj