diff --git a/core/UserMessagePBHelpers.h b/core/UserMessagePBHelpers.h
index 382fa3dd..71d2f957 100644
--- a/core/UserMessagePBHelpers.h
+++ b/core/UserMessagePBHelpers.h
@@ -93,7 +93,7 @@ public:
 			Handle_t &hndl = (*iter);
 			HandleSecurity sec;
 			sec.pIdentity = g_pCoreIdent;
-			g_HandleSys.FreeHandle(hndl, &sec);
+			handlesys->FreeHandle(hndl, &sec);
 			iter = childHandles.erase(iter);
 		}
 	}
diff --git a/core/smn_protobuf.cpp b/core/smn_protobuf.cpp
index cc34c1e1..070aa9a7 100644
--- a/core/smn_protobuf.cpp
+++ b/core/smn_protobuf.cpp
@@ -29,11 +29,9 @@
  * Version: $Id$
  */
 
-#include "UserMessages.h"
-
 #ifdef USE_PROTOBUF_USERMESSAGES
 
-#include "HandleSys.h"
+#include "logic_bridge.h"
 #include "UserMessagePBHelpers.h"
 #include "smn_usermsgs.h"