diff --git a/bacnet-stack/demo/handler/s_iam.c b/bacnet-stack/demo/handler/s_iam.c
index 46edb518..5b778aa8 100644
--- a/bacnet-stack/demo/handler/s_iam.c
+++ b/bacnet-stack/demo/handler/s_iam.c
@@ -27,8 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
-#include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
 #include "address.h"
@@ -40,34 +38,49 @@
 #include "iam.h"
 /* some demo stuff needed */
 #include "handlers.h"
-#include "txbuf.h"
 
-void Send_I_Am(
-    uint8_t * buffer)
+int iam_encode_pdu(
+    uint8_t * buffer,
+    BACNET_ADDRESS * dest,
+    BACNET_NPDU_DATA * npdu_data)
 {
     int len = 0;
     int pdu_len = 0;
-    BACNET_ADDRESS dest;
-    int bytes_sent = 0;
-    BACNET_NPDU_DATA npdu_data;
 
     /* I-Am is a global broadcast */
-    datalink_get_broadcast_address(&dest);
+    datalink_get_broadcast_address(dest);
     /* encode the NPDU portion of the packet */
-    npdu_encode_npdu_data(&npdu_data, false, MESSAGE_PRIORITY_NORMAL);
-    pdu_len = npdu_encode_pdu(&buffer[0], &dest, NULL, &npdu_data);
+    npdu_encode_npdu_data(npdu_data, false, MESSAGE_PRIORITY_NORMAL);
+    pdu_len = npdu_encode_pdu(&buffer[0], dest, NULL, npdu_data);
     /* encode the APDU portion of the packet */
     len =
         iam_encode_apdu(&buffer[pdu_len], Device_Object_Instance_Number(),
         MAX_APDU, SEGMENTATION_NONE, Device_Vendor_Identifier());
     pdu_len += len;
+
+    return pdu_len;
+}
+
+void Send_I_Am(
+    uint8_t * buffer)
+{
+    int pdu_len = 0;
+    BACNET_ADDRESS dest;
+    int bytes_sent = 0;
+    BACNET_NPDU_DATA npdu_data;
+
+    /* are we are forbidden to send? */
+    if (!dcc_communication_enabled())
+        return 0;
+    /* encode the data */
+    pdu_len = iam_encode_pdu(buffer, &dest, &npdu_data);
     /* send data */
     bytes_sent = datalink_send_pdu(&dest, &npdu_data, &buffer[0], pdu_len);
+
 #if PRINT_ENABLED
     if (bytes_sent <= 0)
         fprintf(stderr, "Failed to Send I-Am Reply (%s)!\n",
             strerror(errno));
 #endif
-
-    return;
+    return bytes_sent;
 }
