diff --git a/src/Jamfile b/src/Jamfile
index 40f4e996e6..c7bc3105bc 100644
--- a/src/Jamfile
+++ b/src/Jamfile
@@ -10,7 +10,6 @@ SubInclude HAIKU_TOP src kits ;
 SubInclude HAIKU_TOP src libs ;
 SubInclude HAIKU_TOP src preferences ;
 SubInclude HAIKU_TOP src servers ;
-SubInclude HAIKU_TOP src shared ;
 SubInclude HAIKU_TOP src system ;
 SubInclude HAIKU_TOP src tests ;
 SubInclude HAIKU_TOP src tools ;
diff --git a/src/kits/Jamfile b/src/kits/Jamfile
index a358532f7d..3ab34bad3d 100644
--- a/src/kits/Jamfile
+++ b/src/kits/Jamfile
@@ -97,6 +97,7 @@ SubInclude HAIKU_TOP src kits midi2 ;
 SubInclude HAIKU_TOP src kits network ;
 SubInclude HAIKU_TOP src kits opengl ;
 SubInclude HAIKU_TOP src kits screensaver ;
+SubInclude HAIKU_TOP src kits shared ;
 SubInclude HAIKU_TOP src kits storage ;
 SubInclude HAIKU_TOP src kits support ;
 SubInclude HAIKU_TOP src kits textencoding ;
diff --git a/src/shared/AboutWindow.cpp b/src/kits/shared/AboutWindow.cpp
similarity index 100%
rename from src/shared/AboutWindow.cpp
rename to src/kits/shared/AboutWindow.cpp
diff --git a/src/shared/Jamfile b/src/kits/shared/Jamfile
similarity index 77%
rename from src/shared/Jamfile
rename to src/kits/shared/Jamfile
index b530e45718..aeb8b96137 100644
--- a/src/shared/Jamfile
+++ b/src/kits/shared/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src shared ;
+SubDir HAIKU_TOP src kits shared ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;