diff --git a/src/win/msvc/vc15/VARCem.vcxproj b/src/win/msvc/vc15/VARCem.vcxproj
index 3a31d40..a227d72 100644
--- a/src/win/msvc/vc15/VARCem.vcxproj
+++ b/src/win/msvc/vc15/VARCem.vcxproj
@@ -20,6 +20,16 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\devices\cdrom\cdrom_speed.c" />
+    <ClCompile Include="..\..\..\devices\chipsets\ali1429.c" />
+    <ClCompile Include="..\..\..\devices\chipsets\headland.c" />
+    <ClCompile Include="..\..\..\devices\chipsets\intel4x0.c" />
+    <ClCompile Include="..\..\..\devices\chipsets\neat.c" />
+    <ClCompile Include="..\..\..\devices\chipsets\opti495.c" />
+    <ClCompile Include="..\..\..\devices\chipsets\scat.c" />
+    <ClCompile Include="..\..\..\devices\chipsets\sis471.c" />
+    <ClCompile Include="..\..\..\devices\chipsets\sis496.c" />
+    <ClCompile Include="..\..\..\devices\chipsets\wd76c10.c" />
+    <ClCompile Include="..\..\..\devices\floppy\fdd_mfm.c" />
     <ClCompile Include="..\..\..\devices\misc\bugger.c" />
     <ClCompile Include="..\..\..\devices\cdrom\cdrom.c" />
     <ClCompile Include="..\..\..\devices\cdrom\cdrom_dosbox.cpp" />
@@ -148,7 +158,6 @@
     <ClCompile Include="..\..\..\devices\sound\sound.c" />
     <ClCompile Include="..\..\..\devices\sound\sound_dev.c" />
     <ClCompile Include="..\..\..\devices\system\dma.c" />
-    <ClCompile Include="..\..\..\devices\system\i82335.c" />
     <ClCompile Include="..\..\..\devices\system\intel.c" />
     <ClCompile Include="..\..\..\devices\system\intel_flash.c" />
     <ClCompile Include="..\..\..\devices\system\intel_piix.c" />
@@ -188,41 +197,57 @@
     <ClCompile Include="..\..\..\devices\input\mouse_ps2.c" />
     <ClCompile Include="..\..\..\devices\input\mouse_serial.c" />
     <ClCompile Include="..\..\..\devices\video\video_dev.c" />
+    <ClCompile Include="..\..\..\devices\video\vid_att20c49x_ramdac.c" />
+    <ClCompile Include="..\..\..\devices\video\vid_av9194.c" />
     <ClCompile Include="..\..\..\devices\video\vid_bt48x_ramdac.c" />
     <ClCompile Include="..\..\..\devices\video\vid_cga_compaq.c" />
+    <ClCompile Include="..\..\..\devices\video\vid_im1024.c" />
+    <ClCompile Include="..\..\..\devices\video\vid_pgc.c" />
     <ClCompile Include="..\..\..\devices\video\vid_sigma.c" />
     <ClCompile Include="..\..\..\io.c" />
     <ClCompile Include="..\..\..\machines\machine.c" />
     <ClCompile Include="..\..\..\machines\machine_table.c" />
+    <ClCompile Include="..\..\..\machines\m_acer.c" />
+    <ClCompile Include="..\..\..\machines\m_ali.c" />
     <ClCompile Include="..\..\..\machines\m_amstrad.c" />
+    <ClCompile Include="..\..\..\machines\m_amstrad_vid.c" />
+    <ClCompile Include="..\..\..\machines\m_aopen.c" />
+    <ClCompile Include="..\..\..\machines\m_asus.c" />
     <ClCompile Include="..\..\..\machines\m_at.c" />
