I4B header files were repo-copied from sys/i386/include/ to

sys/i4b/include/ so they will be available to all architectures once I4B compiles on those. Adapt #include paths. Approved by: re (kensmith)
svn path=/head/; revision=171270
2024-12-24 11:29:10 +00:00 · 2007-07-06 07:17:22 +00:00 · 2007-07-06 07:17:22 +00:00 · 6f5d8741e5 · 2020-12-20 02:59:44 +00:00
commit 6f5d8741e5
parent 53ffeb8e0b
84 changed files with 195 additions and 195 deletions
--- a/sys/i4b/capi/capi_l4if.c
+++ b/sys/i4b/capi/capi_l4if.c
@ -36,9 +36,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_cause.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_cause.h>

 #include <i4b/include/i4b_l3l4.h>
 #include <i4b/include/i4b_mbuf.h>
--- a/sys/i4b/capi/capi_llif.c
+++ b/sys/i4b/capi/capi_llif.c
@ -36,9 +36,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_cause.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_cause.h>

 #include <i4b/include/i4b_l3l4.h>
 #include <i4b/include/i4b_mbuf.h>
--- a/sys/i4b/capi/capi_msgs.c
+++ b/sys/i4b/capi/capi_msgs.c
@ -36,9 +36,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_cause.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_cause.h>

 #include <i4b/include/i4b_l3l4.h>
 #include <i4b/include/i4b_mbuf.h>
--- a/sys/i4b/capi/iavc/iavc_card.c
+++ b/sys/i4b/capi/iavc/iavc_card.c
@ -43,9 +43,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/rman.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_l3l4.h>
--- a/sys/i4b/capi/iavc/iavc_isa.c
+++ b/sys/i4b/capi/iavc/iavc_isa.c
@ -42,9 +42,9 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 #include <isa/isavar.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_l3l4.h>
--- a/sys/i4b/capi/iavc/iavc_lli.c
+++ b/sys/i4b/capi/iavc/iavc_lli.c
@ -45,9 +45,9 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_l3l4.h>
--- a/sys/i4b/capi/iavc/iavc_pci.c
+++ b/sys/i4b/capi/iavc/iavc_pci.c
@ -48,9 +48,9 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_l3l4.h>
--- a/sys/i4b/driver/i4b_ctl.c
+++ b/sys/i4b/driver/i4b_ctl.c
@ -42,8 +42,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_l3l4.h>
--- a/sys/i4b/driver/i4b_ing.c
+++ b/sys/i4b/driver/i4b_ing.c
@ -50,8 +50,8 @@ __FBSDID("$FreeBSD$");
 #include <netgraph/ng_parse.h>
 #include <netgraph/netgraph.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_debug.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_l3l4.h>
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@ -98,8 +98,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/time.h>
 #include <net/bpf.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_debug.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_l3l4.h>
--- a/sys/i4b/driver/i4b_isppp.c
+++ b/sys/i4b/driver/i4b_isppp.c
@ -60,8 +60,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/time.h>
 #include <net/bpf.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_debug.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_l3l4.h>
--- a/sys/i4b/driver/i4b_rbch.c
+++ b/sys/i4b/driver/i4b_rbch.c
@ -48,9 +48,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_rbch_ioctl.h>
-#include <machine/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_rbch_ioctl.h>
+#include <i4b/include/i4b_debug.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_mbuf.h>
--- a/sys/i4b/driver/i4b_tel.c
+++ b/sys/i4b/driver/i4b_tel.c
@ -50,9 +50,9 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <sys/tty.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_tel_ioctl.h>
-#include <machine/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_tel_ioctl.h>
+#include <i4b/include/i4b_debug.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_mbuf.h>
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@ -49,8 +49,8 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <sys/tty.h>

-#include <machine/i4b_trace.h>
-#include <machine/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>
+#include <i4b/include/i4b_ioctl.h>

 #include <i4b/include/i4b_mbuf.h>
 #include <i4b/include/i4b_global.h>
--- a/sys/i4b/include/i4b_l1l2.h
+++ b/sys/i4b/include/i4b_l1l2.h
@ -37,7 +37,7 @@
 #ifndef _I4B_L1L2_H_
 #define _I4B_L1L2_H_

