diff --git a/bacnet-stack/whois.c b/bacnet-stack/whois.c
index 6016ccf8..4e7b78d7 100644
--- a/bacnet-stack/whois.c
+++ b/bacnet-stack/whois.c
@@ -96,6 +96,11 @@ int whois_decode_service_request(uint8_t * apdu,
     return len;
 }
 
+#ifdef TEST
+#include <assert.h>
+#include <string.h>
+#include "ctest.h"
+
 int whois_decode_apdu(uint8_t * apdu,
     unsigned apdu_len, int32_t * pLow_limit, int32_t * pHigh_limit)
 {
@@ -117,11 +122,6 @@ int whois_decode_apdu(uint8_t * apdu,
     return len;
 }
 
-#ifdef TEST
-#include <assert.h>
-#include <string.h>
-#include "ctest.h"
-
 void testWhoIs(Test * pTest)
 {
     uint8_t apdu[480] = { 0 };
diff --git a/bacnet-stack/whois.h b/bacnet-stack/whois.h
index d5459f51..aa2cb853 100644
--- a/bacnet-stack/whois.h
+++ b/bacnet-stack/whois.h
@@ -48,10 +48,10 @@ extern "C" {
     int whois_decode_service_request(uint8_t * apdu,
         unsigned apdu_len, int32_t * pLow_limit, int32_t * pHigh_limit);
 
+#ifdef TEST
     int whois_decode_apdu(uint8_t * apdu,
         unsigned apdu_len, int32_t * pLow_limit, int32_t * pHigh_limit);
 
-#ifdef TEST
     void testWhoIs(Test * pTest);
 #endif