diff --git a/sys/conf/files b/sys/conf/files
index e2b99245c9d0..42e1f200d5d1 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -513,21 +513,36 @@ dev/cpufreq/ichss.c		optional cpufreq
 dev/cs/if_cs.c			optional cs
 dev/cs/if_cs_isa.c		optional cs isa
 dev/cs/if_cs_pccard.c		optional cs pccard
-dev/cxgb/cxgb_main.c		optional cxgb pci
-dev/cxgb/cxgb_offload.c		optional cxgb pci
-dev/cxgb/cxgb_sge.c		optional cxgb pci
-dev/cxgb/cxgb_multiq.c		optional cxgb pci
-dev/cxgb/common/cxgb_mc5.c	optional cxgb pci
-dev/cxgb/common/cxgb_vsc7323.c	optional cxgb pci
-dev/cxgb/common/cxgb_vsc8211.c	optional cxgb pci
-dev/cxgb/common/cxgb_ael1002.c	optional cxgb pci
-dev/cxgb/common/cxgb_mv88e1xxx.c	optional cxgb pci
-dev/cxgb/common/cxgb_xgmac.c	optional cxgb pci
-dev/cxgb/common/cxgb_t3_hw.c	optional cxgb pci
-dev/cxgb/common/cxgb_tn1010.c	optional cxgb pci	
-dev/cxgb/sys/uipc_mvec.c	optional cxgb pci
-dev/cxgb/sys/cxgb_support.c	optional cxgb pci
-dev/cxgb/cxgb_t3fw.c		optional cxgb cxgb_t3fw
+dev/cxgb/cxgb_main.c		optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/cxgb_offload.c		optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/cxgb_sge.c		optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/cxgb_multiq.c		optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_mc5.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_vsc7323.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_vsc8211.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_ael1002.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_mv88e1xxx.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_xgmac.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_t3_hw.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_tn1010.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"	
+dev/cxgb/sys/uipc_mvec.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/sys/cxgb_support.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/cxgb_t3fw.c		optional cxgb cxgb_t3fw \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cy/cy.c			optional cy
 dev/cy/cy_isa.c			optional cy isa
 dev/cy/cy_pci.c			optional cy pci
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 770f3ca5ee36..259d11b251a5 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -81,6 +81,9 @@ INCLUDES+= -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/x
 # ...  and OpenSolaris
 INCLUDES+= -I$S/contrib/opensolaris/compat
 
+# ... and the same for cxgb
+INCLUDES+= -I$S/dev/cxgb
+
 .endif
 
 CFLAGS=	${COPTFLAGS} ${C_DIALECT} ${DEBUG} ${CWARNFLAGS}
diff --git a/sys/dev/cxgb/common/cxgb_ael1002.c b/sys/dev/cxgb/common/cxgb_ael1002.c
index 23909767d7b2..b6dacb4c6b8a 100644
--- a/sys/dev/cxgb/common/cxgb_ael1002.c
+++ b/sys/dev/cxgb/common/cxgb_ael1002.c
@@ -30,11 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#endif
 
 #undef msleep
 #define msleep t3_os_sleep
diff --git a/sys/dev/cxgb/common/cxgb_common.h b/sys/dev/cxgb/common/cxgb_common.h
index 68968676e8b2..a9f6bac8134e 100644
--- a/sys/dev/cxgb/common/cxgb_common.h
+++ b/sys/dev/cxgb/common/cxgb_common.h
@@ -31,11 +31,7 @@ $FreeBSD$
 #ifndef __CHELSIO_COMMON_H
 #define __CHELSIO_COMMON_H
 
-#ifdef CONFIG_DEFINED
 #include <cxgb_osdep.h>