-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_trace.h>

 extern struct i4b_l1l2_func i4b_l1l2_func;

--- a/sys/i4b/layer1/i4b_l1dmux.c
+++ b/sys/i4b/layer1/i4b_l1dmux.c
@ -37,9 +37,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>

--- a/sys/i4b/layer1/i4b_l1lib.c
+++ b/sys/i4b/layer1/i4b_l1lib.c
@ -38,8 +38,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>

--- a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
@ -44,9 +44,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>

--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
@ -42,9 +42,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_isac.h>
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
@ -42,9 +42,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/isic/i4b_isic.h>

--- a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
@ -58,9 +58,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_mbuf.h>
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
@ -45,9 +45,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>

--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
@ -42,9 +42,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_isac.h>
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
@ -41,9 +41,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/isic/i4b_isic.h>

--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
@ -57,9 +57,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_mbuf.h>
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
@ -56,9 +56,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_mbuf.h>
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
@ -45,9 +45,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>

--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
@ -43,9 +43,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_isac.h>
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
@ -43,9 +43,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/isic/i4b_isic.h>

--- a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
@ -46,9 +46,9 @@ __FBSDID("$FreeBSD$");

 #include <i4b/include/i4b_mbuf.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>
 #include <i4b/layer1/i4b_hdlc.h>
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
@ -48,9 +48,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/include/i4b_mbuf.h>
 #include <i4b/include/i4b_global.h>
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
@ -46,8 +46,8 @@ __FBSDID("$FreeBSD$");

 #include <i4b/include/i4b_global.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>
 #include <i4b/layer1/ihfc/i4b_ihfc.h>
--- a/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
+++ b/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_ioctl.h>
+#include <i4b/include/i4b_ioctl.h>
 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_ipac.h>

--- a/sys/i4b/layer1/isic/i4b_avm_a1.c
+++ b/sys/i4b/layer1/isic/i4b_avm_a1.c
@ -51,8 +51,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>
 #include <i4b/layer1/isic/i4b_isic.h>
--- a/sys/i4b/layer1/isic/i4b_bchan.c
+++ b/sys/i4b/layer1/isic/i4b_bchan.c
@ -40,9 +40,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>

--- a/sys/i4b/layer1/isic/i4b_ctx_s0P.c
+++ b/sys/i4b/layer1/isic/i4b_ctx_s0P.c
@ -50,8 +50,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>
 #include <i4b/layer1/isic/i4b_isic.h>
--- a/sys/i4b/layer1/isic/i4b_diva.c
+++ b/sys/i4b/layer1/isic/i4b_diva.c
@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_ioctl.h>
+#include <i4b/include/i4b_ioctl.h>

 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_ipac.h>
--- a/sys/i4b/layer1/isic/i4b_drn_ngo.c
+++ b/sys/i4b/layer1/isic/i4b_drn_ngo.c
@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_ioctl.h>
+#include <i4b/include/i4b_ioctl.h>

 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
--- a/sys/i4b/layer1/isic/i4b_dynalink.c
+++ b/sys/i4b/layer1/isic/i4b_dynalink.c
@ -77,8 +77,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>
 #include <i4b/layer1/isic/i4b_isic.h>
--- a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_ioctl.h>
+#include <i4b/include/i4b_ioctl.h>

 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_ioctl.h>
+#include <i4b/include/i4b_ioctl.h>

 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>

-#include <machine/i4b_ioctl.h>
+#include <i4b/include/i4b_ioctl.h>

 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_ipac.h>
--- a/sys/i4b/layer1/isic/i4b_hscx.c
+++ b/sys/i4b/layer1/isic/i4b_hscx.c
@ -41,9 +41,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
--- a/sys/i4b/layer1/isic/i4b_isac.c
+++ b/sys/i4b/layer1/isic/i4b_isac.c
@ -43,9 +43,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>

--- a/sys/i4b/layer1/isic/i4b_isic.c
+++ b/sys/i4b/layer1/isic/i4b_isic.c
@ -41,9 +41,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>

--- a/sys/i4b/layer1/isic/i4b_isic_isa.c
+++ b/sys/i4b/layer1/isic/i4b_isic_isa.c
@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_ioctl.h>
+#include <i4b/include/i4b_ioctl.h>

 #include <i4b/layer1/isic/i4b_isic.h>

