diff --git a/build/Aegisub/standard-libraries.props b/build/Aegisub/standard-libraries.props
index 5617fab53..b47f5d09c 100644
--- a/build/Aegisub/standard-libraries.props
+++ b/build/Aegisub/standard-libraries.props
@@ -9,12 +9,19 @@
     <Link>
       <AdditionalDependencies>
         Vfw32.lib;
-        comctl32.lib;
-        rpcrt4.lib;
-        winmm.lib;
         advapi32.lib;
-        wsock32.lib;
+        comctl32.lib;
+        comdlg32.lib;
+        gdi32.lib;
+        kernel32.lib;
+        ole32.lib;
+        oleaut32.lib;
         opengl32.lib;
+        rpcrt4.lib;
+        shell32.lib;
+        user32.lib;
+        uuid.lib;
+        wsock32.lib;
         %(AdditionalDependencies)
       </AdditionalDependencies>
     </Link>
diff --git a/build/wx/setup-installed.h b/build/wx/setup-installed.h
index 3233b71e2..791db0ffc 100644
--- a/build/wx/setup-installed.h
+++ b/build/wx/setup-installed.h
@@ -1,19 +1,3 @@
 #include "wx/version.h"
 #include "wx/cpp.h"
-
 #include "wx/msw/setup.h"
-
-#pragma comment(lib, "kernel32")
-#pragma comment(lib, "user32")
-#pragma comment(lib, "gdi32")
-#pragma comment(lib, "comdlg32")
-#pragma comment(lib, "winspool")
-#pragma comment(lib, "winmm")
-#pragma comment(lib, "shell32")
-#pragma comment(lib, "comctl32")
-#pragma comment(lib, "ole32")
-#pragma comment(lib, "oleaut32")
-#pragma comment(lib, "uuid")
-#pragma comment(lib, "rpcrt4")
-#pragma comment(lib, "advapi32")
-#pragma comment(lib, "wsock32")
diff --git a/build/wx/wxWidgets.vcxproj b/build/wx/wxWidgets.vcxproj
index 7baba2a2b..78ce22939 100644
--- a/build/wx/wxWidgets.vcxproj
+++ b/build/wx/wxWidgets.vcxproj
@@ -56,15 +56,11 @@
     <ClCompile Include="$(SrcDir)src\common\dummy.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)src\common\extended.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
 
     <ClCompile Include="$(SrcDir)src\common\accelcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\accesscmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\affinematrix2d.cpp" />
     <ClCompile Include="$(SrcDir)src\common\anidecod.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\animatecmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\any.cpp" />
     <ClCompile Include="$(SrcDir)src\common\appbase.cpp" />
     <ClCompile Include="$(SrcDir)src\common\appcmn.cpp" />
@@ -73,15 +69,10 @@
     <ClCompile Include="$(SrcDir)src\common\archive.cpp" />
     <ClCompile Include="$(SrcDir)src\common\arrstr.cpp" />
     <ClCompile Include="$(SrcDir)src\common\artprov.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\artstd.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\arttango.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\base64.cpp" />
     <ClCompile Include="$(SrcDir)src\common\bmpbase.cpp" />
     <ClCompile Include="$(SrcDir)src\common\bmpbtncmn.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\bmpcboxcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\bookctrl.cpp" />
     <ClCompile Include="$(SrcDir)src\common\btncmn.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\cairo.cpp" />
     <ClCompile Include="$(SrcDir)src\common\calctrlcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\checkboxcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\checklstcmn.cpp" />
@@ -98,7 +89,6 @@
     <ClCompile Include="$(SrcDir)src\common\config.cpp" />
     <ClCompile Include="$(SrcDir)src\common\containr.cpp" />
     <ClCompile Include="$(SrcDir)src\common\convauto.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\cshelp.cpp" />
     <ClCompile Include="$(SrcDir)src\common\ctrlcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\ctrlsub.cpp" />
     <ClCompile Include="$(SrcDir)src\common\datavcmn.cpp" />
@@ -108,36 +98,26 @@
     <ClCompile Include="$(SrcDir)src\common\dcbase.cpp" />
     <ClCompile Include="$(SrcDir)src\common\dcbufcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\dcgraph.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\dcsvg.cpp" />
     <ClCompile Include="$(SrcDir)src\common\dircmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\dirctrlcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\dlgcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\dndcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\dobjcmn.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\docmdi.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\docview.cpp" />
     <ClCompile Include="$(SrcDir)src\common\dpycmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\dseldlg.cpp" />
     <ClCompile Include="$(SrcDir)src\common\dynarray.cpp" />
     <ClCompile Include="$(SrcDir)src\common\dynlib.cpp" />
     <ClCompile Include="$(SrcDir)src\common\dynload.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\effects.cpp" />
     <ClCompile Include="$(SrcDir)src\common\encconv.cpp" />
     <ClCompile Include="$(SrcDir)src\common\event.cpp" />
     <ClCompile Include="$(SrcDir)src\common\evtloopcmn.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\fddlgcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\ffile.cpp" />
     <ClCompile Include="$(SrcDir)src\common\file.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\fileback.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\fileconf.cpp" />
     <ClCompile Include="$(SrcDir)src\common\filectrlcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\filefn.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\filehistorycmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\filename.cpp" />
     <ClCompile Include="$(SrcDir)src\common\filepickercmn.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\filesys.cpp" />
     <ClCompile Include="$(SrcDir)src\common\filtall.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\filtfind.cpp" />
     <ClCompile Include="$(SrcDir)src\common\fldlgcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\fmapbase.cpp" />
     <ClCompile Include="$(SrcDir)src\common\fontcmn.cpp" />
