Index: firmware/App/Drivers/CPLD.c
===================================================================
diff -u -r83b1a65b576994e1f8e1476629d8f1277cd67720 -rdcbd821e41803adc6e582d909207bc97f85ff939
--- firmware/App/Drivers/CPLD.c	(.../CPLD.c)	(revision 83b1a65b576994e1f8e1476629d8f1277cd67720)
+++ firmware/App/Drivers/CPLD.c	(.../CPLD.c)	(revision dcbd821e41803adc6e582d909207bc97f85ff939)
@@ -15,7 +15,6 @@
  **************************************************************************/
 
 #include <Controllers/AlarmLamp.h>
-#include <Controllers/Buttons.h>
 #include "gio.h"
 #include "mibspi.h"
 
@@ -39,28 +38,28 @@
 #define RED_SPI5_PORT_MASK          0x00000800  // (SOMI[0] - re-purposed as output GPIO)
 
 // CPLD pin I/O macros
-#define GET_OFF()          (PIN_SIGNAL_STATE_T)(gioGetBit(gioPORTA, OFF_BUTTON_GIO_PORT_PIN))
-#define GET_STOP()         (PIN_SIGNAL_STATE_T)(gioGetBit(gioPORTA, STOP_BUTTON_GIO_PORT_PIN))
-#define GET_WD_EXP()       (PIN_SIGNAL_STATE_T)(gioGetBit(gioPORTB, WD_EXP_GIO_PORT_PIN))
+#define GET_OFF()          ( PIN_SIGNAL_STATE_T )( gioGetBit( gioPORTA, OFF_BUTTON_GIO_PORT_PIN ) )
+#define GET_STOP()         ( PIN_SIGNAL_STATE_T )( gioGetBit( gioPORTA, STOP_BUTTON_GIO_PORT_PIN ) )
+#define GET_WD_EXP()       ( PIN_SIGNAL_STATE_T )( gioGetBit( gioPORTB, WD_EXP_GIO_PORT_PIN ) )
 
 #define TGL_WD_PET()       gioToggleBit( gioPORTB, WD_PET_GIO_PORT_PIN )
-#define TGL_OFF_REQ()      gioToggleBit( gioPORTB, OFF_REQUEST_GIO_PORT_PIN)
+#define TGL_OFF_REQ()      gioToggleBit( gioPORTB, OFF_REQUEST_GIO_PORT_PIN )
 #define SET_WD_PET()       gioSetBit( gioPORTB, WD_PET_GIO_PORT_PIN, PIN_SIGNAL_HIGH )
 #define SET_OFF_REQ()      gioSetBit( gioPORTB, OFF_REQUEST_GIO_PORT_PIN, PIN_SIGNAL_HIGH )
-#define SET_GREEN()        {mibspiREG5->PC3 |= GREEN_SPI5_PORT_MASK;}
-#define SET_BLUE()         {mibspiREG5->PC3 |= BLUE_SPI5_PORT_MASK;}
-#define SET_RED()          {mibspiREG5->PC3 |= RED_SPI5_PORT_MASK;}
+#define SET_GREEN()        { mibspiREG5->PC3 |= GREEN_SPI5_PORT_MASK; }
+#define SET_BLUE()         { mibspiREG5->PC3 |= BLUE_SPI5_PORT_MASK; }
+#define SET_RED()          { mibspiREG5->PC3 |= RED_SPI5_PORT_MASK; }
 
 #define CLR_WD_PET()       gioSetBit( gioPORTB, WD_PET_GIO_PORT_PIN, PIN_SIGNAL_LOW )
 #define CLR_OFF_REQ()      gioSetBit( gioPORTB, OFF_REQUEST_GIO_PORT_PIN, PIN_SIGNAL_LOW )
-#define CLR_GREEN()        {mibspiREG5->PC3 &= ~GREEN_SPI5_PORT_MASK;}
-#define CLR_BLUE()         {mibspiREG5->PC3 &= ~BLUE_SPI5_PORT_MASK;}
-#define CLR_RED()          {mibspiREG5->PC3 &= ~RED_SPI5_PORT_MASK;}
+#define CLR_GREEN()        { mibspiREG5->PC3 &= ~GREEN_SPI5_PORT_MASK; }
+#define CLR_BLUE()         { mibspiREG5->PC3 &= ~BLUE_SPI5_PORT_MASK; }
+#define CLR_RED()          { mibspiREG5->PC3 &= ~RED_SPI5_PORT_MASK; }
 
 #ifdef RM46_EVAL_BOARD_TARGET
     // for RM46 eval board, user button B uses the MIBSPI1_nCS[4] pin, so need to re-purpose that pin as GPIO to see the button
     #define USER_BUTTON_MASK            0x00000010  // (nCS[4]
-    #define GET_USER_BUTTON()           (PIN_SIGNAL_STATE_T)(((mibspiREG1->PC2 & USER_BUTTON_MASK) == 0 ? PIN_SIGNAL_LOW : PIN_SIGNAL_HIGH))
+    #define GET_USER_BUTTON()           ( PIN_SIGNAL_STATE_T )( ( ( mibspiREG1->PC2 & USER_BUTTON_MASK ) == 0 ? PIN_SIGNAL_LOW : PIN_SIGNAL_HIGH ) )
     PIN_SIGNAL_STATE_T getUserButtonState( void )
     {
         PIN_SIGNAL_STATE_T result = GET_USER_BUTTON();