diff --git a/src/add-ons/kernel/bus_managers/firewire/Jamfile b/src/add-ons/kernel/bus_managers/firewire/Jamfile index a5f6b5d145..e33b186f43 100644 --- a/src/add-ons/kernel/bus_managers/firewire/Jamfile +++ b/src/add-ons/kernel/bus_managers/firewire/Jamfile @@ -1,7 +1,8 @@ SubDir HAIKU_TOP src add-ons kernel bus_managers firewire ; UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ; -UsePrivateHeaders firewire kernel ; +UsePrivateHeaders firewire ; +UsePrivateKernelHeaders ; DEFINES += _KERNEL=1 ; diff --git a/src/add-ons/kernel/drivers/audio/ac97/sis7018/Jamfile b/src/add-ons/kernel/drivers/audio/ac97/sis7018/Jamfile index 07ec2404b3..b3bf580735 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/sis7018/Jamfile +++ b/src/add-ons/kernel/drivers/audio/ac97/sis7018/Jamfile @@ -1,7 +1,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 sis7018 ; -UsePrivateHeaders kernel media ; +UsePrivateKernelHeaders ; +UsePrivateHeaders media ; UsePrivateHeaders [ FDirName kernel util ] ; diff --git a/src/add-ons/kernel/drivers/bus/firewire/Jamfile b/src/add-ons/kernel/drivers/bus/firewire/Jamfile index 67fa24ea9b..f9ed678999 100644 --- a/src/add-ons/kernel/drivers/bus/firewire/Jamfile +++ b/src/add-ons/kernel/drivers/bus/firewire/Jamfile @@ -1,7 +1,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers bus firewire ; UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ; -UsePrivateHeaders firewire kernel ; +UsePrivateHeaders firewire ; +UsePrivateKernelHeaders ; SubDirCcFlags [ FDefines _KERNEL=1 ] ; diff --git a/src/add-ons/kernel/drivers/bus/usb/Jamfile b/src/add-ons/kernel/drivers/bus/usb/Jamfile index dc57e669a2..be0d719347 100644 --- a/src/add-ons/kernel/drivers/bus/usb/Jamfile +++ b/src/add-ons/kernel/drivers/bus/usb/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers bus usb ; SetSubDirSupportedPlatformsBeOSCompatible ; SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ; -UsePrivateHeaders kernel ; +UsePrivateKernelHeaders ; if $(TARGET_PLATFORM) != haiku { UsePublicHeaders [ FDirName drivers ] ; } diff --git a/src/add-ons/kernel/drivers/common/Jamfile b/src/add-ons/kernel/drivers/common/Jamfile index 711ec09229..c1618a9470 100644 --- a/src/add-ons/kernel/drivers/common/Jamfile +++ b/src/add-ons/kernel/drivers/common/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src add-ons kernel drivers common ; -UsePrivateHeaders kernel ; +UsePrivateKernelHeaders ; KernelAddon dprintf : dprintf.cpp diff --git a/src/add-ons/kernel/drivers/disk/floppy/pc_floppy/Jamfile b/src/add-ons/kernel/drivers/disk/floppy/pc_floppy/Jamfile index a83bd9d27e..80741fe2ff 100644 --- a/src/add-ons/kernel/drivers/disk/floppy/pc_floppy/Jamfile +++ b/src/add-ons/kernel/drivers/disk/floppy/pc_floppy/Jamfile @@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers disk floppy pc_floppy ; SetSubDirSupportedPlatformsBeOSCompatible ; -UsePrivateHeaders drivers kernel ; +UsePrivateHeaders drivers ; +UsePrivateKernelHeaders ; KernelAddon pc_floppy : floppy.c diff --git a/src/add-ons/kernel/drivers/disk/usb/usb_disk/Jamfile b/src/add-ons/kernel/drivers/disk/usb/usb_disk/Jamfile index 995055abb2..b66cede201 100644 --- a/src/add-ons/kernel/drivers/disk/usb/usb_disk/Jamfile +++ b/src/add-ons/kernel/drivers/disk/usb/usb_disk/Jamfile @@ -1,7 +1,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers disk usb usb_disk ; SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ; -UsePrivateHeaders drivers kernel ; +UsePrivateHeaders drivers ; +UsePrivateKernelHeaders ; KernelAddon usb_disk : usb_disk.cpp diff --git a/src/add-ons/kernel/drivers/disk/usb/usb_floppy/Jamfile b/src/add-ons/kernel/drivers/disk/usb/usb_floppy/Jamfile index 323b908449..6a6fb515c2 100644 --- a/src/add-ons/kernel/drivers/disk/usb/usb_floppy/Jamfile +++ b/src/add-ons/kernel/drivers/disk/usb/usb_floppy/Jamfile @@ -1,7 +1,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers disk usb usb_floppy ; SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ; -UsePrivateHeaders kernel ; +UsePrivateKernelHeaders ; KernelAddon usb_floppy : usb_disk.cpp diff --git a/src/add-ons/kernel/drivers/disk/virtual/nbd/Jamfile b/src/add-ons/kernel/drivers/disk/virtual/nbd/Jamfile index d8dc15c869..91303a4ca3 100644 --- a/src/add-ons/kernel/drivers/disk/virtual/nbd/Jamfile +++ b/src/add-ons/kernel/drivers/disk/virtual/nbd/Jamfile @@ -9,7 +9,7 @@ if $(TARGET_PLATFORM) = haiku { # lock.h wants debug.h and others. #UsePrivateHeaders kernel ; #UsePublicHeaders kernel ; - UsePrivateHeaders [ FDirName kernel ] ; + UsePrivateKernelHeaders ; } KernelAddon nbd : diff --git a/src/add-ons/kernel/drivers/graphics/intel_extreme/Jamfile b/src/add-ons/kernel/drivers/graphics/intel_extreme/Jamfile index 8ac97c6715..33e0b0f3a6 100644 --- a/src/add-ons/kernel/drivers/graphics/intel_extreme/Jamfile +++ b/src/add-ons/kernel/drivers/graphics/intel_extreme/Jamfile @@ -4,8 +4,8 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders [ FDirName graphics intel_extreme ] ; UsePrivateHeaders [ FDirName graphics common ] ; -UsePrivateHeaders graphics kernel ; -UsePrivateHeaders shared ; +UsePrivateHeaders graphics ; +UsePrivateKernelHeaders ; KernelAddon intel_extreme : bios.cpp diff --git a/src/add-ons/kernel/drivers/network/sis19x/Jamfile b/src/add-ons/kernel/drivers/network/sis19x/Jamfile index 4f58405f88..26ca3a5465 100644 --- a/src/add-ons/kernel/drivers/network/sis19x/Jamfile +++ b/src/add-ons/kernel/drivers/network/sis19x/Jamfile @@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers network sis19x ; SetSubDirSupportedPlatformsBeOSCompatible ; -UsePrivateHeaders kernel net ; +UsePrivateKernelHeaders ; +UsePrivateHeaders net ; UsePrivateHeaders [ FDirName kernel util ] ; diff --git a/src/add-ons/kernel/drivers/network/usb_ecm/Jamfile b/src/add-ons/kernel/drivers/network/usb_ecm/Jamfile index a23d2201a1..1917819b56 100644 --- a/src/add-ons/kernel/drivers/network/usb_ecm/Jamfile +++ b/src/add-ons/kernel/drivers/network/usb_ecm/Jamfile @@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers network usb_ecm ; SetSubDirSupportedPlatformsBeOSCompatible ; -UsePrivateHeaders kernel net ; +UsePrivateKernelHeaders ; +UsePrivateHeaders net ; KernelAddon usb_ecm : Driver.cpp diff --git a/src/add-ons/kernel/drivers/printer/usb/Jamfile b/src/add-ons/kernel/drivers/printer/usb/Jamfile index 25713c0982..3e5c2380b0 100644 --- a/src/add-ons/kernel/drivers/printer/usb/Jamfile +++ b/src/add-ons/kernel/drivers/printer/usb/Jamfile @@ -1,7 +1,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers printer usb ; SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ; -UsePrivateHeaders kernel ; +UsePrivateKernelHeaders ; KernelAddon usb_printer : usb_printer.cpp diff --git a/src/add-ons/kernel/file_systems/fat/Jamfile b/src/add-ons/kernel/file_systems/fat/Jamfile index 4ac052b096..4b2cb09d4d 100644 --- a/src/add-ons/kernel/file_systems/fat/Jamfile +++ b/src/add-ons/kernel/file_systems/fat/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src add-ons kernel file_systems fat ; -UsePrivateHeaders kernel ; +UsePrivateKernelHeaders ; SubDirCcFlags -DTRACK_FILENAME ; diff --git a/src/add-ons/kernel/file_systems/googlefs/Jamfile b/src/add-ons/kernel/file_systems/googlefs/Jamfile index 074252af5c..486613e408 100644 --- a/src/add-ons/kernel/file_systems/googlefs/Jamfile +++ b/src/add-ons/kernel/file_systems/googlefs/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel file_systems googlefs ; SetSubDirSupportedPlatformsBeOSCompatible ; -UsePrivateHeaders kernel ; +UsePrivateKernelHeaders ; #SubDirCcFlags -DTRACK_FILENAME ; #SubDirCcFlags -DDEBUG_GOOGLEFS=1 ; diff --git a/src/add-ons/kernel/file_systems/iso9660/Jamfile b/src/add-ons/kernel/file_systems/iso9660/Jamfile index 98e76585e9..b3453c8e32 100644 --- a/src/add-ons/kernel/file_systems/iso9660/Jamfile +++ b/src/add-ons/kernel/file_systems/iso9660/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src add-ons kernel file_systems iso9660 ; -UsePrivateHeaders kernel ; +UsePrivateKernelHeaders ; # set some additional defines SubDirC++Flags -fno-rtti ; diff --git a/src/add-ons/kernel/file_systems/ntfs/Jamfile b/src/add-ons/kernel/file_systems/ntfs/Jamfile index d16ff756dc..cc8febd756 100644 --- a/src/add-ons/kernel/file_systems/ntfs/Jamfile +++ b/src/add-ons/kernel/file_systems/ntfs/Jamfile @@ -6,7 +6,7 @@ SubDirHdrs [ FDirName $(SUBDIR) utils ] ; SubDirCcFlags -DHAVE_CONFIG_H=1 ; SubDirC++Flags -DHAVE_CONFIG_H=1 ; -UsePrivateHeaders kernel ; +UsePrivateKernelHeaders ; SEARCH_SOURCE += [ FDirName $(SUBDIR) utils ] ; diff --git a/src/add-ons/kernel/file_systems/reiserfs/Jamfile b/src/add-ons/kernel/file_systems/reiserfs/Jamfile index 67b1552ffd..90bb57effb 100644 --- a/src/add-ons/kernel/file_systems/reiserfs/Jamfile +++ b/src/add-ons/kernel/file_systems/reiserfs/Jamfile @@ -4,7 +4,7 @@ local userlandFSTop = [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems userlandfs ] ; local userlandFSIncludes = [ PrivateHeaders userlandfs ] ; -UsePrivateHeaders kernel ; +UsePrivateKernelHeaders ; SubDirHdrs [ FDirName $(userlandFSIncludes) shared ] ; SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ; diff --git a/src/add-ons/kernel/generic/ata_adapter/Jamfile b/src/add-ons/kernel/generic/ata_adapter/Jamfile index 7f846d7d90..aa2e79deaa 100644 --- a/src/add-ons/kernel/generic/ata_adapter/Jamfile +++ b/src/add-ons/kernel/generic/ata_adapter/Jamfile @@ -1,6 +1,7 @@ SubDir HAIKU_TOP src add-ons kernel generic ata_adapter ; -UsePrivateHeaders drivers kernel ; +UsePrivateHeaders drivers ; +UsePrivateKernelHeaders ; KernelAddon ata_adapter : ata_adapter.cpp diff --git a/src/add-ons/kernel/generic/locked_pool/Jamfile b/src/add-ons/kernel/generic/locked_pool/Jamfile index 8bb4a5e881..9bcabd0874 100644 --- a/src/add-ons/kernel/generic/locked_pool/Jamfile +++ b/src/add-ons/kernel/generic/locked_pool/Jamfile @@ -1,6 +1,6 @@ SubDir HAIKU_TOP src add-ons kernel generic locked_pool ; -UsePrivateHeaders kernel ; +UsePrivateKernelHeaders ; # enable debug output, if debugging is enabled if $(DEBUG) != 0 { diff --git a/src/add-ons/kernel/generic/scsi_periph/Jamfile b/src/add-ons/kernel/generic/scsi_periph/Jamfile index 5fd764c5bf..ecc553e093 100644 --- a/src/add-ons/kernel/generic/scsi_periph/Jamfile +++ b/src/add-ons/kernel/generic/scsi_periph/Jamfile @@ -1,6 +1,7 @@ SubDir HAIKU_TOP src add-ons kernel generic scsi_periph ; -UsePrivateHeaders drivers kernel shared ; +UsePrivateHeaders drivers ; +UsePrivateKernelHeaders ; SubDirHdrs $(HAIKU_TOP) src system kernel device_manager ; # disable debug output, if debugging is disabled diff --git a/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/Jamfile b/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/Jamfile index b5caa11aee..a197820198 100644 --- a/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/Jamfile +++ b/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/Jamfile @@ -10,7 +10,8 @@ if $(TARGET_PLATFORM) != haiku { # Unfortunately we get more than we want, namely all POSIX headers. } -UsePrivateHeaders kernel net ; +UsePrivateKernelHeaders ; +UsePrivateHeaders net ; KernelAddon ethernet_frame : ethernet_frame.cpp diff --git a/src/add-ons/kernel/network/datalink_protocols/loopback_frame/Jamfile b/src/add-ons/kernel/network/datalink_protocols/loopback_frame/Jamfile index fc60f3cf6f..b034dda000 100644 --- a/src/add-ons/kernel/network/datalink_protocols/loopback_frame/Jamfile +++ b/src/add-ons/kernel/network/datalink_protocols/loopback_frame/Jamfile @@ -10,7 +10,8 @@ if $(TARGET_PLATFORM) != haiku { # Unfortunately we get more than we want, namely all POSIX headers. } -UsePrivateHeaders kernel net ; +UsePrivateKernelHeaders ; +UsePrivateHeaders net ; KernelAddon loopback_frame : loopback_frame.cpp diff --git a/src/add-ons/kernel/network/devices/loopback/Jamfile b/src/add-ons/kernel/network/devices/loopback/Jamfile index 1bab85ff29..2b19f9029a 100644 --- a/src/add-ons/kernel/network/devices/loopback/Jamfile +++ b/src/add-ons/kernel/network/devices/loopback/Jamfile @@ -10,7 +10,8 @@ if $(TARGET_PLATFORM) != haiku { # Unfortunately we get more than we want, namely all POSIX headers. } -UsePrivateHeaders kernel net ; +UsePrivateKernelHeaders ; +UsePrivateHeaders net ; KernelAddon loopback : loopback.cpp diff --git a/src/add-ons/kernel/network/protocols/icmp/Jamfile b/src/add-ons/kernel/network/protocols/icmp/Jamfile index 1c600627b9..8aadbba40d 100644 --- a/src/add-ons/kernel/network/protocols/icmp/Jamfile +++ b/src/add-ons/kernel/network/protocols/icmp/Jamfile @@ -1,7 +1,8 @@ SubDir HAIKU_TOP src add-ons kernel network protocols icmp ; UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols ipv4 ] ; -UsePrivateHeaders kernel net ; +UsePrivateKernelHeaders ; +UsePrivateHeaders net ; KernelAddon icmp : icmp.cpp diff --git a/src/add-ons/kernel/network/protocols/icmp6/Jamfile b/src/add-ons/kernel/network/protocols/icmp6/Jamfile index 21c0520b63..6ff71bba92 100644 --- a/src/add-ons/kernel/network/protocols/icmp6/Jamfile +++ b/src/add-ons/kernel/network/protocols/icmp6/Jamfile @@ -10,7 +10,8 @@ if $(TARGET_PLATFORM) != haiku { # Unfortunately we get more than we want, namely all POSIX headers. } -UsePrivateHeaders kernel net ; +UsePrivateKernelHeaders ; +UsePrivateHeaders net ; UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network datalink_protocols ] : true ;