Index: firmware/App/Modes/StatePreTxDrySelfTests.h
===================================================================
diff -u -refdbfe0a1ee81f4a71cadd5bae98ef4543b6572d -rd7cae63618be45748f93b1576ca49e7825fe0cf8
--- firmware/App/Modes/StatePreTxDrySelfTests.h	(.../StatePreTxDrySelfTests.h)	(revision efdbfe0a1ee81f4a71cadd5bae98ef4543b6572d)
+++ firmware/App/Modes/StatePreTxDrySelfTests.h	(.../StatePreTxDrySelfTests.h)	(revision d7cae63618be45748f93b1576ca49e7825fe0cf8)
@@ -18,6 +18,7 @@
 #ifndef __SELF_TESTS_H__
 #define __SELF_TESTS_H__
 
+#include "Common.h"
 #include "TDCommon.h"
 #include "TDDefs.h"
 
@@ -31,34 +32,20 @@
 
 // ********** public definitions **********
 
-/// Payload record structure for no cartridge self-test data broadcast message
-typedef struct
-{
-    U32 timeout;                            ///< No cartridge self-test timeout (in seconds)
-    U32 countdown;                          ///< No cartridge self-test timeout countdown (in seconds)
-} SELF_TEST_NO_CARTRIDGE_PAYLOAD_T;
-
 /// Payload record structure for dry self-test data broadcast message
 typedef struct
 {
     U32 timeout;                            ///< Dry self-test timeout (in seconds)
     U32 countdown;                          ///< Dry self-test timeout countdown (in seconds)
 } SELF_TEST_DRY_PAYLOAD_T;
 
-/// Payload record structure for no cartridge self-test data broadcast message
-typedef enum AuthRejectReasons
-{
-    AUTH_REASON_NONE = 0,               ///< No rejection reason
-    AUTH_REASON_INVALID,                ///< Invalid tube set
-    AUTH_REASON_MODALITY_MISMATCH,      ///< Modality mismatch
-    NUM_OF_AUTH_REJECT_REASONS          ///< Number of auth reject reasons
-} AUTH_REJECT_REASON_T;
-
 // ********** public function prototypes **********
 void initSelfTests( void );
-void execDrySelfTests( void );
 void transitionToDrySelfTests( void );
+void execDrySelfTests( void );
 
+void handleDoorCloseAfterCartridgeInsertion( void );
+
 /**@}*/
 
 #endif