diff --git a/include/libopencm3/stm32f1/i2c.h b/include/libopencm3/stm32_common/i2c.h
similarity index 98%
rename from include/libopencm3/stm32f1/i2c.h
rename to include/libopencm3/stm32_common/i2c.h
index 1b837b87..1fa4f372 100644
--- a/include/libopencm3/stm32f1/i2c.h
+++ b/include/libopencm3/stm32_common/i2c.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_I2C_H
 #define LIBOPENCM3_I2C_H
 
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- Convenience macros -------------------------------------------------- */
@@ -195,7 +195,7 @@
 
 /* ADD: Address bits: [7:1] in 7-bit mode, bits [9:0] in 10-bit mode */
 
-/* --- I2Cx_OAR1 values ---------------------------------------------------- */
+/* --- I2Cx_OAR2 values ---------------------------------------------------- */
 
 /* Note: Bits [15:8] are reserved, and forced to 0 by hardware. */