Index: firmware/App/Controllers/Buttons.h
===================================================================
diff -u -rf3b83f75a19b975ad1abead662c8151a2907ac00 -r0b3a29a3a189b9d357d3eaa554c7baf22de30e81
--- firmware/App/Controllers/Buttons.h	(.../Buttons.h)	(revision f3b83f75a19b975ad1abead662c8151a2907ac00)
+++ firmware/App/Controllers/Buttons.h	(.../Buttons.h)	(revision 0b3a29a3a189b9d357d3eaa554c7baf22de30e81)
@@ -54,8 +54,8 @@
 void userConfirmOffButton( U08 response );
 SELF_TEST_STATUS_T execStuckButtonTest( void );
 
-DATA_GET_PROTOTYPE( BUTTON_STATE_T, getOffButtonState );
-DATA_GET_PROTOTYPE( BUTTON_STATE_T, getStopButtonState );
+BUTTON_STATE_T getOffButtonState( void );
+BUTTON_STATE_T getStopButtonState( void );
 
 BOOL testSetOffButtonStateOverride( U32 value );
 BOOL testResetOffButtonStateOverride( void );