diff --git a/bacnet-stack/include/client.h b/bacnet-stack/include/client.h
index f1d5b182..54684ea5 100644
--- a/bacnet-stack/include/client.h
+++ b/bacnet-stack/include/client.h
@@ -41,6 +41,10 @@ extern "C" {
 /* unconfirmed requests */
     void Send_I_Am(
         uint8_t * buffer);
+    int iam_encode_pdu(
+        uint8_t * buffer,
+        BACNET_ADDRESS * dest,
+        BACNET_NPDU_DATA * npdu_data);
 
     void Send_WhoIs(
         int32_t low_limit,
diff --git a/bacnet-stack/ports/atmega168/bacnet.aps b/bacnet-stack/ports/atmega168/bacnet.aps
index a39bd51c..26861917 100644
--- a/bacnet-stack/ports/atmega168/bacnet.aps
+++ b/bacnet-stack/ports/atmega168/bacnet.aps
@@ -1 +1 @@
-<AVRStudio><MANAGEMENT><Created>13-Aug-2007 15:08:27</Created><LastEdit>30-Oct-2008 15:54:44</LastEdit><ProjectType>0</ProjectType><Created>13-Aug-2007 15:08:27</Created><Version>4</Version><Build>4, 13, 0, 528</Build><ProjectTypeName>AVR GCC</ProjectTypeName><ICON>241</ICON><ProjectName>bacnet</ProjectName><Created>13-Aug-2007 15:11:07</Created><LastEdit>13-Aug-2007 15:11:07</LastEdit><ICON>241</ICON><ProjectType>0</ProjectType><Created>13-Aug-2007 15:11:07</Created><Version>4</Version><Build>4, 13, 0, 528</Build><ProjectTypeName>AVR GCC</ProjectTypeName></MANAGEMENT><CODE_CREATION><ObjectFile>bacnet.elf</ObjectFile><EntryFile></EntryFile><ObjectFile></ObjectFile><EntryFile></EntryFile><SaveFolder>C:\code\bacnet-stack\ports\atmega168\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_PART>ATMEGA168</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><HIDE>false</HIDE></IO_EXPAND><REGISTERNAMES><Register>R00</Register><Register>R01</Register><Register>R02</Register><Register>R03</Register><Register>R04</Register><Register>R05</Register><Register>R06</Register><Register>R07</Register><Register>R08</Register><Register>R09</Register><Register>R10</Register><Register>R11</Register><Register>R12</Register><Register>R13</Register><Register>R14</Register><Register>R15</Register><Register>R16</Register><Register>R17</Register><Register>R18</Register><Register>R19</Register><Register>R20</Register><Register>R21</Register><Register>R22</Register><Register>R23</Register><Register>R24</Register><Register>R25</Register><Register>R26</Register><Register>R27</Register><Register>R28</Register><Register>R29</Register><Register>R30</Register><Register>R31</Register></REGISTERNAMES><CURRENT_TARGET>AVR Dragon</CURRENT_TARGET><CURRENT_TARGET>AVR Simulator</CURRENT_TARGET><CURRENT_PART>ATmega168.xml</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND></IO_EXPAND><REGISTERNAMES></REGISTERNAMES><COM>Auto</COM><COMType>0</COMType><WATCHNUM>0</WATCHNUM><WATCHNAMES><Pane0><Variables>property_len</Variables><Variables>object_index</Variables><Variables>Present_Value</Variables><Variables>value</Variables></Pane0><Pane1></Pane1><Pane2></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><modules><module></module></modules><Triggers><trigger clsid="{113824F1-C410-4699-A25E-867CC860C28E}" enabled="1" boundTo="0" hitCount="1" updateAndContinue="0" line="192" file="main.c" token="            npdu_handler(&amp;src, &amp;PDUBuffer[0], pdu_len);" offset="0"/></Triggers></Debugger><AVRGCCPLUGIN><FILES><SOURCEFILE>main.c</SOURCEFILE><SOURCEFILE>rs485.c</SOURCEFILE><SOURCEFILE>timer.c</SOURCEFILE><SOURCEFILE>dlmstp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\demo\handler\txbuf.c</SOURCEFILE><SOURCEFILE>device.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\crc.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\npdu.c</SOURCEFILE><SOURCEFILE>apdu.c</SOURCEFILE><SOURCEFILE>h_rp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\iam.c</SOURCEFILE><SOURCEFILE>av.c</SOURCEFILE><SOURCEFILE>h_wp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\bacapp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\bacstr.c</SOURCEFILE><SOURCEFILE>bv.c</SOURCEFILE><SOURCEFILE>h_whois.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\whois.c</SOURCEFILE><HEADERFILE>avr035.h</HEADERFILE><HEADERFILE>hardware.h</HEADERFILE><HEADERFILE>rs485.h</HEADERFILE><HEADERFILE>timer.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\crc.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\dlmstp.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\iam.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\npdu.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\txbuf.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\bacenum.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\bacdcode.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\bacapp.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\bacstr.h</HEADERFILE><OTHERFILE>Makefile</OTHERFILE></FILES><CONFIGS><CONFIG><NAME>default</NAME><USESEXTERNALMAKEFILE>YES</USESEXTERNALMAKEFILE><EXTERNALMAKEFILE>Makefile</EXTERNALMAKEFILE><PART>atmega168</PART><HEX>1</HEX><LIST>0</LIST><MAP>0</MAP><OUTPUTFILENAME>bacnet.elf</OUTPUTFILENAME><OUTPUTDIR>default\</OUTPUTDIR><ISDIRTY>0</ISDIRTY><OPTIONS><OPTION><FILE>C:\code\bacnet-stack\crc.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\mstp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>dlmstp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>main.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>rs485.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>timer.c</FILE><OPTIONLIST></OPTIONLIST></OPTION></OPTIONS><INCDIRS><INCLUDE>..\..\demo\handler\</INCLUDE><INCLUDE>.\</INCLUDE><INCLUDE>..\..\</INCLUDE><INCLUDE>..\..\demo\object\</INCLUDE></INCDIRS><LIBDIRS/><LIBS/><LINKOBJECTS/><OPTIONSFORALL>-Wall -gdwarf-2  -DMAX_APDU=50  -DBACDL_MSTP  -DBIG_ENDIAN=0 -DF_CPU=7372800UL -O0 -fsigned-char</OPTIONSFORALL><LINKEROPTIONS></LINKEROPTIONS><SEGMENTS/></CONFIG></CONFIGS><LASTCONFIG>default</LASTCONFIG><USES_WINAVR>1</USES_WINAVR><GCC_LOC>C:\WinAVR-20071221rc1\bin\avr-gcc.exe</GCC_LOC><MAKE_LOC>C:\WinAVR-20071221rc1\utils\bin\make.exe</MAKE_LOC></AVRGCCPLUGIN><MANAGEMENT></MANAGEMENT><CODE_CREATION></CODE_CREATION><DEBUG_TARGET></DEBUG_TARGET><Debugger></Debugger><AVRSimulator><FuseExt>0</FuseExt><FuseHigh>28</FuseHigh><FuseLow>216</FuseLow><LockBits>193</LockBits><Frequency>7372800</Frequency><ExtSRAM>0</ExtSRAM><SimBoot>1</SimBoot><SimBootnew>1</SimBootnew></AVRSimulator><AVRDragon><DAISY_CHAIN>0</DAISY_CHAIN><DEVS_BEFORE>0</DEVS_BEFORE><DEVS_AFTER>0</DEVS_AFTER><INSTRBITS_BEFORE>0</INSTRBITS_BEFORE><INSTRBITS_AFTER>0</INSTRBITS_AFTER><BAUDRATE>19200</BAUDRATE><JTAG_FREQ>1000000</JTAG_FREQ><TIMERS_RUNNING>0</TIMERS_RUNNING><PRESERVE_EEPROM>0</PRESERVE_EEPROM><ALWAYS_EXT_RESET>0</ALWAYS_EXT_RESET><PRINT_BRK_CAUSE>1</PRINT_BRK_CAUSE><ENABLE_IDR_IN_RUN_MODE>0</ENABLE_IDR_IN_RUN_MODE><ALLOW_BRK_INSTR>1</ALLOW_BRK_INSTR><STOPIF_ENTRYFUNC_NOTFOUND>1</STOPIF_ENTRYFUNC_NOTFOUND><ENTRY_FUNCTION>main</ENTRY_FUNCTION><REPROGRAM>1</REPROGRAM></AVRDragon><IOView><usergroups/><sort sorted="0" column="0" ordername="1" orderaddress="1" ordergroup="1"/></IOView><Files><File00000><FileId>00000</FileId><FileName>main.c</FileName><Status>259</Status></File00000><File00001><FileId>00001</FileId><FileName>dlmstp.c</FileName><Status>259</Status></File00001><File00002><FileId>00002</FileId><FileName>C:\code\bacnet-stack\src\crc.c</FileName><Status>258</Status></File00002><File00003><FileId>00003</FileId><FileName>C:\code\bacnet-stack\src\bacstr.c</FileName><Status>257</Status></File00003><File00004><FileId>00004</FileId><FileName>av.c</FileName><Status>257</Status></File00004><File00005><FileId>00005</FileId><FileName>bv.c</FileName><Status>258</Status></File00005><File00006><FileId>00006</FileId><FileName>h_whois.c</FileName><Status>259</Status></File00006><File00007><FileId>00007</FileId><FileName>rs485.c</FileName><Status>257</Status></File00007><File00008><FileId>00008</FileId><FileName>C:\code\bacnet-stack\demo\handler\h_npdu.c</FileName><Status>3</Status></File00008><File00009><FileId>00009</FileId><FileName>apdu.c</FileName><Status>3</Status></File00009><File00010><FileId>00010</FileId><FileName>C:\code\bacnet-stack\src\whois.c</FileName><Status>1</Status></File00010><File00011><FileId>00011</FileId><FileName>device.c</FileName><Status>1</Status></File00011></Files><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio>
+<AVRStudio><MANAGEMENT><Created>13-Aug-2007 15:08:27</Created><LastEdit>14-Nov-2008 08:40:02</LastEdit><ProjectType>0</ProjectType><Created>13-Aug-2007 15:08:27</Created><Version>4</Version><Build>4, 13, 0, 528</Build><ProjectTypeName>AVR GCC</ProjectTypeName><ICON>241</ICON><ProjectName>bacnet</ProjectName><Created>13-Aug-2007 15:11:07</Created><LastEdit>13-Aug-2007 15:11:07</LastEdit><ICON>241</ICON><ProjectType>0</ProjectType><Created>13-Aug-2007 15:11:07</Created><Version>4</Version><Build>4, 13, 0, 528</Build><ProjectTypeName>AVR GCC</ProjectTypeName></MANAGEMENT><CODE_CREATION><ObjectFile>bacnet.elf</ObjectFile><EntryFile></EntryFile><ObjectFile></ObjectFile><EntryFile></EntryFile><SaveFolder>C:\code\bacnet-stack\ports\atmega168\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_PART>ATMEGA168</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><HIDE>false</HIDE></IO_EXPAND><REGISTERNAMES><Register>R00</Register><Register>R01</Register><Register>R02</Register><Register>R03</Register><Register>R04</Register><Register>R05</Register><Register>R06</Register><Register>R07</Register><Register>R08</Register><Register>R09</Register><Register>R10</Register><Register>R11</Register><Register>R12</Register><Register>R13</Register><Register>R14</Register><Register>R15</Register><Register>R16</Register><Register>R17</Register><Register>R18</Register><Register>R19</Register><Register>R20</Register><Register>R21</Register><Register>R22</Register><Register>R23</Register><Register>R24</Register><Register>R25</Register><Register>R26</Register><Register>R27</Register><Register>R28</Register><Register>R29</Register><Register>R30</Register><Register>R31</Register></REGISTERNAMES><CURRENT_TARGET>AVR Dragon</CURRENT_TARGET><CURRENT_TARGET>AVR Simulator</CURRENT_TARGET><CURRENT_PART>ATmega168.xml</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND></IO_EXPAND><REGISTERNAMES></REGISTERNAMES><COM>Auto</COM><COMType>0</COMType><WATCHNUM>0</WATCHNUM><WATCHNAMES><Pane0><Variables>property_len</Variables><Variables>object_index</Variables><Variables>Present_Value</Variables><Variables>value</Variables></Pane0><Pane1></Pane1><Pane2></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><modules><module></module></modules><Triggers></Triggers></Debugger><AVRGCCPLUGIN><FILES><SOURCEFILE>main.c</SOURCEFILE><SOURCEFILE>rs485.c</SOURCEFILE><SOURCEFILE>timer.c</SOURCEFILE><SOURCEFILE>dlmstp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\demo\handler\txbuf.c</SOURCEFILE><SOURCEFILE>device.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\crc.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\npdu.c</SOURCEFILE><SOURCEFILE>apdu.c</SOURCEFILE><SOURCEFILE>h_rp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\iam.c</SOURCEFILE><SOURCEFILE>av.c</SOURCEFILE><SOURCEFILE>h_wp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\bacapp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\bacstr.c</SOURCEFILE><SOURCEFILE>bv.c</SOURCEFILE><SOURCEFILE>h_whois.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\whois.c</SOURCEFILE><HEADERFILE>avr035.h</HEADERFILE><HEADERFILE>hardware.h</HEADERFILE><HEADERFILE>rs485.h</HEADERFILE><HEADERFILE>timer.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\crc.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\dlmstp.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\iam.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\npdu.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\txbuf.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\bacenum.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\bacdcode.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\bacapp.h</HEADERFILE><HEADERFILE>C:\code\bacnet-stack\include\bacstr.h</HEADERFILE><OTHERFILE>Makefile</OTHERFILE></FILES><CONFIGS><CONFIG><NAME>default</NAME><USESEXTERNALMAKEFILE>YES</USESEXTERNALMAKEFILE><EXTERNALMAKEFILE>Makefile</EXTERNALMAKEFILE><PART>atmega168</PART><HEX>1</HEX><LIST>0</LIST><MAP>0</MAP><OUTPUTFILENAME>bacnet.elf</OUTPUTFILENAME><OUTPUTDIR>default\</OUTPUTDIR><ISDIRTY>0</ISDIRTY><OPTIONS><OPTION><FILE>C:\code\bacnet-stack\crc.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\mstp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>dlmstp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>main.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>rs485.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>timer.c</FILE><OPTIONLIST></OPTIONLIST></OPTION></OPTIONS><INCDIRS><INCLUDE>..\..\demo\handler\</INCLUDE><INCLUDE>.\</INCLUDE><INCLUDE>..\..\</INCLUDE><INCLUDE>..\..\demo\object\</INCLUDE></INCDIRS><LIBDIRS/><LIBS/><LINKOBJECTS/><OPTIONSFORALL>-Wall -gdwarf-2  -DMAX_APDU=50  -DBACDL_MSTP  -DBIG_ENDIAN=0 -DF_CPU=7372800UL -O0 -fsigned-char</OPTIONSFORALL><LINKEROPTIONS></LINKEROPTIONS><SEGMENTS/></CONFIG></CONFIGS><LASTCONFIG>default</LASTCONFIG><USES_WINAVR>1</USES_WINAVR><GCC_LOC>C:\WinAVR-20071221rc1\bin\avr-gcc.exe</GCC_LOC><MAKE_LOC>C:\WinAVR-20071221rc1\utils\bin\make.exe</MAKE_LOC></AVRGCCPLUGIN><MANAGEMENT></MANAGEMENT><CODE_CREATION></CODE_CREATION><DEBUG_TARGET></DEBUG_TARGET><Debugger></Debugger><AVRSimulator><FuseExt>0</FuseExt><FuseHigh>28</FuseHigh><FuseLow>216</FuseLow><LockBits>193</LockBits><Frequency>7372800</Frequency><ExtSRAM>0</ExtSRAM><SimBoot>1</SimBoot><SimBootnew>1</SimBootnew></AVRSimulator><AVRDragon><DAISY_CHAIN>0</DAISY_CHAIN><DEVS_BEFORE>0</DEVS_BEFORE><DEVS_AFTER>0</DEVS_AFTER><INSTRBITS_BEFORE>0</INSTRBITS_BEFORE><INSTRBITS_AFTER>0</INSTRBITS_AFTER><BAUDRATE>19200</BAUDRATE><JTAG_FREQ>1000000</JTAG_FREQ><TIMERS_RUNNING>0</TIMERS_RUNNING><PRESERVE_EEPROM>0</PRESERVE_EEPROM><ALWAYS_EXT_RESET>0</ALWAYS_EXT_RESET><PRINT_BRK_CAUSE>1</PRINT_BRK_CAUSE><ENABLE_IDR_IN_RUN_MODE>0</ENABLE_IDR_IN_RUN_MODE><ALLOW_BRK_INSTR>1</ALLOW_BRK_INSTR><STOPIF_ENTRYFUNC_NOTFOUND>1</STOPIF_ENTRYFUNC_NOTFOUND><ENTRY_FUNCTION>main</ENTRY_FUNCTION><REPROGRAM>1</REPROGRAM></AVRDragon><IOView><usergroups/><sort sorted="0" column="0" ordername="1" orderaddress="1" ordergroup="1"/></IOView><Files><File00000><FileId>00000</FileId><FileName>main.c</FileName><Status>259</Status></File00000><File00001><FileId>00001</FileId><FileName>dlmstp.c</FileName><Status>259</Status></File00001><File00002><FileId>00002</FileId><FileName>C:\code\bacnet-stack\src\crc.c</FileName><Status>258</Status></File00002><File00003><FileId>00003</FileId><FileName>bv.c</FileName><Status>258</Status></File00003><File00004><FileId>00004</FileId><FileName>C:\code\bacnet-stack\demo\handler\h_npdu.c</FileName><Status>258</Status></File00004><File00005><FileId>00005</FileId><FileName>apdu.c</FileName><Status>258</Status></File00005><File00006><FileId>00006</FileId><FileName>h_whois.c</FileName><Status>257</Status></File00006><File00007><FileId>00007</FileId><FileName>h_wp.c</FileName><Status>257</Status></File00007></Files><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio>
diff --git a/bacnet-stack/ports/atmega168/dlmstp.c b/bacnet-stack/ports/atmega168/dlmstp.c
index 9692bf55..3b82fefc 100644
--- a/bacnet-stack/ports/atmega168/dlmstp.c
+++ b/bacnet-stack/ports/atmega168/dlmstp.c
@@ -44,7 +44,7 @@
 #include "bits.h"
 #include "bacaddr.h"
 /* special optimization - I-Am response in this module */
-#include "iam.h"
+#include "client.h"
 #include "txbuf.h"
 
 /* This file has been customized for use with small microprocessors */
@@ -277,7 +277,7 @@ void dlmstp_fill_bacnet_address(
 }
 
 /* I Am from handler */
-extern bool Send_I_Am;
+extern bool Send_I_Am_Flag;
 
 /* look at any of the unconfirmed message bits and encode if set */
 static uint16_t dlmstp_encode_unconfirmed_frame(
@@ -287,8 +287,8 @@ static uint16_t dlmstp_encode_unconfirmed_frame(
     BACNET_NPDU_DATA npdu_data;
     uint16_t len = 0;
 
-    if (Send_I_Am) {
-        Send_I_Am = false;
+    if (Send_I_Am_Flag) {
+        Send_I_Am_Flag = false;
         TransmitPacket = Handler_Transmit_Buffer;
         len = iam_encode_pdu(&TransmitPacket[0], &dest, &npdu_data);
     }
diff --git a/bacnet-stack/ports/atmega168/h_whois.c b/bacnet-stack/ports/atmega168/h_whois.c
index d273bab4..89418ab2 100644
--- a/bacnet-stack/ports/atmega168/h_whois.c
+++ b/bacnet-stack/ports/atmega168/h_whois.c
@@ -37,7 +37,7 @@
 #include "client.h"
 #include "txbuf.h"
 
-bool Send_I_Am = true;
+bool Send_I_Am_Flag = true;
 
 void handler_who_is(
     uint8_t * service_request,
@@ -54,7 +54,7 @@ void handler_who_is(
         whois_decode_service_request(service_request, service_len, &low_limit,
         &high_limit);
     if (len == 0) {
-        Send_I_Am = true;
+        Send_I_Am_Flag = true;
     } else if (len != -1) {
         /* is my device id within the limits? */
         target_device = Device_Object_Instance_Number();
@@ -63,7 +63,7 @@ void handler_who_is(
             /* BACnet wildcard is the max instance number - everyone responds */
             ((BACNET_MAX_INSTANCE >= (uint32_t) low_limit) &&
                 (BACNET_MAX_INSTANCE <= (uint32_t) high_limit))) {
-            Send_I_Am = true;
+            Send_I_Am_Flag = true;
         }
     }
 
diff --git a/bacnet-stack/ports/atmega168/main.c b/bacnet-stack/ports/atmega168/main.c
index 5a3d9989..b2010855 100644
--- a/bacnet-stack/ports/atmega168/main.c
+++ b/bacnet-stack/ports/atmega168/main.c
@@ -37,7 +37,7 @@
 #include "av.h"
 
 /* From the WhoIs hander - performed by the DLMSTP module */
-extern bool Send_I_Am;
+extern bool Send_I_Am_Flag;
 /* local version override */
 const char *BACnet_Version = "1.0";
 
@@ -134,7 +134,7 @@ static void input_switch_read(
             dlmstp_set_mac_address(Address_Switch);
 #endif
             Device_Set_Object_Instance_Number(86000 + Address_Switch);
-            Send_I_Am = true;
+            Send_I_Am_Flag = true;
         }
     }
 }