diff --git a/drivers/gpio/gpio_sam0.c b/drivers/gpio/gpio_sam0.c
index 025e5017279..5c96b70247c 100644
--- a/drivers/gpio/gpio_sam0.c
+++ b/drivers/gpio/gpio_sam0.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <drivers/gpio.h>
 #include <soc.h>
-#include <interrupt_controller/intc_sam0_eic.h>
+#include <drivers/interrupt_controller/sam0_eic.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_stm32.c b/drivers/gpio/gpio_stm32.c
index c4c8bf8b77c..9b5e78659a9 100644
--- a/drivers/gpio/gpio_stm32.c
+++ b/drivers/gpio/gpio_stm32.c
@@ -14,7 +14,7 @@
 #include <pinmux/stm32/pinmux_stm32.h>
 #include <drivers/pinmux.h>
 #include <sys/util.h>
-#include <interrupt_controller/intc_exti_stm32.h>
+#include <drivers/interrupt_controller/exti_stm32.h>
 
 #include "gpio_stm32.h"
 #include "gpio_utils.h"
diff --git a/drivers/interrupt_controller/intc_exti_stm32.c b/drivers/interrupt_controller/intc_exti_stm32.c
index 0b3a6f11067..3279ae6c9ce 100644
--- a/drivers/interrupt_controller/intc_exti_stm32.c
+++ b/drivers/interrupt_controller/intc_exti_stm32.c
@@ -19,7 +19,7 @@
 #include <device.h>
 #include <soc.h>
 #include <sys/__assert.h>
-#include "intc_exti_stm32.h"
+#include <drivers/interrupt_controller/exti_stm32.h>
 
 #if defined(CONFIG_SOC_SERIES_STM32F0X) || \
     defined(CONFIG_SOC_SERIES_STM32L0X) || \
diff --git a/drivers/interrupt_controller/intc_sam0_eic.c b/drivers/interrupt_controller/intc_sam0_eic.c
index 0dded7f44e9..ed423491f9f 100644
--- a/drivers/interrupt_controller/intc_sam0_eic.c
+++ b/drivers/interrupt_controller/intc_sam0_eic.c
@@ -6,7 +6,7 @@
 
 #include <device.h>
 #include <soc.h>
-#include "intc_sam0_eic.h"
+#include <drivers/interrupt_controller/sam0_eic.h>
 #include "intc_sam0_eic_priv.h"
 
 struct sam0_eic_line_assignment {
diff --git a/drivers/interrupt_controller/intc_exti_stm32.h b/include/drivers/interrupt_controller/exti_stm32.h
similarity index 92%
rename from drivers/interrupt_controller/intc_exti_stm32.h
rename to include/drivers/interrupt_controller/exti_stm32.h
index 9e347a79f52..0646f9a8f32 100644
--- a/drivers/interrupt_controller/intc_exti_stm32.h
+++ b/include/drivers/interrupt_controller/exti_stm32.h
@@ -65,11 +65,12 @@ typedef void (*stm32_exti_callback_t) (int line, void *user);
  * @brief set EXTI interrupt callback
  *
  * @param line EXI# line
+ * @param port port index
  * @param cb   user callback
- * @param arg  user arg
+ * @param data user data
  */
-int stm32_exti_set_callback(int line, int port, stm32_exti_callback_t cb,
-				void *data);
+int stm32_exti_set_callback(int line, int port,
+			    stm32_exti_callback_t cb, void *data);
 
 /**
  * @brief unset EXTI interrupt callback
diff --git a/drivers/interrupt_controller/intc_sam0_eic.h b/include/drivers/interrupt_controller/sam0_eic.h
similarity index 96%
rename from drivers/interrupt_controller/intc_sam0_eic.h
rename to include/drivers/interrupt_controller/sam0_eic.h
index 0a4fa1a8dd2..0aa4e9f385b 100644
--- a/drivers/interrupt_controller/intc_sam0_eic.h
+++ b/include/drivers/interrupt_controller/sam0_eic.h
@@ -40,6 +40,7 @@ enum sam0_eic_trigger {
  * @param port port index (A=0, etc)
  * @param pin pin in the port
  * @param trigger trigger condition
+ * @param filter enable filter
  * @param cb interrupt callback
  * @param data parameter to the interrupt callback
  */
@@ -79,6 +80,6 @@ int sam0_eic_disable_interrupt(int port, int pin);
  *
  * @param port port index (A=0, etc)
  */
-u32_t sam0_eic_interrupt_pending(int por);
+u32_t sam0_eic_interrupt_pending(int port);
 
 #endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_SAM0_EIC_H_ */