diff --git a/bacnet-stack/whohas.c b/bacnet-stack/whohas.c
index 8fe24e6e..928b80a5 100644
--- a/bacnet-stack/whohas.c
+++ b/bacnet-stack/whohas.c
@@ -137,6 +137,11 @@ int whohas_decode_service_request(uint8_t * apdu,
     return len;
 }
 
+#ifdef TEST
+#include <assert.h>
+#include <string.h>
+#include "ctest.h"
+
 int whohas_decode_apdu(uint8_t * apdu,
     unsigned apdu_len, BACNET_WHO_HAS_DATA * data)
 {
@@ -157,11 +162,6 @@ int whohas_decode_apdu(uint8_t * apdu,
     return len;
 }
 
-#ifdef TEST
-#include <assert.h>
-#include <string.h>
-#include "ctest.h"
-
 void testWhoHasData(Test * pTest, BACNET_WHO_HAS_DATA * data)
 {
     uint8_t apdu[480] = { 0 };