diff --git a/arch/mips/src/pic32mz/pic32mz-gpio.h b/arch/mips/src/pic32mz/pic32mz-gpio.h
index b9ef55da4c8..1c967bc802a 100644
--- a/arch/mips/src/pic32mz/pic32mz-gpio.h
+++ b/arch/mips/src/pic32mz/pic32mz-gpio.h
@@ -158,7 +158,7 @@ int pic32mz_configgpio(pinset_t cfgset);
  *
  ************************************************************************************/
 
-void pic32mz_gpiowrite(uint16_t pinset, bool value);
+void pic32mz_gpiowrite(pinset_t pinset, bool value);
 
 /************************************************************************************
  * Name: pic32mz_gpioread
@@ -168,7 +168,7 @@ void pic32mz_gpiowrite(uint16_t pinset, bool value);
  *
  ************************************************************************************/
 
-bool pic32mz_gpioread(uint16_t pinset);
+bool pic32mz_gpioread(pinset_t pinset);
 
 /************************************************************************************
  * Name: pic32mz_gpioirqinitialize
@@ -212,7 +212,7 @@ void pic32mz_gpioirqinitialize(void);
  ************************************************************************************/
 
 #ifdef CONFIG_PIC32MZ_GPIOIRQ
-xcpt_t pic32mz_gpioattach(uint32_t pinset, xcpt_t handler);
+xcpt_t pic32mz_gpioattach(pinset_t pinset, xcpt_t handler);
 #else
 #  define pic32mz_gpioattach(p,f) (NULL)
 #endif
diff --git a/arch/mips/src/pic32mz/pic32mz-gpioirq.c b/arch/mips/src/pic32mz/pic32mz-gpioirq.c
index 323f13d82c1..8d2411455d5 100644
--- a/arch/mips/src/pic32mz/pic32mz-gpioirq.c
+++ b/arch/mips/src/pic32mz/pic32mz-gpioirq.c
@@ -377,7 +377,7 @@ void pic32mz_gpioirqinitialize(void)
  *
  ****************************************************************************/
 
-xcpt_t pic32mz_gpioattach(uint32_t pinset, xcpt_t handler)
+xcpt_t pic32mz_gpioattach(pinset_t pinset, xcpt_t handler)
 {
   struct ioport_level2_s *handlers;
   xcpt_t oldhandler = NULL;
diff --git a/arch/mips/src/pic32mz/pic32mz-irq.c b/arch/mips/src/pic32mz/pic32mz-irq.c
index e03770ad17f..71fda0c4b71 100644
--- a/arch/mips/src/pic32mz/pic32mz-irq.c
+++ b/arch/mips/src/pic32mz/pic32mz-irq.c
@@ -53,6 +53,7 @@
 #include "up_internal.h"
 
 #include "chip/pic32mz-int.h"
+#include "pic32mz-gpio.h"
 
 /****************************************************************************
  * Pre-processor Definitions