diff --git a/src/apps/debugger/Jamfile b/src/apps/debugger/Jamfile
index 5c22dd5c57..fed559962a 100644
--- a/src/apps/debugger/Jamfile
+++ b/src/apps/debugger/Jamfile
@@ -2,10 +2,7 @@ SubDir HAIKU_TOP src apps debugger ;
 
 UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
 
-UsePrivateHeaders app interface kernel shared system ;
-UsePrivateSystemHeaders ;
-
-UsePrivateHeaders debugger ;
+UsePrivateHeaders debugger ; 
 UsePrivateHeaders [ FDirName debugger arch ] ;
 UsePrivateHeaders [ FDirName debugger controllers ] ;
 UsePrivateHeaders [ FDirName debugger debug_info ] ;
@@ -28,6 +25,9 @@ UsePrivateHeaders [ FDirName debugger value value_formatters ] ;
 UsePrivateHeaders [ FDirName debugger value value_nodes ] ;
 UsePrivateHeaders [ FDirName debugger value values ] ;
 
+UsePrivateHeaders app interface kernel shared system ;
+UsePrivateSystemHeaders ;
+
 UseBuildFeatureHeaders libedit ;
 
 LINKFLAGS += -Wl,--exclude-libs,ALL ;
diff --git a/src/kits/debugger/Jamfile b/src/kits/debugger/Jamfile
index b5bd7045eb..45146e1471 100644
--- a/src/kits/debugger/Jamfile
+++ b/src/kits/debugger/Jamfile
@@ -6,9 +6,6 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
 UseHeaders [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH))
 	system kernel ] ;
 
-UsePrivateHeaders app debug interface kernel package shared libroot ;
-UsePrivateSystemHeaders ;
-
 UsePrivateHeaders debugger ;
 UsePrivateHeaders [ FDirName debugger arch ] ;
 UsePrivateHeaders [ FDirName debugger controllers ] ;
@@ -32,6 +29,9 @@ UsePrivateHeaders [ FDirName debugger value value_formatters ] ;
 UsePrivateHeaders [ FDirName debugger value value_nodes ] ;
 UsePrivateHeaders [ FDirName debugger value values ] ;
 
+UsePrivateHeaders app debug interface kernel package shared libroot ;
+UsePrivateSystemHeaders ;
+
 LINKFLAGS += -Wl,--exclude-libs,ALL ;
 
 SubDirC++Flags [ FDefines _BSD_SOURCE=1 ] ;