diff --git a/config b/config
index 6fd1646..49958eb 100644
--- a/config
+++ b/config
@@ -17,7 +17,7 @@ UNIX_SO=unix.$(EXT)
 #
 #LUAINC=-I/usr/local/include/lua50
 #LUAINC=-I/usr/local/include/lua5.1
-LUAINC=-Ilua-5.1.1/src
+#LUAINC=-Ilua-5.1.1/src
 
 #------
 # Compat-5.1 directory
@@ -40,20 +40,20 @@ INSTALL_EXEC=cp
 # Compiler and linker settings
 # for Mac OS X
 #
-CC=gcc
-DEF= -DAAA -DLUASOCKET_DEBUG -DUNIX_HAS_SUN_LEN
-CFLAGS= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 -fno-common
-LDFLAGS=-bundle -undefined dynamic_lookup
-LD=export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc
+#CC=gcc
+#DEF= -DLUASOCKET_DEBUG -DUNIX_HAS_SUN_LEN
+#CFLAGS= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 -fno-common
+#LDFLAGS=-bundle -undefined dynamic_lookup
+#LD=export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc
 
 #------
 # Compiler and linker settings
 # for Linux
-#CC=gcc
-#DEF=-DLUASOCKET_DEBUG 
-#CFLAGS= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 -fpic
-#LDFLAGS=-O -shared -fpic
-#LD=gcc 
+CC=gcc
+DEF=-DLUASOCKET_DEBUG 
+CFLAGS= $(LUAINC) $(DEF) -pedantic -Wall -O2 -fpic
+LDFLAGS=-O -shared -fpic
+LD=gcc 
 
 #------
 # End of makefile configuration
diff --git a/luasocket.sln b/luasocket.sln
index 006b7f0..a674c33 100644
--- a/luasocket.sln
+++ b/luasocket.sln
@@ -7,6 +7,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mime", "mime.vcproj", "{128
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluasocket", "libluasocket.vcproj", "{599EAD40-60EE-4043-9C14-AE090A8A092D}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -21,6 +25,10 @@ Global
 		{128E8BD0-174A-48F0-8771-92B1E8D18713}.Debug.Build.0 = Debug|Win32
 		{128E8BD0-174A-48F0-8771-92B1E8D18713}.Release.ActiveCfg = Release|Win32
 		{128E8BD0-174A-48F0-8771-92B1E8D18713}.Release.Build.0 = Release|Win32
+		{599EAD40-60EE-4043-9C14-AE090A8A092D}.Debug.ActiveCfg = Debug|Win32
+		{599EAD40-60EE-4043-9C14-AE090A8A092D}.Debug.Build.0 = Debug|Win32
+		{599EAD40-60EE-4043-9C14-AE090A8A092D}.Release.ActiveCfg = Release|Win32
+		{599EAD40-60EE-4043-9C14-AE090A8A092D}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/mime.vcproj b/mime.vcproj
index 4cc2b8a..8ad7900 100644
--- a/mime.vcproj
+++ b/mime.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="src\compat-5.1r5, h:\include\lua50"
+				AdditionalIncludeDirectories="h:\include\lua5.1"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MIME_EXPORTS;MIME_API=__declspec(dllexport)"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -69,7 +69,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="src\compat-5.1r5, h:\include\lua50"
+				AdditionalIncludeDirectories="h:\include\lua5.1"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MIME_EXPORTS; MIME_API=__declspec(dllexport)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -118,9 +118,6 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath=".\src\compat-5.1r5\compat-5.1.c">
-			</File>
 			<File
 				RelativePath="src\mime.c">
 			</File>
@@ -136,7 +133,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
 		</Filter>
 		<File
-			RelativePath="..\..\lib\lua50.dll.lib">
+			RelativePath="..\..\lib\lua5.1.dll.lib">
 		</File>
 	</Files>
 	<Globals>
diff --git a/socket.vcproj b/socket.vcproj
index 64a6a3f..b7c4a08 100644
--- a/socket.vcproj
+++ b/socket.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="src\compat-5.1r5, h:\include\lua50"
+				AdditionalIncludeDirectories="h:\include\lua5.1"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LUASOCKET_EXPORTS;LUASOCKET_API=__declspec(dllexport)"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -70,7 +70,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="src\compat-5.1r5, h:\include\lua50"
+				AdditionalIncludeDirectories="h:\include\lua5.1"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LUASOCKET_EXPORTS;LUASOCKET_API=__declspec(dllexport);  LUASOCKET_DEBUG"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -126,9 +126,6 @@
 			<File
 				RelativePath="src\buffer.c">
 			</File>
-			<File
-				RelativePath=".\src\compat-5.1r5\compat-5.1.c">
-			</File>
 			<File
 				RelativePath="src\except.c">
 			</File>
@@ -177,7 +174,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
 		</Filter>
 		<File
-			RelativePath="..\..\lib\lua50.dll.lib">
+			RelativePath="..\..\lib\lua5.1.dll.lib">
 		</File>
 	</Files>
 	<Globals>