diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/Jamfile b/src/add-ons/kernel/drivers/network/broadcom570x/Jamfile
index 9cf71f9a3b..76db5bf4a0 100644
--- a/src/add-ons/kernel/drivers/network/broadcom570x/Jamfile
+++ b/src/add-ons/kernel/drivers/network/broadcom570x/Jamfile
@@ -1,3 +1,28 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network broadcom570x ;
 
-SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom570x dev ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
+	: true ;
+UsePrivateHeaders net system ;
+UsePrivateKernelHeaders ;
+
+SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 _XOPEN_SOURCE ] ;
+
+UseHeaders [ FDirName $(SUBDIR) ] : true ;
+
+SEARCH_SOURCE += [ FDirName $(SUBDIR) dev mii ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) dev bce ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) dev bge ] ;
+
+KernelAddon broadcom570x :
+	glue.c
+	brgphy.c
+	ukphy.c
+	ukphy_subr.c
+	if_bge.c
+	: libfreebsd_network.a
+	;
+
+ObjectHdrs [ FGristFiles brgphy$(SUFOBJ) ukphy$(SUFOBJ) if_bge$(SUFOBJ) ]
+	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
+		compat freebsd_network ] ;
+Includes [ FGristFiles brgphy.c ukphy.c if_bge.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/dev/Jamfile b/src/add-ons/kernel/drivers/network/broadcom570x/dev/Jamfile
deleted file mode 100644
index 0244fc20da..0000000000
--- a/src/add-ons/kernel/drivers/network/broadcom570x/dev/Jamfile
+++ /dev/null
@@ -1,4 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network broadcom570x dev ;
-
-SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom570x dev bge ;
-SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom570x dev mii ;
diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/Jamfile b/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/Jamfile
deleted file mode 100644
index 0a94795e39..0000000000
--- a/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/Jamfile
+++ /dev/null
@@ -1,21 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network broadcom570x dev bge ;
-
-UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(SUBDIR) .. mii ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
-
-UsePrivateHeaders net system ;
-UsePrivateKernelHeaders ;
-
-SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 _XOPEN_SOURCE ] ;
-
-KernelAddon broadcom570x :
-	if_bge.c
-	glue.c
-	: broadcom570x_mii.a libfreebsd_network.a
-	;
-
-ObjectHdrs [ FGristFiles if_bge$(SUFOBJ) ]
-	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd_network ] ;
-Includes [ FGristFiles if_bge.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/Jamfile
deleted file mode 100644
index fa21a498bc..0000000000
--- a/src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/Jamfile
+++ /dev/null
@@ -1,21 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers network broadcom570x dev mii ;
-
-UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ;
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
-
-UsePrivateHeaders net system ;
-UsePrivateKernelHeaders ;
-
-SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 _XOPEN_SOURCE ] ;
-
-KernelStaticLibrary broadcom570x_mii.a
-	:
-	brgphy.c
-	ukphy.c
-	ukphy_subr.c
-	;
-
-ObjectHdrs [ FGristFiles brgphy$(SUFOBJ) ]
-	: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH)) libs
-		compat freebsd_network ] ;
-Includes [ FGristFiles brgphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/glue.c b/src/add-ons/kernel/drivers/network/broadcom570x/glue.c
similarity index 100%
rename from src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/glue.c
rename to src/add-ons/kernel/drivers/network/broadcom570x/glue.c