diff --git a/lib/sj3core/adddic.c b/lib/sj3core/adddic.c
index 2a4d821..e910620 100644
--- a/lib/sj3core/adddic.c
+++ b/lib/sj3core/adddic.c
@@ -73,14 +73,14 @@ u_int adddic(u_char* yomi, u_char* kanji, TypeGram hinsi) {
 	STDYIN*	   stdy;
 	STDYOUT	   stdydat;
 
-	if(err = addel_arg(yomi, kanji, hinsi, yptr, sizeof(yptr)))
+	if((err = addel_arg(yomi, kanji, hinsi, yptr, sizeof(yptr))))
 		return err;
 
 	inputyomi = yomi;
 	cnvstart = ystart = yptr;
 	cnvlen		  = sstrlen(yptr);
 
-	if(err = checkdict(kanji, hinsi))
+	if((err = checkdict(kanji, hinsi)))
 		return err;
 
 	if(!curdict->maxunit)
diff --git a/lib/sj3core/addelcmn.c b/lib/sj3core/addelcmn.c
index 23f80a2..962120d 100644
--- a/lib/sj3core/addelcmn.c
+++ b/lib/sj3core/addelcmn.c
@@ -131,7 +131,7 @@ yomi2kata(u_char* src, u_char* dst) {
 	int first;
 	int second;
 
-	while(first = *src++) {
+	while((first = *src++)) {
 		second = *src++;
 
 		if(first != 0xa4) {
@@ -182,9 +182,9 @@ int cvtknj(u_char* yomi, u_char* knj, u_char* dst) {
 	keep = dst;
 	yomi2kata(yomi, kana);
 
-	if(len = top_strcmp(yomi, knj)) {
+	if((len = top_strcmp(yomi, knj))) {
 		*dst = (u_char)(ZENHIRAASSYUKU | (len - 1));
-	} else if(len = top_strcmp(kana, knj)) {
+	} else if((len = top_strcmp(kana, knj))) {
 		*dst = (u_char)(ZENKATAASSYUKU | (len - 1));
 	}
 
@@ -195,10 +195,10 @@ int cvtknj(u_char* yomi, u_char* knj, u_char* dst) {
 
 	if(*knj) {
 		for(;;) {
-			if(len = last_strcmp(yomi, knj)) {
+			if((len = last_strcmp(yomi, knj))) {
 				*dst++ = (u_char)(ZENHIRAASSYUKU | (len - 1));
 				break;
-			} else if(len = last_strcmp(kana, knj)) {
+			} else if((len = last_strcmp(kana, knj))) {
 				*dst++ = (u_char)(ZENKATAASSYUKU | (len - 1));
 				break;
 			} else if(*knj == SS2) {
diff --git a/lib/sj3core/cl2knj.c b/lib/sj3core/cl2knj.c
index 733a28a..6bb20ca 100644
--- a/lib/sj3core/cl2knj.c
+++ b/lib/sj3core/cl2knj.c
@@ -62,7 +62,7 @@ int cl2knj(u_char* yomi, int len, u_char* kouho) {
 	}
 	*ptr2 = 0;
 
-	strlcpy(orgyomi, yomi, (int)(ptr1 - yomi) + 1);
+	strlcpy((char*)orgyomi, (char*)yomi, (int)(ptr1 - yomi) + 1);
 
 	if(!hyomi[0]) return 0;
 
diff --git a/lib/sj3core/cvtdict.c b/lib/sj3core/cvtdict.c
index 42720f8..6a9a147 100644
--- a/lib/sj3core/cvtdict.c
+++ b/lib/sj3core/cvtdict.c
@@ -57,7 +57,7 @@ void cvtdict(KHREC* krec, CLREC* clrec, int flg) {
 
 	jlen = jrec->jlen;
 
-	if(i = jrec->sttofs) {
+	if((i = jrec->sttofs)) {
 
 		if(i == SETTOU_KIGOU) {
 			sttlen = 1;
diff --git a/lib/sj3core/cvtkanji.c b/lib/sj3core/cvtkanji.c
index e77c8f0..24d378c 100644
--- a/lib/sj3core/cvtkanji.c
+++ b/lib/sj3core/cvtkanji.c
@@ -165,7 +165,7 @@ void setstyrec(KHREC* krec) {
 	if(jrec->stbofs && (fptr = getstb(jrec->hinsi)))
 		stdy.len -= StbYomiLen(fptr + jrec->stbofs - 1);
 
-	if(fptr = Settou_ptr(jrec->sttofs))
+	if((fptr = Settou_ptr(jrec->sttofs)))
 		stdy.sttlen = SttYomiLen(fptr);
 	else
 		stdy.sttlen = 0;
diff --git a/lib/sj3core/deldic.c b/lib/sj3core/deldic.c
index 0fcc21b..860a178 100644
--- a/lib/sj3core/deldic.c
+++ b/lib/sj3core/deldic.c
@@ -58,7 +58,7 @@ u_int deldic(u_char* yomi, u_char* kanji, TypeGram hinsi) {
 	u_char *   stp, *edp;
 	int	   size, len;
 
-	if(err = addel_arg(yomi, kanji, hinsi, yptr, sizeof(yptr)))
+	if((err = addel_arg(yomi, kanji, hinsi, yptr, sizeof(yptr))))
 		return err;
 
 	if(!curdict->maxunit) return AD_NOTUSERDICT;
diff --git a/lib/sj3core/mkbunset.c b/lib/sj3core/mkbunset.c
index 07c2bbd..d751fa8 100644
--- a/lib/sj3core/mkbunset.c
+++ b/lib/sj3core/mkbunset.c
@@ -61,7 +61,7 @@ void mkbunsetu() {
 		else
 			hinsi = jrec->hinsi;
 
-		if(right = Connadr[hinsi]) {
+		if((right = Connadr[hinsi])) {
 			gobilen = 0;
 			next	= cnvstart + jrec->jlen;
 
@@ -73,7 +73,7 @@ void mkbunsetu() {
 			srchfzk(jrec, next, right, 0);
 		}
 
-		else if(count = setconj(hinsi, jrec, crec)) {
+		else if((count = setconj(hinsi, jrec, crec))) {
 
 			for(i = count; i-- > 0;) {
 
@@ -108,7 +108,7 @@ argclrec(int len) {
 
 		ptr = NULL;
 		rec = maxclptr;
-		while(child = rec->clsort) {
+		while((child = rec->clsort)) {
 			ptr = rec;
 			rec = child;
 		}
@@ -141,7 +141,7 @@ argclrec(int len) {
 		return rec;
 	}
 
-	while(child = ptr->clsort) {
+	while((child = ptr->clsort)) {
 		if((int)child->cllen < len ||
 		   ((int)child->cllen == len &&
 		    child->jnode->hinsi == TANKANJI)) {
diff --git a/lib/sj3core/mkjiritu.c b/lib/sj3core/mkjiritu.c
index b381bc8..a26b8bf 100644
--- a/lib/sj3core/mkjiritu.c
+++ b/lib/sj3core/mkjiritu.c
@@ -79,7 +79,7 @@ void mkjiritu(int mode) {
 	}
 
 	for(jrec = maxjptr; jrec; jrec = jrec->jsort) {
-		if(stb = getstb(jrec->hinsi))
+		if((stb = getstb(jrec->hinsi)))
 			setubi(jrec, stb);
 	}
 }
@@ -95,7 +95,7 @@ dic_mu(int mode) {
 		dicsaml = 0;
 		prevseg = -1;
 
-		while(tagp = srchdict(tagp)) setjrec(tagp, mode);
+		while((tagp = srchdict(tagp))) setjrec(tagp, mode);
 	}
 }
 
@@ -111,7 +111,7 @@ JREC* argjrec(int len, JREC* rec) {
 
 		ptr  = NULL;
 		jrec = maxjptr;
-		while(child = jrec->jsort) {
+		while((child = jrec->jsort)) {
 			ptr  = jrec;
 			jrec = child;
 		}
@@ -144,7 +144,7 @@ JREC* argjrec(int len, JREC* rec) {
 		return jrec;
 	}
 
-	while(child = ptr->jsort) {
+	while((child = ptr->jsort)) {
 		if((int)child->jlen < len) break;
 
 		ptr = child;
diff --git a/lib/sj3core/mkkouho.c b/lib/sj3core/mkkouho.c
index b240582..87833a4 100644
--- a/lib/sj3core/mkkouho.c
+++ b/lib/sj3core/mkkouho.c
@@ -344,8 +344,8 @@ static int
 chrck_numtbl(u_short flg, u_short cond) {
 	u_short must;
 
-	if(cond = SelNumCond(cond)) {
-		if(must = (cond & SELNUMMUST)) {
+	if((cond = SelNumCond(cond))) {
+		if((must = (cond & SELNUMMUST))) {
 			if((flg & must) != must) return FALSE;
 			cond &= ~must;
 		}
diff --git a/lib/sj3core/mknumber.c b/lib/sj3core/mknumber.c
index 6e8d0dd..ef402d7 100644
--- a/lib/sj3core/mknumber.c
+++ b/lib/sj3core/mknumber.c
@@ -291,11 +291,11 @@ num_kurai(u_char* p, int len, u_char* tbl) {
 
 		*kanjitmp++ = tbl[j = ((tmp & 0x0f) - _NUM0) * 2];
 		*kanjitmp++ = tbl[j + 1];
-		if(j = ((tmp >> 4) & 3)) {
+		if((j = ((tmp >> 4) & 3))) {
 			*kanjitmp++ = Num4tbl[j = (3 - j) * 2];
 			*kanjitmp++ = Num4tbl[j + 1];
 		}
-		if(j = ((tmp >> 6) & 3)) {
+		if((j = ((tmp >> 6) & 3))) {
 			*kanjitmp++ = Num6tbl[j = (3 - j) * 2];
 			*kanjitmp++ = Num6tbl[j + 1];
 		}
diff --git a/lib/sj3core/peepdic.c b/lib/sj3core/peepdic.c
index 5af2362..cc5e841 100644
--- a/lib/sj3core/peepdic.c
+++ b/lib/sj3core/peepdic.c
@@ -299,7 +299,7 @@ static void
 set_idxyomi() {
 	u_char *p1, *p2;
 
-	if(p2 = get_idxptr(peepidx)) {
+	if((p2 = get_idxptr(peepidx))) {
 		p1 = peepyomi;
 		while(*p2) {
 			cd2sjh_chr(*p2++, p1);
diff --git a/lib/sj3core/sdepend.c b/lib/sj3core/sdepend.c
index dd1aade..849866c 100644
--- a/lib/sj3core/sdepend.c
+++ b/lib/sj3core/sdepend.c
@@ -137,11 +137,11 @@ putfile(int fd, int pos, int len, u_char* p) {
 static int
 check_passwd(u_char* buf, char* passwd) {
 	buf += PASSWDPOS;
-	return (*buf && strncmp(passwd, buf, PASSWDLEN)) ? FALSE : TRUE;
+	return (*buf && strncmp(passwd, (char*)buf, PASSWDLEN)) ? FALSE : TRUE;
 }
 static void
 set_passwd(u_char* buf, char* passwd) {
-	strncpy(buf + PASSWDPOS, passwd, PASSWDLEN);
+	strncpy((char*)buf + PASSWDPOS, passwd, PASSWDLEN);
 }
 
 static int
@@ -732,7 +732,7 @@ int set_stdypass(char* pass) {
 
 static void
 set_comment(u_char* buf, char* comment) {
-	strlcpy(buf + HEADERLENGTH, comment, COMMENTLENGTH);
+	strlcpy((char*)buf + HEADERLENGTH, comment, COMMENTLENGTH);
 }
 
 int set_dictcmnt(DictFile* dp, char* cmnt) {
diff --git a/lib/sj3core/setconj.c b/lib/sj3core/setconj.c
index de3b15e..0752613 100644
--- a/lib/sj3core/setconj.c
+++ b/lib/sj3core/setconj.c
@@ -116,7 +116,7 @@ int setconj(TypeGram hinsi, JREC* jrec, CREC* crec) {
 	int	 count = 0;
 	u_char*	 cnj;
 
-	if(cnj = Conjadr(hinsi)) {
+	if((cnj = Conjadr(hinsi))) {
 		saml = ofslen = 0;
 
 		yptr = cnvstart + jrec->jlen;
@@ -139,7 +139,7 @@ int setconj(TypeGram hinsi, JREC* jrec, CREC* crec) {
 
 			if(isdpnd(*(yptr + saml))) continue;
 
-			if(right = cnvrow(jrec, (TypeCnct)CnjRight(cnj))) {
+			if((right = cnvrow(jrec, (TypeCnct)CnjRight(cnj)))) {
 				crec->len   = (u_char)(ofslen + saml);
 				crec->right = right;
 				count++;
diff --git a/lib/sj3core/srchnum.c b/lib/sj3core/srchnum.c
index ccaf6ea..6cf2146 100644
--- a/lib/sj3core/srchnum.c
+++ b/lib/sj3core/srchnum.c
@@ -53,7 +53,7 @@ srch_josuu_sub(JREC* jrec, TypeGram gram) {
 		dicinl	= 1;
 		dicsaml = 0;
 		prevseg = -1;
-		while(tagp = srchdict(tagp)) setnumrec(tagp, jrec, gram);
+		while((tagp = srchdict(tagp))) setnumrec(tagp, jrec, gram);
 	}
 }
 
@@ -101,7 +101,7 @@ setnrec_sub(u_char* p, u_short flag, int stb) {
 		return;
 	}
 
-	if(rec = argjrec(len1, (JREC*)NULL)) {
+	if((rec = argjrec(len1, (JREC*)NULL))) {
 		rec->class  = suuji_class;
 		rec->hinsi  = SUUSI;
 		rec->sttofs = headcode;
@@ -192,7 +192,7 @@ check_num(u_char* ptr) {
 	for(i = suuji_keta; --i >= 0;) {
 		if(hketa >= 4) return FALSE;
 		tmp = suuji_ubuf[i];
-		if(j = ((tmp >> 6) & 3)) {
+		if((j = ((tmp >> 6) & 3))) {
 			if(j < hketa) return FALSE;
 			if(j > hketa) {
 				flag |= JFLAG_N01;
diff --git a/lib/sj3core/wakachi.c b/lib/sj3core/wakachi.c
index 3b86c4b..7d8c4d6 100644
--- a/lib/sj3core/wakachi.c
+++ b/lib/sj3core/wakachi.c
@@ -115,7 +115,7 @@ void wakachi() {
 		return;
 
 	if(jrec->jlen) {
-		if(clrec = argclrec((int)jrec->jlen)) {
+		if((clrec = argclrec((int)jrec->jlen))) {
 			clrec->jnode = jrec;
 			clrec->right = R_MEISI;
 			clrec->kubun = K_TAIGEN;
diff --git a/src/sj3mkdic/cnvhinsi.c b/src/sj3mkdic/cnvhinsi.c
index cb01588..a6fb7bb 100644
--- a/src/sj3mkdic/cnvhinsi.c
+++ b/src/sj3mkdic/cnvhinsi.c
@@ -72,7 +72,7 @@ int cnvhinsi(u_char* buf) {
 
 		mid = (min + max) / 2;
 
-		i = u_strcmp(buf, gramtbl[mid].name);
+		i = u_strcmp(buf, (u_char*)gramtbl[mid].name);
 
 		if(i < 0) {
 			max = mid - 1;
diff --git a/src/sj3mkdic/makedict.c b/src/sj3mkdic/makedict.c
index 98f0d5c..ee6d308 100644
--- a/src/sj3mkdic/makedict.c
+++ b/src/sj3mkdic/makedict.c
@@ -88,7 +88,7 @@ char* get_idxlist(char* name) {
 
 	i = 0;
 	for(q = p; *q;) {
-		if(fp = fopen(q, "r"))
+		if((fp = fopen(q, "r")))
 			fclose(fp);
 		else {
 			fprintf(stderr, "Can't open %s mode \"r\"\n", q);
@@ -106,7 +106,7 @@ void parse(int argc, char** argv) {
 	char* progname = NULL;
 	char* p;
 
-	if(progname = strrchr(argv[0], '/'))
+	if((progname = strrchr(argv[0], '/')))
 		progname++;
 	else
 		progname = argv[0];
diff --git a/src/sj3mkdic/makelist.c b/src/sj3mkdic/makelist.c
index 6ef1cf9..7b46bbe 100644
--- a/src/sj3mkdic/makelist.c
+++ b/src/sj3mkdic/makelist.c
@@ -112,19 +112,19 @@ makekanji(int* yomi, int* kanji, int* atr, int* len) {
 #endif
 	}
 
-	if(i = top_strcmp(yomi, kanji)) {
+	if((i = top_strcmp(yomi, kanji))) {
 		kanji += i;
 		ktmp[pos++] = (ZENHIRAASSYUKU | (i - 1));
-	} else if(i = top_strcmp(kana, kanji)) {
+	} else if((i = top_strcmp(kana, kanji))) {
 		kanji += i;
 		ktmp[pos++] = (ZENKATAASSYUKU | (i - 1));
 	}
 
 	while(*kanji) {
-		if(i = last_strcmp(yomi, kanji)) {
+		if((i = last_strcmp(yomi, kanji))) {
 			kanji += i;
 			ktmp[pos++] = (ZENHIRAASSYUKU | (i - 1));
-		} else if(i = last_strcmp(kana, kanji)) {
+		} else if((i = last_strcmp(kana, kanji))) {
 			kanji += i;
 			ktmp[pos++] = (ZENKATAASSYUKU | (i - 1));
 		} else if(((*kanji >> 8) & 0xff) == SS2 || *kanji < 0x100) {
@@ -293,7 +293,7 @@ douon_knj(DouonRec* drec) {
 	int	  i;
 	int	  len = 0;
 	u_char*	  p;
-	u_char*	  knjofscvt();
+	u_char*	  knjofscvt(u_char*, int, int*);
 	HinsiRec* hrec;
 	KanjiRec* krec;
 
@@ -442,7 +442,7 @@ void makelist(int* yomi, int* kanji, int hinsi, int* atr) {
 
 	kcode = makekanji(yomi, kanji, atr, &klen);
 
-	if(drectmp && strcmp(ycode, drectmp->yptr)) {
+	if(drectmp && strcmp((char*)ycode, (char*)drectmp->yptr)) {
 		make_d_list(drectmp);
 
 		drectmp = NULL;
diff --git a/src/sj3mkdic/makeseg.c b/src/sj3mkdic/makeseg.c
index bb170e0..1d3b32e 100644
--- a/src/sj3mkdic/makeseg.c
+++ b/src/sj3mkdic/makeseg.c
@@ -225,7 +225,7 @@ void makeseg() {
 		dst += DOUONBLKSIZENUMBER;
 
 		p    = drec->yptr;
-		slen = strlen(p) - drec->dlen;
+		slen = strlen((char*)p) - drec->dlen;
 		p += slen;
 		for(i = drec->dlen; i > 0; i--) {
 			datset(*p);
@@ -291,7 +291,7 @@ void makeseg() {
 		fprintf(stderr, "\275\320\316\317\245\325\245\241\245\244\245\353\244\307\245\267\241\274\245\257\245\250\245\351\241\274\n");
 		exit(1);
 	}
-	if(Fwrite(buf, sizeof(buf), 1, outfp) != 1) {
+	if(Fwrite((char*)buf, sizeof(buf), 1, outfp) != 1) {
 		fprintf(stderr, "\275\320\316\317\245\325\245\241\245\244\245\353\244\307\245\351\245\244\245\310\245\250\245\351\241\274\n");
 		exit(1);
 	}
@@ -328,10 +328,7 @@ err:
 #undef datset
 }
 
-static void put4byte(p, n)
-    u_char* p;
-long n;
-{
+static void put4byte(u_char* p, long n) {
 	p += 3;
 	*p-- = n;
 	n >>= 8;
@@ -379,9 +376,9 @@ void makehead(u_char* dict_name) {
 	put4byte(header + DICTASEGLEN, 0);
 
 	Fseek(outfp, (long)HEADERPOS, 0);
-	Fwrite(header, sizeof(header), 1, outfp);
+	Fwrite((char*)header, sizeof(header), 1, outfp);
 	Fseek(outfp, (long)INDEXPOS, 0);
-	Fwrite(mindex, MAININDEXLENGTH, 1, outfp);
+	Fwrite((char*)mindex, MAININDEXLENGTH, 1, outfp);
 
 #undef INDEXPOS
 }
diff --git a/src/sj3mkdic/readline.c b/src/sj3mkdic/readline.c
index f137fd9..a48f91d 100644
--- a/src/sj3mkdic/readline.c
+++ b/src/sj3mkdic/readline.c
@@ -233,7 +233,7 @@ int* readline() {
 		error(NOKANJISTRING);
 
 	i = j = 0;
-	while(c = readhinsi()) {
+	while((c = readhinsi())) {
 		if(c < 0) {
 			if(i >= MAXATRNUMBER)
 				error(TOOMANYATR);
diff --git a/src/sj3mkdic/sj3_dict_const.h b/src/sj3mkdic/sj3_dict_const.h
index d1b4208..f14cc34 100644
--- a/src/sj3mkdic/sj3_dict_const.h
+++ b/src/sj3mkdic/sj3_dict_const.h
@@ -90,7 +90,7 @@
 #define NODATAINMAIN "\245\341\245\244\245\363\274\255\275\361\244\313\302\270\272\337\244\267\244\336\244\273\244\363"
 #define TOOMANYTARGET "\311\312\273\354\244\362\243\261\244\304\273\330\304\352\244\267\244\306\244\257\244\300\244\265\244\244"
 
-#define HINSITANKAN cnvhinsi("\303\261\264\301")
+#define HINSITANKAN cnvhinsi((u_char*)"\303\261\264\301")
 
 #define FALSE 0
 #define TRUE (!FALSE)