diff --git a/src/tests/kits/interface/bshelf/Jamfile b/src/tests/kits/interface/bshelf/Jamfile
index cdf18d668d..3768d03a77 100644
--- a/src/tests/kits/interface/bshelf/Jamfile
+++ b/src/tests/kits/interface/bshelf/Jamfile
@@ -12,7 +12,6 @@ if $(TARGET_PLATFORM) != haiku {
 
 SimpleTest ShelfTest :
         ShelfTest.cpp
-        Shelf.cpp
         : be
         ;
 
diff --git a/src/tests/kits/interface/bshelf/ShelfTest.cpp b/src/tests/kits/interface/bshelf/ShelfTest.cpp
index 26d9e48152..d1092da061 100644
--- a/src/tests/kits/interface/bshelf/ShelfTest.cpp
+++ b/src/tests/kits/interface/bshelf/ShelfTest.cpp
@@ -24,7 +24,7 @@
 #include <Entry.h>
 #include <FindDirectory.h>
 #include <Shelf.h>
-#include <byteorder.h>
+#include <ByteOrder.h>
 
 #define MAGIC_1	'pjpp'
 #define MAGIC_2	'jahh'
@@ -162,7 +162,7 @@ void TWindow::Quit()
 {
 	delete fShelf;	// by deleting the Shelf we'll save the state
 	fShelf = NULL;
-	inherited::Quit();
+	BWindow::Quit();
 }
 
 /*------------------------------------------------------------*/