20 files changed, 19 insertions, 19 deletions

diff --git a/sys/dev/drm2/drm_dp_iic_helper.c b/sys/dev/drm2/drm_dp_iic_helper.c
index c4e580307fbf..c9f4e6044573 100644
--- a/sys/dev/drm2/drm_dp_iic_helper.c
+++ b/sys/dev/drm2/drm_dp_iic_helper.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/kobj.h>
 #include <sys/bus.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 #include "iicbus_if.h"
 #include <dev/iicbus/iiconf.h>
 #include <dev/drm2/drmP.h>
diff --git a/sys/dev/drm2/drm_edid.c b/sys/dev/drm2/drm_edid.c
index 178ab740d288..49752982f3e9 100644
--- a/sys/dev/drm2/drm_edid.c
+++ b/sys/dev/drm2/drm_edid.c
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/drm2/drmP.h>
 #include <dev/drm2/drm_edid.h>
 #include <dev/drm2/drm_edid_modes.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 #include <dev/iicbus/iiconf.h>
 #include "iicbus_if.h"
 
diff --git a/sys/dev/drm2/i915/intel_iic.c b/sys/dev/drm2/i915/intel_iic.c
index 412349c8d9d0..8412ea4d888b 100644
--- a/sys/dev/drm2/i915/intel_iic.c
+++ b/sys/dev/drm2/i915/intel_iic.c
@@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/drm2/i915/i915_drm.h>
 #include <dev/drm2/i915/i915_drv.h>
 #include <dev/drm2/i915/intel_drv.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
 #include "iicbus_if.h"
diff --git a/sys/dev/drm2/i915/intel_sdvo.c b/sys/dev/drm2/i915/intel_sdvo.c
index 8cae7662d5dc..7ce9567dbfc6 100644
--- a/sys/dev/drm2/i915/intel_sdvo.c
+++ b/sys/dev/drm2/i915/intel_sdvo.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/drm2/i915/i915_drv.h>
 #include <dev/drm2/i915/intel_sdvo_regs.h>
 #include <dev/drm2/i915/intel_drv.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 #include <dev/iicbus/iiconf.h>
 #include "iicbus_if.h"
 
diff --git a/sys/dev/drm2/radeon/atombios_i2c.c b/sys/dev/drm2/radeon/atombios_i2c.c
index 40ba15be931e..2ba755d10a39 100644
--- a/sys/dev/drm2/radeon/atombios_i2c.c
+++ b/sys/dev/drm2/radeon/atombios_i2c.c
@@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/drm2/drmP.h>
 #include <dev/drm2/radeon/radeon_drm.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
 #include "radeon.h"
diff --git a/sys/dev/drm2/radeon/radeon_i2c.c b/sys/dev/drm2/radeon/radeon_i2c.c
index 917286a14c18..6b2f6ec9e4c6 100644
--- a/sys/dev/drm2/radeon/radeon_i2c.c
+++ b/sys/dev/drm2/radeon/radeon_i2c.c
@@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/drm2/drmP.h>
 #include <dev/drm2/drm_edid.h>
 #include <dev/drm2/radeon/radeon_drm.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
 #include "radeon.h"
diff --git a/sys/dev/etherswitch/arswitch/arswitch.c b/sys/dev/etherswitch/arswitch/arswitch.c
index 24016e5a825f..04fbf26de7f6 100644
--- a/sys/dev/etherswitch/arswitch/arswitch.c
+++ b/sys/dev/etherswitch/arswitch/arswitch.c
@@ -47,7 +47,7 @@
 #include <net/if_types.h>
 
 #include <machine/bus.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
 #include <dev/mii/mii.h>
