diff --git a/public/IRootConsoleMenu.h b/public/IRootConsoleMenu.h
index 71ec1fd0..928d8758 100644
--- a/public/IRootConsoleMenu.h
+++ b/public/IRootConsoleMenu.h
@@ -32,8 +32,6 @@
 #ifndef _INCLUDE_SOURCEMOD_ROOT_CONSOLE_MENU_H_
 #define _INCLUDE_SOURCEMOD_ROOT_CONSOLE_MENU_H_
 
-#include <compat_wrappers.h>
-
 /**
  * @file IRootConsoleMenu.h
  * @brief Defines the interface for adding options to the "sm" console command.
@@ -45,6 +43,8 @@
  * we won't expose it until a legitimate reason comes up.
  */
 
+class CCommand;
+
 namespace SourceMod
 {
 	/**
diff --git a/public/compat_wrappers.h b/public/compat_wrappers.h
index 56e9dfeb..282f8782 100644
--- a/public/compat_wrappers.h
+++ b/public/compat_wrappers.h
@@ -33,9 +33,6 @@
 #define _INCLUDE_SOURCEMOD_COMPAT_WRAPPERS_H_
 
 #if defined ORANGEBOX_BUILD
-	#include "convar_sm_ob.h"
-	#include "sourcemm_api.h"
-
 	#define CONVAR_REGISTER(object)				ConVar_Register(0, object)
 
 	inline bool IsFlagSet(ConCommandBase *cmd, int flag)
@@ -47,8 +44,6 @@
 		engine->ServerCommand(buf);
 	}
 #else
-	#include "sourcemm_api.h"
-
 	class CCommand
 	{
 	public:
@@ -75,6 +70,8 @@
 		engine->InsertServerCommand(buf);
 	}
 
+	#define CVAR_INTERFACE_VERSION				VENGINE_CVAR_INTERFACE_VERSION
+
 	#define CONVAR_REGISTER(object)				ConCommandBaseMgr::OneTimeInit(object)
 	typedef FnChangeCallback					FnChangeCallback_t;
 #endif //ORANGEBOX_BUILD