Index: firmware/App/Controllers/Heaters.h
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -r5a882c7292cea58e74b5a28d4e85dd60e741b834
--- firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision 5a882c7292cea58e74b5a28d4e85dd60e741b834)
@@ -18,37 +18,37 @@
 #ifndef _HEATERS_H_
 #define _HEATERS_H_
 
-#include "Common.h"
+#include "DGCommon.h"
 
 /**
  *  @defgroup Heaters Heaters
- *  @brief Heaters driver modules.
- *  Controls the Primary and Trimmer Heaters
+ *  @brief Heaters driver modules. Controls the primary and trimmer heaters.
  *
  *  @addtogroup Heaters
  *  @{
  */
 
-void initHeaters ( void );
+void initHeaters( void );
 
-void setPrimaryHeaterTargetTemperature ( F32 targetTemp );
-void setTrimmerHeaterTargetTemperature ( F32 targetTemp );
+void setPrimaryHeaterTargetTemperature( F32 targetTemp );
+void setTrimmerHeaterTargetTemperature( F32 targetTemp );
 
-BOOL startPrimaryHeater ( void );
-BOOL startTrimmerHeater ( void );
+BOOL startPrimaryHeater( void );
+BOOL startTrimmerHeater( void );
 
-void stopPrimaryHeater ( void );
-void stopTrimmerHeater ( void );
+void stopPrimaryHeater( void );
+void stopTrimmerHeater( void );
 
-void execHeatersMonitor ( void );
+void execHeatersMonitor( void );
 
-SELF_TEST_STATUS_T execHeatersSelfTest ( void );
+SELF_TEST_STATUS_T execHeatersSelfTest( void );
 
-void execPrimaryHeaters ( void );
+void execPrimaryHeaters( void );
+void execTrimmerHeater( void );
 
-void execTrimmerHeater ( void );
+BOOL testSetHeatersPublishIntervalOverride( U32 value );
+BOOL testResetHeatersPublishIntervalOverride( void );
 
-BOOL testSetHeatersPublishIntervalOverride ( U32 value );
-BOOL testResetHeatersPublishIntervalOverride ( void );
+/**@}*/
 
 #endif