-    <ClCompile Include="..\..\..\machines\m_at_4x0.c" />
-    <ClCompile Include="..\..\..\machines\m_at_ali1429.c" />
-    <ClCompile Include="..\..\..\machines\m_at_commodore.c" />
-    <ClCompile Include="..\..\..\machines\m_at_compaq.c" />
-    <ClCompile Include="..\..\..\machines\m_at_headland.c" />
-    <ClCompile Include="..\..\..\machines\m_at_neat.c" />
-    <ClCompile Include="..\..\..\machines\m_at_opti495.c" />
-    <ClCompile Include="..\..\..\machines\m_at_scat.c" />
-    <ClCompile Include="..\..\..\machines\m_at_sis471.c" />
-    <ClCompile Include="..\..\..\machines\m_at_sis496.c" />
-    <ClCompile Include="..\..\..\machines\m_at_t3100e.c" />
-    <ClCompile Include="..\..\..\machines\m_at_t3100e_vid.c" />
-    <ClCompile Include="..\..\..\machines\m_at_wd76c10.c" />
+    <ClCompile Include="..\..\..\machines\m_bull.c" />
+    <ClCompile Include="..\..\..\machines\m_commodore.c" />
+    <ClCompile Include="..\..\..\machines\m_compaq.c" />
+    <ClCompile Include="..\..\..\machines\m_compaq_vid.c" />
     <ClCompile Include="..\..\..\machines\m_europc.c" />
-    <ClCompile Include="..\..\..\machines\m_olivetti_m24.c" />
+    <ClCompile Include="..\..\..\machines\m_headland.c" />
+    <ClCompile Include="..\..\..\machines\m_intel4x0.c" />
+    <ClCompile Include="..\..\..\machines\m_laserxt.c" />
+    <ClCompile Include="..\..\..\machines\m_misc.c" />
+    <ClCompile Include="..\..\..\machines\m_neat.c" />
+    <ClCompile Include="..\..\..\machines\m_olim24.c" />
+    <ClCompile Include="..\..\..\machines\m_olim24_vid.c" />
+    <ClCompile Include="..\..\..\machines\m_opti495.c" />
+    <ClCompile Include="..\..\..\machines\m_pbell.c" />
     <ClCompile Include="..\..\..\machines\m_pcjr.c" />
     <ClCompile Include="..\..\..\machines\m_ps1.c" />
     <ClCompile Include="..\..\..\machines\m_ps1_hdc.c" />
     <ClCompile Include="..\..\..\machines\m_ps2_isa.c" />
     <ClCompile Include="..\..\..\machines\m_ps2_mca.c" />
-    <ClCompile Include="..\..\..\machines\m_tandy.c" />
+    <ClCompile Include="..\..\..\machines\m_scat.c" />
+    <ClCompile Include="..\..\..\machines\m_sis471.c" />
+    <ClCompile Include="..\..\..\machines\m_sis496.c" />
+    <ClCompile Include="..\..\..\machines\m_tandy1000.c" />
+    <ClCompile Include="..\..\..\machines\m_tandy1000_vid.c" />
+    <ClCompile Include="..\..\..\machines\m_tosh1x00.c" />
+    <ClCompile Include="..\..\..\machines\m_tosh1x00_vid.c" />
+    <ClCompile Include="..\..\..\machines\m_tosh3100e.c" />
+    <ClCompile Include="..\..\..\machines\m_tosh3100e_vid.c" />
+    <ClCompile Include="..\..\..\machines\m_tyan.c" />
+    <ClCompile Include="..\..\..\machines\m_wd76c10.c" />
+    <ClCompile Include="..\..\..\machines\m_xi8088.c" />
     <ClCompile Include="..\..\..\machines\m_xt.c" />
-    <ClCompile Include="..\..\..\machines\m_xt_compaq.c" />
-    <ClCompile Include="..\..\..\machines\m_xt_laserxt.c" />
-    <ClCompile Include="..\..\..\machines\m_xt_t1000.c" />
-    <ClCompile Include="..\..\..\machines\m_xt_t1000_vid.c" />
-    <ClCompile Include="..\..\..\machines\m_xt_xi8088.c" />
+    <ClCompile Include="..\..\..\machines\m_zenith.c" />
+    <ClCompile Include="..\..\..\machines\m_zenith_vid.c" />
     <ClCompile Include="..\..\..\mem.c" />
     <ClCompile Include="..\..\..\devices\network\network.c" />
     <ClCompile Include="..\..\..\devices\network\net_ne2000.c" />
@@ -310,6 +335,16 @@
     <ClCompile Include="..\..\win_sdl.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\devices\chipsets\ali1429.h" />
