diff --git a/src/GetDflt.c b/src/GetDflt.c
index 2098e813..7b401525 100644
--- a/src/GetDflt.c
+++ b/src/GetDflt.c
@@ -98,16 +98,16 @@ GetHomeDir(
     int len)
 {
 #ifdef WIN32
-    register char *ptr1;
-    register char *ptr2;
+    register char *ptr1 = NULL;
+    register char *ptr2 = NULL;
     int len1 = 0, len2 = 0;
 
-    if (ptr1 = getenv("HOME")) {	/* old, deprecated */
+    if ((ptr1 = getenv("HOME"))) {	/* old, deprecated */
 	len1 = strlen (ptr1);
     } else if ((ptr1 = getenv("HOMEDRIVE")) && (ptr2 = getenv("HOMEDIR"))) {
 	len1 = strlen (ptr1);
 	len2 = strlen (ptr2);
-    } else if (ptr2 = getenv("USERNAME")) {
+    } else if ((ptr2 = getenv("USERNAME"))) {
 	len1 = strlen (ptr1 = "/users/");
 	len2 = strlen (ptr2);
     }
diff --git a/src/locking.c b/src/locking.c
index 537ffa3f..d69b3548 100644
--- a/src/locking.c
+++ b/src/locking.c
@@ -60,7 +60,7 @@ extern LockInfoPtr _Xi18n_lock;
 #ifdef WIN32
 static DWORD _X_TlsIndex = (DWORD)-1;
 
-_Xthread_init()
+void _Xthread_init()
 {
     if (_X_TlsIndex == (DWORD)-1)
 	_X_TlsIndex = TlsAlloc();
diff --git a/src/xlibi18n/lcWrap.c b/src/xlibi18n/lcWrap.c
index ea262319..c0cee44b 100644
--- a/src/xlibi18n/lcWrap.c
+++ b/src/xlibi18n/lcWrap.c
@@ -154,7 +154,7 @@ _XlcDefaultMapModifiers(
 #ifdef WIN32
 	{
 	    char *s;
-	    for (s = mods; s = strchr(s, '@'); s++) {
+	    for (s = mods; (s = strchr(s, '@')); s++) {
 		for (s++; *s && *s != '='; s++) {
 		    if (*s == '#') {
 			*s = '=';