diff --git a/drivers/ioexpander/tca64xx.h b/drivers/ioexpander/tca64xx.h
index 24d036a1e8..48efa0747c 100644
--- a/drivers/ioexpander/tca64xx.h
+++ b/drivers/ioexpander/tca64xx.h
@@ -1,7 +1,7 @@
 /********************************************************************************************
  * drivers/ioexpander/tca64.h
  *
- *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Sebastien Lorquet <sebastien@lorquet.fr>
  *
  * References:
@@ -166,29 +166,6 @@
 #define TCA64XX_IRQ_TYPE_EDGE           0x00000000
 #define TCA64XX_IRQ_TYPE_LEVEL          0x00000001
 
-#define tca64xx_irq_type_is_level(handle, gpio) \
-    (tca64xx_get_gpio_triggering_type(handle, gpio) == TCA64XX_IRQ_TYPE_LEVEL)
-#define tca64xx_irq_type_is_edge(handle, gpio) \
-    (tca64xx_get_gpio_triggering_type(handle, gpio) == TCA64XX_IRQ_TYPE_EDGE)
-#define tca64xx_irq_edge_trigger_is_both(handle, gpio) \
-    (tca64xx_get_gpio_triggering_level(handle, gpio) == \
-     TCA64XX_IRQ_TYPE_EDGE_BOTH)
-#define tca64xx_irq_edge_trigger_is_falling(handle, gpio) \
-    (tca64xx_get_gpio_triggering_level(handle, gpio) == \
-     TCA64XX_IRQ_TYPE_EDGE_FALLING)
-#define tca64xx_irq_edge_trigger_is_rising(handle, gpio) \
-    (tca64xx_get_gpio_triggering_level(handle, gpio) == \
-     TCA64XX_IRQ_TYPE_EDGE_RISING)
-#define tca64xx_irq_level_trigger_is_low(handle, gpio) \
-    (tca64xx_get_gpio_triggering_level(handle, gpio) == \
-     TCA64XX_IRQ_TYPE_LEVEL_LOW)
-#define tca64xx_irq_level_trigger_is_high(handle, gpio) \
-    (tca64xx_get_gpio_triggering_level(handle, gpio) == \
-     TCA64XX_IRQ_TYPE_LEVEL_HIGH)
-
-#define WORKER_DEFPRIO          50
-#define WORKER_STACKSIZE        1024
-
 #define TCA64XX_POLLDELAY       (CONFIG_TCA64XX_INT_POLLDELAY / USEC_PER_TICK)
 
 #define TCA64_LEVEL_SENSITIVE(d,p) \
diff --git a/include/nuttx/ioexpander/tca64xx.h b/include/nuttx/ioexpander/tca64xx.h
index 84ef480f01..9a1ec8ca0a 100644
--- a/include/nuttx/ioexpander/tca64xx.h
+++ b/include/nuttx/ioexpander/tca64xx.h
@@ -36,8 +36,8 @@
  *
  ****************************************************************************/
 
-#ifndef _TSB_TCA64XX_H_
-#define _TSB_TCA64XX_H_
+#ifndef __INCLUDE_NUTTX_IOEXPANDER_TCA64XX_H
+#define __INCLUDE_NUTTX_IOEXPANDER_TCA64XX_H
 
 /****************************************************************************
  * Included Files
@@ -46,14 +46,6 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* Unused IO line for irq, reset. */
-
-#define TCA64XX_IO_UNUSED   (1 << 31)
-
 /****************************************************************************
  * Public Types
  ****************************************************************************/