diff --git a/src/tests/add-ons/kernel/file_systems/fs_shell/cache.c b/src/tests/add-ons/kernel/file_systems/fs_shell/cache.c
index fe76cd2865..9e3a2df1d9 100644
--- a/src/tests/add-ons/kernel/file_systems/fs_shell/cache.c
+++ b/src/tests/add-ons/kernel/file_systems/fs_shell/cache.c
@@ -36,6 +36,8 @@
    dbg@be.com
 */   
 
+#include "compat.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <memory.h>
@@ -51,7 +53,6 @@
 #include <KernelExport.h>
 #endif
 
-#include "compat.h"
 #include "lock.h"
 #include "cache.h"
 
diff --git a/src/tests/add-ons/kernel/file_systems/fs_shell/compat.h b/src/tests/add-ons/kernel/file_systems/fs_shell/compat.h
index 5567b21bcc..55b5b223e9 100644
--- a/src/tests/add-ons/kernel/file_systems/fs_shell/compat.h
+++ b/src/tests/add-ons/kernel/file_systems/fs_shell/compat.h
@@ -35,27 +35,30 @@
 typedef struct dirent dirent_t;
 typedef struct iovec iovec;
 
+#else
+#	define _BE_ERRNO_H_
+		// in this case, we want to use our Errors.h, not both :)
+		// (this is defined by Dano/Zeta's be_errors.h header)
 #endif
 
-
 #include <dirent.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <time.h>
 
 #ifdef __BEOS__
-#include <OS.h>              /* for typedefs and prototypes */
-#include <image.h>           /* for a few typedefs */
-#include <Drivers.h>         /* for various ioctl structs, etc */
-#include <iovec.h>           /* because we're boneheads sometimes */
+#	include <OS.h>				/* for typedefs and prototypes */
+#	include <image.h>			/* for a few typedefs */
+#	include <Drivers.h>			/* for various ioctl structs, etc */
+#	include <iovec.h>			/* because we're boneheads sometimes */
 #else
-#include <sys/uio.h>
-#include <image.h>           /* for a few typedefs */
-#include <Drivers.h>         /* for various ioctl structs, etc */
+#	include <sys/uio.h>
+#	include <image.h>			/* for a few typedefs */
+#	include <Drivers.h>			/* for various ioctl structs, etc */
 #endif
 
 #include <fs_attr.h>