diff --git a/include/ac/socket.h b/include/ac/socket.h
index 38990136cf..96ebabe063 100644
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -63,7 +63,7 @@
 #ifdef HAVE_WINSOCK2
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#elif HAVE_WINSOCK
+#elif defined(HAVE_WINSOCK)
 #include <winsock.h>
 #endif
 
@@ -111,22 +111,20 @@
 
 LBER_F( char * ) ber_pvt_wsa_err2string LDAP_P((int));
 
-#elif MACOS
+#elif defined(MACOS)
 #	define tcp_close( s )		tcpclose( s )
 #	define tcp_read( s, buf, len )	tcpread( s, buf, len )
 #	define tcp_write( s, buf, len )	tcpwrite( s, buf, len )
 
-#elif DOS
-#	ifdef PCNFS
-#		define tcp_close( s )	close( s )
-#		define tcp_read( s, buf, len )	recv( s, buf, len, 0 )
-#		define tcp_write( s, buf, len )	send( s, buf, len, 0 )
-#	endif /* PCNFS */
-#	ifdef NCSA
-#		define tcp_close( s )	do { netclose( s ); netshut() } while(0)
-#		define tcp_read( s, buf, len )	nread( s, buf, len )
-#		define tcp_write( s, buf, len )	netwrite( s, buf, len )
-#	endif /* NCSA */
+#elif defined(HAVE_PCNFS)
+#	define tcp_close( s )	close( s )
+#	define tcp_read( s, buf, len )	recv( s, buf, len, 0 )
+#	define tcp_write( s, buf, len )	send( s, buf, len, 0 )
+
+#elif defined(HAVE_NCSA)
+#	define tcp_close( s )	do { netclose( s ); netshut() } while(0)
+#	define tcp_read( s, buf, len )	nread( s, buf, len )
+#	define tcp_write( s, buf, len )	netwrite( s, buf, len )
 
 #elif defined(HAVE_CLOSESOCKET)
 #	define tcp_close( s )		closesocket( s )
diff --git a/libraries/liblunicode/ucdata/ucgendat.c b/libraries/liblunicode/ucdata/ucgendat.c
index 6187756d86..305aed04e4 100644
--- a/libraries/liblunicode/ucdata/ucgendat.c
+++ b/libraries/liblunicode/ucdata/ucgendat.c
@@ -1655,7 +1655,7 @@ write_cdata(char *opath)
     }
 #endif
 
-#ifdef HARDCODE_DATA
+#if HARDCODE_DATA
     fprintf(out, PREF "ac_uint4 _uckdcmp_size = %ld;\n\n",
         kdecomps_used * 2L);
 
@@ -1753,7 +1753,7 @@ write_cdata(char *opath)
      * Generate the combining class data.
      *
      *****************************************************************/
-#ifdef HARDCODE_DATA
+#if HARDCODE_DATA
     fprintf(out, PREF "ac_uint4 _uccmcl_size = %ld;\n\n", (long) ccl_used);
 
     fprintf(out, PREF "ac_uint4 _uccmcl_nodes[] = {");