diff --git a/Makefile b/Makefile
index 23bf400..c315a5d 100644
--- a/Makefile
+++ b/Makefile
@@ -34,15 +34,31 @@ CFLAGS += -fPIC
 CPPFLAGS += -I. -I./include -I./sj3h
 LDFLAGS += -L.
 
+# Public API library
 SJ3LIB_OBJS   = level1.o sj3lib.o string.o
+
+# Private libraries
+KANAKAN_OBJS  = adddic.o addelcmn.o alloc.o charsize.o chrtbl.o cl2knj.o \
+                clstudy.o cmpstr.o conjunc.o connect.o cvtclknj.o cvtdict.o \
+                cvtkanji.o deldic.o depend.o dict.o functbl.o fuzoku.o \
+                fzkyomi.o getkanji.o getrank.o global2.o hzstrlen.o init.o \
+                istrcmp.o memcpy.o memory2.o memset.o mk2claus.o mkbunset.o \
+                mkjiritu.o mkkouho.o mknumber.o mvmemd.o mvmemi.o peepdic.o \
+                ph2knj.o ph_khtbl.o priority.o prtytbl.o s2ctbl.o selclrec.o \
+                selsuuji.o setconj.o setjrec.o setkouho.o setubi.o sj2code.o \
+                skiphblk.o skipkstr.o srchdict.o srchhead.o srchidx.o \
+                srchnum.o sstrcmp.o sstrlen.o sstrncmp.o stbtbl.o stttbl.o \
+                study.o suujitbl.o terminat.o termtbl.o wakachi.o
 SJ3RKCV_OBJS  = rk_conv.o sj3_rkcv.o wc16_str.o
+
+# Client applications
 SJ3DIC_OBJS   = codecnv.o dictdisp.o dictmake.o hinsi.o sj3dic.o sj3err.o \
                 sjrc.o
 SJ3MKDIC_OBJS = char.o cnvhinsi.o file.o global.o hindo.o knjcvt.o makedict.o \
                 makelist.o makeseg.o memory.o offset.o readline.o string2.o
 SJ3STAT_OBJS  = sj3stat.o
 
-all: libsj3lib.a libsj3lib.so.$(LIBVER) libsj3rkcv.a sj3dic sj3mkdic sj3stat
+all: libsj3lib.a libsj3lib.so.$(LIBVER) libkanakan.a libsj3rkcv.a sj3dic sj3mkdic sj3stat
 
 install: all
 	mkdir -p $(DESTDIR)$(BINDIR)
@@ -63,6 +79,9 @@ libsj3lib.so.$(LIBVER): $(SJ3LIB_OBJS) compats.o
 	$(CC) -shared -o $@ $(SJ3LIB_OBJS) compats.o $(LDFLAGS) -Wl,${LINKER_SONAME},$@ $(LDLIBS)
 	ln -sf $@ `basename $@ .$(LIBVER)`
 
+libkanakan.a: $(KANAKAN_OBJS) compats.o
+	$(AR) crs $@ $(KANAKAN_OBJS) compats.o
+
 libsj3rkcv.a: $(SJ3RKCV_OBJS) compats.o
 	$(AR) crs $@ $(SJ3RKCV_OBJS) compats.o
 
diff --git a/kanakan/adddic.c b/adddic.c
similarity index 100%
rename from kanakan/adddic.c
rename to adddic.c
diff --git a/kanakan/addelcmn.c b/addelcmn.c
similarity index 100%
rename from kanakan/addelcmn.c
rename to addelcmn.c
diff --git a/kanakan/alloc.c b/alloc.c
similarity index 100%
rename from kanakan/alloc.c
rename to alloc.c
diff --git a/char.c b/char.c
index c85eead..49dfbef 100644
--- a/char.c
+++ b/char.c
@@ -39,7 +39,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include "sj_euc.h"
-#include "sj_const.h"
+#include "sj_const2.h"
 
 
 int
