9 files changed, 33 insertions, 35 deletions
diff --git a/src/savage_bci.h b/src/savage_bci.h
index 174a26b..9d8d656 100644
--- a/src/savage_bci.h
+++ b/src/savage_bci.h
@@ -1,6 +1,6 @@
 
-#ifndef _S3BCI_H_
-#define _S3BCI_H_
+#ifndef S3BCI_H
+#define S3BCI_H
 
 
 /* BCI Control Register */
@@ -140,5 +140,4 @@
 	((yp) ? 1<<15 : 0) | \
 	((err) << 16))
 
-
-#endif /* _S3BCI_H_ */
+#endif /* S3BCI_H */
diff --git a/src/savage_common.h b/src/savage_common.h
index 9dbd3cb..9664304 100644
--- a/src/savage_common.h
+++ b/src/savage_common.h
@@ -23,8 +23,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __SAVAGE_COMMON_H__
-#define __SAVAGE_COMMON_H__
+#ifndef SAVAGE_COMMON_H
+#define SAVAGE_COMMON_H
 
 #include <inttypes.h>
 
@@ -174,4 +174,4 @@ union drmSAVAGECmdHeader {
 	} clear1; /* SAVAGE_CMD_CLEAR data */
 };
 
-#endif /* __SAVAGE_COMMON_H__ */
+#endif /* SAVAGE_COMMON_H */
diff --git a/src/savage_dri.h b/src/savage_dri.h
index 214d985..36377c9 100644
--- a/src/savage_dri.h
+++ b/src/savage_dri.h
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef __SAVAGE_DRI_H__
-#define __SAVAGE_DRI_H__
+#ifndef SAVAGE_DRI_H
+#define SAVAGE_DRI_H
 
 #include "drm.h"
 
@@ -73,4 +73,4 @@ typedef struct {
    drm_handle_t xvmcSurfHandle; /* ? */
 } SAVAGEDRIRec, *SAVAGEDRIPtr;
 
-#endif
+#endif /* SAVAGE_DRI_H */
diff --git a/src/savage_dripriv.h b/src/savage_dripriv.h
index 19e4487..4206a9f 100644
--- a/src/savage_dripriv.h
+++ b/src/savage_dripriv.h
@@ -22,8 +22,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __SAVAGE_DRIPRIV_H__
-#define __SAVAGE_DRIPRIV_H__
+#ifndef SAVAGE_DRIPRIV_H
+#define SAVAGE_DRIPRIV_H
 
 #include "GL/glxint.h"
 
@@ -43,4 +43,4 @@ typedef struct {
   int dummy;
 } SAVAGEDRIContextRec, *SAVAGEDRIContextPtr;
 
-#endif
+#endif /* SAVAGE_DRIPRIV_H */
diff --git a/src/savage_drm.h b/src/savage_drm.h
index 62bd49b..7d624b5 100644
--- a/src/savage_drm.h
+++ b/src/savage_drm.h
@@ -22,11 +22,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __SAVAGE_DRM_H__
-#define __SAVAGE_DRM_H__
+#ifndef SAVAGE_DRM_H
+#define SAVAGE_DRM_H
 
-#ifndef __SAVAGE_SAREA_DEFINES__
-#define __SAVAGE_SAREA_DEFINES__
+#ifndef SAVAGE_SAREA_DEFINES
+#define SAVAGE_SAREA_DEFINES
 
 #define DRM_SAVAGE_MEM_PAGE (1UL<<12)
 #define DRM_SAVAGE_MEM_WORK 32
@@ -96,7 +96,7 @@ typedef struct drm_savage_get_physcis_address
 #define SAVAGE_NR_TEX_REGIONS		16   /* num. of global texture manage list element*/
 #define SAVAGE_LOG_MIN_TEX_REGION_SIZE	16   /* each region 64K, Jiayo Hsu */
 
-#endif /* __SAVAGE_SAREA_DEFINES__ */
+#endif /* SAVAGE_SAREA_DEFINES */
 
 /* drm_tex_region_t define in drm.h */
 