--- a/sys/i4b/layer1/isic/i4b_isic_pnp.c
+++ b/sys/i4b/layer1/isic/i4b_isic_pnp.c
@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_ioctl.h>
+#include <i4b/include/i4b_ioctl.h>
 #include <i4b/layer1/isic/i4b_isic.h>

 #include <isa/isavar.h>
--- a/sys/i4b/layer1/isic/i4b_itk_ix1.c
+++ b/sys/i4b/layer1/isic/i4b_itk_ix1.c
@ -70,8 +70,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>
 #include <i4b/layer1/i4b_l1.h>
 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
--- a/sys/i4b/layer1/isic/i4b_l1.c
+++ b/sys/i4b/layer1/isic/i4b_l1.c
@ -41,9 +41,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_isac.h>
--- a/sys/i4b/layer1/isic/i4b_l1fsm.c
+++ b/sys/i4b/layer1/isic/i4b_l1fsm.c
@ -41,9 +41,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/isic/i4b_isic.h>

--- a/sys/i4b/layer1/isic/i4b_siemens_isurf.c
+++ b/sys/i4b/layer1/isic/i4b_siemens_isurf.c
@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_ioctl.h>
+#include <i4b/include/i4b_ioctl.h>

 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_ipac.h>
--- a/sys/i4b/layer1/isic/i4b_sws.c
+++ b/sys/i4b/layer1/isic/i4b_sws.c
@ -70,8 +70,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>
 #include <i4b/layer1/i4b_l1.h>
 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_hscx.h>
--- a/sys/i4b/layer1/isic/i4b_tel_s016.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s016.c
@ -52,8 +52,8 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>

 #include <machine/md_var.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>
 #include <i4b/layer1/isic/i4b_isic.h>
--- a/sys/i4b/layer1/isic/i4b_tel_s0163.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s0163.c
@ -51,8 +51,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>
 #include <i4b/layer1/isic/i4b_isic.h>
--- a/sys/i4b/layer1/isic/i4b_tel_s08.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s08.c
@ -52,8 +52,8 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>

 #include <machine/md_var.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>
 #include <i4b/layer1/isic/i4b_isic.h>
--- a/sys/i4b/layer1/isic/i4b_usr_sti.c
+++ b/sys/i4b/layer1/isic/i4b_usr_sti.c
@ -47,8 +47,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>
 #include <i4b/layer1/isic/i4b_isic.h>
--- a/sys/i4b/layer1/itjc/i4b_itjc_isac.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_isac.c
@ -46,9 +46,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>

--- a/sys/i4b/layer1/itjc/i4b_itjc_l1.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_l1.c
@ -44,9 +44,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_isac.h>
--- a/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
@ -44,9 +44,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/isic/i4b_isic.h>
 #include <i4b/layer1/isic/i4b_isac.h>
--- a/sys/i4b/layer1/itjc/i4b_itjc_pci.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
@ -58,9 +58,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_mbuf.h>
--- a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
@ -45,9 +45,9 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>


-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>

--- a/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
@ -43,9 +43,9 @@ __FBSDID("$FreeBSD$");

 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>

--- a/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
@ -42,9 +42,9 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>


-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/layer1/i4b_l1.h>

--- a/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
@ -41,9 +41,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_l3l4.h>
--- a/sys/i4b/layer1/iwic/i4b_iwic_pci.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_pci.c
@ -50,8 +50,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_l3l4.h>
--- a/sys/i4b/layer2/i4b_iframe.c
+++ b/sys/i4b/layer2/i4b_iframe.c
@ -41,8 +41,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_trace.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_trace.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_l1l2.h>
--- a/sys/i4b/layer2/i4b_l2.c
+++ b/sys/i4b/layer2/i4b_l2.c
@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
+#include <i4b/include/i4b_debug.h>

 #include <i4b/include/i4b_l1l2.h>
 #include <i4b/include/i4b_l2l3.h>
--- a/sys/i4b/layer2/i4b_l2fsm.c
+++ b/sys/i4b/layer2/i4b_l2fsm.c
@ -39,8 +39,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_l2l3.h>
--- a/sys/i4b/layer2/i4b_l2timer.c
+++ b/sys/i4b/layer2/i4b_l2timer.c
@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
+#include <i4b/include/i4b_debug.h>

 #include <i4b/include/i4b_global.h>