+    <ClInclude Include="..\..\..\devices\chipsets\headland.h" />
+    <ClInclude Include="..\..\..\devices\chipsets\intel4x0.h" />
+    <ClInclude Include="..\..\..\devices\chipsets\neat.h" />
+    <ClInclude Include="..\..\..\devices\chipsets\opti495.h" />
+    <ClInclude Include="..\..\..\devices\chipsets\scat.h" />
+    <ClInclude Include="..\..\..\devices\chipsets\sis471.h" />
+    <ClInclude Include="..\..\..\devices\chipsets\sis496.h" />
+    <ClInclude Include="..\..\..\devices\chipsets\wd76c10.h" />
+    <ClInclude Include="..\..\..\devices\floppy\fdd_mfm.h" />
     <ClInclude Include="..\..\..\devices\misc\bugger.h" />
     <ClInclude Include="..\..\..\devices\cdrom\cdrom.h" />
     <ClInclude Include="..\..\..\devices\cdrom\cdrom_dosbox.h" />
@@ -393,7 +428,6 @@
     <ClInclude Include="..\..\..\devices\network\net_dp8390.h" />
     <ClInclude Include="..\..\..\devices\network\net_wd80x3.h" />
     <ClInclude Include="..\..\..\devices\printer\printer.h" />
-    <ClInclude Include="..\..\..\devices\scsi\queue.h" />
     <ClInclude Include="..\..\..\devices\scsi\scsi.h" />
     <ClInclude Include="..\..\..\devices\scsi\scsi_aha154x.h" />
     <ClInclude Include="..\..\..\devices\scsi\scsi_buslogic.h" />
@@ -463,7 +497,6 @@
     <ClInclude Include="..\..\..\devices\sound\snd_ym7128.h" />
     <ClInclude Include="..\..\..\devices\sound\sound.h" />
     <ClInclude Include="..\..\..\devices\system\dma.h" />
-    <ClInclude Include="..\..\..\devices\system\i82335.h" />
     <ClInclude Include="..\..\..\devices\system\intel.h" />
     <ClInclude Include="..\..\..\devices\system\intel_flash.h" />
     <ClInclude Include="..\..\..\devices\system\intel_piix.h" />
@@ -476,7 +509,12 @@
     <ClInclude Include="..\..\..\devices\system\pic.h" />
     <ClInclude Include="..\..\..\devices\system\pit.h" />
     <ClInclude Include="..\..\..\devices\system\ppi.h" />
+    <ClInclude Include="..\..\..\devices\video\vid_ati.h" />
+    <ClInclude Include="..\..\..\devices\video\vid_att20c49x_ramdac.h" />
+    <ClInclude Include="..\..\..\devices\video\vid_av9194.h" />
     <ClInclude Include="..\..\..\devices\video\vid_bt48x_ramdac.h" />
+    <ClInclude Include="..\..\..\devices\video\vid_mda.h" />
+    <ClInclude Include="..\..\..\devices\video\vid_pgc.h" />
     <ClInclude Include="..\..\..\emu.h" />
     <ClInclude Include="..\..\..\devices\floppy\fdc.h" />
     <ClInclude Include="..\..\..\devices\floppy\fdd.h" />
@@ -497,9 +535,13 @@
     <ClInclude Include="..\..\..\devices\input\mouse.h" />
     <ClInclude Include="..\..\..\io.h" />
     <ClInclude Include="..\..\..\machines\machine.h" />
-    <ClInclude Include="..\..\..\machines\m_at_t3100e.h" />
-    <ClInclude Include="..\..\..\machines\m_xt_t1000.h" />
-    <ClInclude Include="..\..\..\machines\m_xt_xi8088.h" />
+    <ClInclude Include="..\..\..\machines\m_amstrad.h" />
+    <ClInclude Include="..\..\..\machines\m_compaq.h" />
+    <ClInclude Include="..\..\..\machines\m_olim24.h" />
+    <ClInclude Include="..\..\..\machines\m_tandy1000.h" />
+    <ClInclude Include="..\..\..\machines\m_tosh1x00.h" />
+    <ClInclude Include="..\..\..\machines\m_tosh3100e.h" />
+    <ClInclude Include="..\..\..\machines\m_zenith.h" />
     <ClInclude Include="..\..\..\mem.h" />
     <ClInclude Include="..\..\..\devices\network\bswap.h" />
     <ClInclude Include="..\..\..\devices\network\network.h" />
@@ -524,7 +566,6 @@
     <ClInclude Include="..\..\..\version.h" />
     <ClInclude Include="..\..\..\devices\video\video.h" />
     <ClInclude Include="..\..\..\devices\video\vid_ati68860_ramdac.h" />
