diff --git a/dlls/regex/AMBuilder b/dlls/regex/AMBuilder
index d1436354..9c79e1c7 100644
--- a/dlls/regex/AMBuilder
+++ b/dlls/regex/AMBuilder
@@ -10,8 +10,10 @@ elif builder.target_platform == 'mac':
 elif builder.target_platform == 'windows':
   binary.compiler.postlink += [binary.Dep('lib_win\\pcre.lib')]
 
-binary.compiler.defines += ['PCRE_STATIC']
-
+binary.compiler.defines += [
+  'PCRE_STATIC',
+  'HAVE_STDINT_H',
+]
 binary.sources = [
   'sdk/amxxmodule.cpp',
   'module.cpp',
diff --git a/dlls/regex/module.cpp b/dlls/regex/module.cpp
index 48c58bd4..f175ce6d 100755
--- a/dlls/regex/module.cpp
+++ b/dlls/regex/module.cpp
@@ -1,55 +1,55 @@
 /* AMX Mod X
-*   Regular Expressions Module
-*
-* by the AMX Mod X Development Team
-*
-* This file is part of AMX Mod X.
-*
-*
-*  This program is free software; you can redistribute it and/or modify it
-*  under the terms of the GNU General Public License as published by the
-*  Free Software Foundation; either version 2 of the License, or (at
-*  your option) any later version.
-*
-*  This program is distributed in the hope that it will be useful, but
-*  WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-*  General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with this program; if not, write to the Free Software Foundation,
-*  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*
-*  In addition, as a special exception, the author gives permission to
-*  link the code of this program with the Half-Life Game Engine ("HL
-*  Engine") and Modified Game Libraries ("MODs") developed by Valve,
-*  L.L.C ("Valve"). You must obey the GNU General Public License in all
-*  respects for all of the code used other than the HL Engine and MODs
-*  from Valve. If you modify this file, you may extend this exception
-*  to your version of the file, but you are not obligated to do so. If
-*  you do not wish to do so, delete this exception statement from your
-*  version.
-*/
+ *   Regular Expressions Module
+ *
+ * by the AMX Mod X Development Team
+ *
+ * This file is part of AMX Mod X.
+ *
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation; either version 2 of the License, or (at
+ *  your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ *  General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software Foundation,
+ *  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ *  In addition, as a special exception, the author gives permission to
+ *  link the code of this program with the Half-Life Game Engine ("HL
+ *  Engine") and Modified Game Libraries ("MODs") developed by Valve,
+ *  L.L.C ("Valve"). You must obey the GNU General Public License in all
+ *  respects for all of the code used other than the HL Engine and MODs
+ *  from Valve. If you modify this file, you may extend this exception
+ *  to your version of the file, but you are not obligated to do so. If
+ *  you do not wish to do so, delete this exception statement from your
+ *  version.
+ */
 #include <string.h>
 #include "pcre.h"
 #include "amxxmodule.h"
-#include "CVector.h"
+#include <am-vector.h>
 #include "CRegEx.h"
 
-CVector<RegEx *> PEL;
+ke::Vector<RegEx *> PEL;
 
 int GetPEL()
 {
-	for (int i=0; i<(int)PEL.size(); i++)
+	for (int i=0; i<(int)PEL.length(); i++)
 	{
 		if (PEL[i]->isFree())
 			return i;
 	}
 
 	RegEx *x = new RegEx();
-	PEL.push_back(x);
+	PEL.append(x);
 
-	return (int)PEL.size() - 1;
+	return (int)PEL.length() - 1;
 }
 
 // native Regex:regex_compile(const pattern[], &ret, error[], maxLen, const flags[]="");
@@ -150,7 +150,7 @@ static cell AMX_NATIVE_CALL regex_match_c(AMX *amx, cell *params)
 	int id = params[2]-1;
 	const char *str = MF_GetAmxString(amx, params[1], 0, &len);
 
-	if (id >= (int)PEL.size() || id < 0 || PEL[id]->isFree())
+	if (id >= (int)PEL.length() || id < 0 || PEL[id]->isFree())
 	{
 		MF_LogError(amx, AMX_ERR_NATIVE, "Invalid regex handle %d", id);
 		return 0;
@@ -187,7 +187,7 @@ static cell AMX_NATIVE_CALL regex_match_ex(AMX *amx, cell *params)
 {
 	int id = params[1] - 1;
 	
-	if (id >= (int)PEL.size() || id < 0 || PEL[id]->isFree())
+	if (id >= (int)PEL.length() || id < 0 || PEL[id]->isFree())
 	{
 		MF_LogError(amx, AMX_ERR_NATIVE, "Invalid regex handle %d", id);
 		return 0;
@@ -226,7 +226,7 @@ static cell AMX_NATIVE_CALL regex_match_ex(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL regex_substr(AMX *amx, cell *params)
 {
 	int id = params[1]-1;
-	if (id >= (int)PEL.size() || id < 0 || PEL[id]->isFree())
+	if (id >= (int)PEL.length() || id < 0 || PEL[id]->isFree())
 	{
 		MF_LogError(amx, AMX_ERR_NATIVE, "Invalid regex handle %d", id);
 		return 0;
@@ -252,7 +252,7 @@ static cell AMX_NATIVE_CALL regex_free(AMX *amx, cell *params)
 	int id = *c;
 	*c = 0;
 	id -= 1;
-	if (id >= (int)PEL.size() || id < 0 || PEL[id]->isFree())
+	if (id >= (int)PEL.length() || id < 0 || PEL[id]->isFree())
 	{
 		MF_LogError(amx, AMX_ERR_NATIVE, "Invalid regex handle %d", id);
 		return 0;
@@ -282,7 +282,7 @@ void OnAmxxAttach()
 
 void OnAmxxDetach()
 {
-	for (int i = 0; i<(int)PEL.size(); i++)
+	for (int i = 0; i<(int)PEL.length(); i++)
 	{
 		if (PEL[i])
 		{
diff --git a/dlls/regex/msvc10/regex.vcxproj b/dlls/regex/msvc10/regex.vcxproj
index 06fd9a49..f2255e89 100644
--- a/dlls/regex/msvc10/regex.vcxproj
+++ b/dlls/regex/msvc10/regex.vcxproj
@@ -52,8 +52,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\;..\sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;REGEX_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\;..\..\..\public\amtl;..\sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;REGEX_EXPORTS;HAVE_STDINT_H;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -75,8 +75,8 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\;..\sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;REGEX_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\;..\..\..\public\amtl;..\sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;REGEX_EXPORTS;HAVE_STDINT_H;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <PrecompiledHeader>