5 files changed, 21 insertions, 14 deletions
diff --git a/usr/src/head/endian.h b/usr/src/head/endian.h
index a5117bbacd..78ca13cec4 100644
--- a/usr/src/head/endian.h
+++ b/usr/src/head/endian.h
@@ -27,18 +27,22 @@ extern "C" {
 #include <sys/isa_defs.h>
 #include <inttypes.h>
 
-#define	LITTLE_ENDIAN	1234
-#define	BIG_ENDIAN	4321
-#define	PDP_ENDIAN	3412
+#define	__LITTLE_ENDIAN	1234
+#define	__BIG_ENDIAN	4321
+#define	__PDP_ENDIAN	3412
 
-#ifdef	_LITTLE_ENDIAN
-#define	BYTE_ORDER	LITTLE_ENDIAN
-#elif	_BIG_ENDIAN
-#define	BYTE_ORDER	BIG_ENDIAN
+#if	defined(_LITTLE_ENDIAN)
+#define	__BYTE_ORDER	LITTLE_ENDIAN
+#elif	defined(_BIG_ENDIAN)
+#define	__BYTE_ORDER	BIG_ENDIAN
 #else
 #error	"Unknown byte order"
 #endif	/* _LITTLE_ENDIAN */
 
+#define	LITTLE_ENDIAN	__LITTLE_ENDIAN
+#define	BIG_ENDIAN	__BIG_ENDIAN
+#define	BYTE_ORDER	__BYTE_ORDER
+
 extern uint16_t htobe16(uint16_t);
 extern uint32_t htobe32(uint32_t);
 extern uint64_t htobe64(uint64_t);
diff --git a/usr/src/lib/libc/i386/gen/endian.c b/usr/src/lib/libc/i386/gen/endian.c
index 580c965406..84d93290e6 100644
--- a/usr/src/lib/libc/i386/gen/endian.c
+++ b/usr/src/lib/libc/i386/gen/endian.c
@@ -13,7 +13,6 @@
  * Copyright (c) 2015, Joyent, Inc.
  */
 
-#include <sys/isa_defs.h>
 #include <endian.h>
 
 /*
diff --git a/usr/src/lib/libc/sparc/gen/endian.c b/usr/src/lib/libc/sparc/gen/endian.c
index b19974b86a..fb07640999 100644
--- a/usr/src/lib/libc/sparc/gen/endian.c
+++ b/usr/src/lib/libc/sparc/gen/endian.c
@@ -13,6 +13,8 @@
  * Copyright (c) 2015, Joyent, Inc.
  */
 
+#include <endian.h>
+
 /*
  * endian(3C) routines
  */
diff --git a/usr/src/lib/libc/sparcv9/gen/endian.c b/usr/src/lib/libc/sparcv9/gen/endian.c
index b19974b86a..fb07640999 100644
--- a/usr/src/lib/libc/sparcv9/gen/endian.c
+++ b/usr/src/lib/libc/sparcv9/gen/endian.c
@@ -13,6 +13,8 @@
  * Copyright (c) 2015, Joyent, Inc.
  */
 
+#include <endian.h>
+
 /*
  * endian(3C) routines
  */
diff --git a/usr/src/test/libc-tests/tests/endian.c b/usr/src/test/libc-tests/tests/endian.c
index 1165ad773d..dcf0bdfdb5 100644
--- a/usr/src/test/libc-tests/tests/endian.c
+++ b/usr/src/test/libc-tests/tests/endian.c
@@ -39,14 +39,14 @@ endian_fromhost(void)
 	uint32_t ebe32, ele32, test32;
 	uint64_t ebe64, ele64, test64;
 
-#ifdef	_LITTLE_ENDIAN
+#if	defined(_LITTLE_ENDIAN)
 	ebe16 = 0x2211;
 	ebe32 = 0x44332211UL;
 	ebe64 = 0x8877665544332211ULL;
 	ele16 = 0x1122;
 	ele32 = 0x11223344UL;
 	ele64 = 0x1122334455667788ULL;
-#elif	_BIG_ENDIAN
+#elif	defined(_BIG_ENDIAN)
 	ele16 = 0x2211;
 	ele32 = 0x44332211UL;
 	ele64 = 0x8877665544332211ULL;
@@ -82,11 +82,11 @@ endian_frombig(void)
 	uint32_t e32, test32;
 	uint64_t e64, test64;
 
-#ifdef	_LITTLE_ENDIAN
+#if	defined(_LITTLE_ENDIAN)
 	e16 = 0x2211;
 	e32 = 0x44332211UL;
 	e64 = 0x8877665544332211ULL;
-#elif	_BIG_ENDIAN
+#elif	defined(_BIG_ENDIAN)
 	e16 = 0x1122;
 	e32 = 0x11223344UL;
 	e64 = 0x1122334455667788ULL;
@@ -120,11 +120,11 @@ endian_fromlittle(void)
 	uint32_t e32, test32;
 	uint64_t e64, test64;
 
-#ifdef	_LITTLE_ENDIAN
+#if	defined(_LITTLE_ENDIAN)
 	e16 = 0x1122;
 	e32 = 0x11223344UL;
 	e64 = 0x1122334455667788ULL;
-#elif	_BIG_ENDIAN
+#elif	defined(_BIG_ENDIAN)
 	e16 = 0x2211;
 	e32 = 0x44332211UL;
 	e64 = 0x8877665544332211ULL;