diff --git a/src/add-ons/kernel/file_systems/Jamfile b/src/add-ons/kernel/file_systems/Jamfile
index 8f65f53549..af9cebba75 100644
--- a/src/add-ons/kernel/file_systems/Jamfile
+++ b/src/add-ons/kernel/file_systems/Jamfile
@@ -5,6 +5,7 @@ SubInclude HAIKU_TOP src add-ons kernel file_systems bfs ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems googlefs ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems iso9660 ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems nfs ;
+SubInclude HAIKU_TOP src add-ons kernel file_systems ramfs ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems udf ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems userlandfs ;
 
diff --git a/src/add-ons/kernel/file_systems/ramfs/Block.h b/src/add-ons/kernel/file_systems/ramfs/Block.h
index 4dbea0c219..091c994e40 100644
--- a/src/add-ons/kernel/file_systems/ramfs/Block.h
+++ b/src/add-ons/kernel/file_systems/ramfs/Block.h
@@ -55,7 +55,7 @@ private:
 		SIZE_MASK		= 0x7fffffff,
 	};
 
-private:
+protected:
 	BlockHeader();
 	~BlockHeader();
 
@@ -73,7 +73,7 @@ public:
 								  bool hasNext,
 								  BlockReference *reference = NULL);
 
-private:
+protected:
 	Block();
 	~Block();
 };
@@ -94,7 +94,7 @@ public:
 //		Block *previous, size_t size, bool hasNext, TFreeBlock *previousFree,
 //		TFreeBlock *nextFree);
 
-private:
+protected:
 	TFreeBlock();
 	~TFreeBlock();
 
diff --git a/src/add-ons/kernel/file_systems/ramfs/Index.cpp b/src/add-ons/kernel/file_systems/ramfs/Index.cpp
index 416670b818..81bdd2234d 100644
--- a/src/add-ons/kernel/file_systems/ramfs/Index.cpp
+++ b/src/add-ons/kernel/file_systems/ramfs/Index.cpp
@@ -71,12 +71,14 @@ Index::Find(const uint8 *key, size_t length, IndexEntryIterator *iterator)
 void
 Index::Dump()
 {
-	PRINT(("Index: `%s', type: %lx\n", GetName(), GetType()));
-	for (IndexEntryIterator it(this); it.GetCurrent(); it.GetNext()) {
-		Entry *entry = it.GetCurrent();
-		PRINT(("  entry: `%s', dir: %Ld\n", entry->GetName(),
-											entry->GetParent()->GetID()));
-	}
+	D(
+		PRINT(("Index: `%s', type: %lx\n", GetName(), GetType()));
+		for (IndexEntryIterator it(this); it.GetCurrent(); it.GetNext()) {
+			Entry *entry = it.GetCurrent();
+			PRINT(("  entry: `%s', dir: %Ld\n", entry->GetName(),
+												entry->GetParent()->GetID()));
+		}
+	)
 }
 
 
diff --git a/src/add-ons/kernel/file_systems/ramfs/Jamfile b/src/add-ons/kernel/file_systems/ramfs/Jamfile
index 0edcad998d..4357dc1926 100644
--- a/src/add-ons/kernel/file_systems/ramfs/Jamfile
+++ b/src/add-ons/kernel/file_systems/ramfs/Jamfile
@@ -1,30 +1,14 @@
-SubDir HAIKU_TOP src tests add-ons kernel file_systems userlandfs r5 src test
-	ramfs ;
+SubDir HAIKU_TOP src add-ons kernel file_systems ramfs ;
 
-SetSubDirSupportedPlatforms r5 bone dano ;
+local userlandFSTop = [ FDirName $(HAIKU_TOP) src add-ons kernel
+	file_systems userlandfs ] ;
+local userlandFSIncludes = [ PrivateHeaders userlandfs ] ;
 
-local userlandFSTop = [ FDirName $(HAIKU_TOP) src tests add-ons kernel
-	file_systems userlandfs r5 ] ;
-local userlandFSIncludes = [ FDirName $(userlandFSTop) headers ] ;
-
-DEFINES += USER=1 ;
-
-SubDirC++Flags -include
-	[ FDirName $(userlandFSIncludes) shared Compatibility.h ] ;
-
-SubDirSysHdrs [ FDirName $(userlandFSIncludes) public ] ;
 SubDirHdrs [ FDirName $(userlandFSIncludes) shared ] ;
 
-if $(OSPLAT) = X86 {
-#	SubDirC++Flags -include [ FDirName $(UFS_TOP) src kernel_add_on
-#		kernel-cpp.h ] ;
-	SubDirC++Flags -include [ FDirName $(SUBDIR) cpp.h ] ;
-}
+SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ;
 
-SEARCH_SOURCE += [ FDirName $(userlandFSTop) src shared ] ;
-
-Addon <test>ramfs
-	: # relpath - obsolete
+KernelAddon ramfs
 	: Debug.cpp
 	  Locker.cpp
 	  String.cpp
@@ -57,6 +41,6 @@ Addon <test>ramfs
 	  SizeIndex.cpp
 	  SymLink.cpp
 	  Volume.cpp
-	: false		# is executable
-	: <test>UserlandFSServer
+
+	: $(TARGET_GCC_LIBGCC) $(HAIKU_LIBSUPC++)
 ;