diff -r f04de1a697bd -r 0a382baff180 extensions/sqlite/msvc9/sm_sqlite.vcproj
--- a/extensions/sqlite/msvc9/sm_sqlite.vcproj	Fri Aug 03 07:56:31 2012 -0400
+++ b/extensions/sqlite/msvc9/sm_sqlite.vcproj	Fri Aug 03 16:10:28 2012 -0400
@@ -59,6 +59,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\..\public"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -138,6 +139,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="BINARY_NAME=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="..\..\..\public"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -247,591 +249,15 @@
 				Name="Header Files"
 				>
 				<File
-					RelativePath="..\sqlite-source\btree.h"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\btreeInt.h"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\hash.h"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\keywordhash.h"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\mutex.h"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\opcodes.h"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\os.h"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\os_common.h"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\os_os2.h"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\pager.h"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\parse.h"
-					>
-				</File>
-				<File
 					RelativePath="..\sqlite-source\sqlite3.h"
 					>
 				</File>
-				<File
-					RelativePath="..\sqlite-source\sqliteInt.h"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\sqliteLimit.h"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\vdbe.h"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\vdbeInt.h"
-					>
-				</File>
 			</Filter>
 			<Filter
 				Name="Source Files"
 				>
 				<File
-					RelativePath="..\sqlite-source\alter.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\analyze.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\attach.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\auth.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\btmutex.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\btree.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\build.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\callback.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\complete.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\date.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\delete.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\expr.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\func.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\hash.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\insert.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\journal.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\legacy.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\main.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\malloc.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\mem1.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\mem2.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\mutex.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\mutex_w32.c"
-					>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\opcodes.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\os.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\os_win.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\pager.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\parse.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\pragma.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\prepare.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\printf.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\random.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\select.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\table.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\tokenize.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\trigger.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\update.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\utf.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\util.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\vacuum.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\vdbe.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\vdbeapi.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\vdbeaux.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\vdbeblob.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\vdbefifo.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\vdbemem.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\vtab.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WarningLevel="2"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\sqlite-source\where.c"
+					RelativePath="..\sqlite-source\sqlite3.c"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"