diff --git a/kanakan/charsize.c b/charsize.c
similarity index 100%
rename from kanakan/charsize.c
rename to charsize.c
diff --git a/kanakan/chrtbl.c b/chrtbl.c
similarity index 100%
rename from kanakan/chrtbl.c
rename to chrtbl.c
diff --git a/kanakan/cl2knj.c b/cl2knj.c
similarity index 100%
rename from kanakan/cl2knj.c
rename to cl2knj.c
diff --git a/kanakan/clstudy.c b/clstudy.c
similarity index 100%
rename from kanakan/clstudy.c
rename to clstudy.c
diff --git a/kanakan/cmpstr.c b/cmpstr.c
similarity index 100%
rename from kanakan/cmpstr.c
rename to cmpstr.c
diff --git a/kanakan/conjunc.c b/conjunc.c
similarity index 100%
rename from kanakan/conjunc.c
rename to conjunc.c
diff --git a/kanakan/connect.c b/connect.c
similarity index 100%
rename from kanakan/connect.c
rename to connect.c
diff --git a/kanakan/cvtclknj.c b/cvtclknj.c
similarity index 100%
rename from kanakan/cvtclknj.c
rename to cvtclknj.c
diff --git a/kanakan/cvtdict.c b/cvtdict.c
similarity index 100%
rename from kanakan/cvtdict.c
rename to cvtdict.c
diff --git a/kanakan/cvtkanji.c b/cvtkanji.c
similarity index 100%
rename from kanakan/cvtkanji.c
rename to cvtkanji.c
diff --git a/kanakan/deldic.c b/deldic.c
similarity index 100%
rename from kanakan/deldic.c
rename to deldic.c
diff --git a/kanakan/depend.c b/depend.c
similarity index 100%
rename from kanakan/depend.c
rename to depend.c
diff --git a/kanakan/dict.c b/dict.c
similarity index 100%
rename from kanakan/dict.c
rename to dict.c
diff --git a/dicttool.h b/dicttool.h
index a44534c..3e7e261 100644
--- a/dicttool.h
+++ b/dicttool.h
@@ -36,7 +36,7 @@
 
 #include <stdio.h>
 #include <sys/types.h>
-#include "sj_struct.h"
+#include "sj_struct2.h"
 
 /* char.c */
 int cnvyomi (int code);
diff --git a/kanakan/functbl.c b/functbl.c
similarity index 100%
rename from kanakan/functbl.c
rename to functbl.c
diff --git a/kanakan/fuzoku.c b/fuzoku.c
similarity index 100%
rename from kanakan/fuzoku.c
rename to fuzoku.c
diff --git a/kanakan/fzkyomi.c b/fzkyomi.c
similarity index 100%
rename from kanakan/fzkyomi.c
rename to fzkyomi.c
diff --git a/kanakan/getkanji.c b/getkanji.c
similarity index 100%
rename from kanakan/getkanji.c
rename to getkanji.c
diff --git a/kanakan/getrank.c b/getrank.c
similarity index 100%
rename from kanakan/getrank.c
rename to getrank.c
diff --git a/global.c b/global.c
index deeae75..00c8029 100644
--- a/global.c
+++ b/global.c
@@ -36,7 +36,7 @@
 
 #include <stdio.h>
 #include <sys/types.h>
-#include "sj_struct.h"
+#include "sj_struct2.h"
 
 DouonRec *douon_ptr = NULL;		
 int	douon_num = 0;			
diff --git a/kanakan/global.c b/global2.c
similarity index 100%
rename from kanakan/global.c
rename to global2.c
diff --git a/kanakan/hzstrlen.c b/hzstrlen.c
similarity index 100%
rename from kanakan/hzstrlen.c
rename to hzstrlen.c
diff --git a/include/Struct.h b/include/Struct.h
index d538af3..6bdd16e 100644
--- a/include/Struct.h
+++ b/include/Struct.h
@@ -38,6 +38,7 @@
 #ifndef _Struct_H_
 #define _Struct_H_  1
 