@@ -145,55 +125,34 @@
     <ClCompile Include="$(SrcDir)src\common\fontenumcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\fontmap.cpp" />
     <ClCompile Include="$(SrcDir)src\common\fontpickercmn.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\fontutilcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\framecmn.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\fs_arc.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\fs_filter.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\fs_mem.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\fswatchercmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\gaugecmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\gbsizer.cpp" />
     <ClCompile Include="$(SrcDir)src\common\gdicmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\geometry.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\gifdecod.cpp" />
     <ClCompile Include="$(SrcDir)src\common\glcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\graphcmn.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\gridcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\hash.cpp" />
     <ClCompile Include="$(SrcDir)src\common\hashmap.cpp" />
     <ClCompile Include="$(SrcDir)src\common\headercolcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\headerctrlcmn.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\helpbase.cpp" />
     <ClCompile Include="$(SrcDir)src\common\hyperlnkcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\iconbndl.cpp" />
     <ClCompile Include="$(SrcDir)src\common\imagall.cpp" />
     <ClCompile Include="$(SrcDir)src\common\imagbmp.cpp" />
     <ClCompile Include="$(SrcDir)src\common\image.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\imagfill.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\imaggif.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\imagiff.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\imagjpeg.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\imagpcx.cpp" />
     <ClCompile Include="$(SrcDir)src\common\imagpng.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\imagpnm.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\imagtga.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\imagtiff.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\imagxpm.cpp" />
     <ClCompile Include="$(SrcDir)src\common\init.cpp" />
     <ClCompile Include="$(SrcDir)src\common\intl.cpp" />
     <ClCompile Include="$(SrcDir)src\common\ipcbase.cpp" />
     <ClCompile Include="$(SrcDir)src\common\languageinfo.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\layout.cpp" />
     <ClCompile Include="$(SrcDir)src\common\lboxcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\list.cpp" />
     <ClCompile Include="$(SrcDir)src\common\listctrlcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\log.cpp" />
     <ClCompile Include="$(SrcDir)src\common\longlong.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\markupparser.cpp" />
     <ClCompile Include="$(SrcDir)src\common\matrix.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\memory.cpp" />
     <ClCompile Include="$(SrcDir)src\common\menucmn.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\mimecmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\modalhook.cpp" />
     <ClCompile Include="$(SrcDir)src\common\module.cpp" />
     <ClCompile Include="$(SrcDir)src\common\mousemanager.cpp" />
@@ -206,23 +165,17 @@
     <ClCompile Include="$(SrcDir)src\common\overlaycmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\ownerdrwcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\panelcmn.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\paper.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\persist.cpp" />
     <ClCompile Include="$(SrcDir)src\common\pickerbase.cpp" />
     <ClCompile Include="$(SrcDir)src\common\platinfo.cpp" />
     <ClCompile Include="$(SrcDir)src\common\popupcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\powercmn.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\preferencescmn.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\prntbase.cpp" />
     <ClCompile Include="$(SrcDir)src\common\process.cpp" />
     <ClCompile Include="$(SrcDir)src\common\quantize.cpp" />
     <ClCompile Include="$(SrcDir)src\common\radiobtncmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\radiocmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\rearrangectrl.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\regex.cpp" />
     <ClCompile Include="$(SrcDir)src\common\rendcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\rgncmn.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\richtooltipcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\scrolbarcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\settcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\sizer.cpp" />
@@ -244,16 +197,12 @@
     <ClCompile Include="$(SrcDir)src\common\stream.cpp" />
     <ClCompile Include="$(SrcDir)src\common\string.cpp" />
     <ClCompile Include="$(SrcDir)src\common\stringimpl.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\stringops.cpp" />
     <ClCompile Include="$(SrcDir)src\common\strvararg.cpp" />
     <ClCompile Include="$(SrcDir)src\common\sysopt.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\tarstrm.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\taskbarcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\tbarbase.cpp" />
     <ClCompile Include="$(SrcDir)src\common\textbuf.cpp" />
     <ClCompile Include="$(SrcDir)src\common\textcmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\textentrycmn.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\textfile.cpp" />
     <ClCompile Include="$(SrcDir)src\common\textmeasurecmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\threadinfo.cpp" />
     <ClCompile Include="$(SrcDir)src\common\time.cpp" />
@@ -264,7 +213,6 @@
     <ClCompile Include="$(SrcDir)src\common\translation.cpp" />
     <ClCompile Include="$(SrcDir)src\common\treebase.cpp" />
     <ClCompile Include="$(SrcDir)src\common\txtstrm.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\uiactioncmn.cpp" />
     <ClCompile Include="$(SrcDir)src\common\unichar.cpp" />
     <ClCompile Include="$(SrcDir)src\common\uri.cpp" />
     <ClCompile Include="$(SrcDir)src\common\ustring.cpp" />