--- a/sys/i4b/layer2/i4b_lme.c
+++ b/sys/i4b/layer2/i4b_lme.c
@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
+#include <i4b/include/i4b_debug.h>

 #include <i4b/layer2/i4b_l2.h>

--- a/sys/i4b/layer2/i4b_sframe.c
+++ b/sys/i4b/layer2/i4b_sframe.c
@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
+#include <i4b/include/i4b_debug.h>

 #include <i4b/include/i4b_l1l2.h>
 #include <i4b/include/i4b_mbuf.h>
--- a/sys/i4b/layer2/i4b_tei.c
+++ b/sys/i4b/layer2/i4b_tei.c
@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
+#include <i4b/include/i4b_debug.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_l1l2.h>
--- a/sys/i4b/layer2/i4b_uframe.c
+++ b/sys/i4b/layer2/i4b_uframe.c
@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
+#include <i4b/include/i4b_debug.h>

 #include <i4b/include/i4b_l1l2.h>
 #include <i4b/include/i4b_l2l3.h>
--- a/sys/i4b/layer2/i4b_util.c
+++ b/sys/i4b/layer2/i4b_util.c
@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
+#include <i4b/include/i4b_debug.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_l1l2.h>
--- a/sys/i4b/layer3/i4b_l2if.c
+++ b/sys/i4b/layer3/i4b_l2if.c
@ -38,9 +38,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/mbuf.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_cause.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_cause.h>

 #include <i4b/include/i4b_isdnq931.h>
 #include <i4b/include/i4b_l2l3.h>
--- a/sys/i4b/layer3/i4b_l3fsm.c
+++ b/sys/i4b/layer3/i4b_l3fsm.c
@ -38,9 +38,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/mbuf.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_cause.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_cause.h>

 #include <i4b/include/i4b_l2l3.h>
 #include <i4b/include/i4b_l3l4.h>
--- a/sys/i4b/layer3/i4b_l3timer.c
+++ b/sys/i4b/layer3/i4b_l3timer.c
@ -39,8 +39,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/mbuf.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_l3l4.h>
--- a/sys/i4b/layer3/i4b_l4if.c
+++ b/sys/i4b/layer3/i4b_l4if.c
@ -38,9 +38,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/mbuf.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_cause.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_cause.h>

 #include <i4b/include/i4b_l2l3.h>
 #include <i4b/include/i4b_l3l4.h>
--- a/sys/i4b/layer3/i4b_q931.c
+++ b/sys/i4b/layer3/i4b_q931.c
@ -38,9 +38,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/mbuf.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_cause.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_cause.h>

 #include <i4b/include/i4b_isdnq931.h>
 #include <i4b/include/i4b_l3l4.h>
--- a/sys/i4b/layer3/i4b_q932fac.c
+++ b/sys/i4b/layer3/i4b_q932fac.c
@ -38,8 +38,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/mbuf.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>

 #include <i4b/include/i4b_l3l4.h>

--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@ -48,9 +48,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/selinfo.h>
 #include <net/if.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_cause.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_cause.h>

 #include <i4b/include/i4b_l3l4.h>
 #include <i4b/include/i4b_mbuf.h>
--- a/sys/i4b/layer4/i4b_l4.c
+++ b/sys/i4b/layer4/i4b_l4.c
@ -41,9 +41,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/mbuf.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_cause.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>
+#include <i4b/include/i4b_cause.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_l3l4.h>
--- a/sys/i4b/layer4/i4b_l4mgmt.c
+++ b/sys/i4b/layer4/i4b_l4mgmt.c
@ -38,8 +38,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/mbuf.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>

 #include <i4b/include/i4b_l3l4.h>
 #include <i4b/include/i4b_global.h>
--- a/sys/i4b/layer4/i4b_l4timer.c
+++ b/sys/i4b/layer4/i4b_l4timer.c
@ -37,8 +37,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/systm.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
+#include <i4b/include/i4b_debug.h>
+#include <i4b/include/i4b_ioctl.h>

 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_l3l4.h>