A slight reorganization of the source tree and fixed a warning in disk/mo.c.

src/machine/m_at_386dx_486.c

@@ -40,8 +40,6 @@
 #include <86box/video.h>
 #include <86box/intel_flash.h>
 #include <86box/sst_flash.h>
-#include <86box/intel_420ex.h>
-#include <86box/intel_sio.h>
 #include <86box/scsi_ncr53c8xx.h>
 #include <86box/machine.h>
 

src/machine/m_at_slot1.c

@@ -30,10 +30,7 @@
 #include <86box/hdc_ide.h>
 #include <86box/keyboard.h>
 #include <86box/intel_flash.h>
-#include <86box/intel_sio.h>
-#include <86box/piix.h>
 #include <86box/sio.h>
-#include <86box/intel_sio.h>
 #include <86box/sst_flash.h>
 #include <86box/hwm.h>
 #include <86box/spd.h>

src/machine/m_at_slot2.c

@@ -32,10 +32,7 @@
 #include <86box/keyboard.h>
 #include <86box/intel_flash.h>
 #include <86box/sst_flash.h>
-#include <86box/intel_sio.h>
-#include <86box/piix.h>
 #include <86box/sio.h>
-#include <86box/intel_sio.h>
 #include <86box/hwm.h>
 #include <86box/spd.h>
 #include <86box/video.h>

src/machine/m_at_socket370.c

@@ -30,9 +30,6 @@
 #include <86box/hdc_ide.h>
 #include <86box/keyboard.h>
 #include <86box/intel_flash.h>
-#include <86box/via_vt82c586b.h>
-#include <86box/intel_sio.h>
-#include <86box/piix.h>
 #include <86box/sio.h>
 #include <86box/sst_flash.h>
 #include <86box/hwm.h>

src/machine/m_at_socket4_5.c

@@ -35,9 +35,7 @@
 #include <86box/fdc.h>
 #include <86box/keyboard.h>
 #include <86box/intel_flash.h>
-#include <86box/intel_sio.h>
 #include <86box/nvr.h>
-#include <86box/piix.h>
 #include <86box/sio.h>
 #include <86box/video.h>
 #include <86box/machine.h>

src/machine/m_at_socket7_s7.c

@@ -34,11 +34,8 @@
 #include <86box/hdc_ide.h>
 #include <86box/keyboard.h>
 #include <86box/intel_flash.h>
-#include <86box/intel_sio.h>
-#include <86box/piix.h>
 #include <86box/sio.h>
 #include <86box/sst_flash.h>
-#include <86box/via_vt82c586b.h>
 #include <86box/hwm.h>
 #include <86box/video.h>
 #include <86box/spd.h>
@@ -180,7 +177,7 @@ machine_at_pb640_init(const machine_t *model)
     pci_register_slot(0x13, PCI_CARD_NORMAL, 2, 1, 3, 4);
     pci_register_slot(0x0B, PCI_CARD_NORMAL, 3, 2, 1, 4);
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
-    device_add(&i430fx_pb640_device);
+    device_add(&i430fx_rev02_device);
     device_add(&piix_rev02_device);
 
     if (gfxcard == VID_INTERNAL)

src/machine/m_at_socket8.c

@@ -31,8 +31,6 @@
 #include <86box/keyboard.h>
 #include <86box/intel_flash.h>
 #include <86box/sst_flash.h>
-#include <86box/intel_sio.h>
-#include <86box/piix.h>
 #include <86box/sio.h>
 #include <86box/sst_flash.h>
 #include <86box/hwm.h>

src/machine/m_at_sockets7.c

@@ -34,11 +34,8 @@
 #include <86box/hdc_ide.h>
 #include <86box/keyboard.h>
 #include <86box/intel_flash.h>
-#include <86box/intel_sio.h>
-#include <86box/piix.h>
 #include <86box/sio.h>
 #include <86box/sst_flash.h>
-#include <86box/via_vt82c586b.h>
 #include <86box/spd.h>
 #include <86box/hwm.h>
 #include <86box/video.h>