diff --git a/file.c b/file.c
index a8aecf5..1706c6a 100644
--- a/file.c
+++ b/file.c
@@ -2156,11 +2156,11 @@
 
 #endif /* HAVE_SYS_ASYNCH_H */
 
-#ifdef XATTR_CREATE
-
 struct xlat xattrflags[] = {
+#ifdef XATTR_CREATE
 	{ XATTR_CREATE,	 "XATTR_CREATE" },
 	{ XATTR_REPLACE, "XATTR_REPLACE" },
+#endif
 	{ 0,		 NULL }
 };
 
@@ -2270,5 +2270,3 @@
     }
     return 0;
 }
-
-#endif
diff --git a/sock.c b/sock.c
index 6d494b7..aa0bf88 100644
--- a/sock.c
+++ b/sock.c
@@ -29,7 +29,7 @@
 
 #include "defs.h"
 
-#ifdef linux
+#ifdef LINUX
 #include <sys/socket.h>
 #else
 #include <sys/sockio.h>
diff --git a/stream.c b/stream.c
index 135735a..3dac282 100644
--- a/stream.c
+++ b/stream.c
@@ -50,7 +50,7 @@
 #include <sys/tihdr.h>
 #endif
 
-#if defined(HAVE_SYS_STREAM_H) || defined(linux) || defined(FREEBSD)
+#if defined(HAVE_SYS_STREAM_H) || defined(LINUX) || defined(FREEBSD)
 
 #ifndef HAVE_STROPTS_H
 #define RS_HIPRI 1
@@ -367,7 +367,7 @@
 }
 #endif
 
-#if !defined(linux) && !defined(FREEBSD)
+#if !defined(LINUX) && !defined(FREEBSD)
 
 static struct xlat stream_flush_options[] = {
 	{ FLUSHR,	"FLUSHR"	},
@@ -1296,6 +1296,6 @@
 	}
 }
 
-#endif /* !linux && !FREEBSD */
+#endif /* !LINUX && !FREEBSD */
 
-#endif /* HAVE_SYS_STREAM_H || linux || FREEBSD */
+#endif /* HAVE_SYS_STREAM_H || LINUX || FREEBSD */