diff --git a/arch/arm/src/stm32f7/Make.defs b/arch/arm/src/stm32f7/Make.defs
index 2f4b7b25134..d8fc2877a96 100644
--- a/arch/arm/src/stm32f7/Make.defs
+++ b/arch/arm/src/stm32f7/Make.defs
@@ -114,7 +114,7 @@ endif
 CHIP_ASRCS  =
 CHIP_CSRCS  = stm32_allocateheap.c stm32_exti_gpio.c stm32_gpio.c
 CHIP_CSRCS += stm32_irq.c stm32_lowputc.c stm32_rcc.c stm32_serial.c
-CHIP_CSRCS += stm32_start.c
+CHIP_CSRCS += stm32_i2c.c stm32_start.c
 
 ifneq ($(CONFIG_SCHED_TICKLESS),y)
 CHIP_CSRCS += stm32_timerisr.c
diff --git a/arch/arm/src/stm32f7/stm32_i2c.c b/arch/arm/src/stm32f7/stm32_i2c.c
index 01a59959960..ad6724564ff 100644
--- a/arch/arm/src/stm32f7/stm32_i2c.c
+++ b/arch/arm/src/stm32f7/stm32_i2c.c
@@ -96,9 +96,8 @@
 
 #include "up_arch.h"
 
-#include "stm32f7_rcc.h"
-#include "stm32f7_i2c.h"
-#include "stm32f7_waste.h"
+#include "stm32_rcc.h"
+#include "stm32_i2c.h"
 
 /* At least one I2C peripheral must be enabled */
 
diff --git a/arch/arm/src/stm32f7/stm32_i2c.h b/arch/arm/src/stm32f7/stm32_i2c.h
index 9fc26497be5..8829776e631 100644
--- a/arch/arm/src/stm32f7/stm32_i2c.h
+++ b/arch/arm/src/stm32f7/stm32_i2c.h
@@ -44,7 +44,7 @@
 #include <nuttx/i2c/i2c_master.h>
 
 #include "chip.h"
-#include "chip/stm32f7_i2c.h"
+#include "chip/stm32_i2c.h"
 
 /****************************************************************************
  * Pre-processor Definitions