diff --git a/src/apps/showimage/ImageFileNavigator.cpp b/src/apps/showimage/ImageFileNavigator.cpp
index 977a7e495a..ecaadefdda 100644
--- a/src/apps/showimage/ImageFileNavigator.cpp
+++ b/src/apps/showimage/ImageFileNavigator.cpp
@@ -33,6 +33,7 @@
 
 #include "ProgressWindow.h"
 #include "ShowImageConstants.h"
+#include "Utilities.h"
 
 
 class Navigator {
@@ -344,8 +345,7 @@ FolderNavigator::_BuildEntryList()
 /*static*/ int
 FolderNavigator::_CompareRefs(const entry_ref* refA, const entry_ref* refB)
 {
-	// TODO: natural sorting? Collating via current locale?
-	return strcasecmp(refA->name, refB->name);
+	return BPrivate::NaturalCompare(refA->name, refB->name);
 }
 
 
diff --git a/src/apps/showimage/Jamfile b/src/apps/showimage/Jamfile
index 541f405f85..40f7c861eb 100644
--- a/src/apps/showimage/Jamfile
+++ b/src/apps/showimage/Jamfile
@@ -4,6 +4,7 @@ UsePrivateSystemHeaders ;
 UsePrivateHeaders tracker shared ;
 UsePublicHeaders [ FDirName be_apps Tracker ] ;
 SubDirHdrs $(HAIKU_TOP) src kits tracker ;
+UseHeaders [ FDirName $(HAIKU_TOP) src kits tracker ] : false ;
 
 Application ShowImage :
 	Filter.cpp