diff --git a/payloads/libpayload/crypto/sha1.c b/payloads/libpayload/crypto/sha1.c
index 1c68a8019c..292561913d 100644
--- a/payloads/libpayload/crypto/sha1.c
+++ b/payloads/libpayload/crypto/sha1.c
@@ -20,6 +20,7 @@
  *   34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
  */
 
+#include <config.h>
 #include <libpayload.h>
 
 typedef u8 u_int8_t;
@@ -27,6 +28,14 @@ typedef u32 u_int32_t;
 typedef u64 u_int64_t;
 typedef unsigned int u_int;
 
+/* Moved from libpayload.h */
+
+#ifdef CONFIG_TARGET_I386
+#define BYTE_ORDER      LITTLE_ENDIAN
+#else
+#define BYTE_ORDER      BIG_ENDIAN
+#endif
+
 #if 0
 #include <sys/param.h>
 #include <string.h>
diff --git a/payloads/libpayload/curses/local.h b/payloads/libpayload/curses/local.h
index 001edab4ef..fff26cbc0c 100644
--- a/payloads/libpayload/curses/local.h
+++ b/payloads/libpayload/curses/local.h
@@ -58,6 +58,7 @@
 
 #undef USE_TERMLIB
 
+#include <config.h>
 #include <libpayload.h>
 #include <curses.h>
 #include <curses.priv.h>
diff --git a/payloads/libpayload/i386/coreboot.c b/payloads/libpayload/i386/coreboot.c
index 97589261a5..af76f182fc 100644
--- a/payloads/libpayload/i386/coreboot.c
+++ b/payloads/libpayload/i386/coreboot.c
@@ -27,6 +27,7 @@
  * SUCH DAMAGE.
  */
 
+#include <config.h>
 #include <libpayload.h>
 #include <coreboot_tables.h>
 
diff --git a/payloads/libpayload/i386/sysinfo.c b/payloads/libpayload/i386/sysinfo.c
index 686b28ffc6..a845a2817b 100644
--- a/payloads/libpayload/i386/sysinfo.c
+++ b/payloads/libpayload/i386/sysinfo.c
@@ -27,6 +27,7 @@
  * SUCH DAMAGE.
  */
 
+#include <config.h>
 #include <libpayload.h>
 
 /**
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index ff69eaad2f..9e95291bc4 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -44,11 +44,6 @@
 
 #define LITTLE_ENDIAN	1234
 #define BIG_ENDIAN	4321
-#ifdef CONFIG_TARGET_I386
-#define BYTE_ORDER	LITTLE_ENDIAN
-#else
-#define BYTE_ORDER	BIG_ENDIAN
-#endif
 
 #define EXIT_SUCCESS 0
 #define EXIT_FAILURE 1