diff --git a/src/bin/bfs_tools/Jamfile b/src/bin/bfs_tools/Jamfile
index b286992667..84e3469a42 100644
--- a/src/bin/bfs_tools/Jamfile
+++ b/src/bin/bfs_tools/Jamfile
@@ -12,7 +12,7 @@ StdBinCommands
 	bfswhich.cpp
 	recover.cpp
 
-	: libbfs_tools.a be : $(haiku-utils_rsrc
+	: libbfs_tools.a be $(TARGET_LIBSTDC++) : $(haiku-utils_rsrc)
 ;
 
 SubInclude HAIKU_TOP src bin bfs_tools lib ;
diff --git a/src/bin/bfs_tools/lib/BPlusTree.h b/src/bin/bfs_tools/lib/BPlusTree.h
index 917d710efc..5a53683f42 100644
--- a/src/bin/bfs_tools/lib/BPlusTree.h
+++ b/src/bin/bfs_tools/lib/BPlusTree.h
@@ -7,6 +7,8 @@
 
 #include <List.h>
 
+#include <string.h>
+
 #include "Cache.h"
 #include "bfs.h"
 
@@ -158,7 +160,7 @@ class BPlusTree {
 		bool		CheckNode(bplustree_node *node);
 
 	private:
-		friend NodeCache;
+		friend class NodeCache;
 		bplustree_node *Node(off_t nodeoffset,bool check = true);
 
 	private:
diff --git a/src/bin/bfs_tools/lib/Cache.h b/src/bin/bfs_tools/lib/Cache.h
index 98c2b0e04c..c4295b953d 100644
--- a/src/bin/bfs_tools/lib/Cache.h
+++ b/src/bin/bfs_tools/lib/Cache.h
@@ -8,6 +8,8 @@
 
 #include <SupportDefs.h>
 
+#include <stdio.h>
+
 
 template<class T> class Cache
 {
diff --git a/src/bin/bfs_tools/lib/Disk.cpp b/src/bin/bfs_tools/lib/Disk.cpp
index d03d83ddac..1e2af9db30 100644
--- a/src/bin/bfs_tools/lib/Disk.cpp
+++ b/src/bin/bfs_tools/lib/Disk.cpp
@@ -235,7 +235,7 @@ Disk::DumpBootBlockToFile()
 
 
 status_t 
-Disk::ScanForSuperBlock(off_t start = 0, off_t stop = -1)
+Disk::ScanForSuperBlock(off_t start, off_t stop)
 {
 	printf("Disk size %Ld bytes, %.2f GB\n", fSize, 1.0 * fSize / (1024*1024*1024));
 
diff --git a/src/bin/bfs_tools/lib/Disk.h b/src/bin/bfs_tools/lib/Disk.h
index 774d44fbfe..d1e89979c1 100644
--- a/src/bin/bfs_tools/lib/Disk.h
+++ b/src/bin/bfs_tools/lib/Disk.h
@@ -9,6 +9,8 @@
 #include <File.h>
 #include <Path.h>
 
+#include <string.h>
+
 #include "Bitmap.h"
 #include "bfs.h"
 #include "Cache.h"
diff --git a/src/bin/bfs_tools/lib/Hashtable.cpp b/src/bin/bfs_tools/lib/Hashtable.cpp
index 1cdab31f85..0a0e2ba1ef 100644
--- a/src/bin/bfs_tools/lib/Hashtable.cpp
+++ b/src/bin/bfs_tools/lib/Hashtable.cpp
@@ -192,7 +192,7 @@ void Hashtable::Rewind()
 
 
 void
-Hashtable::MakeEmpty(int8 keyMode = HASH_EMPTY_NONE,int8 valueMode = HASH_EMPTY_NONE)
+Hashtable::MakeEmpty(int8 keyMode,int8 valueMode)
 {
 	fModCount++;