@@ -245,4 +245,4 @@ typedef struct _drm_savage_blit {
 	int source_pitch, dest_pitch;
 } drm_savage_blit_t;
 
-#endif
+#endif /* SAVAGE_DRM_H */
diff --git a/src/savage_regs.h b/src/savage_regs.h
index 26cc2da..1a71c4e 100644
--- a/src/savage_regs.h
+++ b/src/savage_regs.h
@@ -1,6 +1,6 @@
 
-#ifndef _SAVAGE_REGS_H
-#define _SAVAGE_REGS_H
+#ifndef SAVAGE_REGS_H
+#define SAVAGE_REGS_H
 
 /* Copied and renamed from radeon_reg.h for AGP/PCI detection. */
 #define SAVAGE_STATUS_PCI_CONFIG            0x06
@@ -285,4 +285,4 @@ do {                                            \
 #define EC1_CENTER_ON	0x10
 #define EC1_EXPAND_ON	0x0c
 
-#endif /* _SAVAGE_REGS_H */
+#endif /* SAVAGE_REGS_H */
diff --git a/src/savage_sarea.h b/src/savage_sarea.h
index 1debc6d..e2ea3e5 100644
--- a/src/savage_sarea.h
+++ b/src/savage_sarea.h
@@ -23,11 +23,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __SAVAGE_SAREA_H__
-#define __SAVAGE_SAREA_H__
+#ifndef SAVAGE_SAREA_H
+#define SAVAGE_SAREA_H
 
-#ifndef __SAVAGE_SAREA_DEFINES__
-#define __SAVAGE_SAREA_DEFINES__
+#ifndef SAVAGE_SAREA_DEFINES
+#define SAVAGE_SAREA_DEFINES
 
 /* 2 heaps (1 for card, 1 for agp), each divided into upto 128
  * regions, subject to a minimum region size of (1<<16) == 64k.
@@ -42,7 +42,7 @@
 #define SAVAGE_NR_TEX_REGIONS		16
 #define SAVAGE_LOG_MIN_TEX_REGION_SIZE	16
 
-#endif /* __SAVAGE_SAREA_DEFINES__ */
+#endif /* SAVAGE_SAREA_DEFINES */
 
 typedef struct {
 	/* LRU lists for texture memory in agp space and on the card.
@@ -55,4 +55,4 @@ typedef struct {
 	int ctxOwner;
 }  SAVAGESAREAPrivRec, *SAVAGESAREAPrivPtr;
 
-#endif /* __SAVAGE_SAREA_H__ */
+#endif /* SAVAGE_SAREA_H */
diff --git a/src/savage_streams.h b/src/savage_streams.h
index ad16ad7..9968a1a 100644
--- a/src/savage_streams.h
+++ b/src/savage_streams.h
@@ -1,6 +1,5 @@
-#ifndef __SAVAGE_STREAMS_H__
-
-# define __SAVAGE_STREAMS_H__
+#ifndef SAVAGE_STREAMS_H
+#define SAVAGE_STREAMS_H
 
 /**************************************
    S3 streams processor
@@ -220,4 +219,4 @@
 #define SSTREAMS_MODE(bpp) (bpp > 16 ? (bpp > 24 ? STREAMS_MODE32 :\
 				       STREAMS_MODE24) : STREAMS_MODE16)
 
-#endif /*__SAVAGE_STREAMS_H__*/
+#endif /* SAVAGE_STREAMS_H */
diff --git a/src/savage_vbe.h b/src/savage_vbe.h
index 9b06e0c..45d4a51 100644
--- a/src/savage_vbe.h
+++ b/src/savage_vbe.h
@@ -12,8 +12,8 @@ versions as being modified.
 This software has NO WARRANTY.  Use it at your own risk.
 */
 
-#ifndef _SAVAGEVBE_H
-#define _SAVAGEVBE_H
+#ifndef SAVAGEVBE_H
+#define SAVAGEVBE_H
 
 /*
  *  Common BIOS functions
@@ -161,4 +161,4 @@ struct vbe_palette_entry
 	unsigned char align;
 	} __attribute__ ((packed));
 
-#endif
+#endif /* SAVAGEVBE_H */