+#include <sys/select.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include "sj_const.h"
diff --git a/kanakan/init.c b/init.c
similarity index 100%
rename from kanakan/init.c
rename to init.c
diff --git a/kanakan/istrcmp.c b/istrcmp.c
similarity index 100%
rename from kanakan/istrcmp.c
rename to istrcmp.c
diff --git a/kanakan/kanakan.h b/kanakan.h
similarity index 100%
rename from kanakan/kanakan.h
rename to kanakan.h
diff --git a/kanakan/memcpy.c b/memcpy.c
similarity index 100%
rename from kanakan/memcpy.c
rename to memcpy.c
diff --git a/kanakan/memory.c b/memory2.c
similarity index 100%
rename from kanakan/memory.c
rename to memory2.c
diff --git a/kanakan/memset.c b/memset.c
similarity index 100%
rename from kanakan/memset.c
rename to memset.c
diff --git a/kanakan/mk2claus.c b/mk2claus.c
similarity index 100%
rename from kanakan/mk2claus.c
rename to mk2claus.c
diff --git a/kanakan/mkbunset.c b/mkbunset.c
similarity index 100%
rename from kanakan/mkbunset.c
rename to mkbunset.c
diff --git a/kanakan/mkjiritu.c b/mkjiritu.c
similarity index 100%
rename from kanakan/mkjiritu.c
rename to mkjiritu.c
diff --git a/kanakan/mkkouho.c b/mkkouho.c
similarity index 100%
rename from kanakan/mkkouho.c
rename to mkkouho.c
diff --git a/kanakan/mknumber.c b/mknumber.c
similarity index 100%
rename from kanakan/mknumber.c
rename to mknumber.c
diff --git a/kanakan/mvmemd.c b/mvmemd.c
similarity index 100%
rename from kanakan/mvmemd.c
rename to mvmemd.c
diff --git a/kanakan/mvmemi.c b/mvmemi.c
similarity index 100%
rename from kanakan/mvmemi.c
rename to mvmemi.c
diff --git a/kanakan/peepdic.c b/peepdic.c
similarity index 100%
rename from kanakan/peepdic.c
rename to peepdic.c
diff --git a/kanakan/ph2knj.c b/ph2knj.c
similarity index 100%
rename from kanakan/ph2knj.c
rename to ph2knj.c
diff --git a/kanakan/ph_khtbl.c b/ph_khtbl.c
similarity index 100%
rename from kanakan/ph_khtbl.c
rename to ph_khtbl.c
diff --git a/kanakan/priority.c b/priority.c
similarity index 100%
rename from kanakan/priority.c
rename to priority.c
diff --git a/kanakan/prtytbl.c b/prtytbl.c
similarity index 100%
rename from kanakan/prtytbl.c
rename to prtytbl.c
diff --git a/kanakan/s2ctbl.c b/s2ctbl.c
similarity index 100%
rename from kanakan/s2ctbl.c
rename to s2ctbl.c
diff --git a/kanakan/selclrec.c b/selclrec.c
similarity index 100%
rename from kanakan/selclrec.c
rename to selclrec.c
diff --git a/kanakan/selsuuji.c b/selsuuji.c
similarity index 100%
rename from kanakan/selsuuji.c
rename to selsuuji.c
diff --git a/kanakan/setconj.c b/setconj.c
similarity index 100%
rename from kanakan/setconj.c
rename to setconj.c
diff --git a/kanakan/setjrec.c b/setjrec.c
similarity index 100%
rename from kanakan/setjrec.c
rename to setjrec.c
diff --git a/kanakan/setkouho.c b/setkouho.c
similarity index 100%
rename from kanakan/setkouho.c
rename to setkouho.c
diff --git a/kanakan/setubi.c b/setubi.c
similarity index 100%
rename from kanakan/setubi.c
rename to setubi.c
diff --git a/kanakan/sj2code.c b/sj2code.c
similarity index 100%
rename from kanakan/sj2code.c
rename to sj2code.c
diff --git a/sj_const.h b/sj_const2.h
similarity index 100%
rename from sj_const.h
rename to sj_const2.h
diff --git a/sj_struct.h b/sj_struct2.h
similarity index 98%
rename from sj_struct.h
rename to sj_struct2.h
index 5cd47c0..a21a564 100644
--- a/sj_struct.h
+++ b/sj_struct2.h
@@ -36,7 +36,7 @@
 
 
 
-#include "sj_const.h"
+#include "sj_const2.h"
 
 #ifndef	_STRUCT_
 #define	_STRUCT_
diff --git a/kanakan/skiphblk.c b/skiphblk.c
similarity index 100%
rename from kanakan/skiphblk.c
rename to skiphblk.c
diff --git a/kanakan/skipkstr.c b/skipkstr.c
similarity index 100%
rename from kanakan/skipkstr.c
rename to skipkstr.c
diff --git a/kanakan/srchdict.c b/srchdict.c
similarity index 100%
rename from kanakan/srchdict.c
rename to srchdict.c
diff --git a/kanakan/srchhead.c b/srchhead.c
similarity index 100%
rename from kanakan/srchhead.c
rename to srchhead.c
diff --git a/kanakan/srchidx.c b/srchidx.c
similarity index 100%
rename from kanakan/srchidx.c
rename to srchidx.c
diff --git a/kanakan/srchnum.c b/srchnum.c
similarity index 100%
rename from kanakan/srchnum.c
rename to srchnum.c
diff --git a/kanakan/sstrcmp.c b/sstrcmp.c
similarity index 100%
rename from kanakan/sstrcmp.c
rename to sstrcmp.c
diff --git a/kanakan/sstrlen.c b/sstrlen.c
similarity index 100%
rename from kanakan/sstrlen.c
rename to sstrlen.c
diff --git a/kanakan/sstrncmp.c b/sstrncmp.c
similarity index 100%
rename from kanakan/sstrncmp.c
rename to sstrncmp.c
diff --git a/kanakan/stbtbl.c b/stbtbl.c
similarity index 100%
rename from kanakan/stbtbl.c
rename to stbtbl.c
diff --git a/kanakan/stttbl.c b/stttbl.c
similarity index 100%
rename from kanakan/stttbl.c
rename to stttbl.c
diff --git a/kanakan/study.c b/study.c
similarity index 100%
rename from kanakan/study.c
rename to study.c
diff --git a/kanakan/suujitbl.c b/suujitbl.c
similarity index 100%
rename from kanakan/suujitbl.c
rename to suujitbl.c
diff --git a/kanakan/terminat.c b/terminat.c
similarity index 100%
rename from kanakan/terminat.c
rename to terminat.c
diff --git a/kanakan/termtbl.c b/termtbl.c
similarity index 100%
rename from kanakan/termtbl.c
rename to termtbl.c
diff --git a/kanakan/wakachi.c b/wakachi.c
similarity index 100%
rename from kanakan/wakachi.c
rename to wakachi.c