5 files changed, 9 insertions, 11 deletions
diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile
index 314c151bea..06f162f63a 100644
--- a/arch/sandbox/Makefile
+++ b/arch/sandbox/Makefile
@@ -73,6 +73,6 @@ cmd_uboot__ = $(CC) -o $@ -Wl,-T,$(uboot-lds) \
 	-Wl,--start-group $(uboot-common) -Wl,--end-group \
 	-lrt -lpthread
 
-common-y += arch/sandbox/lib/ board/sandbox/
+common-y += board/sandbox/ arch/sandbox/os/
 
 MRPROPER_FILES += include/asm-sandbox/arch
diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile
index 418f4d3427..436fd0d3e0 100644
--- a/arch/sandbox/lib/Makefile
+++ b/arch/sandbox/lib/Makefile
@@ -2,11 +2,3 @@ CPPFLAGS_u-boot.lds = -U$(SUBARCH) -DELF_ARCH=$(ELF_ARCH) \
 	-DELF_FORMAT="$(ELF_FORMAT)"
 
 extra-y += u-boot.lds
-
-CPPFLAGS := -I/usr/include -Iinclude -P
-CFLAGS := -Wall
-#NOSTDINC_FLAGS :=
-
-obj-y = common.o tap.o
-
-USER_OBJS := common.o
diff --git a/arch/sandbox/os/Makefile b/arch/sandbox/os/Makefile
new file mode 100644
index 0000000000..117f05eba0
--- /dev/null
+++ b/arch/sandbox/os/Makefile
@@ -0,0 +1,6 @@
+CPPFLAGS := -Iinclude/asm/arch -P
+CFLAGS := -Wall
+NOSTDINC_FLAGS :=
+
+obj-y = common.o tap.o
+
diff --git a/arch/sandbox/lib/common.c b/arch/sandbox/os/common.c
index bc90bf9351..71b0c8072b 100644
--- a/arch/sandbox/lib/common.c
+++ b/arch/sandbox/os/common.c
@@ -47,8 +47,8 @@
 /*
  * ...except the ones needed to connect with U-Boot
  */
-#include <asm/arch/linux.h>
-#include <asm/arch/hostfile.h>
+#include <linux.h>
+#include <hostfile.h>
 
 static struct termios term_orig, term_vi;
 static char erase_char;	/* the users erase character */
diff --git a/arch/sandbox/lib/tap.c b/arch/sandbox/os/tap.c
index ebd828b2b2..ebd828b2b2 100644
--- a/arch/sandbox/lib/tap.c
+++ b/arch/sandbox/os/tap.c