diff --git a/src/tests/add-ons/kernel/file_systems/consistency_check/SHA256.h b/headers/private/shared/SHA256.h
similarity index 100%
rename from src/tests/add-ons/kernel/file_systems/consistency_check/SHA256.h
rename to headers/private/shared/SHA256.h
diff --git a/src/kits/shared/Jamfile b/src/kits/shared/Jamfile
index ec2c70dda6..fa8ead14e9 100644
--- a/src/kits/shared/Jamfile
+++ b/src/kits/shared/Jamfile
@@ -20,6 +20,7 @@ StaticLibrary libshared.a :
 	HashString.cpp
 	Keymap.cpp
 	RWLockManager.cpp
+	SHA256.cpp
 	ShakeTrackingFilter.cpp
 	StringForSize.cpp
 	Variant.cpp
diff --git a/src/tests/add-ons/kernel/file_systems/consistency_check/SHA256.cpp b/src/kits/shared/SHA256.cpp
similarity index 100%
rename from src/tests/add-ons/kernel/file_systems/consistency_check/SHA256.cpp
rename to src/kits/shared/SHA256.cpp
diff --git a/src/tests/add-ons/kernel/file_systems/consistency_check/Jamfile b/src/tests/add-ons/kernel/file_systems/consistency_check/Jamfile
index 873ae66e8c..c68d8bc8f4 100644
--- a/src/tests/add-ons/kernel/file_systems/consistency_check/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/consistency_check/Jamfile
@@ -1,15 +1,15 @@
 SubDir HAIKU_TOP src tests add-ons kernel file_systems consistency_check ;
 
+UsePrivateHeaders shared ;
+
 SimpleTest generate_hashs :
 	generate_hashs.cpp
 	AdaptiveBuffering.cpp
-	SHA256.cpp
-	: be $(TARGET_LIBSTDC++)
+	: be $(TARGET_LIBSTDC++) libshared.a
 ;
 
 SimpleTest consistency_check :
 	consistency_check.cpp
 	AdaptiveBuffering.cpp
-	SHA256.cpp
-	: be $(TARGET_LIBSTDC++)
+	: be $(TARGET_LIBSTDC++) libshared.a
 ;
diff --git a/src/tests/add-ons/kernel/file_systems/consistency_check/consistency_check.cpp b/src/tests/add-ons/kernel/file_systems/consistency_check/consistency_check.cpp
index 0dc1c0c228..0a4f2c09f1 100644
--- a/src/tests/add-ons/kernel/file_systems/consistency_check/consistency_check.cpp
+++ b/src/tests/add-ons/kernel/file_systems/consistency_check/consistency_check.cpp
@@ -18,8 +18,9 @@
 #include <OS.h>
 #include <Path.h>
 
+#include <SHA256.h>
+
 #include "AdaptiveBuffering.h"
-#include "SHA256.h"
 
 
 //#define TRACE(x...) printf(x)
@@ -211,7 +212,7 @@ main(int argc, char** argv)
 		file_entry entry;
 		read(file, entry.hash, SHA_DIGEST_LENGTH);
 		read(file, &entry.node, sizeof(ino_t));
-		
+
 		int length;
 		read(file, &length, sizeof(int));
 		read(file, buffer, length + 1);
diff --git a/src/tests/add-ons/kernel/file_systems/consistency_check/generate_hashs.cpp b/src/tests/add-ons/kernel/file_systems/consistency_check/generate_hashs.cpp
index 359b91614f..4ab7d77af4 100644
--- a/src/tests/add-ons/kernel/file_systems/consistency_check/generate_hashs.cpp
+++ b/src/tests/add-ons/kernel/file_systems/consistency_check/generate_hashs.cpp
@@ -18,8 +18,9 @@
 #include <OS.h>
 #include <Path.h>
 
+#include <SHA256.h>
+
 #include "AdaptiveBuffering.h"
-#include "SHA256.h"
 
 
 //#define TRACE(x...) printf(x)