diff --git a/core/AdminCache.cpp b/core/AdminCache.cpp
index 0cc9e833..3db94043 100644
--- a/core/AdminCache.cpp
+++ b/core/AdminCache.cpp
@@ -17,7 +17,7 @@
 #include "ShareSys.h"
 #include "ForwardSys.h"
 #include "CPlayerManager.h"
-#include "CConCmdManager.h"
+#include "ConCmdManager.h"
 
 AdminCache g_Admins;
 
diff --git a/core/CPlayerManager.cpp b/core/CPlayerManager.cpp
index 34b16afe..8e4776ba 100644
--- a/core/CPlayerManager.cpp
+++ b/core/CPlayerManager.cpp
@@ -15,7 +15,7 @@
 #include "ForwardSys.h"
 #include "ShareSys.h"
 #include "AdminCache.h"
-#include "CConCmdManager.h"
+#include "ConCmdManager.h"
 
 CPlayerManager g_Players;
 
diff --git a/core/ConVarManager.cpp b/core/ConVarManager.cpp
index 1daf4aeb..0eb448b3 100644
--- a/core/ConVarManager.cpp
+++ b/core/ConVarManager.cpp
@@ -169,7 +169,6 @@ Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name,
 {
 	ConVar *pConVar = NULL;
 	ConVarInfo *pInfo = NULL;
-	ConVarList *pConVarList = NULL;
 	Handle_t hndl = 0;
 
 	/* Find out if the convar exists already */
diff --git a/core/Makefile b/core/Makefile
index 5d0a8835..7d744920 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -19,9 +19,9 @@ BINARY = sourcemod_mm_i486.so
 HL2PUB = $(HL2SDK)/public
 HL2LIB = $(HL2SDK)/linux_sdk
 
-OBJECTS = sourcemm_api.cpp sourcemod.cpp AdminCache.cpp CConVarManager.cpp CDataPack.cpp \
+OBJECTS = sourcemm_api.cpp sourcemod.cpp AdminCache.cpp ConVarManager.cpp CDataPack.cpp \
           CDbgReporter.cpp CLogger.cpp CPlayerManager.cpp CTextParsers.cpp CTranslator.cpp \
-	  CConCmdManager.cpp \
+	  ConCmdManager.cpp \
 	  sm_autonatives.cpp sm_memtable.cpp sm_srvcmds.cpp sm_trie.cpp \
 	  sm_stringutil.cpp smn_filesystem.cpp smn_float.cpp smn_handles.cpp \
 	  smn_player.cpp smn_string.cpp smn_textparse.cpp smn_console.cpp smn_admin.cpp \