-#else
-#include <dev/cxgb/cxgb_osdep.h>
-#endif
 
 enum {
 	MAX_FRAME_SIZE = 10240, /* max MAC frame size, includes header + FCS */
@@ -603,11 +599,7 @@ struct addr_val_pair {
 	unsigned int val;
 };
 
-#ifdef CONFIG_DEFINED
 #include <cxgb_adapter.h>
-#else
-#include <dev/cxgb/cxgb_adapter.h>
-#endif
 
 #ifndef PCI_VENDOR_ID_CHELSIO
 # define PCI_VENDOR_ID_CHELSIO 0x1425
diff --git a/sys/dev/cxgb/common/cxgb_mc5.c b/sys/dev/cxgb/common/cxgb_mc5.c
index 6f1537c68084..c67f6bbe86e5 100644
--- a/sys/dev/cxgb/common/cxgb_mc5.c
+++ b/sys/dev/cxgb/common/cxgb_mc5.c
@@ -30,13 +30,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#ifdef CONFIG_DEFINED
 #include <common/cxgb_common.h>
 #include <common/cxgb_regs.h>
-#else
-#include <dev/cxgb/common/cxgb_common.h>
-#include <dev/cxgb/common/cxgb_regs.h>
-#endif
 
 enum {
 	IDT75P52100 = 4,
diff --git a/sys/dev/cxgb/common/cxgb_mv88e1xxx.c b/sys/dev/cxgb/common/cxgb_mv88e1xxx.c
index ab8cce7fdc04..7d39def10dad 100644
--- a/sys/dev/cxgb/common/cxgb_mv88e1xxx.c
+++ b/sys/dev/cxgb/common/cxgb_mv88e1xxx.c
@@ -30,11 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#endif
 
 /* Marvell PHY interrupt status bits. */
 #define MV_INTR_JABBER          0x0001
diff --git a/sys/dev/cxgb/common/cxgb_t3_hw.c b/sys/dev/cxgb/common/cxgb_t3_hw.c
index 5e14e2b3ae04..d0f7c84b7698 100644
--- a/sys/dev/cxgb/common/cxgb_t3_hw.c
+++ b/sys/dev/cxgb/common/cxgb_t3_hw.c
@@ -31,11 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 __FBSDID("$FreeBSD$");
 
 
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#endif
 
 #undef msleep
 #define msleep t3_os_sleep
diff --git a/sys/dev/cxgb/common/cxgb_tn1010.c b/sys/dev/cxgb/common/cxgb_tn1010.c
index 920ccc04a866..623f784a9eaa 100644
--- a/sys/dev/cxgb/common/cxgb_tn1010.c
+++ b/sys/dev/cxgb/common/cxgb_tn1010.c
@@ -30,11 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#endif
 
 #undef msleep
 #define msleep t3_os_sleep
diff --git a/sys/dev/cxgb/common/cxgb_vsc7323.c b/sys/dev/cxgb/common/cxgb_vsc7323.c
index ded8261b5480..bfe152952b74 100644
--- a/sys/dev/cxgb/common/cxgb_vsc7323.c
+++ b/sys/dev/cxgb/common/cxgb_vsc7323.c
@@ -31,11 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#ifdef CONFIG_DEFINED
 #include <common/cxgb_common.h>
-#else
-#include <dev/cxgb/common/cxgb_common.h>
-#endif
 
 enum {
 	ELMR_ADDR    = 0,
diff --git a/sys/dev/cxgb/common/cxgb_vsc8211.c b/sys/dev/cxgb/common/cxgb_vsc8211.c
index ad3c88e4c99d..004f2f877262 100644
--- a/sys/dev/cxgb/common/cxgb_vsc8211.c
+++ b/sys/dev/cxgb/common/cxgb_vsc8211.c
@@ -30,11 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#endif
 
 #undef msleep
 #define msleep t3_os_sleep
diff --git a/sys/dev/cxgb/common/cxgb_xgmac.c b/sys/dev/cxgb/common/cxgb_xgmac.c
index 5ea72b992b5e..792509306f9b 100644
--- a/sys/dev/cxgb/common/cxgb_xgmac.c
+++ b/sys/dev/cxgb/common/cxgb_xgmac.c
@@ -30,11 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#endif
 
 #undef msleep
 #define msleep t3_os_sleep
diff --git a/sys/dev/cxgb/cxgb_adapter.h b/sys/dev/cxgb/cxgb_adapter.h
index 22d31823b907..db79fe3010ce 100644
--- a/sys/dev/cxgb/cxgb_adapter.h
+++ b/sys/dev/cxgb/cxgb_adapter.h
@@ -54,18 +54,10 @@ $FreeBSD$
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-
-#ifdef CONFIG_DEFINED
 #include <cxgb_osdep.h>
 #include <t3cdev.h>
 #include <ulp/toecore/cxgb_toedev.h>
 #include <sys/mbufq.h>
-#else
-#include <dev/cxgb/cxgb_osdep.h>
-#include <dev/cxgb/t3cdev.h>
-#include <dev/cxgb/sys/mbufq.h>
-#include <dev/cxgb/ulp/toecore/cxgb_toedev.h>
-#endif
 
 #ifdef LRO_SUPPORTED
 #include <netinet/tcp_lro.h>
diff --git a/sys/dev/cxgb/cxgb_config.h b/sys/dev/cxgb/cxgb_config.h
index 93840969c3b7..7d54e36cc0f5 100644
--- a/sys/dev/cxgb/cxgb_config.h
+++ b/sys/dev/cxgb/cxgb_config.h
@@ -31,8 +31,7 @@ $FreeBSD$
 ***************************************************************************/
 #ifndef _CXGB_CONFIG_H_
 #define _CXGB_CONFIG_H_
-#ifndef CONFIG_DEFINED
+
 #define CONFIG_CHELSIO_T3_CORE
-#endif
 
 #endif
diff --git a/sys/dev/cxgb/cxgb_include.h b/sys/dev/cxgb/cxgb_include.h
index 9f187ee764bb..ec318f619377 100644
--- a/sys/dev/cxgb/cxgb_include.h
+++ b/sys/dev/cxgb/cxgb_include.h
@@ -6,7 +6,6 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <machine/bus.h>
-#ifdef CONFIG_DEFINED
 #include <cxgb_osdep.h>
 #include <common/cxgb_common.h>
 #include <cxgb_ioctl.h>
@@ -18,18 +17,3 @@
 #include <common/cxgb_firmware_exports.h>
 #include <common/jhash.h>
 #include <ulp/toecore/cxgb_toedev.h>
-#else
-#include <dev/cxgb/cxgb_osdep.h>
-#include <dev/cxgb/common/cxgb_common.h>
-#include <dev/cxgb/cxgb_ioctl.h>
-#include <dev/cxgb/cxgb_offload.h>
-#include <dev/cxgb/common/cxgb_regs.h>
-#include <dev/cxgb/common/cxgb_t3_cpl.h>
-#include <dev/cxgb/common/cxgb_ctl_defs.h>
-#include <dev/cxgb/common/cxgb_sge_defs.h>
-#include <dev/cxgb/common/cxgb_firmware_exports.h>
-#include <dev/cxgb/common/jhash.h>
-#include <dev/cxgb/ulp/toecore/cxgb_toedev.h>
-#endif
-
-
diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
index 6b4252c43abe..432ccdd1e6a9 100644
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c
@@ -76,11 +76,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pci_private.h>
 
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#endif
 
 #ifdef PRIV_SUPPORTED
 #include <sys/priv.h>
diff --git a/sys/dev/cxgb/cxgb_multiq.c b/sys/dev/cxgb/cxgb_multiq.c
index 9e22bba0d083..81c9ba2f62c5 100644
--- a/sys/dev/cxgb/cxgb_multiq.c
+++ b/sys/dev/cxgb/cxgb_multiq.c
@@ -85,13 +85,8 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
 #include <sys/mvec.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#include <dev/cxgb/sys/mvec.h>
-#endif
 
 extern int txq_fills;
 extern struct sysctl_oid_list sysctl__hw_cxgb_children;
diff --git a/sys/dev/cxgb/cxgb_offload.c b/sys/dev/cxgb/cxgb_offload.c
index d865e7f7cbfb..b1b9d554a3bc 100644
--- a/sys/dev/cxgb/cxgb_offload.c
+++ b/sys/dev/cxgb/cxgb_offload.c
@@ -56,11 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/taskqueue.h>
 #include <sys/proc.h>
 
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#endif
 
 #include <net/route.h>
 
diff --git a/sys/dev/cxgb/cxgb_offload.h b/sys/dev/cxgb/cxgb_offload.h
index a965afddaff7..54d73375fb7e 100644
--- a/sys/dev/cxgb/cxgb_offload.h
+++ b/sys/dev/cxgb/cxgb_offload.h
@@ -33,19 +33,11 @@ $FreeBSD$
 #ifndef _CXGB_OFFLOAD_H
 #define _CXGB_OFFLOAD_H
 
-#ifdef CONFIG_DEFINED
 #include <common/cxgb_version.h>
 #include <cxgb_config.h>
 #include <ulp/tom/cxgb_l2t.h>
 #include <common/cxgb_tcb.h>
 #include <t3cdev.h>
-#else
-#include <dev/cxgb/common/cxgb_version.h>
-#include <dev/cxgb/cxgb_config.h>
-#include <dev/cxgb/ulp/tom/cxgb_l2t.h>
-#include <dev/cxgb/common/cxgb_tcb.h>
-#include <dev/cxgb/t3cdev.h>
-#endif
 
 MALLOC_DECLARE(M_CXGB);
 
diff --git a/sys/dev/cxgb/cxgb_osdep.h b/sys/dev/cxgb/cxgb_osdep.h
index 2f3d0ce0c106..773d12db7bb0 100644
--- a/sys/dev/cxgb/cxgb_osdep.h
+++ b/sys/dev/cxgb/cxgb_osdep.h
@@ -41,13 +41,8 @@ $FreeBSD$
 
 #include <dev/mii/mii.h>
 
-#ifdef CONFIG_DEFINED
 #include <common/cxgb_version.h>
 #include <cxgb_config.h>
-#else
-#include <dev/cxgb/common/cxgb_version.h>
-#include <dev/cxgb/cxgb_config.h>
-#endif
 
 #ifndef _CXGB_OSDEP_H_
 #define _CXGB_OSDEP_H_
diff --git a/sys/dev/cxgb/cxgb_sge.c b/sys/dev/cxgb/cxgb_sge.c
index 6acdbdad1427..3d262835218c 100644
--- a/sys/dev/cxgb/cxgb_sge.c
+++ b/sys/dev/cxgb/cxgb_sge.c
@@ -64,13 +64,8 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
 #include <sys/mvec.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#include <dev/cxgb/sys/mvec.h>
-#endif
 
 int      txq_fills = 0;
 /*
diff --git a/sys/dev/cxgb/cxgb_t3fw.c b/sys/dev/cxgb/cxgb_t3fw.c
index 770c80fe7f80..cf54f9c40e75 100644
--- a/sys/dev/cxgb/cxgb_t3fw.c
+++ b/sys/dev/cxgb/cxgb_t3fw.c
@@ -10,9 +10,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/linker.h>
 #include <sys/firmware.h>
 #include <sys/systm.h>
-#include <dev/cxgb/cxgb_t3fw.h>
-#include <dev/cxgb/t3b_protocol_sram.h>
-#include <dev/cxgb/t3b_tp_eeprom.h>
+#include <cxgb_t3fw.h>
+#include <t3b_protocol_sram.h>
+#include <t3b_tp_eeprom.h>
 
 static int
 cxgb_t3fw_modevent(module_t mod, int type, void *unused)
diff --git a/sys/dev/cxgb/sys/cxgb_support.c b/sys/dev/cxgb/sys/cxgb_support.c
index e911dfcbdac0..f0c595677be6 100644
--- a/sys/dev/cxgb/sys/cxgb_support.c
+++ b/sys/dev/cxgb/sys/cxgb_support.c
@@ -44,13 +44,8 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
 #include <sys/mvec.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#include <dev/cxgb/sys/mvec.h>
-#endif
 
 extern int cxgb_use_16k_clusters;
 int cxgb_pcpu_cache_enable = 1;
diff --git a/sys/dev/cxgb/sys/uipc_mvec.c b/sys/dev/cxgb/sys/uipc_mvec.c
index 0e0ab51ee6b1..cf0de13f091e 100644
--- a/sys/dev/cxgb/sys/uipc_mvec.c
+++ b/sys/dev/cxgb/sys/uipc_mvec.c
@@ -45,15 +45,8 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 
-
-
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
 #include <sys/mvec.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#include <dev/cxgb/sys/mvec.h>
-#endif
 
 #include "opt_zero.h"
 
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
index 6851be986af1..e41ce155a0b7 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
@@ -67,22 +67,12 @@ __FBSDID("$FreeBSD$");
 
 #include <contrib/rdma/ib_verbs.h>
 
-
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
 #include <ulp/iw_cxgb/iw_cxgb_wr.h>
 #include <ulp/iw_cxgb/iw_cxgb_hal.h>
 #include <ulp/iw_cxgb/iw_cxgb_provider.h>
 #include <ulp/iw_cxgb/iw_cxgb_cm.h>
 #include <ulp/iw_cxgb/iw_cxgb.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb.h>
-#endif
 
 /*
  * XXX :-/
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
index cec461147ccc..613d62e31161 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
@@ -68,8 +68,6 @@ __FBSDID("$FreeBSD$");
 
 #include <contrib/rdma/ib_verbs.h>
 
-
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
 #include <ulp/tom/cxgb_tom.h>
 #include <ulp/tom/cxgb_t3_ddp.h>
@@ -80,18 +78,6 @@ __FBSDID("$FreeBSD$");
 #include <ulp/iw_cxgb/iw_cxgb_provider.h>
 #include <ulp/iw_cxgb/iw_cxgb_cm.h>
 #include <ulp/iw_cxgb/iw_cxgb.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#include <dev/cxgb/ulp/tom/cxgb_tom.h>
-#include <dev/ulp/tom/cxgb_t3_ddp.h>
-#include <dev/cxgb/ulp/tom/cxgb_defs.h>
-#include <dev/cxgb/ulp/tom/cxgb_toepcb.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb.h>
-#endif
 
 #ifdef KTR
 static char *states[] = {
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c
index 93a9e89fd39d..bb564bb5b42b 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c
@@ -63,8 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <contrib/rdma/ib_umem.h>
 #include <contrib/rdma/ib_user_verbs.h>
 
-
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
 #include <ulp/iw_cxgb/iw_cxgb_wr.h>
 #include <ulp/iw_cxgb/iw_cxgb_hal.h>
@@ -73,16 +71,6 @@ __FBSDID("$FreeBSD$");
 #include <ulp/iw_cxgb/iw_cxgb.h>
 #include <ulp/iw_cxgb/iw_cxgb_resource.h>
 #include <ulp/iw_cxgb/iw_cxgb_user.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h>
-#endif
 
 /*
  * Get one cq entry from cxio and map it to openib.
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c
index 8b52119e306e..ac9c74283047 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
 #include <contrib/rdma/ib_user_verbs.h>
 
 #ifdef DEBUG
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
 #include <ulp/iw_cxgb/iw_cxgb_wr.h>
 #include <ulp/iw_cxgb/iw_cxgb_hal.h>
@@ -74,16 +73,6 @@ __FBSDID("$FreeBSD$");
 #include <ulp/iw_cxgb/iw_cxgb.h>
 #include <ulp/iw_cxgb/iw_cxgb_resource.h>
 #include <ulp/iw_cxgb/iw_cxgb_user.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h>
-#endif
 
 void cxio_dump_tpt(struct cxio_rdev *rdev, uint32_t stag)
 {
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c
index 2e8154731133..cf0891d7fe73 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c
@@ -63,8 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <contrib/rdma/ib_umem.h>
 #include <contrib/rdma/ib_user_verbs.h>
 
-
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
 #include <ulp/iw_cxgb/iw_cxgb_wr.h>
 #include <ulp/iw_cxgb/iw_cxgb_hal.h>
@@ -73,16 +71,6 @@ __FBSDID("$FreeBSD$");
 #include <ulp/iw_cxgb/iw_cxgb.h>
 #include <ulp/iw_cxgb/iw_cxgb_resource.h>
 #include <ulp/iw_cxgb/iw_cxgb_user.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h>
-#endif
 
 static void
 post_qp_event(struct iwch_dev *rnicp, struct iwch_qp *qhp, struct iwch_cq *chp,
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c
index 0309b53ba3c0..f2e59d2909e1 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c
@@ -63,8 +63,6 @@ __FBSDID("$FreeBSD$");
 
 #include <contrib/rdma/ib_verbs.h>
 
-
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
 #include <ulp/iw_cxgb/iw_cxgb_wr.h>
 #include <ulp/iw_cxgb/iw_cxgb_hal.h>
@@ -72,15 +70,6 @@ __FBSDID("$FreeBSD$");
 #include <ulp/iw_cxgb/iw_cxgb_cm.h>
 #include <ulp/iw_cxgb/iw_cxgb.h>
 #include <ulp/iw_cxgb/iw_cxgb_resource.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.h>
-#endif
 
 static TAILQ_HEAD( ,cxio_rdev) rdev_list;
 static cxio_hal_ev_callback_func_t cxio_ev_cb = NULL;
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c
index df06f87a9805..c052aa6b2f09 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c
@@ -63,8 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <contrib/rdma/ib_umem.h>
 #include <contrib/rdma/ib_user_verbs.h>
 
-
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
 #include <ulp/iw_cxgb/iw_cxgb_wr.h>
 #include <ulp/iw_cxgb/iw_cxgb_hal.h>
@@ -73,17 +71,6 @@ __FBSDID("$FreeBSD$");
 #include <ulp/iw_cxgb/iw_cxgb.h>
 #include <ulp/iw_cxgb/iw_cxgb_resource.h>
 #include <ulp/iw_cxgb/iw_cxgb_user.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h>
-#endif
-
 
 int iwch_register_mem(struct iwch_dev *rhp, struct iwch_pd *php,
 					struct iwch_mr *mhp,
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c
index 4ef7dc5f8c97..bc336a4a625c 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c
@@ -66,10 +66,6 @@ __FBSDID("$FreeBSD$");
 #include <contrib/rdma/ib_umem.h>
 #include <contrib/rdma/ib_user_verbs.h>
 
-
-
-
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
 #include <ulp/iw_cxgb/iw_cxgb_wr.h>
 #include <ulp/iw_cxgb/iw_cxgb_hal.h>
@@ -78,17 +74,6 @@ __FBSDID("$FreeBSD$");
 #include <ulp/iw_cxgb/iw_cxgb.h>
 #include <ulp/iw_cxgb/iw_cxgb_resource.h>
 #include <ulp/iw_cxgb/iw_cxgb_user.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h>
-#endif
-
 
 static int
 iwch_modify_port(struct ib_device *ibdev,
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c
index 3c203f1b4337..708c35906ab5 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c
@@ -63,8 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <contrib/rdma/ib_umem.h>
 #include <contrib/rdma/ib_user_verbs.h>
 
-
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
 #include <ulp/iw_cxgb/iw_cxgb_wr.h>
 #include <ulp/iw_cxgb/iw_cxgb_hal.h>
@@ -73,17 +71,6 @@ __FBSDID("$FreeBSD$");
 #include <ulp/iw_cxgb/iw_cxgb.h>
 #include <ulp/iw_cxgb/iw_cxgb_resource.h>
 #include <ulp/iw_cxgb/iw_cxgb_user.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h>
-#endif
-
 
 #define NO_SUPPORT -1
 
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c
index 9d3618fbd57f..1882bcede001 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c
@@ -63,8 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <contrib/rdma/ib_umem.h>
 #include <contrib/rdma/ib_user_verbs.h>
 
-
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
 #include <ulp/iw_cxgb/iw_cxgb_wr.h>
 #include <ulp/iw_cxgb/iw_cxgb_hal.h>
@@ -73,16 +71,6 @@ __FBSDID("$FreeBSD$");
 #include <ulp/iw_cxgb/iw_cxgb.h>
 #include <ulp/iw_cxgb/iw_cxgb_resource.h>
 #include <ulp/iw_cxgb/iw_cxgb_user.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.h>
-#include <dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h>
-#endif
 
 #ifdef needed
 static struct buf_ring *rhdl_fifo;
diff --git a/sys/dev/cxgb/ulp/toecore/toedev.c b/sys/dev/cxgb/ulp/toecore/toedev.c
index 8a6b39f650cd..78d38749857f 100644
--- a/sys/dev/cxgb/ulp/toecore/toedev.c
+++ b/sys/dev/cxgb/ulp/toecore/toedev.c
@@ -52,12 +52,7 @@ __FBSDID("$FreeBSD$");
 /*
  * XXX 
  */
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#endif
-
 
 
 static struct mtx offload_db_lock;
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c b/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
index 2732c57adc91..073d291fc4ab 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
+++ b/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
@@ -68,8 +68,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in_var.h>
 
 
-#include <dev/cxgb/cxgb_osdep.h>
-#include <dev/cxgb/sys/mbufq.h>
+#include <cxgb_osdep.h>
+#include <sys/mbufq.h>
 
 #include <netinet/ip.h>
 #include <netinet/tcp_var.h>
@@ -80,24 +80,23 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_timer.h>
 #include <net/route.h>
 
-#include <dev/cxgb/t3cdev.h>
-#include <dev/cxgb/common/cxgb_firmware_exports.h>
-#include <dev/cxgb/common/cxgb_t3_cpl.h>
-#include <dev/cxgb/common/cxgb_tcb.h>
-#include <dev/cxgb/common/cxgb_ctl_defs.h>
-#include <dev/cxgb/cxgb_offload.h>
+#include <t3cdev.h>
+#include <common/cxgb_firmware_exports.h>
+#include <common/cxgb_t3_cpl.h>
+#include <common/cxgb_tcb.h>
+#include <common/cxgb_ctl_defs.h>
+#include <cxgb_offload.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <machine/bus.h>
-#include <dev/cxgb/sys/mvec.h>
-#include <dev/cxgb/ulp/toecore/cxgb_toedev.h>
-#include <dev/cxgb/ulp/tom/cxgb_defs.h>
-#include <dev/cxgb/ulp/tom/cxgb_tom.h>
-#include <dev/cxgb/ulp/tom/cxgb_t3_ddp.h>
-#include <dev/cxgb/ulp/tom/cxgb_toepcb.h>
-#include <dev/cxgb/ulp/tom/cxgb_tcp.h>
-
-#include <dev/cxgb/ulp/tom/cxgb_tcp_offload.h>
+#include <sys/mvec.h>
+#include <ulp/toecore/cxgb_toedev.h>
+#include <ulp/tom/cxgb_defs.h>
+#include <ulp/tom/cxgb_tom.h>
+#include <ulp/tom/cxgb_t3_ddp.h>
+#include <ulp/tom/cxgb_toepcb.h>
+#include <ulp/tom/cxgb_tcp.h>
+#include <ulp/tom/cxgb_tcp_offload.h>
 
 /*
  * For ULP connections HW may add headers, e.g., for digests, that aren't part
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c b/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c
index f68089d108d8..9fe39b1911f5 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c
+++ b/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c
@@ -61,22 +61,22 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 
-#include <dev/cxgb/cxgb_config.h>
-#include <dev/cxgb/cxgb_osdep.h>
-#include <dev/cxgb/sys/mbufq.h>
-#include <dev/cxgb/ulp/tom/cxgb_tcp_offload.h>
+#include <cxgb_config.h>
+#include <cxgb_osdep.h>
+#include <sys/mbufq.h>
+#include <ulp/tom/cxgb_tcp_offload.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_offload.h>
 #include <net/route.h>
 
-#include <dev/cxgb/t3cdev.h>
-#include <dev/cxgb/common/cxgb_firmware_exports.h>
-#include <dev/cxgb/common/cxgb_t3_cpl.h>
-#include <dev/cxgb/common/cxgb_tcb.h>
-#include <dev/cxgb/common/cxgb_ctl_defs.h>
-#include <dev/cxgb/cxgb_offload.h>
+#include <t3cdev.h>
+#include <common/cxgb_firmware_exports.h>
+#include <common/cxgb_t3_cpl.h>
+#include <common/cxgb_tcb.h>
+#include <common/cxgb_ctl_defs.h>
+#include <cxgb_offload.h>
 
 #include <vm/vm.h>
 #include <vm/vm_page.h>
@@ -84,14 +84,14 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_extern.h>
 #include <vm/pmap.h>
 
-#include <dev/cxgb/sys/mvec.h>
-#include <dev/cxgb/ulp/toecore/cxgb_toedev.h>
-#include <dev/cxgb/ulp/tom/cxgb_defs.h>
-#include <dev/cxgb/ulp/tom/cxgb_tom.h>
-#include <dev/cxgb/ulp/tom/cxgb_t3_ddp.h>
-#include <dev/cxgb/ulp/tom/cxgb_toepcb.h>
-#include <dev/cxgb/ulp/tom/cxgb_tcp.h>
-#include <dev/cxgb/ulp/tom/cxgb_vm.h>
+#include <sys/mvec.h>
+#include <ulp/toecore/cxgb_toedev.h>
+#include <ulp/tom/cxgb_defs.h>
+#include <ulp/tom/cxgb_tom.h>
+#include <ulp/tom/cxgb_t3_ddp.h>
+#include <ulp/tom/cxgb_toepcb.h>
+#include <ulp/tom/cxgb_tcp.h>
+#include <ulp/tom/cxgb_vm.h>
 
 
 static int	(*pru_sosend)(struct socket *so, struct sockaddr *addr,
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_ddp.c b/sys/dev/cxgb/ulp/tom/cxgb_ddp.c
index fa2929eb5ef6..09a9d3acac0e 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_ddp.c
+++ b/sys/dev/cxgb/ulp/tom/cxgb_ddp.c
@@ -60,22 +60,22 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in_var.h>
 
 
-#include <dev/cxgb/cxgb_osdep.h>
-#include <dev/cxgb/sys/mbufq.h>
+#include <cxgb_osdep.h>
+#include <sys/mbufq.h>
 
-#include <dev/cxgb/ulp/tom/cxgb_tcp_offload.h>
+#include <ulp/tom/cxgb_tcp_offload.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_offload.h>
 #include <net/route.h>
 
-#include <dev/cxgb/t3cdev.h>
-#include <dev/cxgb/common/cxgb_firmware_exports.h>
-#include <dev/cxgb/common/cxgb_t3_cpl.h>
-#include <dev/cxgb/common/cxgb_tcb.h>
-#include <dev/cxgb/common/cxgb_ctl_defs.h>
-#include <dev/cxgb/cxgb_offload.h>
+#include <t3cdev.h>
+#include <common/cxgb_firmware_exports.h>
+#include <common/cxgb_t3_cpl.h>
+#include <common/cxgb_tcb.h>
+#include <common/cxgb_ctl_defs.h>
+#include <cxgb_offload.h>
 
 #include <vm/vm.h>
 #include <vm/vm_page.h>
@@ -83,14 +83,14 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_extern.h>
 #include <vm/pmap.h>
 
-#include <dev/cxgb/sys/mvec.h>
-#include <dev/cxgb/ulp/toecore/cxgb_toedev.h>
-#include <dev/cxgb/ulp/tom/cxgb_defs.h>
-#include <dev/cxgb/ulp/tom/cxgb_tom.h>
-#include <dev/cxgb/ulp/tom/cxgb_t3_ddp.h>
-#include <dev/cxgb/ulp/tom/cxgb_toepcb.h>
-#include <dev/cxgb/ulp/tom/cxgb_tcp.h>
-#include <dev/cxgb/ulp/tom/cxgb_vm.h>
+#include <sys/mvec.h>
+#include <ulp/toecore/cxgb_toedev.h>
+#include <ulp/tom/cxgb_defs.h>
+#include <ulp/tom/cxgb_tom.h>
+#include <ulp/tom/cxgb_t3_ddp.h>
+#include <ulp/tom/cxgb_toepcb.h>
+#include <ulp/tom/cxgb_tcp.h>
+#include <ulp/tom/cxgb_vm.h>
 
 
 #define MAX_SCHEDULE_TIMEOUT	300
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_l2t.c b/sys/dev/cxgb/ulp/tom/cxgb_l2t.c
index 15aa16768d53..1fcd53d9389d 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_l2t.c
+++ b/sys/dev/cxgb/ulp/tom/cxgb_l2t.c
@@ -50,11 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#endif
 
 #define VLAN_NONE 0xfff
 #define SDL(s) ((struct sockaddr_dl *)s) 
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_l2t.h b/sys/dev/cxgb/ulp/tom/cxgb_l2t.h
index 3575f6fa98b1..1d547d3207c8 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_l2t.h
+++ b/sys/dev/cxgb/ulp/tom/cxgb_l2t.h
@@ -31,7 +31,7 @@ $FreeBSD$
 #ifndef _CHELSIO_L2T_H
 #define _CHELSIO_L2T_H
 
-#include <dev/cxgb/ulp/toecore/cxgb_toedev.h>
+#include <ulp/toecore/cxgb_toedev.h>
 #include <sys/lock.h>
 
 #if __FreeBSD_version > 700000
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_listen.c b/sys/dev/cxgb/ulp/tom/cxgb_listen.c
index 45bf7575de5f..8836b58e87bb 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_listen.c
+++ b/sys/dev/cxgb/ulp/tom/cxgb_listen.c
@@ -54,8 +54,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in_var.h>
 
 
-#include <dev/cxgb/cxgb_osdep.h>
-#include <dev/cxgb/sys/mbufq.h>
+#include <cxgb_osdep.h>
+#include <sys/mbufq.h>
 
 #include <netinet/tcp.h>
 #include <netinet/tcp_var.h>
@@ -64,17 +64,17 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_offload.h>
 #include <net/route.h>
 
-#include <dev/cxgb/t3cdev.h>
-#include <dev/cxgb/common/cxgb_firmware_exports.h>
-#include <dev/cxgb/common/cxgb_t3_cpl.h>
-#include <dev/cxgb/common/cxgb_tcb.h>
-#include <dev/cxgb/common/cxgb_ctl_defs.h>
-#include <dev/cxgb/cxgb_offload.h>
-#include <dev/cxgb/ulp/toecore/cxgb_toedev.h>
-#include <dev/cxgb/ulp/tom/cxgb_defs.h>
-#include <dev/cxgb/ulp/tom/cxgb_tom.h>
-#include <dev/cxgb/ulp/tom/cxgb_t3_ddp.h>
-#include <dev/cxgb/ulp/tom/cxgb_toepcb.h>
+#include <t3cdev.h>
+#include <common/cxgb_firmware_exports.h>
+#include <common/cxgb_t3_cpl.h>
+#include <common/cxgb_tcb.h>
+#include <common/cxgb_ctl_defs.h>
+#include <cxgb_offload.h>
+#include <ulp/toecore/cxgb_toedev.h>
+#include <ulp/tom/cxgb_defs.h>
+#include <ulp/tom/cxgb_tom.h>
+#include <ulp/tom/cxgb_t3_ddp.h>
+#include <ulp/tom/cxgb_toepcb.h>
 
 
 static struct listen_info *listen_hash_add(struct tom_data *d, struct socket *so, unsigned int stid);
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h b/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h
index 2cbfa7b38b28..d6f980422336 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h
+++ b/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h
@@ -132,7 +132,7 @@ enum {
 	DDP_BF_NODATA  = 1 << 4,   /* buffer completed before filling */ 
 };
 
-#include <dev/cxgb/ulp/tom/cxgb_toepcb.h>
+#include <ulp/tom/cxgb_toepcb.h>
 struct sockbuf;
 
 /*
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c b/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c
index 171cf2e60234..6cb610748214 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c
+++ b/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c
@@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_syncache.h>
 #include <netinet/toedev.h>
 
-#include <dev/cxgb/ulp/tom/cxgb_tcp_offload.h>
+#include <ulp/tom/cxgb_tcp_offload.h>
 
 
 /*
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h b/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h
index 7c4bd0c06c41..1b28e965a18c 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h
+++ b/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h
@@ -30,7 +30,7 @@
 #define CXGB_TOEPCB_H_
 #include <sys/bus.h>
 #include <sys/condvar.h>
-#include <dev/cxgb/sys/mbufq.h>
+#include <sys/mbufq.h>
 
 struct toepcb {
 	struct toedev 		*tp_toedev;
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_tom.c b/sys/dev/cxgb/ulp/tom/cxgb_tom.c
index 590394b9b482..1067b3292c2a 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_tom.c
+++ b/sys/dev/cxgb/ulp/tom/cxgb_tom.c
@@ -58,43 +58,35 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 
-#include <dev/cxgb/cxgb_osdep.h>
-#include <dev/cxgb/sys/mbufq.h>
+#include <cxgb_osdep.h>
+#include <sys/mbufq.h>
 
 #include <netinet/in_pcb.h>
 
-#include <dev/cxgb/ulp/tom/cxgb_tcp_offload.h>
+#include <ulp/tom/cxgb_tcp_offload.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcp_offload.h>
 #include <netinet/tcp_fsm.h>
 
-#ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
-#else
-#include <dev/cxgb/cxgb_include.h>
-#endif
 
 #include <net/if_vlan_var.h>
 #include <net/route.h>
 
-
-#include <dev/cxgb/t3cdev.h>
-#include <dev/cxgb/common/cxgb_firmware_exports.h>
-#include <dev/cxgb/common/cxgb_tcb.h>
-#include <dev/cxgb/cxgb_include.h>
-#include <dev/cxgb/common/cxgb_ctl_defs.h>
-#include <dev/cxgb/common/cxgb_t3_cpl.h>
-#include <dev/cxgb/cxgb_offload.h>
-#include <dev/cxgb/ulp/toecore/cxgb_toedev.h>
-#include <dev/cxgb/ulp/tom/cxgb_tom.h>
-#include <dev/cxgb/ulp/tom/cxgb_defs.h>
-#include <dev/cxgb/ulp/tom/cxgb_t3_ddp.h>
-#include <dev/cxgb/ulp/tom/cxgb_toepcb.h>
-#include <dev/cxgb/ulp/tom/cxgb_tcp.h>
-
-
-
+#include <t3cdev.h>
+#include <common/cxgb_firmware_exports.h>
+#include <common/cxgb_tcb.h>
+#include <cxgb_include.h>
+#include <common/cxgb_ctl_defs.h>
+#include <common/cxgb_t3_cpl.h>
+#include <cxgb_offload.h>
+#include <ulp/toecore/cxgb_toedev.h>
+#include <ulp/tom/cxgb_tom.h>
+#include <ulp/tom/cxgb_defs.h>
+#include <ulp/tom/cxgb_t3_ddp.h>
+#include <ulp/tom/cxgb_toepcb.h>
+#include <ulp/tom/cxgb_tcp.h>
 
 
 static int activated = 1;
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c b/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c
index a2bcde523a26..d39f20e25b5b 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c
+++ b/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c
@@ -56,25 +56,25 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 
-#include <dev/cxgb/cxgb_osdep.h>
-#include <dev/cxgb/sys/mbufq.h>
+#include <cxgb_osdep.h>
+#include <sys/mbufq.h>
 
 #include <netinet/tcp.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcp_fsm.h>
 #include <net/route.h>
 
-#include <dev/cxgb/t3cdev.h>
-#include <dev/cxgb/common/cxgb_firmware_exports.h>
-#include <dev/cxgb/common/cxgb_tcb.h>
-#include <dev/cxgb/common/cxgb_ctl_defs.h>
-#include <dev/cxgb/common/cxgb_t3_cpl.h>
-#include <dev/cxgb/cxgb_offload.h>
-#include <dev/cxgb/cxgb_include.h>
-#include <dev/cxgb/ulp/toecore/cxgb_toedev.h>
-#include <dev/cxgb/ulp/tom/cxgb_tom.h>
-#include <dev/cxgb/ulp/tom/cxgb_defs.h>
-#include <dev/cxgb/ulp/tom/cxgb_t3_ddp.h>
+#include <t3cdev.h>
+#include <common/cxgb_firmware_exports.h>
+#include <common/cxgb_tcb.h>
+#include <common/cxgb_ctl_defs.h>
+#include <common/cxgb_t3_cpl.h>
+#include <cxgb_offload.h>
+#include <cxgb_include.h>
+#include <ulp/toecore/cxgb_toedev.h>
+#include <ulp/tom/cxgb_tom.h>
+#include <ulp/tom/cxgb_defs.h>
+#include <ulp/tom/cxgb_t3_ddp.h>
 
 static struct tom_tunables default_tunable_vals = {
 	.max_host_sndbuf = 32 * 1024,
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_vm.c b/sys/dev/cxgb/ulp/tom/cxgb_vm.c
index 7036005e93e0..9c6898ab0979 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_vm.c
+++ b/sys/dev/cxgb/ulp/tom/cxgb_vm.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 #include <vm/pmap.h>
-#include <dev/cxgb/ulp/tom/cxgb_vm.h>
+#include <ulp/tom/cxgb_vm.h>
 
 #define TRACE_ENTER printf("%s:%s entered", __FUNCTION__, __FILE__)
 #define TRACE_EXIT printf("%s:%s:%d exited", __FUNCTION__, __FILE__, __LINE__)
diff --git a/sys/modules/cxgb/cxgb/Makefile b/sys/modules/cxgb/cxgb/Makefile
index a8dff5883782..4868a0edb446 100644
--- a/sys/modules/cxgb/cxgb/Makefile
+++ b/sys/modules/cxgb/cxgb/Makefile
@@ -10,7 +10,7 @@ SRCS+=  cxgb_sge.c cxgb_offload.c cxgb_tn1010.c
 SRCS+=	device_if.h bus_if.h pci_if.h opt_zero.h opt_sched.h
 SRCS+=	uipc_mvec.c cxgb_support.c cxgb_multiq.c 
 
-CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -DDEFAULT_JUMBO -I${CXGB} -DSMP
+CFLAGS+= -g -DDEFAULT_JUMBO -I${CXGB}
 CFLAGS+= -DDISABLE_MBUF_IOVEC
 #CFLAGS+= -DIFNET_MULTIQUEUE
 #CFLAGS+= -DDISABLE_MBUF_IOVEC
diff --git a/sys/modules/cxgb/cxgb_t3fw/Makefile b/sys/modules/cxgb/cxgb_t3fw/Makefile
index 0a097aa08e42..0d2f36330f5c 100644
--- a/sys/modules/cxgb/cxgb_t3fw/Makefile
+++ b/sys/modules/cxgb/cxgb_t3fw/Makefile
@@ -5,5 +5,6 @@ CXGB = ${.CURDIR}/../../../dev/cxgb
 
 KMOD= cxgb_t3fw
 SRCS+= cxgb_t3fw.c
+CFLAGS+= -g -I${CXGB}
 
-.include <bsd.kmod.mk>
\ No newline at end of file
+.include <bsd.kmod.mk>
diff --git a/sys/modules/cxgb/iw_cxgb/Makefile b/sys/modules/cxgb/iw_cxgb/Makefile
index e1123bba3faf..1731285e8fd9 100644
--- a/sys/modules/cxgb/iw_cxgb/Makefile
+++ b/sys/modules/cxgb/iw_cxgb/Makefile
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
 CXGB = ${.CURDIR}/../../../dev/cxgb
-.PATH: ${IW_CXGB} ${CXGB}/common ${CXGB}/ulp/iw_cxgb
+.PATH: ${CXGB}/ulp/iw_cxgb
 
 KMOD=   iw_cxgb
 SRCS=   iw_cxgb.c iw_cxgb_cm.c iw_cxgb_hal.c 
 SRCS+=  iw_cxgb_provider.c iw_cxgb_qp.c iw_cxgb_resource.c
 SRCS+=  iw_cxgb_ev.c iw_cxgb_mem.c iw_cxgb_dbg.c iw_cxgb_cq.c
 SRCS+=  bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h opt_ktr.h
-CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED  -I${CXGB} -DSMP
+CFLAGS+= -g -I${CXGB}
 #CFLAGS+= -DDEBUG
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cxgb/toecore/Makefile b/sys/modules/cxgb/toecore/Makefile
index 1c05d799a5f8..52b9f623d953 100644
--- a/sys/modules/cxgb/toecore/Makefile
+++ b/sys/modules/cxgb/toecore/Makefile
@@ -1,8 +1,11 @@
 # $FreeBSD$
-TOECORE = ${.CURDIR}/../../../dev/cxgb/ulp/toecore
-.PATH: ${TOECORE} 
+
+CXGB = ${.CURDIR}/../../../dev/cxgb
+.PATH: ${CXGB}/ulp/toecore
 
 KMOD=	toecore
 SRCS=   toedev.c
 SRCS+=	device_if.h bus_if.h pci_if.h opt_sched.h
-.include <bsd.kmod.mk>
\ No newline at end of file
+CFLAGS+= -g -I${CXGB}
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/cxgb/tom/Makefile b/sys/modules/cxgb/tom/Makefile
index 2417edf1fc40..2b8750a40072 100644
--- a/sys/modules/cxgb/tom/Makefile
+++ b/sys/modules/cxgb/tom/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-TOM = ${.CURDIR}/../../../dev/cxgb/ulp/tom
-.PATH: ${TOM} 
+CXGB = ${.CURDIR}/../../../dev/cxgb
+.PATH: ${CXGB}/ulp/tom
 
 KMOD=	tom
 SRCS=   cxgb_tom.c cxgb_cpl_io.c cxgb_listen.c cxgb_tom_sysctl.c cxgb_cpl_socket.c
@@ -9,6 +9,7 @@ SRCS+=  cxgb_ddp.c cxgb_vm.c cxgb_l2t.c cxgb_tcp_offload.c
 SRCS+=	opt_compat.h opt_inet.h opt_inet6.h opt_ipsec.h opt_mac.h 
 SRCS+=	opt_tcpdebug.h opt_ddb.h opt_sched.h opt_global.h opt_ktr.h
 SRCS+=	device_if.h bus_if.h pci_if.h
+CFLAGS+= -g -I${CXGB}
 
 #CFLAGS+= -DDEBUG_PRINT -DDEBUG
 .include <bsd.kmod.mk>