-    <ClInclude Include="..\..\..\devices\video\vid_ati_eeprom.h" />
     <ClInclude Include="..\..\..\devices\video\vid_cga.h" />
     <ClInclude Include="..\..\..\devices\video\vid_cga_comp.h" />
     <ClInclude Include="..\..\..\devices\video\vid_ega.h" />
diff --git a/src/win/msvc/vc15/VARCem.vcxproj.filters b/src/win/msvc/vc15/VARCem.vcxproj.filters
index 1b7f786..6ab342d 100644
--- a/src/win/msvc/vc15/VARCem.vcxproj.filters
+++ b/src/win/msvc/vc15/VARCem.vcxproj.filters
@@ -518,9 +518,6 @@
     <ClCompile Include="..\..\..\devices\system\dma.c">
       <Filter>devices\system</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\devices\system\i82335.c">
-      <Filter>devices\system</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\devices\system\intel.c">
       <Filter>devices\system</Filter>
     </ClCompile>
@@ -680,42 +677,9 @@
     <ClCompile Include="..\..\..\machines\m_at.c">
       <Filter>machines</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_at_ali1429.c">
-      <Filter>machines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_at_commodore.c">
-      <Filter>machines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_at_compaq.c">
-      <Filter>machines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_at_headland.c">
-      <Filter>machines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_at_neat.c">
-      <Filter>machines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_at_opti495.c">
-      <Filter>machines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_at_scat.c">
-      <Filter>machines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_at_t3100e.c">
-      <Filter>machines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_at_t3100e_vid.c">
-      <Filter>machines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_at_wd76c10.c">
-      <Filter>machines</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\machines\m_europc.c">
       <Filter>machines</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_olivetti_m24.c">
-      <Filter>machines</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\machines\m_pcjr.c">
       <Filter>machines</Filter>
     </ClCompile>
@@ -731,27 +695,9 @@
     <ClCompile Include="..\..\..\machines\m_ps2_mca.c">
       <Filter>machines</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_tandy.c">
-      <Filter>machines</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\machines\m_xt.c">
       <Filter>machines</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_xt_compaq.c">
-      <Filter>machines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_xt_laserxt.c">
-      <Filter>machines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_xt_t1000.c">
-      <Filter>machines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_xt_t1000_vid.c">
-      <Filter>machines</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_xt_xi8088.c">
-      <Filter>machines</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\machines\machine.c">
       <Filter>machines</Filter>
     </ClCompile>
@@ -813,9 +759,6 @@
     <ClCompile Include="..\..\..\devices\video\vid_cga_compaq.c">
       <Filter>devices\video</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_at_4x0.c">
-      <Filter>machines</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\ui\ui_cdrom.c">
       <Filter>ui</Filter>
     </ClCompile>
@@ -835,12 +778,147 @@
     <ClCompile Include="..\..\..\devices\scsi\scsi_cdrom.c">
       <Filter>devices\scsi</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_at_sis471.c">
+    <ClCompile Include="..\..\..\devices\chipsets\ali1429.c">
+      <Filter>devices\chipsets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\devices\chipsets\headland.c">
+      <Filter>devices\chipsets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\devices\chipsets\intel4x0.c">
+      <Filter>devices\chipsets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\devices\chipsets\neat.c">
+      <Filter>devices\chipsets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\devices\chipsets\opti495.c">
+      <Filter>devices\chipsets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\devices\chipsets\scat.c">
+      <Filter>devices\chipsets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\devices\chipsets\sis471.c">
+      <Filter>devices\chipsets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\devices\chipsets\sis496.c">
+      <Filter>devices\chipsets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\devices\chipsets\wd76c10.c">
+      <Filter>devices\chipsets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\devices\floppy\fdd_mfm.c">
+      <Filter>devices\floppy</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\devices\video\vid_att20c49x_ramdac.c">
+      <Filter>devices\video</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\devices\video\vid_av9194.c">
+      <Filter>devices\video</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\devices\video\vid_im1024.c">
+      <Filter>devices\video</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\devices\video\vid_pgc.c">
+      <Filter>devices\video</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_acer.c">
       <Filter>machines</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\machines\m_at_sis496.c">
