diff --git a/configs/dk-tm4c129x/src/tm4c_tmp100.c b/configs/dk-tm4c129x/src/tm4c_tmp100.c
index 1b179610c44..e494479b16e 100644
--- a/configs/dk-tm4c129x/src/tm4c_tmp100.c
+++ b/configs/dk-tm4c129x/src/tm4c_tmp100.c
@@ -41,7 +41,7 @@
 
 #include <errno.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/sensors/lm75.h>
 
 #include "tiva_i2c.h"
diff --git a/configs/sama5d3x-ek/src/sam_at24.c b/configs/sama5d3x-ek/src/sam_at24.c
index 06e209dc0e9..5a5b1b83826 100644
--- a/configs/sama5d3x-ek/src/sam_at24.c
+++ b/configs/sama5d3x-ek/src/sam_at24.c
@@ -64,7 +64,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/nxffs.h>
 
diff --git a/configs/sama5d3x-ek/src/sam_ov2640.c b/configs/sama5d3x-ek/src/sam_ov2640.c
index 617b13cd518..ff9e9da8279 100644
--- a/configs/sama5d3x-ek/src/sam_ov2640.c
+++ b/configs/sama5d3x-ek/src/sam_ov2640.c
@@ -42,7 +42,7 @@
 #include <stdlib.h>
 #include <debug.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/video/fb.h>
 #include <nuttx/video/ov2640.h>
 
diff --git a/configs/sama5d3x-ek/src/sam_wm8904.c b/configs/sama5d3x-ek/src/sam_wm8904.c
index 771fc26cf00..b77b09ba50f 100644
--- a/configs/sama5d3x-ek/src/sam_wm8904.c
+++ b/configs/sama5d3x-ek/src/sam_wm8904.c
@@ -45,7 +45,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/audio/i2s.h>
 #include <nuttx/audio/pcm.h>
 #include <nuttx/audio/wm8904.h>
diff --git a/configs/sama5d4-ek/src/sam_pmic.c b/configs/sama5d4-ek/src/sam_pmic.c
index 27eca5404f2..cadfdfd0c6f 100644
--- a/configs/sama5d4-ek/src/sam_pmic.c
+++ b/configs/sama5d4-ek/src/sam_pmic.c
@@ -43,7 +43,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 
 #include "sam_twi.h"
 
diff --git a/configs/sama5d4-ek/src/sam_wm8904.c b/configs/sama5d4-ek/src/sam_wm8904.c
index eb8688ca78b..a2ef539d75a 100644
--- a/configs/sama5d4-ek/src/sam_wm8904.c
+++ b/configs/sama5d4-ek/src/sam_wm8904.c
@@ -45,7 +45,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/audio/i2s.h>
 #include <nuttx/audio/pcm.h>
 #include <nuttx/audio/wm8904.h>
diff --git a/configs/samv71-xult/src/sam_bringup.c b/configs/samv71-xult/src/sam_bringup.c
index 1074d76fa58..8f5eac7eb6d 100644
--- a/configs/samv71-xult/src/sam_bringup.c
+++ b/configs/samv71-xult/src/sam_bringup.c
@@ -72,7 +72,7 @@
 
 #if defined(HAVE_RTC_DSXXXX) || defined(HAVE_RTC_PCF85263)
 #  include <nuttx/clock.h>
-#  include <nuttx/i2c.h>
+#  include <nuttx/i2c/i2c_master.h>
 #ifdef HAVE_RTC_DSXXXX
 #  include <nuttx/timers/ds3231.h>
 #else
diff --git a/configs/samv71-xult/src/sam_wm8904.c b/configs/samv71-xult/src/sam_wm8904.c
index c156c13ec60..028874ba08f 100644
--- a/configs/samv71-xult/src/sam_wm8904.c
+++ b/configs/samv71-xult/src/sam_wm8904.c
@@ -45,7 +45,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/audio/i2s.h>
 #include <nuttx/audio/pcm.h>
 #include <nuttx/audio/wm8904.h>
diff --git a/configs/stm3210e-eval/src/stm32_lm75.c b/configs/stm3210e-eval/src/stm32_lm75.c
index 3aee4e6ca4a..aae873e0f2e 100644
--- a/configs/stm3210e-eval/src/stm32_lm75.c
+++ b/configs/stm3210e-eval/src/stm32_lm75.c
@@ -41,7 +41,7 @@
 
 #include <errno.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/sensors/lm75.h>
 
 #include "stm32.h"
diff --git a/configs/stm3220g-eval/src/stm32_stmpe811.c b/configs/stm3220g-eval/src/stm32_stmpe811.c
index 55007fc9911..6bf2f4b484c 100644
--- a/configs/stm3220g-eval/src/stm32_stmpe811.c
+++ b/configs/stm3220g-eval/src/stm32_stmpe811.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 
 #include <nuttx/board.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/input/touchscreen.h>
 #include <nuttx/input/stmpe811.h>
 
diff --git a/configs/stm3240g-eval/src/stm32_stmpe811.c b/configs/stm3240g-eval/src/stm32_stmpe811.c
index f871a664eb4..83a1e5109a0 100644
--- a/configs/stm3240g-eval/src/stm32_stmpe811.c
+++ b/configs/stm3240g-eval/src/stm32_stmpe811.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 
 #include <nuttx/board.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/input/touchscreen.h>
 #include <nuttx/input/stmpe811.h>
 
diff --git a/configs/stm32f4discovery/src/stm32_pca9635.c b/configs/stm32f4discovery/src/stm32_pca9635.c
index aa979185baa..c7dd52d403f 100644
--- a/configs/stm32f4discovery/src/stm32_pca9635.c
+++ b/configs/stm32f4discovery/src/stm32_pca9635.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/pca9635pw.h>
 
 #include <arch/irq.h>
diff --git a/configs/tm4c123g-launchpad/src/tm4c_at24.c b/configs/tm4c123g-launchpad/src/tm4c_at24.c
index a3444bcac69..5541940368e 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_at24.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_at24.c
@@ -61,7 +61,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/nxffs.h>
 
diff --git a/configs/vsn/src/sif.c b/configs/vsn/src/sif.c
index 65612291773..146a01d27ad 100644
--- a/configs/vsn/src/sif.c
+++ b/configs/vsn/src/sif.c
@@ -81,7 +81,7 @@
 #include <nuttx/clock.h>
 #include <nuttx/time.h>
 #include <nuttx/progmem.h>
-#include <nuttx/i2c.h>
+#include <nuttx/i2c/i2c_master.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/sensors/lis331dl.h>
 #include <nuttx/wireless/cc1101.h>