diff --git a/sys/dev/puc/puc_bfe.h b/sys/dev/puc/puc_bfe.h
index c67fab5f6705..3cf0c533a1e7 100644
--- a/sys/dev/puc/puc_bfe.h
+++ b/sys/dev/puc/puc_bfe.h
@@ -27,7 +27,7 @@
  */
 
 #ifndef _DEV_PUC_BFE_H_
-#define	_DEV_PUC_BFE_H
+#define	_DEV_PUC_BFE_H_
 
 #define	PUC_PCI_BARS	6
 
diff --git a/sys/dev/puc/puc_cfg.h b/sys/dev/puc/puc_cfg.h
index 4c2c65ee3bbd..3599d4c9429c 100644
--- a/sys/dev/puc/puc_cfg.h
+++ b/sys/dev/puc/puc_cfg.h
@@ -27,7 +27,7 @@
  */
 
 #ifndef _DEV_PUC_CFG_H_
-#define	_DEV_PUC_CFG_H
+#define	_DEV_PUC_CFG_H_
 
 #define	DEFAULT_RCLK	1843200
 
diff --git a/sys/dev/vxge/vxge.h b/sys/dev/vxge/vxge.h
index 439c1ced443f..37ab88b9f074 100644
--- a/sys/dev/vxge/vxge.h
+++ b/sys/dev/vxge/vxge.h
@@ -31,7 +31,7 @@
 /*$FreeBSD$*/
 
 #ifndef	_VXGE_H_
-#define	__VXGE_H_
+#define	_VXGE_H_
 
 #include <dev/vxge/vxgehal/vxgehal.h>
 #include <dev/vxge/vxge-osdep.h>
diff --git a/usr.bin/csup/updater.h b/usr.bin/csup/updater.h
index 9ec9ed7c0945..b71c9c572f53 100644
--- a/usr.bin/csup/updater.h
+++ b/usr.bin/csup/updater.h
@@ -26,7 +26,7 @@
  * $FreeBSD$
  */
 #ifndef _UPDATER_H_
-#define _UPDATER_H
+#define _UPDATER_H_
 
 void	*updater(void *);
 
diff --git a/usr.bin/sort/vsort.h b/usr.bin/sort/vsort.h
index 4d43087879e8..6712c2299078 100644
--- a/usr.bin/sort/vsort.h
+++ b/usr.bin/sort/vsort.h
@@ -28,7 +28,7 @@
  */
 
 #if !defined(__VSORT_H__)
-#define _VSORT_H__
+#define __VSORT_H__
 
 #include "bwstring.h"