@@ -279,83 +227,51 @@
     <ClCompile Include="$(SrcDir)src\common\windowid.cpp" />
     <ClCompile Include="$(SrcDir)src\common\wrapsizer.cpp" />
     <ClCompile Include="$(SrcDir)src\common\wxcrt.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\wxprintf.cpp" />
     <ClCompile Include="$(SrcDir)src\common\xlocale.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\xpmdecod.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\xti.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\xtistrm.cpp" />
-    <ClCompile Include="$(SrcDir)src\common\xtixml.cpp" />
     <ClCompile Include="$(SrcDir)src\common\zipstrm.cpp" />
     <ClCompile Include="$(SrcDir)src\common\zstream.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\aboutdlgg.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\animateg.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\bannerwindow.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\bmpcboxg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\busyinfo.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\buttonbar.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\calctrlg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\choicbkg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\choicdgg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\clrpickerg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\collpaneg.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\combog.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\commandlinkbuttong.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\datavgen.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\datectlg.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\dcpsg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\dirctrlg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\dragimgg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\editlbox.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\filectrlg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\filepickerg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\fontpickerg.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\fswatcherg.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\graphicc.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\grid.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\gridctrl.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\grideditors.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\gridsel.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\headerctrlg.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\helpext.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\hyperlinkg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\infobar.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\laywin.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\listbkg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\logg.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\markuptext.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\msgdlgg.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\notifmsgg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\numdlgg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\odcombo.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\preferencesg.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\printps.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\prntdlgg.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\progdlgg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\propdlg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\renderg.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\richmsgdlgg.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\richtooltipg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\sashwin.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\scrlwing.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\selstore.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\spinctlg.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\splash.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\splitter.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\srchctlg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\statbmpg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\stattextg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\statusbr.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\textdlgg.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\timectrlg.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\tipdlg.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\tipwin.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\toolbkg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\treebkg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\treectlg.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\treelist.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\vlbox.cpp" />
     <ClCompile Include="$(SrcDir)src\generic\vscroll.cpp" />
-    <ClCompile Include="$(SrcDir)src\generic\wizard.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\aboutdlg.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\accel.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\anybutton.cpp" />
@@ -364,7 +280,6 @@
     <ClCompile Include="$(SrcDir)src\msw\basemsw.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\bitmap.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\bmpbuttn.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\bmpcbox.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\brush.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\button.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\calctrl.cpp" />
@@ -377,71 +292,51 @@
     <ClCompile Include="$(SrcDir)src\msw\colour.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\combo.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\combobox.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\commandlinkbutton.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\control.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\crashrpt.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\cursor.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\data.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\datecontrols.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\datectrl.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\datetimectrl.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\dc.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\dcclient.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\dcmemory.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\dcprint.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\dcscreen.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\dde.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\debughlp.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\dialog.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\dialup.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\dib.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\dir.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\dirdlg.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\display.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\dlmsw.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\dragimag.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\enhmeta.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\evtloop.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\evtloopconsole.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\fdrepdlg.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\filedlg.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\font.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\fontdlg.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\fontenum.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\fontutil.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\frame.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\fswatcher.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\gauge.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\gdiimage.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\gdiobj.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\gdiplus.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\glcanvas.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\graphics.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\headerctrl.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\helpchm.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\helpwin.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\hyperlink.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\icon.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\imaglist.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\iniconf.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\joystick.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\listbox.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\listctrl.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\main.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\mdi.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\menu.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\menuitem.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\metafile.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\mimetype.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\minifram.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\msgdlg.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\mslu.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\nativdlg.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\nativewin.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\nonownedwnd.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\notebook.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\notifmsg.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\ole\automtn.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\ole\dataobj.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\ole\dropsrc.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\ole\droptgt.cpp" />
@@ -454,32 +349,23 @@
     <ClCompile Include="$(SrcDir)src\msw\pen.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\popupwin.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\power.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\printdlg.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\printwin.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\progdlg.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\radiobox.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\radiobut.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\regconf.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\region.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\registry.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\renderer.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\richmsgdlg.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\richtooltip.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\scrolbar.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\settings.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\slider.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\snglinst.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\sound.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\spinbutt.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\spinctrl.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\stackwalk.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\statbmp.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\statbox.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\statline.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\stattext.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\statusbar.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\stdpaths.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\taskbar.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\textctrl.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\textentry.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\textmeasure.cpp" />
@@ -491,13 +377,11 @@
     <ClCompile Include="$(SrcDir)src\msw\tooltip.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\toplevel.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\treectrl.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\uiaction.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\utils.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\utilsexc.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\utilsgui.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\utilswin.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\uxtheme.cpp" />
-    <ClCompile Include="$(SrcDir)src\msw\volume.cpp" />
     <ClCompile Include="$(SrcDir)src\msw\window.cpp" />
 
     <ClCompile Include="$(SrcDir)src\stc\PlatWX.cpp">