diff --git a/src/kits/tracker/Jamfile b/src/kits/tracker/Jamfile
index bcd9e6eea7..d8204a2929 100644
--- a/src/kits/tracker/Jamfile
+++ b/src/kits/tracker/Jamfile
@@ -21,6 +21,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 
 		SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons input_server
 			filters shortcut_catcher ] ;
+		SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits tracker infowindow ] ;
 
 		SharedLibrary $(libtracker) :
 			AttributeStream.cpp
diff --git a/src/kits/tracker/FilePermissionsView.cpp b/src/kits/tracker/infowindow/FilePermissionsView.cpp
similarity index 100%
rename from src/kits/tracker/FilePermissionsView.cpp
rename to src/kits/tracker/infowindow/FilePermissionsView.cpp
diff --git a/src/kits/tracker/FilePermissionsView.h b/src/kits/tracker/infowindow/FilePermissionsView.h
similarity index 100%
rename from src/kits/tracker/FilePermissionsView.h
rename to src/kits/tracker/infowindow/FilePermissionsView.h
diff --git a/src/kits/tracker/InfoWindow.cpp b/src/kits/tracker/infowindow/InfoWindow.cpp
similarity index 100%
rename from src/kits/tracker/InfoWindow.cpp
rename to src/kits/tracker/infowindow/InfoWindow.cpp
diff --git a/src/kits/tracker/InfoWindow.h b/src/kits/tracker/infowindow/InfoWindow.h
similarity index 100%
rename from src/kits/tracker/InfoWindow.h
rename to src/kits/tracker/infowindow/InfoWindow.h