+    <ClCompile Include="..\..\..\machines\m_ali.c">
       <Filter>machines</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_amstrad_vid.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_aopen.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_asus.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_bull.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_commodore.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_compaq.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_compaq_vid.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_headland.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_intel4x0.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_laserxt.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_misc.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_neat.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_olim24.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_olim24_vid.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_opti495.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_pbell.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_scat.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_sis471.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_sis496.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_tandy1000.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_tandy1000_vid.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_tosh1x00.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_tosh1x00_vid.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_tosh3100e.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_tosh3100e_vid.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_tyan.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_wd76c10.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_xi8088.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_zenith.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\machines\m_zenith_vid.c">
+      <Filter>machines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\devices\sound\snd_cs423x.c">
+      <Filter>devices\sound</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\config.h" />
@@ -1163,9 +1241,6 @@
     <ClInclude Include="..\..\..\devices\ports\serial.h">
       <Filter>devices\ports</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\devices\scsi\queue.h">
-      <Filter>devices\scsi</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\devices\scsi\scsi.h">
       <Filter>devices\scsi</Filter>
     </ClInclude>
@@ -1379,9 +1454,6 @@
     <ClInclude Include="..\..\..\devices\system\dma.h">
       <Filter>devices\system</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\devices\system\i82335.h">
-      <Filter>devices\system</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\devices\system\intel.h">
       <Filter>devices\system</Filter>
     </ClInclude>
@@ -1418,9 +1490,6 @@
     <ClInclude Include="..\..\..\devices\system\ppi.h">
       <Filter>devices\system</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\devices\video\vid_ati_eeprom.h">
-      <Filter>devices\video</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\devices\video\vid_ati68860_ramdac.h">
       <Filter>devices\video</Filter>
     </ClInclude>
@@ -1472,15 +1541,6 @@
     <ClInclude Include="..\..\..\devices\video\video.h">
       <Filter>devices\video</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\machines\m_at_t3100e.h">
-      <Filter>machines</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\machines\m_xt_t1000.h">
-      <Filter>machines</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\machines\m_xt_xi8088.h">
-      <Filter>machines</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\machines\machine.h">
       <Filter>machines</Filter>
     </ClInclude>
@@ -1548,6 +1608,75 @@
     <ClInclude Include="..\..\..\devices\scsi\scsi_cdrom.h">
       <Filter>devices\scsi</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\devices\chipsets\ali1429.h">
+      <Filter>devices\chipsets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\devices\chipsets\headland.h">
+      <Filter>devices\chipsets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\devices\chipsets\intel4x0.h">
+      <Filter>devices\chipsets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\devices\chipsets\neat.h">
+      <Filter>devices\chipsets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\devices\chipsets\opti495.h">
+      <Filter>devices\chipsets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\devices\chipsets\scat.h">
+      <Filter>devices\chipsets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\devices\chipsets\sis471.h">
+      <Filter>devices\chipsets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\devices\chipsets\sis496.h">
+      <Filter>devices\chipsets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\devices\chipsets\wd76c10.h">
+      <Filter>devices\chipsets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\devices\floppy\fdd_mfm.h">
+      <Filter>devices\floppy</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\devices\video\vid_ati.h">
+      <Filter>devices\video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\devices\video\vid_att20c49x_ramdac.h">
+      <Filter>devices\video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\devices\video\vid_av9194.h">
+      <Filter>devices\video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\devices\video\vid_mda.h">
+      <Filter>devices\video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\devices\video\vid_pgc.h">
+      <Filter>devices\video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\machines\m_amstrad.h">
+      <Filter>machines</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\machines\m_compaq.h">
+      <Filter>machines</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\machines\m_olim24.h">
+      <Filter>machines</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\machines\m_tandy1000.h">
+      <Filter>machines</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\machines\m_tosh1x00.h">
+      <Filter>machines</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\machines\m_tosh3100e.h">
+      <Filter>machines</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\machines\m_zenith.h">
+      <Filter>machines</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\devices\sound\snd_cs423x.h">
+      <Filter>devices\sound</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="cpu">
@@ -1622,6 +1751,9 @@
     <Filter Include="devices\printer">
       <UniqueIdentifier>{4797388a-1c9d-4a4c-a7f9-aa1925cad334}</UniqueIdentifier>
     </Filter>
+    <Filter Include="devices\chipsets">
+      <UniqueIdentifier>{552b793b-68ef-4307-a736-304825db0e67}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\VARCem.rc">