58 files changed, 50 insertions, 106 deletions
diff --git a/plugins/WhenWasIt/WhenWasIt/WhenWasIt.cpp b/plugins/WhenWasIt/WhenWasIt.cpp
index 3c956d7e56..3c956d7e56 100644
--- a/plugins/WhenWasIt/WhenWasIt/WhenWasIt.cpp
+++ b/plugins/WhenWasIt/WhenWasIt.cpp
diff --git a/plugins/WhenWasIt/WhenWasIt.html b/plugins/WhenWasIt/WhenWasIt.html
deleted file mode 100644
index 3d5ac8852c..0000000000
--- a/plugins/WhenWasIt/WhenWasIt.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-	<head></head>
-	<body>
-		<center>
-			<h1>WhenWasIt Test Page</h1>
-	
-			<p>WhenWasIt version 0.3.3.4</p>
-			<p><a href="WhenWasIt.zip">WhenWasIt.zip</a></p>
-			<p><a href="WhenWasIt unicode.zip">WhenWasIt unicode.zip</a></p>
-		</center>
-	</body>
-</html>
diff --git a/plugins/WhenWasIt/WhenWasIt/WhenWasIt.rc b/plugins/WhenWasIt/WhenWasIt.rc
index afe6a7cb4a..afe6a7cb4a 100644
--- a/plugins/WhenWasIt/WhenWasIt/WhenWasIt.rc
+++ b/plugins/WhenWasIt/WhenWasIt.rc
diff --git a/plugins/WhenWasIt/WhenWasIt_10.sln b/plugins/WhenWasIt/WhenWasIt_10.sln
index 111b59ab2a..60282fb633 100644
--- a/plugins/WhenWasIt/WhenWasIt_10.sln
+++ b/plugins/WhenWasIt/WhenWasIt_10.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhenWasIt", "WhenWasIt\WhenWasIt_10.vcxproj", "{63E05ECA-0A63-479E-86BD-2CAF53869BDA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhenWasIt", "WhenWasIt_10.vcxproj", "{63E05ECA-0A63-479E-86BD-2CAF53869BDA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/plugins/WhenWasIt/WhenWasIt/WhenWasIt_10.vcxproj b/plugins/WhenWasIt/WhenWasIt_10.vcxproj
index 68a2c29336..83e0024b16 100644
--- a/plugins/WhenWasIt/WhenWasIt/WhenWasIt_10.vcxproj
+++ b/plugins/WhenWasIt/WhenWasIt_10.vcxproj
@@ -21,8 +21,6 @@
   <PropertyGroup Label="Globals">
     <ProjectName>WhenWasIt</ProjectName>
     <ProjectGuid>{63E05ECA-0A63-479E-86BD-2CAF53869BDA}</ProjectGuid>
-    <RootNamespace>WhenWasIt</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -61,29 +59,29 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64/Plugins\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>
+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CRT_NON_CONFORMING_SWPRINTFS;_USE_32BIT_TIME_T;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;WHENWASIT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_USE_32BIT_TIME_T;_WINDOWS;_USRDLL;WHENWASIT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -91,68 +89,84 @@
       <SubSystem>Windows</SubSystem>
       <BaseAddress>0x2F400000</BaseAddress>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
     </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <PreprocessorDefinitions>_CRT_NON_CONFORMING_SWPRINTFS;_USE_32BIT_TIME_T;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;WHENWASIT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_USE_32BIT_TIME_T;_WINDOWS;_USRDLL;WHENWASIT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <BaseAddress>0x2F400000</BaseAddress>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
     </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_USE_32BIT_TIME_T;_WINDOWS;_USRDLL;WHENWASIT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <BaseAddress>0x2F400000</BaseAddress>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
     </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_USE_32BIT_TIME_T;_WINDOWS;_USRDLL;WHENWASIT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Optimization>Disabled</Optimization>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>comctl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <SubSystem>Windows</SubSystem>
+      <BaseAddress>0x2F400000</BaseAddress>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="birthdays.cpp" />
@@ -200,7 +214,7 @@
     <None Include="icons\import.ico" />
     <None Include="icons\list.ico" />
     <None Include="icons\refresh.ico" />
-    <None Include="..\docs\WhenWasIt_readme.txt" />
+    <None Include="docs\WhenWasIt_readme.txt" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="version.rc" />
diff --git a/plugins/WhenWasIt/WhenWasIt/WhenWasIt_10.vcxproj.filters b/plugins/WhenWasIt/WhenWasIt_10.vcxproj.filters
index 0a4f4f6b4d..0a4f4f6b4d 100644
--- a/plugins/WhenWasIt/WhenWasIt/WhenWasIt_10.vcxproj.filters
+++ b/plugins/WhenWasIt/WhenWasIt_10.vcxproj.filters
diff --git a/plugins/WhenWasIt/WhenWasIt/birthdays.cpp b/plugins/WhenWasIt/birthdays.cpp
index 357936a866..357936a866 100644
--- a/plugins/WhenWasIt/WhenWasIt/birthdays.cpp
+++ b/plugins/WhenWasIt/birthdays.cpp
diff --git a/plugins/WhenWasIt/WhenWasIt/birthdays.h b/plugins/WhenWasIt/birthdays.h
index b20dd88554..b20dd88554 100644
--- a/plugins/WhenWasIt/WhenWasIt/birthdays.h
+++ b/plugins/WhenWasIt/birthdays.h
diff --git a/plugins/WhenWasIt/WhenWasIt/commonheaders.h b/plugins/WhenWasIt/commonheaders.h
index c3e9cc1734..c3e9cc1734 100644
--- a/plugins/WhenWasIt/WhenWasIt/commonheaders.h
+++ b/plugins/WhenWasIt/commonheaders.h
diff --git a/plugins/WhenWasIt/WhenWasIt/date_utils.cpp b/plugins/WhenWasIt/date_utils.cpp
index e4c8195890..e4c8195890 100644
--- a/plugins/WhenWasIt/WhenWasIt/date_utils.cpp
+++ b/plugins/WhenWasIt/date_utils.cpp
diff --git a/plugins/WhenWasIt/WhenWasIt/date_utils.h b/plugins/WhenWasIt/date_utils.h
index 624fceb155..624fceb155 100644
--- a/plugins/WhenWasIt/WhenWasIt/date_utils.h
+++ b/plugins/WhenWasIt/date_utils.h
diff --git a/plugins/WhenWasIt/WhenWasIt/dlg_handlers.cpp b/plugins/WhenWasIt/dlg_handlers.cpp
index 7e907264bd..7e907264bd 100644
--- a/plugins/WhenWasIt/WhenWasIt/dlg_handlers.cpp
+++ b/plugins/WhenWasIt/dlg_handlers.cpp
diff --git a/plugins/WhenWasIt/WhenWasIt/dlg_handlers.h b/plugins/WhenWasIt/dlg_handlers.h
index c335ad026e..c335ad026e 100644
--- a/plugins/WhenWasIt/WhenWasIt/dlg_handlers.h
+++ b/plugins/WhenWasIt/dlg_handlers.h
diff --git a/plugins/WhenWasIt/WhenWasIt/events.cpp b/plugins/WhenWasIt/events.cpp
index d9b9eab75e..d9b9eab75e 100644
--- a/plugins/WhenWasIt/WhenWasIt/events.cpp
+++ b/plugins/WhenWasIt/events.cpp
diff --git a/plugins/WhenWasIt/WhenWasIt/events.h b/plugins/WhenWasIt/events.h
index 7944673fbf..7944673fbf 100644
--- a/plugins/WhenWasIt/WhenWasIt/events.h
+++ b/plugins/WhenWasIt/events.h
diff --git a/plugins/WhenWasIt/files_release.txt b/plugins/WhenWasIt/files_release.txt
deleted file mode 100644
index 063ca0c2a0..0000000000
--- a/plugins/WhenWasIt/files_release.txt
+++ /dev/null
@@ -1 +0,0 @@
-Release\plugins\WhenWasIt.dll
-\ No newline at end of file
diff --git a/plugins/WhenWasIt/files_releasew.txt b/plugins/WhenWasIt/files_releasew.txt
deleted file mode 100644
index 5770cdd6d0..0000000000
--- a/plugins/WhenWasIt/files_releasew.txt
+++ /dev/null
@@ -1 +0,0 @@
-Release Unicode\plugins\WhenWasIt.dll
diff --git a/plugins/WhenWasIt/files_releasewx64.txt b/plugins/WhenWasIt/files_releasewx64.txt
deleted file mode 100644
index bea4718d90..0000000000
--- a/plugins/WhenWasIt/files_releasewx64.txt
+++ /dev/null
@@ -1 +0,0 @@
-Release Unicode\x64\plugins\WhenWasIt.dll
diff --git a/plugins/WhenWasIt/files_source.txt b/plugins/WhenWasIt/files_source.txt
deleted file mode 100644
index edf239f270..0000000000
--- a/plugins/WhenWasIt/files_source.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-WhenWasIt\*.*
-WhenWasIt\sdk\*.*
-WhenWasIt\icons\*.*
-docs\*.*
-*.*
diff --git a/plugins/WhenWasIt/WhenWasIt/hooked_events.cpp b/plugins/WhenWasIt/hooked_events.cpp
index 4c23bc2bf4..4c23bc2bf4 100644
--- a/plugins/WhenWasIt/WhenWasIt/hooked_events.cpp
+++ b/plugins/WhenWasIt/hooked_events.cpp
diff --git a/plugins/WhenWasIt/WhenWasIt/hooked_events.h b/plugins/WhenWasIt/hooked_events.h
index 8db02414ff..8db02414ff 100644
--- a/plugins/WhenWasIt/WhenWasIt/hooked_events.h
+++ b/plugins/WhenWasIt/hooked_events.h
diff --git a/plugins/WhenWasIt/WhenWasIt/icons.cpp b/plugins/WhenWasIt/icons.cpp
index a366f9bf2c..a366f9bf2c 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons.cpp
+++ b/plugins/WhenWasIt/icons.cpp
diff --git a/plugins/WhenWasIt/WhenWasIt/icons.h b/plugins/WhenWasIt/icons.h
index 42095b51f7..42095b51f7 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons.h
+++ b/plugins/WhenWasIt/icons.h
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/00.ico b/plugins/WhenWasIt/icons/00.ico
index db6ad259de..db6ad259de 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/00.ico
+++ b/plugins/WhenWasIt/icons/00.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/add.ico b/plugins/WhenWasIt/icons/add.ico
index 503f5809f3..503f5809f3 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/add.ico
+++ b/plugins/WhenWasIt/icons/add.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/check.bmp b/plugins/WhenWasIt/icons/check.bmp
index cf430c8c6d..cf430c8c6d 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/check.bmp
+++ b/plugins/WhenWasIt/icons/check.bmp
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/check.ico b/plugins/WhenWasIt/icons/check.ico
index 6e66db6fe9..6e66db6fe9 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/check.ico
+++ b/plugins/WhenWasIt/icons/check.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/dlg.ico b/plugins/WhenWasIt/icons/dlg.ico
index 68e4d3a004..68e4d3a004 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/dlg.ico
+++ b/plugins/WhenWasIt/icons/dlg.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/dtb0.ico b/plugins/WhenWasIt/icons/dtb0.ico
index 037c31c939..037c31c939 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/dtb0.ico
+++ b/plugins/WhenWasIt/icons/dtb0.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/dtb1.ico b/plugins/WhenWasIt/icons/dtb1.ico
index 4840bbee3e..4840bbee3e 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/dtb1.ico
+++ b/plugins/WhenWasIt/icons/dtb1.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/dtb2.ico b/plugins/WhenWasIt/icons/dtb2.ico
index 54e5fc14a3..54e5fc14a3 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/dtb2.ico
+++ b/plugins/WhenWasIt/icons/dtb2.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/dtb3.ico b/plugins/WhenWasIt/icons/dtb3.ico
index 479913ded6..479913ded6 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/dtb3.ico
+++ b/plugins/WhenWasIt/icons/dtb3.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/dtb4.ico b/plugins/WhenWasIt/icons/dtb4.ico
index f8825f5f30..f8825f5f30 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/dtb4.ico
+++ b/plugins/WhenWasIt/icons/dtb4.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/dtb5.ico b/plugins/WhenWasIt/icons/dtb5.ico
index beac5bac42..beac5bac42 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/dtb5.ico
+++ b/plugins/WhenWasIt/icons/dtb5.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/dtb6.ico b/plugins/WhenWasIt/icons/dtb6.ico
index efb04a9f6e..efb04a9f6e 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/dtb6.ico
+++ b/plugins/WhenWasIt/icons/dtb6.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/dtb7.ico b/plugins/WhenWasIt/icons/dtb7.ico
index 87ca751736..87ca751736 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/dtb7.ico
+++ b/plugins/WhenWasIt/icons/dtb7.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/dtb8.ico b/plugins/WhenWasIt/icons/dtb8.ico
index e166704921..e166704921 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/dtb8.ico
+++ b/plugins/WhenWasIt/icons/dtb8.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/dtb9.ico b/plugins/WhenWasIt/icons/dtb9.ico
index d7307d5527..d7307d5527 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/dtb9.ico
+++ b/plugins/WhenWasIt/icons/dtb9.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/dtbX.ico b/plugins/WhenWasIt/icons/dtbX.ico
index 7c0f421183..7c0f421183 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/dtbX.ico
+++ b/plugins/WhenWasIt/icons/dtbX.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/export.ico b/plugins/WhenWasIt/icons/export.ico
index 8a80733ef4..8a80733ef4 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/export.ico
+++ b/plugins/WhenWasIt/icons/export.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/import.ico b/plugins/WhenWasIt/icons/import.ico
index 2e2904416d..2e2904416d 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/import.ico
+++ b/plugins/WhenWasIt/icons/import.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/list.ico b/plugins/WhenWasIt/icons/list.ico
index 00c219c6eb..00c219c6eb 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/list.ico
+++ b/plugins/WhenWasIt/icons/list.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/icons/refresh.ico b/plugins/WhenWasIt/icons/refresh.ico
index db6ad259de..db6ad259de 100644
--- a/plugins/WhenWasIt/WhenWasIt/icons/refresh.ico
+++ b/plugins/WhenWasIt/icons/refresh.ico
diff --git a/plugins/WhenWasIt/WhenWasIt/notifiers.cpp b/plugins/WhenWasIt/notifiers.cpp
index 654dbbbe53..654dbbbe53 100644
--- a/plugins/WhenWasIt/WhenWasIt/notifiers.cpp
+++ b/plugins/WhenWasIt/notifiers.cpp
diff --git a/plugins/WhenWasIt/WhenWasIt/notifiers.h b/plugins/WhenWasIt/notifiers.h
index 22ddb96c8d..22ddb96c8d 100644
--- a/plugins/WhenWasIt/WhenWasIt/notifiers.h
+++ b/plugins/WhenWasIt/notifiers.h
diff --git a/plugins/WhenWasIt/pack source.bat b/plugins/WhenWasIt/pack source.bat
deleted file mode 100644
index ca481a3784..0000000000
--- a/plugins/WhenWasIt/pack source.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-for /F "tokens=6-10* delims=. " %%i in (docs\WhenWasIt_readme.txt) do (call :Pack %%i %%j %%k %%l; exit)
-
-:Pack
-d:\usr\PowerArchiver\pacl\pacomp.exe -p -a -c2 "WhenWasIt src %1.%2.%3.%4.zip" @files_source.txt -x*.zip -x*.ncb -x*.user -x*.sdf
-exit
-
-error:
-echo "Error packing WhenWasIt"
diff --git a/plugins/WhenWasIt/pack symbols.bat b/plugins/WhenWasIt/pack symbols.bat
deleted file mode 100644
index d0e1e31294..0000000000
--- a/plugins/WhenWasIt/pack symbols.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-
-if NOT EXIST "symbols\%1 - %3%4" ( 
-	mkdir "symbols\%1 - %3%4"
-)
-xcopy WhenWasIt\win32\%2\*.pdb "symbols\%1 - %3%4\win32\*" /EXCLUDE:symbols_exclude.txt /Y
-xcopy WhenWasIt\x64\%2\*.pdb "symbols\%1 - %3%4\x64\*" /EXCLUDE:symbols_exclude.txt /Y
-
-d:\usr\PowerArchiver\pacl\pacomp.exe -p -a -r -c2 "symbols - %1.zip" "symbols\*.*"
-rmdir "symbols\" /Q /S
-\ No newline at end of file
diff --git a/plugins/WhenWasIt/pack unicode x64.bat b/plugins/WhenWasIt/pack unicode x64.bat
deleted file mode 100644
index 8a5d510322..0000000000
--- a/plugins/WhenWasIt/pack unicode x64.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-copy folders\m_folders.h docs /y
-for /F "tokens=6-10* delims=. " %%i in (docs\WhenWasIt_readme.txt) do (call :Pack %%i %%j %%k %%l; exit)
-
-:Pack
-d:\usr\PowerArchiver\pacl\pacomp.exe -a -c2 "WhenWasIt %1.%2.%3.%4 x64 unicode.zip" @files_releasewx64.txt
-d:\usr\PowerArchiver\pacl\pacomp.exe -p -a -c2 "WhenWasIt %1.%2.%3.%4 x64 unicode.zip" docs\*.* *.caca
-call "pack symbols.bat" WhenWasIt "Release Unicode" %1.%2.%3.%4 unicode
-exit
-
-error:
-echo "Error packing WhenWasIt"
diff --git a/plugins/WhenWasIt/pack unicode.bat b/plugins/WhenWasIt/pack unicode.bat
deleted file mode 100644
index 2bb0f32333..0000000000
--- a/plugins/WhenWasIt/pack unicode.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-copy folders\m_folders.h docs /y
-for /F "tokens=6-10* delims=. " %%i in (docs\WhenWasIt_readme.txt) do (call :Pack %%i %%j %%k %%l; exit)
-
-:Pack
-d:\usr\PowerArchiver\pacl\pacomp.exe -a -c2 "WhenWasIt %1.%2.%3.%4 x32 unicode.zip" @files_releasew.txt
-d:\usr\PowerArchiver\pacl\pacomp.exe -p -a -c2 "WhenWasIt %1.%2.%3.%4 x32 unicode.zip" docs\*.* *.caca
-call "pack symbols.bat" WhenWasIt "Release Unicode" %1.%2.%3.%4 unicode
-exit
-
-error:
-echo "Error packing WhenWasIt"
diff --git a/plugins/WhenWasIt/pack.bat b/plugins/WhenWasIt/pack.bat
deleted file mode 100644
index 9cf47f0473..0000000000
--- a/plugins/WhenWasIt/pack.bat
+++ /dev/null
@@ -1,10 +0,0 @@
-for /F "tokens=6-10* delims=. " %%i in (docs\WhenWasIt_readme.txt) do (call :Pack %%i %%j %%k %%l; exit)
-
-:Pack
-d:\usr\PowerArchiver\pacl\pacomp.exe -a -c2 "WhenWasIt %1.%2.%3.%4 x32.zip" @files_release.txt
-d:\usr\PowerArchiver\pacl\pacomp.exe -p -a -c2 "WhenWasIt %1.%2.%3.%4 x32.zip" docs\*.* *.caca
-call "pack symbols.bat" WhenWasIt Release %1.%2.%3.%4
-exit
-
-error:
-echo "Error packing WhenWasIt"
diff --git a/plugins/WhenWasIt/WhenWasIt/resource.h b/plugins/WhenWasIt/resource.h
index d04aaf378f..d04aaf378f 100644
--- a/plugins/WhenWasIt/WhenWasIt/resource.h
+++ b/plugins/WhenWasIt/resource.h
diff --git a/plugins/WhenWasIt/WhenWasIt/services.cpp b/plugins/WhenWasIt/services.cpp
index 303866bffa..303866bffa 100644
--- a/plugins/WhenWasIt/WhenWasIt/services.cpp
+++ b/plugins/WhenWasIt/services.cpp
diff --git a/plugins/WhenWasIt/WhenWasIt/services.h b/plugins/WhenWasIt/services.h
index 39f49abde6..39f49abde6 100644
--- a/plugins/WhenWasIt/WhenWasIt/services.h
+++ b/plugins/WhenWasIt/services.h
diff --git a/plugins/WhenWasIt/symbols_exclude.txt b/plugins/WhenWasIt/symbols_exclude.txt
deleted file mode 100644
index 361cf2448b..0000000000
--- a/plugins/WhenWasIt/symbols_exclude.txt
+++ /dev/null
@@ -1 +0,0 @@
-vc80.pdb
-\ No newline at end of file
diff --git a/plugins/WhenWasIt/WhenWasIt/utils.cpp b/plugins/WhenWasIt/utils.cpp
index 36759393f0..36759393f0 100644
--- a/plugins/WhenWasIt/WhenWasIt/utils.cpp
+++ b/plugins/WhenWasIt/utils.cpp
diff --git a/plugins/WhenWasIt/WhenWasIt/utils.h b/plugins/WhenWasIt/utils.h
index 0528c0440f..0528c0440f 100644
--- a/plugins/WhenWasIt/WhenWasIt/utils.h
+++ b/plugins/WhenWasIt/utils.h
diff --git a/plugins/WhenWasIt/WhenWasIt/version.h b/plugins/WhenWasIt/version.h
index 022bb80385..022bb80385 100644
--- a/plugins/WhenWasIt/WhenWasIt/version.h
+++ b/plugins/WhenWasIt/version.h
diff --git a/plugins/WhenWasIt/WhenWasIt/version.rc b/plugins/WhenWasIt/version.rc
index 0f8fea03fc..0f8fea03fc 100644
--- a/plugins/WhenWasIt/WhenWasIt/version.rc
+++ b/plugins/WhenWasIt/version.rc