diff --git a/src/apps/haikudepot/ui_generic/BarberPole.h b/headers/private/shared/BarberPole.h
similarity index 100%
rename from src/apps/haikudepot/ui_generic/BarberPole.h
rename to headers/private/shared/BarberPole.h
diff --git a/src/apps/haikudepot/Jamfile b/src/apps/haikudepot/Jamfile
index 83e075616d..21381ea649 100644
--- a/src/apps/haikudepot/Jamfile
+++ b/src/apps/haikudepot/Jamfile
@@ -113,7 +113,6 @@ local textDocumentSources =
 
 local applicationSources =
 	App.cpp
-	BarberPole.cpp
 	BitmapView.cpp
 	Captcha.cpp
 	CreateUserDetail.cpp
diff --git a/src/apps/haikudepot/ui_generic/BarberPole.cpp b/src/kits/shared/BarberPole.cpp
similarity index 98%
rename from src/apps/haikudepot/ui_generic/BarberPole.cpp
rename to src/kits/shared/BarberPole.cpp
index 2476f4af7e..9319757ca5 100644
--- a/src/apps/haikudepot/ui_generic/BarberPole.cpp
+++ b/src/kits/shared/BarberPole.cpp
@@ -15,8 +15,6 @@
 #include <pthread.h>
 #include <stdio.h>
 
-#include "Logger.h"
-
 
 // #pragma mark - MachineRoom
 
@@ -80,7 +78,6 @@ private:
 
 		BMessenger* messenger = new BMessenger(pole);
 		fMessengers.AddItem(messenger);
-		HDTRACE("did add barber-pole to machine room");
 
 		if (wasEmpty)
 			release_sem(fSpinLoopLock);
@@ -94,7 +91,6 @@ private:
 			BMessenger* messenger = fMessengers.ItemAt(i);
 			if (messenger->Target(NULL) == pole) {
 				fMessengers.RemoveItem(messenger, true);
-				HDTRACE("did remove barber-pole from machine room");
 				break;
 			}
 		}
diff --git a/src/kits/shared/Jamfile b/src/kits/shared/Jamfile
index 757610116a..8087303e7c 100644
--- a/src/kits/shared/Jamfile
+++ b/src/kits/shared/Jamfile
@@ -28,6 +28,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			AboutMenuItem.cpp
 			ArgumentVector.cpp
 			AttributeUtilities.cpp
+			BarberPole.cpp
 			BitmapButton.cpp
 			CalendarView.cpp
 			ColorItem.cpp