diff --git a/core/CUserMessages.cpp b/core/CUserMessages.cpp
index 25bc3ee2..d675b737 100644
--- a/core/CUserMessages.cpp
+++ b/core/CUserMessages.cpp
@@ -36,6 +36,11 @@ CUserMessages::~CUserMessages()
 	sm_trie_destroy(m_Names);
 }
 
+void CUserMessages::OnSourceModAllInitialized()
+{
+	g_ShareSys.AddInterface(NULL, this);
+}
+
 void CUserMessages::OnSourceModAllShutdown()
 {
 	if (m_HookCount)
diff --git a/core/CUserMessages.h b/core/CUserMessages.h
index 3c79965e..d18ce29a 100644
--- a/core/CUserMessages.h
+++ b/core/CUserMessages.h
@@ -15,9 +15,8 @@
 #ifndef _INCLUDE_SOURCEMOD_CUSERMESSAGES_H_
 #define _INCLUDE_SOURCEMOD_CUSERMESSAGES_H_
 
-#include "sm_globals.h"
+#include "ShareSys.h"
 #include <IUserMessages.h>
-#include <sh_list.h>
 #include "sourcemm_api.h"
 #include "sm_trie.h"
 #include "CellRecipientFilter.h"
@@ -37,6 +36,7 @@ public:
 	CUserMessages();
 	~CUserMessages();
 public: //SMGlobalClass
+	void OnSourceModAllInitialized();
 	void OnSourceModAllShutdown();
 public: //IUserMessages
 	int GetMessageIndex(const char *msg);