diff --git a/src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile
index 2a1ec901f3..a2b8d7ec8f 100644
--- a/src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile
+++ b/src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile
@@ -15,3 +15,7 @@ KernelStaticLibrary 3com_mii.a
 	ukphy_subr.c
 	;
 
+ObjectHdrs [ FGristFiles bmtphy$(SUFOBJ) exphy$(SUFOBJ) ukphy$(SUFOBJ) ]
+        : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
+Includes [ FGristFiles bmtphy.c exphy.c ukphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
+
diff --git a/src/add-ons/kernel/drivers/network/3com/dev/mii/miidevs.h b/src/add-ons/kernel/drivers/network/3com/dev/mii/miidevs.h
deleted file mode 100644
index 9ee45234c2..0000000000
--- a/src/add-ons/kernel/drivers/network/3com/dev/mii/miidevs.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#define MII_OUI_BROADCOM			0x001018
-#define MII_MODEL_BROADCOM_3C905B	0x0012
-#define MII_MODEL_BROADCOM_3C905C	0x0017
-#define MII_MODEL_BROADCOM_BCM5201	0x0021
-#define MII_MODEL_BROADCOM_BCM5221	0x001e
-#define MII_MODEL_BROADCOM_BCM4401	0x0036
-
-#define MII_STR_BROADCOM_3C905B		"3C905B"
-#define MII_STR_BROADCOM_3C905C		"3C905C"
-#define MII_STR_BROADCOM_BCM5201	"BCM5201"
-#define MII_STR_BROADCOM_BCM5221	"BCM5221"
-#define MII_STR_BROADCOM_BCM4401	"BCM4401"
diff --git a/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/Jamfile
index 2a25a7337e..2781d64e32 100644
--- a/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/Jamfile
+++ b/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/Jamfile
@@ -11,3 +11,6 @@ KernelStaticLibrary rtl8139_mii.a
 	: rlphy.c
 	;
 
+ObjectHdrs [ FGristFiles rlphy$(SUFOBJ) ]
+        : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
+Includes [ FGristFiles rlphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
diff --git a/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/miidevs.h b/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/miidevs.h
deleted file mode 100644
index da2d4a3587..0000000000
--- a/src/add-ons/kernel/drivers/network/rtl8139/dev/mii/miidevs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#define MII_OUI_REALTEK			0x000020
-#define MII_MODEL_REALTEK_RTL8201L	0x0020
-#define MII_STR_REALTEK_RTL8201L	"RTL8021L"
-#define MII_OUI_ICPLUS			0x0090c3
-#define MII_MODEL_ICPLUS_IP101		0x0005
-#define MII_STR_ICPLUS_IP101		"IP101"
diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/Jamfile
index 7659bc30cb..05f6916518 100644
--- a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/Jamfile
+++ b/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/Jamfile
@@ -15,3 +15,7 @@ KernelStaticLibrary syskonnect_mii.a
 	ukphy_subr.c
 	;
 
+ObjectHdrs [ FGristFiles e1000phy$(SUFOBJ) ukphy$(SUFOBJ) xmphy$(SUFOBJ) ]
+        : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
+Includes [ FGristFiles e1000phy.c ukphy.c xmphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
+
diff --git a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/miidevs.h b/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/miidevs.h
deleted file mode 100644
index 6f2967bfd7..0000000000
--- a/src/add-ons/kernel/drivers/network/syskonnect/dev/mii/miidevs.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#define MII_OUI_MARVELL				0x005043
-#define MII_OUI_xxMARVELL			0x000ac2
-
-#define MII_MODEL_MARVELL_E1000		0x0000
-#define MII_MODEL_MARVELL_E1011		0x0002
-#define MII_MODEL_MARVELL_E1000_3	0x0003
-#define MII_MODEL_MARVELL_E1000S	0x0004
-#define MII_MODEL_MARVELL_E1000_5	0x0005
-#define MII_MODEL_MARVELL_E1000_6	0x0006
-#define MII_MODEL_MARVELL_E3082		0x0008
-#define MII_MODEL_MARVELL_E1112		0x0009
-#define MII_MODEL_MARVELL_E1149		0x000b
-#define MII_MODEL_MARVELL_E1111		0x000c
-#define MII_MODEL_MARVELL_E1116		0x0021
-#define MII_MODEL_MARVELL_E1118		0x0022
-
-#define MII_MODEL_xxMARVELL_E1000	0x0005
-#define MII_MODEL_xxMARVELL_E1011	0x0002
-#define MII_MODEL_xxMARVELL_E1000_3	0x0003
-#define MII_MODEL_xxMARVELL_E1000_5	0x0005
-#define MII_MODEL_xxMARVELL_E1111	0x000c
-
-#define MII_STR_MARVELL_E1000		"Marvell 88E1000 Gigabit PHY"
-#define MII_STR_MARVELL_E1011		"Marvell 88E1011 Gigabit PHY"
-#define MII_STR_MARVELL_E1000_3		"Marvell 88E1000 Gigabit PHY"
-#define MII_STR_MARVELL_E1000S		"Marvell 88E1000S Gigabit PHY"
-#define MII_STR_MARVELL_E1000_5		"Marvell 88E1000 Gigabit PHY"
-#define MII_STR_MARVELL_E1000_6		"Marvell 88E1000 Gigabit PHY"
-#define MII_STR_MARVELL_E3082		"Marvell 88E3082 10/100 Fast Ethernet PHY"
-#define MII_STR_MARVELL_E1112		"Marvell 88E1112 Gigabit PHY"
-#define MII_STR_MARVELL_E1149		"Marvell 88E1149 Gigabit PHY"
-#define MII_STR_MARVELL_E1111		"Marvell 88E1111 Gigabit PHY"
-#define MII_STR_MARVELL_E1116		"Marvell 88E1116 Gigabit PHY"
-#define MII_STR_MARVELL_E1118		"Marvell 88E1118 Gigabit PHY"
-
-#define MII_STR_xxMARVELL_E1000		"Marvell 88E1000 Gigabit PHY"
-#define MII_STR_xxMARVELL_E1011		"Marvell 88E1011 Gigabit PHY"
-#define MII_STR_xxMARVELL_E1000_3	"Marvell 88E1000 Gigabit PHY"
-#define MII_STR_xxMARVELL_E1000_5	"Marvell 88E1000 Gigabit PHY"
-#define MII_STR_xxMARVELL_E1111		"Marvell 88E1111 Gigabit PHY"
-
-#define MII_OUI_JATO				0x00e083	/*Jato Technologies*/
-#define MII_OUI_XAQTI				0x00e0ae	/*XaQti Corp.*/
-
-#define MII_OUI_xxXAQTI				0x350700	/*XaQti Corp.*/
-
-/* Jato Technologies PHYs */
-#define MII_MODEL_JATO_BASEX		0x0000 
-#define MII_STR_JATO_BASEX 			"Jato 1000baseX media interface"
-
-/* XaQti Corp. PHYs. */
-#define MII_MODEL_XAQTI_XMACII		0x0000 
-#define MII_STR_XAQTI_XMACII 		"XaQti Corp. XMAC II gigabit interface"
-
-
diff --git a/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/Jamfile
index 488e753acb..c0b8ca2bbc 100644
--- a/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/Jamfile
+++ b/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/Jamfile
@@ -14,3 +14,7 @@ KernelStaticLibrary via_rhine_mii.a
 	ukphy_subr.c
 	;
 
+ObjectHdrs [ FGristFiles ciphy$(SUFOBJ) ukphy$(SUFOBJ) ]
+        : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ;
+Includes [ FGristFiles ciphy.c ukphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ;
+
diff --git a/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/miidevs.h b/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/miidevs.h
deleted file mode 100644
index 5b93b049fe..0000000000
--- a/src/add-ons/kernel/drivers/network/via_rhine/dev/mii/miidevs.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2007, Axel Dörfler, axeld@pinc-software.de. All Rights Reserved.
- * Distributed under the terms of the MIT License.
- */
-#ifndef _FBSD_MII_DEVS_H
-#define _FBSD_MII_DEVS_H
-
-#define MII_OUI_CICADA				0x0003f1
-
-#define MII_MODEL_CICADA_CS8201		0x0001
-#define MII_MODEL_CICADA_CS8201A	0x0020
-#define MII_MODEL_CICADA_CS8201B	0x0021
-
-#define MII_STR_CICADA_CS8201		"Cicada CS8201 10/100/1000TX PHY"
-#define MII_STR_CICADA_CS8201A		MII_STR_CICADA_CS8201
-#define MII_STR_CICADA_CS8201B		MII_STR_CICADA_CS8201
-
-#endif	/* _FBSD_MII_DEVS_H */