From 83e4b8d5d91e7f88df5803c5c838f4a9d204eca8 Mon Sep 17 00:00:00 2001
From: Godzil <godzil@godzil.net>
Date: Mon, 27 Jun 2022 17:01:07 +0100
Subject: [PATCH] Some more cosmetics.

---
 source/includes/audio.h        |  9 ---------
 source/includes/device.h       |  4 ++--
 source/includes/emulate.h      |  8 --------
 source/includes/memory.h       |  9 ---------
 source/includes/nec_debugger.h |  6 +++---
 source/includes/necintrf.h     |  6 +++---
 source/includes/rom.h          | 11 +----------
 source/includes/ws.h           | 11 +----------
 8 files changed, 10 insertions(+), 54 deletions(-)

diff --git a/source/includes/audio.h b/source/includes/audio.h
index ee93d13..8dda5ba 100644
--- a/source/includes/audio.h
+++ b/source/includes/audio.h
@@ -7,15 +7,6 @@
  *
  ******************************************************************************/
 
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-
 #ifndef __AUDIO_H__
 #define __AUDIO_H__
 
diff --git a/source/includes/device.h b/source/includes/device.h
index a2210bd..e68ac7f 100644
--- a/source/includes/device.h
+++ b/source/includes/device.h
@@ -7,8 +7,8 @@
  *
  ******************************************************************************/
 
-#ifndef NEWOSWAN_DEVICE_H
-#define NEWOSWAN_DEVICE_H
+#ifndef __DEVICE_H__
+#define __DEVICE_H__
 
 typedef void (*device_init)(void);
 typedef void (*device_reset)(void);
diff --git a/source/includes/emulate.h b/source/includes/emulate.h
index f44a10e..f71a366 100644
--- a/source/includes/emulate.h
+++ b/source/includes/emulate.h
@@ -7,14 +7,6 @@
  *
  ******************************************************************************/
 
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
 #ifndef EMULATE_H
 #define EMULATE_H
 
diff --git a/source/includes/memory.h b/source/includes/memory.h
index 5f3f8e6..bb052c5 100644
--- a/source/includes/memory.h
+++ b/source/includes/memory.h
@@ -7,15 +7,6 @@
  *
  ******************************************************************************/
 
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-
 #ifndef __MEMORY_H__
 #define __MEMORY_H__
 
diff --git a/source/includes/nec_debugger.h b/source/includes/nec_debugger.h
index c2b2fef..f41d126 100644
--- a/source/includes/nec_debugger.h
+++ b/source/includes/nec_debugger.h
@@ -7,10 +7,10 @@
  *
  ******************************************************************************/
 
-#ifndef NEWOSWAN_SOURCE_NEC_NEC_DEBUGGER_H
-#define NEWOSWAN_SOURCE_NEC_NEC_DEBUGGER_H
+#ifndef __NEC_DEBUGGER_H__
+#define __NEC_DEBUGGER_H__
 
 
 int nec_decode_instruction(uint16_t segment, uint16_t offset, char *buffer, unsigned int bufferSize);
 
-#endif /* NEWOSWAN_SOURCE_NEC_NEC_DEBUGGER_H */
+#endif /* __NEC_DEBUGGER_H__ */
diff --git a/source/includes/necintrf.h b/source/includes/necintrf.h
index 4b4c6ae..ac9fe90 100644
--- a/source/includes/necintrf.h
+++ b/source/includes/necintrf.h
@@ -8,8 +8,8 @@
  ******************************************************************************/
 
 /* ASG 971222 -- rewrote this interface */
-#ifndef __NECITRF_H_
-#define __NECITRF_H_
+#ifndef __NECITRF_H__
+#define __NECITRF_H__
 
 #include <stdint.h>
 
@@ -46,4 +46,4 @@ unsigned nec_get_reg(int regnum);
 void nec_reset(void *param);
 void nec_int(uint16_t vector);
 
-#endif /* __NECITRF_H_ */
+#endif /* __NECITRF_H__ */
diff --git a/source/includes/rom.h b/source/includes/rom.h
index f704055..dea8070 100644
--- a/source/includes/rom.h
+++ b/source/includes/rom.h
@@ -7,15 +7,6 @@
  *
  ******************************************************************************/
 
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-
 #ifndef __ROM_H__
 #define __ROM_H__
 
@@ -76,4 +67,4 @@ static inline uint8_t *ws_get_page_ptr(uint8_t *wsrom, uint32_t romSize, uint16_
     return &wsrom[temp];
 }
 
-#endif
+#endif /* __ROM_H__ */
diff --git a/source/includes/ws.h b/source/includes/ws.h
index f57fc39..f9dbcfe 100644
--- a/source/includes/ws.h
+++ b/source/includes/ws.h
@@ -7,15 +7,6 @@
  *
  ******************************************************************************/
 
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-
 #ifndef __WS_H__
 #define __WS_H__
 
@@ -44,4 +35,4 @@ extern char *ws_ieep_path;
 extern char *ws_rom_path;
 
 
-#endif
+#endif /* __WS_H__ */