diff --git a/sys/dev/etherswitch/arswitch/arswitch_7240.c b/sys/dev/etherswitch/arswitch/arswitch_7240.c
index f3750bf7bb89..fa0480a38f67 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_7240.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_7240.c
@@ -45,7 +45,7 @@
 #include <net/if_types.h>
 
 #include <machine/bus.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
 #include <dev/mii/mii.h>
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8216.c b/sys/dev/etherswitch/arswitch/arswitch_8216.c
index 72b232709b4d..c48efb5f2809 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8216.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_8216.c
@@ -45,7 +45,7 @@
 #include <net/if_types.h>
 
 #include <machine/bus.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
 #include <dev/mii/mii.h>
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8226.c b/sys/dev/etherswitch/arswitch/arswitch_8226.c
index 43d2281f2425..204b0378fcde 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8226.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_8226.c
@@ -45,7 +45,7 @@
 #include <net/if_types.h>
 
 #include <machine/bus.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
 #include <dev/mii/mii.h>
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8316.c b/sys/dev/etherswitch/arswitch/arswitch_8316.c
index 91dd72d90297..f859e2dd5318 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8316.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_8316.c
@@ -45,7 +45,7 @@
 #include <net/if_types.h>
 
 #include <machine/bus.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
 #include <dev/mii/mii.h>
diff --git a/sys/dev/etherswitch/arswitch/arswitch_8327.c b/sys/dev/etherswitch/arswitch/arswitch_8327.c
index 3fc2bb02797c..7c1bd4723d69 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_8327.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_8327.c
@@ -45,7 +45,7 @@
 #include <net/if_types.h>
 
 #include <machine/bus.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
 #include <dev/mii/mii.h>
diff --git a/sys/dev/etherswitch/arswitch/arswitch_9340.c b/sys/dev/etherswitch/arswitch/arswitch_9340.c
index 4de76e2d9ec1..8f16e66d4b49 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_9340.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_9340.c
@@ -45,7 +45,7 @@
 #include <net/if_types.h>
 
 #include <machine/bus.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
 #include <dev/mii/mii.h>
diff --git a/sys/dev/etherswitch/arswitch/arswitch_phy.c b/sys/dev/etherswitch/arswitch/arswitch_phy.c
index 928ca03dbe43..5b73d6ff3af9 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_phy.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_phy.c
@@ -43,7 +43,7 @@
 #include <net/if_media.h>
 
 #include <machine/bus.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
 #include <dev/mii/mii.h>
diff --git a/sys/dev/etherswitch/arswitch/arswitch_reg.c b/sys/dev/etherswitch/arswitch/arswitch_reg.c
index 3251da8a2eec..6503910df878 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_reg.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_reg.c
@@ -44,7 +44,7 @@
 #include <net/if_types.h>
 
 #include <machine/bus.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
 #include <dev/mii/mii.h>
diff --git a/sys/dev/etherswitch/rtl8366/rtl8366rb.c b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
index d14f4660130e..bbf981a0ded4 100644
--- a/sys/dev/etherswitch/rtl8366/rtl8366rb.c
+++ b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
@@ -46,7 +46,7 @@
 #include <net/if_types.h>
 
 #include <machine/bus.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
 #include <dev/mii/mii.h>
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index 16d113ee6c78..5d63060a826e 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.c
@@ -37,10 +37,10 @@
 #include <sys/sx.h>
 #include <sys/systm.h>
 #include <sys/uio.h>
+#include <sys/iic.h>
 
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
-#include <dev/iicbus/iic.h>
 
 #include "iicbus_if.h"
 
diff --git a/sys/dev/iicbus/iicbus_if.m b/sys/dev/iicbus/iicbus_if.m
index c57fac584216..d0d83a3c3bd1 100644
--- a/sys/dev/iicbus/iicbus_if.m
+++ b/sys/dev/iicbus/iicbus_if.m
@@ -27,7 +27,7 @@
 #
 
 #include <sys/bus.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 
 INTERFACE iicbus;
 
diff --git a/sys/dev/iicbus/iiconf.h b/sys/dev/iicbus/iiconf.h
index 092ba8de065e..68ca83febffa 100644
--- a/sys/dev/iicbus/iiconf.h
+++ b/sys/dev/iicbus/iiconf.h
@@ -29,7 +29,7 @@
 #define __IICONF_H
 
 #include <sys/queue.h>
-#include <dev/iicbus/iic.h>
+#include <sys/iic.h>
 
 
 #define IICPRI (PZERO+8)		/* XXX sleep/wakeup queue priority */
diff --git a/sys/dev/iicbus/iic.h b/sys/sys/iic.h
index ab58abf7bf7a..ab58abf7bf7a 100644
--- a/sys/dev/iicbus/iic.h
+++ b/sys/sys/iic.h