diff --git a/src/Makefile b/src/Makefile
index 4de263cec9..799e35058b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -257,10 +257,9 @@ AFLAGS	=
 
 # Use LINUXBIOSINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
-# how to set the fucking LBARCH in time? arg.
 LINUXBIOSINCLUDE    := -Iinclude \
                    -I$(srctree)/include \
-			-I$(srctree)/include/cpu/generic/$(LBARCH)/  \
+			-I$(srctree)/include/cpu/generic/$(ARCH)/  \
 			-I$(srctree)/include/cpu/generic/x86/  \
 		   -include include/linuxbios/autoconf.h
 
diff --git a/src/include/cpu/generic/i386/arch/byteorder.h b/src/include/cpu/generic/i386/arch/byteorder.h
index aec4861e24..02990ceb27 100644
--- a/src/include/cpu/generic/i386/arch/byteorder.h
+++ b/src/include/cpu/generic/i386/arch/byteorder.h
@@ -19,7 +19,7 @@
 
 #define __LITTLE_ENDIAN 1234
 
-#include <swab.h>
+#include <arch/swab.h>
 
 #define cpu_to_le32(x) ((unsigned int)(x))
 #define le32_to_cpu(x) ((unsigned int)(x))