diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index 7da466927793..7bd2d2b7940b 100644
--- a/usr.bin/make/buf.h
+++ b/usr.bin/make/buf.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: buf.h,v 1.18 2017/05/31 21:15:47 maya Exp $	*/
+/*	$NetBSD: buf.h,v 1.19 2017/05/31 22:02:06 maya Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -77,8 +77,8 @@
  *	Header for users of the buf library.
  */
 
-#ifndef _MAKE_BUF_H
-#define _MAKE_BUF_H
+#ifndef MAKE_BUF_H
+#define MAKE_BUF_H
 
 typedef char Byte;
 
@@ -116,4 +116,4 @@ void Buf_Init(Buffer *, int);
 Byte *Buf_Destroy(Buffer *, Boolean);
 Byte *Buf_DestroyCompact(Buffer *);
 
-#endif /* _MAKE_BUF_H */
+#endif /* MAKE_BUF_H */
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index b5f4835351f3..52ab35e2fd25 100644
--- a/usr.bin/make/dir.h
+++ b/usr.bin/make/dir.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: dir.h,v 1.17 2017/05/31 21:15:47 maya Exp $	*/
+/*	$NetBSD: dir.h,v 1.18 2017/05/31 22:02:06 maya Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -75,8 +75,8 @@
 /* dir.h --
  */
 
-#ifndef	_MAKE_DIR_H
-#define	_MAKE_DIR_H
+#ifndef	MAKE_DIR_H
+#define	MAKE_DIR_H
 
 typedef struct Path {
     char         *name;	    	/* Name of directory */
@@ -105,4 +105,4 @@ void Dir_PrintPath(Lst);
 void Dir_Destroy(void *);
 void * Dir_CopyDir(void *);
 
-#endif /* _MAKE_DIR_H */
+#endif /* MAKE_DIR_H */
diff --git a/usr.bin/make/sprite.h b/usr.bin/make/sprite.h
index a238d2691e52..cdcffd99abed 100644
--- a/usr.bin/make/sprite.h
+++ b/usr.bin/make/sprite.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: sprite.h,v 1.13 2017/05/31 21:15:47 maya Exp $	*/
+/*	$NetBSD: sprite.h,v 1.14 2017/05/31 22:02:06 maya Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -78,8 +78,8 @@
  * Common constants and type declarations for Sprite.
  */
 
-#ifndef _MAKE_SPRITE_H
-#define _MAKE_SPRITE_H
+#ifndef MAKE_SPRITE_H
+#define MAKE_SPRITE_H
 
 
 /*
@@ -113,4 +113,4 @@ typedef int  ReturnStatus;
 #define	SUCCESS			0x00000000
 #define	FAILURE			0x00000001
 
-#endif /* _MAKE_SPRITE_H */
+#endif /* MAKE_SPRITE_H */