diff --git a/bochs/iodev/cdrom.cc b/bochs/iodev/cdrom.cc
index 749d9eb64..ca8fee191 100644
--- a/bochs/iodev/cdrom.cc
+++ b/bochs/iodev/cdrom.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: cdrom.cc,v 1.72 2004-08-30 10:47:09 vruppert Exp $
+// $Id: cdrom.cc,v 1.73 2004-09-05 10:30:18 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -37,9 +37,11 @@
 // is used to know when we are exporting symbols and when we are importing.
 #define BX_PLUGGABLE
 
-#include "iodev.h"
+#include "bochs.h"
 #if BX_SUPPORT_CDROM
 
+#include "cdrom.h"
+
 #define LOG_THIS /* no SMF tricks here, not needed */
 
 extern "C" {
@@ -521,7 +523,7 @@ cdrom_interface::cdrom_interface(char *dev)
 
 void
 cdrom_interface::init(void) {
-  BX_DEBUG(("Init $Id: cdrom.cc,v 1.72 2004-08-30 10:47:09 vruppert Exp $"));
+  BX_DEBUG(("Init $Id: cdrom.cc,v 1.73 2004-09-05 10:30:18 vruppert Exp $"));
   BX_INFO(("file = '%s'",path));
 }
 
diff --git a/bochs/iodev/crc32.h b/bochs/iodev/crc32.h
index 41b910887..81487ef8e 100644
--- a/bochs/iodev/crc32.h
+++ b/bochs/iodev/crc32.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: crc32.h,v 1.3 2001-10-03 13:10:38 bdenney Exp $
+// $Id: crc32.h,v 1.4 2004-09-05 10:30:18 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 /* CRC-32 calculator
@@ -9,7 +9,7 @@
 #ifndef _CRC_32_H_
 #define _CRC_32_H_
 
-#include "bochs.h"
+#include "../config.h"
 
 class CRC_Generator {
 private:
diff --git a/bochs/iodev/eth.cc b/bochs/iodev/eth.cc
index ffd9684d6..916563140 100644
--- a/bochs/iodev/eth.cc
+++ b/bochs/iodev/eth.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: eth.cc,v 1.20 2004-08-06 15:49:54 vruppert Exp $
+// $Id: eth.cc,v 1.21 2004-09-05 10:30:18 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -37,6 +37,8 @@
 #include "iodev.h"
 #if BX_SUPPORT_NE2K
 
+#include "eth.h"
+
 #define LOG_THIS /* not needed */
 
 eth_locator_c *eth_locator_c::all;
diff --git a/bochs/iodev/eth_arpback.cc b/bochs/iodev/eth_arpback.cc
index 0644f9bfc..b764161fe 100644
--- a/bochs/iodev/eth_arpback.cc
+++ b/bochs/iodev/eth_arpback.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: eth_arpback.cc,v 1.13 2004-08-06 15:49:54 vruppert Exp $
+// $Id: eth_arpback.cc,v 1.14 2004-09-05 10:30:18 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -40,6 +40,7 @@
 
 #if BX_SUPPORT_NE2K && defined(ETH_ARPBACK)
 
+#include "eth.h"
 #include "crc32.h"
 #include "eth_packetmaker.h"
 #define LOG_THIS bx_devices.pluginNE2kDevice->
@@ -159,11 +160,11 @@ bx_arpback_pktmover_c::sendpkt(void *buf, unsigned io_len)
   // dump raw bytes to a file, eventually dump in pcap format so that
   // tcpdump -r FILE can interpret them for us.
   int n = fwrite (buf, io_len, 1, txlog);
-  if (n != 1) BX_ERROR (("fwrite to txlog failed", io_len));
+  if (n != 1) BX_ERROR (("fwrite to txlog failed, length %u", io_len));
   // dump packet in hex into an ascii log file
   fprintf (txlog_txt, "NE2K transmitting a packet, length %u\n", io_len);
   Bit8u *charbuf = (Bit8u *)buf;
-  for (n=0; n<io_len; n++) {
+  for (n=0; n<(int)io_len; n++) {
     if (((n % 16) == 0) && n>0)
       fprintf (txlog_txt, "\n");
     fprintf (txlog_txt, "%02x ", charbuf[n]);
@@ -187,8 +188,8 @@ void bx_arpback_pktmover_c::rx_timer_handler (void * this_ptr)
 
 void bx_arpback_pktmover_c::rx_timer (void)
 {
-  int nbytes = 0;
-  struct bpf_hdr *bhdr;
+//int nbytes = 0;
+//struct bpf_hdr *bhdr;
   eth_packet rubble;
   
   if(packetmaker.getpacket(rubble)) {
diff --git a/bochs/iodev/eth_fbsd.cc b/bochs/iodev/eth_fbsd.cc
index d659a5c2e..ac631aa77 100644
--- a/bochs/iodev/eth_fbsd.cc
+++ b/bochs/iodev/eth_fbsd.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: eth_fbsd.cc,v 1.28 2004-08-06 15:49:54 vruppert Exp $
+// $Id: eth_fbsd.cc,v 1.29 2004-09-05 10:30:18 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -56,6 +56,8 @@
 #include "iodev.h"
 #if BX_SUPPORT_NE2K && defined(ETH_FBSD)
 
+#include "eth.h"
+
 #define LOG_THIS bx_devices.pluginNE2kDevice->
 
 extern "C" {
diff --git a/bochs/iodev/eth_linux.cc b/bochs/iodev/eth_linux.cc
index c3d726e85..7c148c31d 100644
--- a/bochs/iodev/eth_linux.cc
+++ b/bochs/iodev/eth_linux.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: eth_linux.cc,v 1.16 2004-08-06 15:49:54 vruppert Exp $
+// $Id: eth_linux.cc,v 1.17 2004-09-05 10:30:18 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -47,6 +47,9 @@
  
 #include "iodev.h"
 #if BX_SUPPORT_NE2K && defined (ETH_LINUX)
+
+#include "eth.h"
+
 #define LOG_THIS bx_devices.pluginNE2kDevice->
 
 extern "C" {
diff --git a/bochs/iodev/eth_null.cc b/bochs/iodev/eth_null.cc
index b502136e0..e0c6ef714 100644
--- a/bochs/iodev/eth_null.cc
+++ b/bochs/iodev/eth_null.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: eth_null.cc,v 1.15 2004-08-06 15:49:54 vruppert Exp $
+// $Id: eth_null.cc,v 1.16 2004-09-05 10:30:18 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -39,6 +39,8 @@
 #include "iodev.h"
 #if BX_SUPPORT_NE2K
 
+#include "eth.h"
+
 #define LOG_THIS bx_devices.pluginNE2kDevice->
 
 
diff --git a/bochs/iodev/eth_packetmaker.cc b/bochs/iodev/eth_packetmaker.cc
index cb7bc0433..e1186248a 100644
--- a/bochs/iodev/eth_packetmaker.cc
+++ b/bochs/iodev/eth_packetmaker.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: eth_packetmaker.cc,v 1.10 2004-08-06 15:49:54 vruppert Exp $
+// $Id: eth_packetmaker.cc,v 1.11 2004-09-05 10:30:18 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 // Define BX_PLUGGABLE in files that can be compiled into plugins.  For
@@ -16,6 +16,7 @@
 
 bx_bool sendable(const eth_packet& outpacket) {
   //FINISH ME!
+  return 0;
 }
 
 Bit32u eth_IPmaker::datalen(const eth_packet& outpacket) {
@@ -72,8 +73,7 @@ Bit32u eth_IPmaker::build_packet_header(Bit32u source, Bit32u dest, Bit8u protoc
 }
 
 Bit8u eth_IPmaker::protocol(const eth_packet& outpacket) {
-  Bit8u out;
-  out=0xFF & *(outpacket.buf+23);
+  return (*(outpacket.buf+23) & 0xff);
 }
 
 Bit32u eth_IPmaker::source(const eth_packet& outpacket) {
@@ -165,7 +165,7 @@ eth_ARPmaker::sendpacket(const eth_packet& outpacket) {
   if(is_pending || !ishandler(outpacket)) {
     return 0;
   } else {
-    Bit32u tempcrc;
+    //Bit32u tempcrc;
     memcpy(pending.buf,outpacket.buf,outpacket.len); //move to temporary buffer
     memcpy(pending.buf, pending.buf+6, 6); //set destination to sender
     memcpy(pending.buf+6, external_mac, 6); //set sender to us
diff --git a/bochs/iodev/eth_tap.cc b/bochs/iodev/eth_tap.cc
index 8e7c4a791..524003a4c 100644
--- a/bochs/iodev/eth_tap.cc
+++ b/bochs/iodev/eth_tap.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: eth_tap.cc,v 1.18 2004-08-06 15:49:54 vruppert Exp $
+// $Id: eth_tap.cc,v 1.19 2004-09-05 10:30:18 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -87,6 +87,8 @@
 #include "iodev.h"
 #if BX_SUPPORT_NE2K
 
+#include "eth.h"
+
 #define LOG_THIS bx_devices.pluginNE2kDevice->
 
 #include <signal.h>
diff --git a/bochs/iodev/eth_tuntap.cc b/bochs/iodev/eth_tuntap.cc
index ef39edce0..0646985ff 100644
--- a/bochs/iodev/eth_tuntap.cc
+++ b/bochs/iodev/eth_tuntap.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: eth_tuntap.cc,v 1.14 2004-08-06 15:49:54 vruppert Exp $
+// $Id: eth_tuntap.cc,v 1.15 2004-09-05 10:30:18 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -89,6 +89,8 @@
 #include "iodev.h"
 #if BX_SUPPORT_NE2K
 
+#include "eth.h"
+
 #define LOG_THIS bx_devices.pluginNE2kDevice->
 
 #include <signal.h>
diff --git a/bochs/iodev/eth_vde.cc b/bochs/iodev/eth_vde.cc
index e39243dd3..4b5910cb5 100644
--- a/bochs/iodev/eth_vde.cc
+++ b/bochs/iodev/eth_vde.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: eth_vde.cc,v 1.4 2004-08-06 15:49:54 vruppert Exp $
+// $Id: eth_vde.cc,v 1.5 2004-09-05 10:30:18 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2003  Renzo Davoli
@@ -29,6 +29,8 @@
 #include "iodev.h"
 #if BX_SUPPORT_NE2K
 
+#include "eth.h"
+
 #define LOG_THIS bx_devices.pluginNE2kDevice->
 
 #include <signal.h>
@@ -316,11 +318,11 @@ static int send_fd(char *name, int fddata, struct sockaddr_un *datasock, int gro
 	return fdctl;
 }
 
-  int vde_alloc(char *dev, int *fdp, struct sockaddr_un *pdataout)
-  {
+int vde_alloc(char *dev, int *fdp, struct sockaddr_un *pdataout)
+{
       //struct ifreq ifr;
-      int fd, err;
-      int fddata;
+      //int err;
+      int fd, fddata;
 
       if((fddata = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0){ 
 	      return -1;
@@ -334,6 +336,6 @@ static int send_fd(char *name, int fddata, struct sockaddr_un *datasock, int gro
       *fdp=fddata;
 
       return fd;
-  }              
+}              
 
 #endif /* if BX_SUPPORT_NE2K */
diff --git a/bochs/iodev/eth_vnet.cc b/bochs/iodev/eth_vnet.cc
index e4019b785..8e92f4ac8 100644
--- a/bochs/iodev/eth_vnet.cc
+++ b/bochs/iodev/eth_vnet.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: eth_vnet.cc,v 1.4 2004-08-27 08:23:50 vruppert Exp $
+// $Id: eth_vnet.cc,v 1.5 2004-09-05 10:30:18 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 // virtual Ethernet locator
@@ -19,6 +19,8 @@
 #include "iodev.h"
 #if BX_SUPPORT_NE2K
 
+#include "eth.h"
+
 #define LOG_THIS bx_devices.pluginNE2kDevice->
 
 #define BX_ETH_VNET_LOGGING 1
@@ -382,7 +384,7 @@ bx_vnet_pktmover_c::process_arp(const Bit8u *buf, unsigned io_len)
   Bit8u replybuf[60];
 
   if (io_len < 22) return;
-  if (io_len < (22+buf[18]*2+buf[19]*2)) return;
+  if (io_len < (unsigned)(22+buf[18]*2+buf[19]*2)) return;
   // hardware:Ethernet
   if (buf[14] != 0x00 || buf[15] != 0x01 || buf[18] != 0x06) return;
   opcode = get_net2(&buf[20]);
diff --git a/bochs/iodev/eth_win32.cc b/bochs/iodev/eth_win32.cc
index aa6e66cfe..d1be797ab 100644
--- a/bochs/iodev/eth_win32.cc
+++ b/bochs/iodev/eth_win32.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: eth_win32.cc,v 1.19 2004-08-06 15:49:54 vruppert Exp $
+// $Id: eth_win32.cc,v 1.20 2004-09-05 10:30:18 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -44,6 +44,8 @@
 #include "iodev.h"
 #if BX_SUPPORT_NE2K
 
+#include "eth.h"
+
 // windows.h included by bochs.h
 #define LOG_THIS bx_devices.pluginNE2kDevice->
 
diff --git a/bochs/iodev/harddrv.cc b/bochs/iodev/harddrv.cc
index c4362dd63..f0808767b 100644
--- a/bochs/iodev/harddrv.cc
+++ b/bochs/iodev/harddrv.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: harddrv.cc,v 1.125 2004-08-24 15:15:19 vruppert Exp $
+// $Id: harddrv.cc,v 1.126 2004-09-05 10:30:18 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -36,6 +36,8 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "vmware3.h"
+#include "cdrom.h"
 
 #if BX_HAVE_SYS_MMAN_H
 #include <sys/mman.h>
@@ -161,7 +163,7 @@ bx_hard_drive_c::init(void)
   char  string[5];
   char  sbtext[8];
 
-  BX_DEBUG(("Init $Id: harddrv.cc,v 1.125 2004-08-24 15:15:19 vruppert Exp $"));
+  BX_DEBUG(("Init $Id: harddrv.cc,v 1.126 2004-09-05 10:30:18 vruppert Exp $"));
 
   for (channel=0; channel<BX_MAX_ATA_CHANNEL; channel++) {
     if (bx_options.ata[channel].Opresent->get() == 1) {
diff --git a/bochs/iodev/harddrv.h b/bochs/iodev/harddrv.h
index 99cb83a99..e57b5010f 100644
--- a/bochs/iodev/harddrv.h
+++ b/bochs/iodev/harddrv.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: harddrv.h,v 1.25 2004-02-09 18:59:50 vruppert Exp $
+// $Id: harddrv.h,v 1.26 2004-09-05 10:30:19 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -639,11 +639,6 @@ uint16 read_16bit(const uint8* buf) BX_CPP_AttrRegparmN(1);
 uint32 read_32bit(const uint8* buf) BX_CPP_AttrRegparmN(1);
 
 
-#ifdef LOWLEVEL_CDROM
-#  include "cdrom.h"
-#endif
-
-
 struct cdrom_t
 {
   bx_bool ready;
diff --git a/bochs/iodev/iodev.h b/bochs/iodev/iodev.h
index 42d45909a..e8784bac8 100644
--- a/bochs/iodev/iodev.h
+++ b/bochs/iodev/iodev.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: iodev.h,v 1.50 2004-08-24 10:15:55 vruppert Exp $
+// $Id: iodev.h,v 1.51 2004-09-05 10:30:19 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -462,7 +462,6 @@ private:
 #include "iodev/dma.h"
 #include "iodev/floppy.h"
 #include "iodev/harddrv.h"
-#include "iodev/vmware3.h"
 #if BX_SUPPORT_IODEBUG
 #   include "iodev/iodebug.h"
 #endif
@@ -477,7 +476,6 @@ private:
 #  include "iodev/sb16.h"
 #endif
 #include "iodev/unmapped.h"
-#include "iodev/eth.h"
 #include "iodev/ne2k.h"
 #if BX_SUPPORT_PCIPNIC
 #include "iodev/pcipnic.h"
@@ -486,7 +484,6 @@ private:
 #include "iodev/slowdown_timer.h"
 #include "iodev/extfpuirq.h"
 #include "iodev/gameport.h"
-#include "iodev/speaker.h"
 
 #if ( BX_PROVIDE_DEVICE_MODELS==1 )
 BOCHSAPI extern bx_devices_c   bx_devices;
diff --git a/bochs/iodev/ne2k.cc b/bochs/iodev/ne2k.cc
index 2712235ab..7f62909cf 100644
--- a/bochs/iodev/ne2k.cc
+++ b/bochs/iodev/ne2k.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: ne2k.cc,v 1.66 2004-08-06 15:49:54 vruppert Exp $
+// $Id: ne2k.cc,v 1.67 2004-09-05 10:30:19 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -35,6 +35,8 @@
 #include "iodev.h"
 #if BX_SUPPORT_NE2K
 
+#include "eth.h"
+
 //Never completely fill the ne2k ring so that we never
 // hit the unclear completely full buffer condition.
 #define BX_NE2K_NEVER_FULL_RING (1)
@@ -1303,7 +1305,7 @@ bx_ne2k_c::init(void)
 {
   char devname[16];
 
-  BX_DEBUG(("Init $Id: ne2k.cc,v 1.66 2004-08-06 15:49:54 vruppert Exp $"));
+  BX_DEBUG(("Init $Id: ne2k.cc,v 1.67 2004-09-05 10:30:19 vruppert Exp $"));
 
   // Read in values from config file
   memcpy(BX_NE2K_THIS s.physaddr, bx_options.ne2k.Omacaddr->getptr (), 6);
diff --git a/bochs/iodev/ne2k.h b/bochs/iodev/ne2k.h
index 3006b5c1b..60a1ac016 100644
--- a/bochs/iodev/ne2k.h
+++ b/bochs/iodev/ne2k.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: ne2k.h,v 1.15 2004-08-06 15:49:54 vruppert Exp $
+// $Id: ne2k.h,v 1.16 2004-09-05 10:30:19 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -48,6 +48,8 @@
 #define  BX_NE2K_MEMSTART  (16*1024)
 #define  BX_NE2K_MEMEND    (BX_NE2K_MEMSTART + BX_NE2K_MEMSIZ)
 
+class eth_pktmover_c;
+
 typedef struct {
     //
     // ne2k register state
diff --git a/bochs/iodev/pit.cc b/bochs/iodev/pit.cc
index f21942255..7e547a6b9 100644
--- a/bochs/iodev/pit.cc
+++ b/bochs/iodev/pit.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: pit.cc,v 1.18 2004-06-19 15:20:13 sshwarts Exp $
+// $Id: pit.cc,v 1.19 2004-09-05 10:30:19 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -30,6 +30,8 @@
 
 #if (BX_USE_NEW_PIT==0)
 
+#include "speaker.h"
+
 #define LOG_THIS bx_pit.
 
 
diff --git a/bochs/iodev/pit_wrap.cc b/bochs/iodev/pit_wrap.cc
index b564de194..22da0c08b 100644
--- a/bochs/iodev/pit_wrap.cc
+++ b/bochs/iodev/pit_wrap.cc
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////
-// $Id: pit_wrap.cc,v 1.56 2004-06-19 19:16:02 sshwarts Exp $
+// $Id: pit_wrap.cc,v 1.57 2004-09-05 10:30:19 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -29,7 +29,7 @@
 
 #if BX_USE_NEW_PIT
 
-#include "pit_wrap.h"
+#include "speaker.h"
 
 //Important constant #defines:
 #define USEC_PER_SECOND (1000000)
diff --git a/bochs/iodev/sb16.cc b/bochs/iodev/sb16.cc
index c60ad4bc3..9f7d6879f 100644
--- a/bochs/iodev/sb16.cc
+++ b/bochs/iodev/sb16.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: sb16.cc,v 1.40 2004-06-19 15:20:14 sshwarts Exp $
+// $Id: sb16.cc,v 1.41 2004-09-05 10:30:19 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -34,6 +34,10 @@
 #include "iodev.h"
 #if BX_SUPPORT_SB16
 
+#include "soundlnx.h"
+#include "soundwin.h"
+#include "soundosx.h"
+
 #define LOG_THIS theSB16Device->
 
 bx_sb16_c *theSB16Device = NULL;
diff --git a/bochs/iodev/sb16.h b/bochs/iodev/sb16.h
index 99695a50c..9a8ccbad4 100644
--- a/bochs/iodev/sb16.h
+++ b/bochs/iodev/sb16.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: sb16.h,v 1.18 2004-08-11 11:05:11 vruppert Exp $
+// $Id: sb16.h,v 1.19 2004-09-05 10:30:19 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -411,7 +411,3 @@ public:
 #define BOTHLOG(x)      (x)
 #define MIDILOG(x)      ((bx_options.sb16.Omidimode->get ()>0?x:0x7f))
 #define WAVELOG(x)      ((bx_options.sb16.Owavemode->get ()>0?x:0x7f))
-
-#include "soundlnx.h"
-#include "soundwin.h"
-#include "soundosx.h"
diff --git a/bochs/iodev/serial.cc b/bochs/iodev/serial.cc
index 8e27378e3..95ec8e949 100644
--- a/bochs/iodev/serial.cc
+++ b/bochs/iodev/serial.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: serial.cc,v 1.55 2004-07-28 19:36:42 vruppert Exp $
+// $Id: serial.cc,v 1.56 2004-09-05 10:30:19 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2004  MandrakeSoft S.A.
@@ -39,6 +39,10 @@
 
 #include "iodev.h"
 
+#if USE_RAW_SERIAL
+#include "serial_raw.h"
+#endif // USE_RAW_SERIAL
+
 #define LOG_THIS theSerialDevice->
 
 bx_serial_c *theSerialDevice = NULL;
diff --git a/bochs/iodev/serial.h b/bochs/iodev/serial.h
index d0f108cbe..77ec72e2f 100644
--- a/bochs/iodev/serial.h
+++ b/bochs/iodev/serial.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: serial.h,v 1.19 2004-07-28 19:36:42 vruppert Exp $
+// $Id: serial.h,v 1.20 2004-09-05 10:30:19 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2004  MandrakeSoft S.A.
@@ -36,10 +36,6 @@
 #  define BX_SER_THIS this->
 #endif
 
-#if USE_RAW_SERIAL
-#include "serial_raw.h"
-#endif // USE_RAW_SERIAL
-
 #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__linux__) || defined(__GNU__) || defined(__APPLE__)
 #define SERIAL_ENABLE
 extern "C" {
diff --git a/bochs/iodev/serial_raw.cc b/bochs/iodev/serial_raw.cc
index 2b82359f3..4dd6209b8 100644
--- a/bochs/iodev/serial_raw.cc
+++ b/bochs/iodev/serial_raw.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: serial_raw.cc,v 1.16 2004-06-19 15:20:14 sshwarts Exp $
+// $Id: serial_raw.cc,v 1.17 2004-09-05 10:30:19 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2004  MandrakeSoft S.A.
@@ -34,6 +34,8 @@
 
 #if USE_RAW_SERIAL
 
+#include "serial_raw.h"
+
 #define LOG_THIS
 
 #ifdef WIN32_RECEIVE_RAW
diff --git a/bochs/iodev/soundlnx.cc b/bochs/iodev/soundlnx.cc
index 61e6ef19a..7f81d237e 100644
--- a/bochs/iodev/soundlnx.cc
+++ b/bochs/iodev/soundlnx.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: soundlnx.cc,v 1.7 2004-06-19 15:20:14 sshwarts Exp $
+// $Id: soundlnx.cc,v 1.8 2004-09-05 10:30:19 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -31,6 +31,8 @@
 #if (defined(linux) || defined(__FreeBSD__)) && BX_SUPPORT_SB16
 #define LOG_THIS bx_sb16.
 
+#include "soundlnx.h"
+
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/soundcard.h>
diff --git a/bochs/iodev/soundlnx.h b/bochs/iodev/soundlnx.h
index a864df928..4e4b38701 100644
--- a/bochs/iodev/soundlnx.h
+++ b/bochs/iodev/soundlnx.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: soundlnx.h,v 1.5 2002-12-24 10:12:26 vruppert Exp $
+// $Id: soundlnx.h,v 1.6 2004-09-05 10:30:19 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -29,8 +29,6 @@
 
 #if (defined(linux) || defined(__FreeBSD__))
 
-#include "bochs.h"
-
 #define BX_SOUND_LINUX_BUFSIZE   BX_SOUND_OUTPUT_WAVEPACKETSIZE
 
 class bx_sound_linux_c : public bx_sound_output_c {
diff --git a/bochs/iodev/soundosx.cc b/bochs/iodev/soundosx.cc
index c7a60fabe..be8e08b94 100644
--- a/bochs/iodev/soundosx.cc
+++ b/bochs/iodev/soundosx.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: soundosx.cc,v 1.4 2004-06-19 15:20:14 sshwarts Exp $
+// $Id: soundosx.cc,v 1.5 2004-09-05 10:30:19 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 
 // This file (SOUNDOSX.CC) written and donated by Brian Huffman
@@ -17,6 +17,8 @@
 #if defined(macintosh) && BX_SUPPORT_SB16
 #define LOG_THIS bx_sb16.
 
+#include "soundosx.h"
+
 #if BX_WITH_MACOS
 #include <QuickTimeMusic.h>
 #else
diff --git a/bochs/iodev/soundwin.cc b/bochs/iodev/soundwin.cc
index 55347ff5f..833fc458b 100644
--- a/bochs/iodev/soundwin.cc
+++ b/bochs/iodev/soundwin.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: soundwin.cc,v 1.14 2004-06-19 15:20:14 sshwarts Exp $
+// $Id: soundwin.cc,v 1.15 2004-09-05 10:30:19 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -34,6 +34,8 @@
 #include "iodev.h"
 #if defined(WIN32) && BX_SUPPORT_SB16
 
+#include "soundwin.h"
+
 #define LOG_THIS bx_devices.pluginSB16Device->
 
 bx_sound_windows_c::bx_sound_windows_c(bx_sb16_c *sb16)
diff --git a/bochs/iodev/soundwin.h b/bochs/iodev/soundwin.h
index 67bb86c3d..9d2401450 100644
--- a/bochs/iodev/soundwin.h
+++ b/bochs/iodev/soundwin.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: soundwin.h,v 1.3 2001-10-03 13:10:38 bdenney Exp $
+// $Id: soundwin.h,v 1.4 2004-09-05 10:30:19 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -29,7 +29,6 @@
 
 #if defined(WIN32)
 
-#include "bochs.h"
 #include <windows.h>
 
 // uncomment one of the following two #defines
diff --git a/bochs/iodev/speaker.cc b/bochs/iodev/speaker.cc
index c4587b0b4..339bd5b43 100644
--- a/bochs/iodev/speaker.cc
+++ b/bochs/iodev/speaker.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: speaker.cc,v 1.2 2004-06-19 15:20:14 sshwarts Exp $
+// $Id: speaker.cc,v 1.3 2004-09-05 10:30:19 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright 2003 by David N. Welton <davidw@dedasys.com>.
@@ -21,6 +21,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "speaker.h"
 
 #ifdef __linux__
 #include <unistd.h>
diff --git a/bochs/iodev/vmware3.cc b/bochs/iodev/vmware3.cc
index 0e735e3ad..35bfbdd2d 100644
--- a/bochs/iodev/vmware3.cc
+++ b/bochs/iodev/vmware3.cc
@@ -28,11 +28,10 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "vmware3.h"
 
 const off_t vmware3_image_t::INVALID_OFFSET=(off_t)-1;
-/* Not very friendly... */
-extern bx_hard_drive_c *theHardDrive;
-#define LOG_THIS theHardDrive->
+#define LOG_THIS bx_devices.pluginHardDrive->
 
 #define DTOH32_HEADER(field) (header.field = (dtoh32(header.field)))
 #define HTOD32_HEADER(field) (header.field = (htod32(header.field)))