diff --git a/bacnet-stack/abort.c b/bacnet-stack/abort.c
index db9d1340..61425b26 100644
--- a/bacnet-stack/abort.c
+++ b/bacnet-stack/abort.c
@@ -68,6 +68,11 @@ int abort_decode_service_request(uint8_t * apdu,
     return len;
 }
 
+#ifdef TEST
+#include <assert.h>
+#include <string.h>
+#include "ctest.h"
+
 /* decode the whole APDU - mainly used for unit testing */
 int abort_decode_apdu(uint8_t * apdu,
     unsigned apdu_len, uint8_t * invoke_id, uint8_t * abort_reason)
@@ -89,11 +94,6 @@ int abort_decode_apdu(uint8_t * apdu,
     return len;
 }
 
-#ifdef TEST
-#include <assert.h>
-#include <string.h>
-#include "ctest.h"
-
 void testAbort(Test * pTest)
 {
     uint8_t apdu[480] = { 0 };
diff --git a/bacnet-stack/abort.h b/bacnet-stack/abort.h
index 376dc271..cc339afb 100644
--- a/bacnet-stack/abort.h
+++ b/bacnet-stack/abort.h
@@ -47,11 +47,11 @@ extern "C" {
     int abort_decode_service_request(uint8_t * apdu,
         unsigned apdu_len, uint8_t * invoke_id, uint8_t * abort_reason);
 
+#ifdef TEST
+#include "ctest.h"
     int abort_decode_apdu(uint8_t * apdu,
         unsigned apdu_len, uint8_t * invoke_id, uint8_t * abort_reason);
 
-#ifdef TEST
-#include "ctest.h"
     void testAbort(Test * pTest);
 #endif