Fix errors from rebase

core/provider/source/provider_source.cpp

@@ -32,6 +32,7 @@
 #include "KeyValues.h"
 #include "filesystem.h"
 #include "tier0/icommandline.h"
+#include "khook/memory.hpp"
 
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 void LocalCommand_Meta(const CCommand& args);

core/provider/source/provider_source.h

@@ -33,6 +33,7 @@
 #include <list>
 
 #include "../provider_base.h"
+#include "khook.hpp"
 
 class IFileSystem;
 

core/vsp_bridge.cpp

@@ -23,6 +23,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 #include <cassert>
+#include <string>
 
 #include "metamod.h"
 #include "metamod_util.h"
@@ -32,8 +33,7 @@
 #include "loader_bridge.h"
 #include "metamod_version.h"
 #include "provider/provider_base.h"
-
-#include <string>
+#include "khook.hpp"
 
 ConCommand *g_plugin_unload = NULL;
 bool g_bIsTryingToUnload;