diff --git a/scim-wnn/src/wnnconversion.cpp b/scim-wnn/src/wnnconversion.cpp
index fe24ae6..d569a16 100644
--- a/scim-wnn/src/wnnconversion.cpp
+++ b/scim-wnn/src/wnnconversion.cpp
@@ -166,7 +166,7 @@
     String y;
     m_iconv.convert(y,yomiText);
     strtows(ws,(unsigned char*)y.data());
-    bunsetu = jl_ren_conv(wnn,ws,0,-1,WNN_NO_USE);
+    bunsetu = jl_fi_ren_conv(wnn,ws,0,-1,WNN_NO_USE);
     if (bunsetu == -1) return(-1);
     bunList.resize(bunsetu);
     yomiList.resize(bunsetu);
@@ -201,7 +201,7 @@
     int h = WNN_NO_USE;
     if (pos > 0) h = WNN_USE_MAE;
     else if (pos < bunsetu - 1) h = WNN_USE_ATO;
-    bunsetu = jl_nobi_conv(wnn,pos,yomiList[pos].length() + w,-1,h,WNN_SHO);
+    bunsetu = jl_fi_nobi_conv(wnn,pos,yomiList[pos].length() + w,-1,h,WNN_SHO);
     convList.kouho.clear();
     bunList.clear();
     bunList.resize(bunsetu);
@@ -346,7 +346,7 @@
 void WnnConversion::updateFrequency()
 {
     if (bunsetu)
-        jl_update_hindo(wnn,0,-1);
+        jl_optimize_fi(wnn,0,-1);
 }
 
 
diff --git a/scim-wnn/src/wnnproto.h b/scim-wnn/src/wnnproto.h
index f054a23..4dfc1a6 100644
--- a/scim-wnn/src/wnnproto.h
+++ b/scim-wnn/src/wnnproto.h
@@ -35,32 +35,15 @@
 
 
 
-    /*
-        wnn6sdk�ڤ�wnn7sdk��FreeWnn�Ǥδؿ��ΰ㤤��ե�����
-    */
 
     #ifdef HAVE_LIBWNN7
         #define HAVE_LIBWNN6
     #endif
 
-    #ifndef HAVE_LIBWNN6
-        #include "wnnstruct.h"
-        #define jl_zenkouho_suu(buf) ((buf)->zenkouho_daip? (buf)->zenkouho_dai_suu:(buf)->zenkouho_suu)
-        int jl_ren_conv(struct wnn_buf*,w_char*,int,int,int); /*jl_fi_ren_conv�Ȥ��⤢�ä��ʤ� */
-        int jl_nobi_conv(struct wnn_buf*,int,int,int,int,int);
-        int jl_update_hindo(struct wnn_buf*,int,int);
-    #else
-        int jl_fi_ren_conv(struct wnn_buf*,w_char*,int,int,int);
-        int jl_optimize_fi(struct wnn_buf*,int,int);
-        int jl_fi_nobi_conv(struct wnn_buf*,int,int,int,int,int);
-        int jl_zenkouho_suu(struct wnn_buf*);
-        #define jl_ren_conv(a,b,c,d,e) jl_fi_ren_conv(a,b,c,d,e)
-        #define jl_nobi_conv(a,b,c,d,e,f) jl_fi_nobi_conv(a,b,c,d,e,f)
-        #define jl_update_hindo(a,b,c) jl_optimize_fi(a,b,c)
-
-    /* int jl_isconnect(struct wnn_buf*); */
-
-    #endif
+    int jl_fi_ren_conv(struct wnn_buf*,w_char*,int,int,int);
+    int jl_optimize_fi(struct wnn_buf*,int,int);
+    int jl_fi_nobi_conv(struct wnn_buf*,int,int,int,int,int);
+    int jl_zenkouho_suu(struct wnn_buf*);
 
     /* �Ѵ��˴ؤ��뤽�� */
     int wnn_get_area(struct wnn_buf*,int,int,w_char*,int);