diff --git a/headers/os/package/BlockBufferCacheNoLock.h b/headers/os/package/BlockBufferCacheNoLock.h
new file mode 100644
index 0000000000..5bc766da29
--- /dev/null
+++ b/headers/os/package/BlockBufferCacheNoLock.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2009,2011, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _PACKAGE__BLOCK_BUFFER_CACHE_NO_LOCK_H
+#define _PACKAGE__BLOCK_BUFFER_CACHE_NO_LOCK_H
+
+
+#include <package/hpkg/BlockBufferCache.h>
+
+
+namespace BPackageKit {
+
+
+class BBlockBufferCacheNoLock : public BHPKG::BBlockBufferCache {
+public:
+								BBlockBufferCacheNoLock(size_t blockSize,
+									uint32 maxCachedBlocks);
+	virtual						~BBlockBufferCacheNoLock();
+
+	virtual	bool				Lock();
+	virtual	void				Unlock();
+};
+
+
+}	// namespace BPackageKit
+
+
+#endif	// _PACKAGE__BLOCK_BUFFER_CACHE_NO_LOCK_H
diff --git a/src/bin/package/BlockBufferCacheNoLock.h b/src/bin/package/BlockBufferCacheNoLock.h
deleted file mode 100644
index 74a37c6d53..0000000000
--- a/src/bin/package/BlockBufferCacheNoLock.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
- * Copyright 2011, Oliver Tappe <zooey@hirschkaefer.de>
- * Distributed under the terms of the MIT License.
- */
-#ifndef BLOCK_BUFFER_CACHE_NO_LOCK_H
-#define BLOCK_BUFFER_CACHE_NO_LOCK_H
-
-
-#include <package/hpkg/BlockBufferCache.h>
-
-
-using BPackageKit::BHPKG::BBlockBufferCache;
-
-
-class BlockBufferCacheNoLock : public BBlockBufferCache {
-public:
-								BlockBufferCacheNoLock(size_t blockSize,
-									uint32 maxCachedBlocks);
-	virtual						~BlockBufferCacheNoLock();
-
-	virtual	bool				Lock();
-	virtual	void				Unlock();
-};
-
-
-#endif	// BLOCK_BUFFER_CACHE_NO_LOCK_H
diff --git a/src/bin/package/Jamfile b/src/bin/package/Jamfile
index dd787c71d6..70c4ae3568 100644
--- a/src/bin/package/Jamfile
+++ b/src/bin/package/Jamfile
@@ -6,7 +6,6 @@ DEFINES += B_ENABLE_INCOMPLETE_POSIX_AT_SUPPORT ;
 	# TODO: Remove when it is complete!
 
 BinCommand package :
-	BlockBufferCacheNoLock.cpp
 	command_create.cpp
 	command_dump.cpp
 	command_extract.cpp
diff --git a/src/bin/package/command_extract.cpp b/src/bin/package/command_extract.cpp
index d3b3a86a45..28c30b69da 100644
--- a/src/bin/package/command_extract.cpp
+++ b/src/bin/package/command_extract.cpp
@@ -26,13 +26,14 @@
 #include <package/hpkg/PackageEntry.h>
 #include <package/hpkg/PackageEntryAttribute.h>
 #include <package/hpkg/PackageReader.h>
+#include <package/BlockBufferCacheNoLock.h>
 
-#include "BlockBufferCacheNoLock.h"
 #include "package.h"
 #include "StandardErrorOutput.h"
 
 
 using namespace BPackageKit::BHPKG;
+using BPackageKit::BBlockBufferCacheNoLock;
 
 
 struct PackageContentExtractHandler : BPackageContentHandler {
@@ -296,7 +297,7 @@ private:
 	}
 
 private:
-	BlockBufferCacheNoLock	fBufferCache;
+	BBlockBufferCacheNoLock	fBufferCache;
 	BFDDataReader			fPackageFileReader;
 	void*					fDataBuffer;
 	size_t					fDataBufferSize;
diff --git a/src/bin/package_repo/Jamfile b/src/bin/package_repo/Jamfile
index 4c4999a4b8..4563254d22 100644
--- a/src/bin/package_repo/Jamfile
+++ b/src/bin/package_repo/Jamfile
@@ -8,7 +8,6 @@ DEFINES += B_ENABLE_INCOMPLETE_POSIX_AT_SUPPORT ;
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src bin package ] ;
 
 BinCommand package_repo :
-	BlockBufferCacheNoLock.cpp
 	command_create.cpp
 	command_list.cpp
 	package_repo.cpp
diff --git a/src/bin/package/BlockBufferCacheNoLock.cpp b/src/kits/package/BlockBufferCacheNoLock.cpp
similarity index 51%
rename from src/bin/package/BlockBufferCacheNoLock.cpp
rename to src/kits/package/BlockBufferCacheNoLock.cpp
index 4c2d171f51..261703e0f8 100644
--- a/src/bin/package/BlockBufferCacheNoLock.cpp
+++ b/src/kits/package/BlockBufferCacheNoLock.cpp
@@ -5,10 +5,13 @@
  */
 
 
-#include "BlockBufferCacheNoLock.h"
+#include <package/BlockBufferCacheNoLock.h>
 
 
-BlockBufferCacheNoLock::BlockBufferCacheNoLock(size_t blockSize,
+namespace BPackageKit {
+
+
+BBlockBufferCacheNoLock::BBlockBufferCacheNoLock(size_t blockSize,
 	uint32 maxCachedBlocks)
 	:
 	BBlockBufferCache(blockSize, maxCachedBlocks)
@@ -16,19 +19,22 @@ BlockBufferCacheNoLock::BlockBufferCacheNoLock(size_t blockSize,
 }
 
 
-BlockBufferCacheNoLock::~BlockBufferCacheNoLock()
+BBlockBufferCacheNoLock::~BBlockBufferCacheNoLock()
 {
 }
 
 
 bool
-BlockBufferCacheNoLock::Lock()
+BBlockBufferCacheNoLock::Lock()
 {
 	return true;
 }
 
 
 void
-BlockBufferCacheNoLock::Unlock()
+BBlockBufferCacheNoLock::Unlock()
 {
 }
+
+
+}	// namespace BPackageKit
diff --git a/src/kits/package/Jamfile b/src/kits/package/Jamfile
index 98d95692a1..dac8c07bff 100644
--- a/src/kits/package/Jamfile
+++ b/src/kits/package/Jamfile
@@ -43,6 +43,7 @@ SharedLibrary libpackage.so
 	ActivateRepositoryConfigJob.cpp
 	AddRepositoryRequest.cpp
 	Attributes.cpp
+	BlockBufferCacheNoLock.cpp
 	ChecksumAccessors.cpp
 	Context.cpp
 	DropRepositoryRequest.cpp