diff --git a/bacnet-stack/Makefile b/bacnet-stack/Makefile
index a95c3c01..3c5ef51e 100644
--- a/bacnet-stack/Makefile
+++ b/bacnet-stack/Makefile
@@ -1,4 +1,4 @@
-all: readprop writeprop readfile writefile reinit server dcc
+all: readprop writeprop readfile writefile reinit server dcc whohas
 	@echo "utilities are in demo/xx directories"
 
 clean: \
@@ -7,7 +7,8 @@ clean: \
 	demo/readfile/Makefile \
 	demo/writefile/Makefile \
 	demo/server/Makefile \
-	demo/dcc/Makefile
+	demo/dcc/Makefile \
+	demo/whohas/Makefile
 	( cd demo/readprop ; make clean )
 	( cd demo/writeprop ; make clean )
 	( cd demo/readfile ; make clean )
@@ -15,6 +16,7 @@ clean: \
 	( cd demo/reinit ; make clean )
 	( cd demo/server ; make clean )
 	( cd demo/dcc ; make clean )
+	( cd demo/whohas ; make clean )
 
 readprop: demo/readprop/Makefile
 	( cd demo/readprop ; make clean ; make )
@@ -37,3 +39,6 @@ server: demo/server/Makefile
 dcc: demo/dcc/Makefile
 	( cd demo/dcc ; make clean ; make )
 
+whohas: demo/whohas/Makefile
+	( cd demo/whohas ; make clean ; make )
+
diff --git a/bacnet-stack/demo/object/ai.c b/bacnet-stack/demo/object/ai.c
index adbe16b6..f8a57df7 100644
--- a/bacnet-stack/demo/object/ai.c
+++ b/bacnet-stack/demo/object/ai.c
@@ -87,7 +87,6 @@ int Analog_Input_Encode_Property_APDU(
   int apdu_len = 0; // return value
   BACNET_BIT_STRING bit_string;
   BACNET_CHARACTER_STRING char_string;
-  char text_string[32] = {""};
   float value = 3.14;
   
   (void)array_index;
diff --git a/bacnet-stack/demo/object/ao.c b/bacnet-stack/demo/object/ao.c
index 61007f6b..59dc3bcf 100644
--- a/bacnet-stack/demo/object/ao.c
+++ b/bacnet-stack/demo/object/ao.c
@@ -168,7 +168,6 @@ int Analog_Output_Encode_Property_APDU(
   int apdu_len = 0; // return value
   BACNET_BIT_STRING bit_string;
   BACNET_CHARACTER_STRING char_string;
-  char text_string[32] = {""};
   float real_value = 1.414;
   unsigned object_index = 0;
   unsigned i = 0; 
diff --git a/bacnet-stack/demo/whohas/Makefile b/bacnet-stack/demo/whohas/Makefile
index 35ad42cf..25b7b640 100644
--- a/bacnet-stack/demo/whohas/Makefile
+++ b/bacnet-stack/demo/whohas/Makefile
@@ -9,7 +9,7 @@ BASEDIR = .
 #DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1
 #DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1
 #DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 
-DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1
+DEFINES = -DBACFILE=1 -DTSM_ENABLED=0 -DBACDL_BIP=1
 BACNET_PORT = ../../ports/linux
 BACNET_OBJECT = ../object
 BACNET_HANDLER = ../handler
@@ -18,7 +18,7 @@ INCLUDES = -I$(BACNET_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDL
 
 CFLAGS  = -Wall -g $(INCLUDES) $(DEFINES)
 
-TARGET = bacrd
+TARGET = bacwh
 
 SRCS = main.c \
        $(BACNET_ROOT)/rd.c \
@@ -27,10 +27,10 @@ SRCS = main.c \
        $(BACNET_HANDLER)/txbuf.c \
        $(BACNET_HANDLER)/noserv.c \
        $(BACNET_HANDLER)/h_whois.c \
+       $(BACNET_HANDLER)/h_ihave.c \
        $(BACNET_HANDLER)/h_rp.c \
-       $(BACNET_HANDLER)/h_iam.c  \
-       $(BACNET_HANDLER)/s_whois.c  \
-       $(BACNET_HANDLER)/s_rd.c  \
+       $(BACNET_HANDLER)/s_whohas.c  \
+       $(BACNET_HANDLER)/s_ihave.c  \
        $(BACNET_OBJECT)/device.c \
        $(BACNET_OBJECT)/ai.c \
        $(BACNET_OBJECT)/ao.c \
@@ -47,7 +47,8 @@ SRCS = main.c \
        $(BACNET_ROOT)/bigend.c \
        $(BACNET_ROOT)/whois.c \
        $(BACNET_ROOT)/iam.c \
-       $(BACNET_ROOT)/tsm.c \
+       $(BACNET_ROOT)/whohas.c \
+       $(BACNET_ROOT)/ihave.c \
        $(BACNET_ROOT)/datalink.c \
        $(BACNET_ROOT)/address.c \
        $(BACNET_ROOT)/arf.c \
diff --git a/bacnet-stack/demo/whohas/main.c b/bacnet-stack/demo/whohas/main.c
index 1ed195b9..6df8f601 100644
--- a/bacnet-stack/demo/whohas/main.c
+++ b/bacnet-stack/demo/whohas/main.c
@@ -135,13 +135,10 @@ int main(int argc, char *argv[])
   BACNET_ADDRESS src = {0};  // address where message came from
   uint16_t pdu_len = 0;
   unsigned timeout = 100; // milliseconds
-  unsigned max_apdu = 0;
   time_t elapsed_seconds = 0;
   time_t last_seconds = 0; 
   time_t current_seconds = 0;
   time_t timeout_seconds = 0;
-  uint8_t invoke_id = 0;
-  bool found = false;
   #ifdef BIP_DEBUG
   BACNET_ADDRESS my_address, broadcast_address;
   #endif
diff --git a/bacnet-stack/ihave.c b/bacnet-stack/ihave.c
index 92e97aae..5ba6ab3c 100644
--- a/bacnet-stack/ihave.c
+++ b/bacnet-stack/ihave.c
@@ -79,7 +79,6 @@ int ihave_decode_service_request(
   int len = 0;
   uint8_t tag_number = 0;
   uint32_t len_value = 0;
-  uint32_t decoded_value = 0; /* for decoding */
   int decoded_type = 0; /* for decoding */
 
   if (apdu_len && data)
@@ -175,7 +174,6 @@ void testIHaveData(Test * pTest, BACNET_I_HAVE_DATA *data)
     data->object_id.instance);
   ct_test(pTest, characterstring_same(
     &test_data.object_name,&data->object_name));
-  }
 }
 
 void testIHave(Test * pTest)
diff --git a/bacnet-stack/unittest.sh b/bacnet-stack/unittest.sh
index 5452e6bb..8350980b 100755
--- a/bacnet-stack/unittest.sh
+++ b/bacnet-stack/unittest.sh
@@ -74,6 +74,11 @@ make -f iam.mak
 ./iam >> test.log
 make -f iam.mak clean
 
+make -f ihave.mak clean
+make -f ihave.mak
+./ihave >> test.log
+make -f ihave.mak clean
+
 make -f indtext.mak clean
 make -f indtext.mak
 ./indtext >> test.log