rename some headers for consistency

8 files changed, 17 insertions, 17 deletions

diff --git a/dlog.h b/dlog.h
index 944edfb..7b39a5a 100644
--- a/dlog.h
+++ b/dlog.h
@@ -24,7 +24,7 @@
 
 // Customizable defines
 /** If 0, these routines become nops */
-#define ENABLE_DLOG 1
+#define ENABLE_DLOG 0
 /** 1 means target serial port, 0 means target IO port. */
 #define DLOG_TARGET_SERIAL 0
 /** IO port to target.
diff --git a/ps2.h b/int15ps2.h
index ffcf7bb..6b6c415 100644
--- a/ps2.h
+++ b/int15ps2.h
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef PS2_H
-#define PS2_H
+#ifndef INT15PS2_H
+#define INT15PS2_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -232,4 +232,4 @@ static bool ps2m_detect_wheel(void)
 	return err == 0 && device_id == PS2M_DEVICE_ID_IMPS2;
 }
 
-#endif
+#endif /* INT15PS2_H */
diff --git a/pci.h b/int1Apci.h
index 8d0b7a8..92f347e 100644
--- a/pci.h
+++ b/int1Apci.h
@@ -17,10 +17,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef PCI_H
-#define PCI_H
+#ifndef INT1APCI_H
+#define INT1APCI_H
 
-typedef unsigned char  pcierr;
+typedef unsigned char pcierr;
 enum {
 	PCI_SUCCESSFUL = 0,
 	PCI_GENERIC_ERROR = 1,
@@ -32,7 +32,7 @@ enum {
 	PCI_BUFFER_TOO_SMALL = 0x89
 };
 
-typedef unsigned short  pcisel;
+typedef unsigned short pcisel;
 
 static pcierr pci_init_bios(void);
 #pragma aux pci_init_bios = \
@@ -119,4 +119,4 @@ static pcierr pci_write_config_dword(pcisel sel, unsigned char reg, unsigned lon
 	__value [ah] \
 	__modify [ax cx]
 
-#endif
+#endif /* INT1APCI_H */
diff --git a/vds.h b/int4Bvds.h
index c8822c4..511cb0f 100644
--- a/vds.h
+++ b/int4Bvds.h
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef VDS_H
-#define VDS_H
+#ifndef INT4BVDS_H
+#define INT4BVDS_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -159,4 +159,4 @@ static vdserr vds_release_dma_buffer(VDSDDS __far * dds, unsigned char flags);
 	__value [al] \
 	__modify [ax]
 
-#endif
+#endif /* INT4BVDS_H */
diff --git a/mousetsr.c b/mousetsr.c
index b9fad9e..4fcc381 100644
--- a/mousetsr.c
+++ b/mousetsr.c
@@ -22,7 +22,7 @@
 #include <i86.h>
 
 #include "dlog.h"
-#include "ps2.h"
+#include "int15ps2.h"
 #include "int10vga.h"
 #include "int16kbd.h"
 #include "int2fwin.h"
diff --git a/mousmain.c b/mousmain.c
index c62712c..93a8c0d 100644
--- a/mousmain.c
+++ b/mousmain.c
@@ -26,7 +26,7 @@
 #include "dlog.h"
 #include "int33.h"
 #include "int21dos.h"
-#include "ps2.h"
+#include "int15ps2.h"
 #include "vbox.h"
 #include "vmware.h"
 #include "dostsr.h"
diff --git a/vbox.c b/vbox.c
index 8c6d28a..9fd0aa4 100644
--- a/vbox.c
+++ b/vbox.c
@@ -24,8 +24,8 @@
 
 #include "dlog.h"
 #include "utils.h"
-#include "pci.h"
-#include "vds.h"
+#include "int1Apci.h"
+#include "int4Bvds.h"
 #include "vboxdev.h"
 #include "vbox.h"
 
diff --git a/vbox.h b/vbox.h
index 8bbfed9..d47c01a 100644
--- a/vbox.h
+++ b/vbox.h
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "dlog.h"
-#include "vds.h"
+#include "int4Bvds.h"
 #include "utils.h"
 #include "vboxdev.h"