1.1 --- a/core/UserMessagePBHelpers.h	Fri Mar 29 12:19:41 2013 -0700
     1.2 +++ b/core/UserMessagePBHelpers.h	Fri Mar 29 12:35:56 2013 -0700
     1.3 @@ -93,7 +93,7 @@
     1.4  			Handle_t &hndl = (*iter);
     1.5  			HandleSecurity sec;
     1.6  			sec.pIdentity = g_pCoreIdent;
     1.7 -			g_HandleSys.FreeHandle(hndl, &sec);
     1.8 +			handlesys->FreeHandle(hndl, &sec);
     1.9  			iter = childHandles.erase(iter);
    1.10  		}
    1.11  	}

     2.1 --- a/core/smn_protobuf.cpp	Fri Mar 29 12:19:41 2013 -0700
     2.2 +++ b/core/smn_protobuf.cpp	Fri Mar 29 12:35:56 2013 -0700
     2.3 @@ -29,11 +29,9 @@
     2.4   * Version: $Id$
     2.5   */
     2.6  
     2.7 -#include "UserMessages.h"
     2.8 -
     2.9  #ifdef USE_PROTOBUF_USERMESSAGES
    2.10  
    2.11 -#include "HandleSys.h"
    2.12 +#include "logic_bridge.h"
    2.13  #include "UserMessagePBHelpers.h"
    2.14  #include "smn_usermsgs.h"
    2.15