diff --git a/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp b/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
index 7d6d729e46..5917fc53d3 100644
--- a/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
@@ -1315,7 +1315,7 @@ BPlusTree::RemoveDuplicate(Transaction &transaction, bplustree_node *node, Cache
 	// Remove value from a duplicate node!
 	//
 
-	duplicate_array *array;
+	duplicate_array *array = NULL;
 
 	if (duplicate->LeftLink() != BPLUSTREE_NULL) {
 		FATAL(("invalid duplicate node: first left link points to %Ld!\n", duplicate->LeftLink()));
diff --git a/src/add-ons/kernel/file_systems/bfs/BPlusTree.h b/src/add-ons/kernel/file_systems/bfs/BPlusTree.h
index 8306d52568..6720291b63 100644
--- a/src/add-ons/kernel/file_systems/bfs/BPlusTree.h
+++ b/src/add-ons/kernel/file_systems/bfs/BPlusTree.h
@@ -248,8 +248,8 @@ class BPlusTree {
 		void		RemoveIterator(TreeIterator *iterator);
 
 	private:
-		friend TreeIterator;
-		friend CachedNode;
+		friend class TreeIterator;
+		friend class CachedNode;
 
 		Inode		*fStream;
 		bplustree_header *fHeader;
@@ -298,8 +298,8 @@ class TreeIterator {
 		bool		fIsFragment;
 
 	private:
-		friend Chain<TreeIterator>;
-		friend BPlusTree;
+		friend class Chain<TreeIterator>;
+		friend class BPlusTree;
 
 		void Update(off_t offset, off_t nextOffset, uint16 keyIndex, uint16 splitAt, int8 change);
 		void Stop();
diff --git a/src/add-ons/kernel/file_systems/bfs/Inode.h b/src/add-ons/kernel/file_systems/bfs/Inode.h
index 8240c7ed73..c66d4d8171 100644
--- a/src/add-ons/kernel/file_systems/bfs/Inode.h
+++ b/src/add-ons/kernel/file_systems/bfs/Inode.h
@@ -291,8 +291,8 @@ class AttributeIterator {
 		void		*fBuffer;
 
 	private:
-		friend Chain<AttributeIterator>;
-		friend Inode;
+		friend class Chain<AttributeIterator>;
+		friend class Inode;
 
 		void Update(uint16 index, int8 change);
 		AttributeIterator *fNext;
diff --git a/src/add-ons/kernel/file_systems/bfs/Journal.h b/src/add-ons/kernel/file_systems/bfs/Journal.h
index 9c83fe441b..ace785d68d 100644
--- a/src/add-ons/kernel/file_systems/bfs/Journal.h
+++ b/src/add-ons/kernel/file_systems/bfs/Journal.h
@@ -66,7 +66,7 @@ class Journal {
 		inline uint32 FreeLogBlocks() const;
 
 	private:
-		friend log_entry;
+		friend struct log_entry;
 
 		static void blockNotify(int32 transactionID, void *arg);
 		status_t TransactionDone(bool success);
diff --git a/src/add-ons/kernel/file_systems/bfs/Query.h b/src/add-ons/kernel/file_systems/bfs/Query.h
index 3c156f9165..a8d05126c0 100644
--- a/src/add-ons/kernel/file_systems/bfs/Query.h
+++ b/src/add-ons/kernel/file_systems/bfs/Query.h
@@ -72,7 +72,8 @@ class Query {
 		int32			fToken;
 
 	private:
-		friend Chain<Query>;
+		friend class Chain<Query>;
+
 		Query			*fNext;
 };