From 8e9fff9ed8d773e4a22730d485c0617c456bb0e0 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Mon, 27 Dec 2010 17:57:59 -0500
Subject: [PATCH] Windows: cleanup preprocessor definition namespace

Do not use reserved preprocessor symbol names.  Instead
use OPENAFS_<PATH>_<HEADER>_H formatted names where <PATH>
is the subdirectory path from src/ in which the header
file originates in the repository.

Change-Id: I998d7feeddeb9660f3fc514e2ba752c54e402a24
Reviewed-on: http://gerrit.openafs.org/3599
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
---
 src/WINNT/afsd/afsd.h           | 6 +++---
 src/WINNT/afsd/afsdicon.h       | 6 +++---
 src/WINNT/afsd/cm.h             | 6 +++---
 src/WINNT/afsd/cm_access.h      | 6 +++---
 src/WINNT/afsd/cm_buf.h         | 6 +++---
 src/WINNT/afsd/cm_callback.h    | 6 +++---
 src/WINNT/afsd/cm_cell.h        | 6 +++---
 src/WINNT/afsd/cm_config.h      | 6 +++---
 src/WINNT/afsd/cm_conn.h        | 6 +++---
 src/WINNT/afsd/cm_daemon.h      | 6 +++---
 src/WINNT/afsd/cm_dcache.h      | 6 +++---
 src/WINNT/afsd/cm_dir.h         | 6 +++---
 src/WINNT/afsd/cm_ioctl.h       | 6 +++---
 src/WINNT/afsd/cm_nls.h         | 4 ++--
 src/WINNT/afsd/cm_scache.h      | 6 +++---
 src/WINNT/afsd/cm_server.h      | 6 +++---
 src/WINNT/afsd/cm_user.h        | 6 +++---
 src/WINNT/afsd/cm_utils.h       | 6 +++---
 src/WINNT/afsd/cm_vnodeops.h    | 6 +++---
 src/WINNT/afsd/cm_volume.h      | 6 +++---
 src/WINNT/afsd/fs.h             | 6 +++---
 src/WINNT/afsd/fs_utils.h       | 6 +++---
 src/WINNT/afsd/smb.h            | 4 ++--
 src/WINNT/afsd/smb3.h           | 6 +++---
 src/WINNT/afsd/smb_iocons.h     | 6 +++---
 src/WINNT/afsd/smb_ioctl.h      | 6 +++---
 src/WINNT/client_osi/basic.h    | 6 +++---
 src/WINNT/client_osi/osi.h      | 6 +++---
 src/WINNT/client_osi/osibasel.h | 6 +++---
 src/WINNT/client_osi/osidb.h    | 6 +++---
 src/WINNT/client_osi/osifd.h    | 6 +++---
 src/WINNT/client_osi/osiltype.h | 6 +++---
 src/WINNT/client_osi/osiqueue.h | 6 +++---
 src/WINNT/client_osi/osisleep.h | 6 +++---
 src/WINNT/client_osi/osistatl.h | 6 +++---
 src/WINNT/client_osi/osiutils.h | 6 +++---
 src/WINNT/client_osi/perf.h     | 6 +++---
 src/WINNT/client_osi/trylock.h  | 6 +++---
 38 files changed, 112 insertions(+), 112 deletions(-)

diff --git a/src/WINNT/afsd/afsd.h b/src/WINNT/afsd/afsd.h
index 04a08cdd4..fe932bcd0 100644
--- a/src/WINNT/afsd/afsd.h
+++ b/src/WINNT/afsd/afsd.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __AFSD_H_ENV__
-#define __AFSD_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_AFSD_H
+#define OPENAFS_WINNT_AFSD_AFSD_H 1
 
 #define USE_BPLUS 1
 
@@ -141,4 +141,4 @@ typedef BOOL ( APIENTRY * AfsdStoppingHook )(void);
 typedef BOOL ( APIENTRY * AfsdStoppedHook )(void);
 
 #define SERVICE_CONTROL_CUSTOM_DUMP 128
-#endif /* AFSD_H_ENV */
+#endif /* OPENAFS_WINNT_AFSD_AFSD_H */
diff --git a/src/WINNT/afsd/afsdicon.h b/src/WINNT/afsd/afsdicon.h
index fb51844c7..aeb5e3b24 100644
--- a/src/WINNT/afsd/afsdicon.h
+++ b/src/WINNT/afsd/afsdicon.h
@@ -7,9 +7,9 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __AFSDICON_H_ENV__
-#define __AFSDICON_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_AFSDICON_H
+#define OPENAFS_WINNT_AFSD_AFSDICON_H 1
 
 #define IDM_HELP 100
 
-#endif /* __AFSDICON_H_ENV */
+#endif /* OPENAFS_WINNT_AFSD_AFSDICON_H */
diff --git a/src/WINNT/afsd/cm.h b/src/WINNT/afsd/cm.h
index 059ab66f0..1bf23a06b 100644
--- a/src/WINNT/afsd/cm.h
+++ b/src/WINNT/afsd/cm.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __CM_H_ENV__
-#define __CM_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_CM_H
+#define OPENAFS_WINNT_AFSD_CM_H 1
 
 /* We use pthreads in the cache manager (not LWP) */
 #ifndef AFS_PTHREAD_ENV
@@ -150,5 +150,5 @@
 #define LOCK_HIERARCHY_AFSDBSBMT_GLOBAL       1000
 #define LOCK_HIERARCHY_TOKEN_EVENT_GLOBAL     2000
 #define LOCK_HIERARCHY_SYSCFG_GLOBAL          3000
-#endif /*  __CM_H_ENV__ */
+#endif /*  OPENAFS_WINNT_AFSD_CM_H */
 
diff --git a/src/WINNT/afsd/cm_access.h b/src/WINNT/afsd/cm_access.h
index 5367b9bb6..69c7c45d4 100644
--- a/src/WINNT/afsd/cm_access.h
+++ b/src/WINNT/afsd/cm_access.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef _CM_ACCESS_H_ENV__
-#define _CM_ACCESS_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_CM_ACCESS_H
+#define OPENAFS_WINNT_AFSD_CM_ACCESS_H 1
 
 #include "cm_user.h"
 
@@ -19,4 +19,4 @@ extern long cm_GetAccessRights(struct cm_scache *scp, struct cm_user *up,
 	struct cm_req *reqp);
 
 extern int cm_accessPerFileCheck;
-#endif /*  _CM_ACCESS_H_ENV__ */
+#endif /* OPENAFS_WINNT_AFSD_CM_ACCESS_H */
diff --git a/src/WINNT/afsd/cm_buf.h b/src/WINNT/afsd/cm_buf.h
index 018e9824b..5fe6fb9de 100644
--- a/src/WINNT/afsd/cm_buf.h
+++ b/src/WINNT/afsd/cm_buf.h
@@ -9,8 +9,8 @@
 
 /* Copyright (C) 1994 Cazamar Systems, Inc. */
 
-#ifndef _BUF_H__ENV_
-#define _BUF_H__ENV_ 1
+#ifndef OPENAFS_WINNT_AFSD_BUF_H
+#define OPENAFS_WINNT_AFSD_BUF_H 1
 
 #include <osi.h>
 #ifdef DISKCACHE95
@@ -222,4 +222,4 @@ extern int cm_DumpBufHashTable(FILE *outputFile, char *cookie, int lock);
 
 /* error codes */
 #define CM_BUF_EXISTS	1	/* buffer exists, and shouldn't */
-#endif /*  _BUF_H__ENV_ */
+#endif /* OPENAFS_WINNT_AFSD_BUF_H */
diff --git a/src/WINNT/afsd/cm_callback.h b/src/WINNT/afsd/cm_callback.h
index ededa8ddb..70e9a0839 100644
--- a/src/WINNT/afsd/cm_callback.h
+++ b/src/WINNT/afsd/cm_callback.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef _CM_CALLBACK_H_ENV__
-#define _CM_CALLBACK_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_CM_CALLBACK_H
+#define OPENAFS_WINNT_AFSD_CM_CALLBACK_H 1
 
 #include <osi.h>
 
@@ -77,4 +77,4 @@ extern afs_int32 cm_OfflineROIsValid;
 extern afs_int32 cm_giveUpAllCBs;
 
 extern afs_int32 cm_shutdown;
-#endif /*  _CM_CALLBACK_H_ENV__ */
+#endif /*  OPENAFS_WINNT_AFSD_CM_CALLBACK_H */
diff --git a/src/WINNT/afsd/cm_cell.h b/src/WINNT/afsd/cm_cell.h
index aefe118d0..d3058ff1f 100644
--- a/src/WINNT/afsd/cm_cell.h
+++ b/src/WINNT/afsd/cm_cell.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __CELL_H_ENV_
-#define __CELL_H_ENV_ 1
+#ifndef OPENAFS_WINNT_AFSD_CELL_H
+#define OPENAFS_WINNT_AFSD_CELL_H 1
 
 #define CELL_MAXNAMELEN                 256
 
@@ -86,4 +86,4 @@ extern long cm_CreateCellWithInfo( char * cellname,
                                    unsigned short vlport, afs_uint32 host_count,
                                    char *hostname[], afs_uint32 flags);
 
-#endif /* __CELL_H_ENV_ */
+#endif /* OPENAFS_WINNT_AFSD_CELL_H */
diff --git a/src/WINNT/afsd/cm_config.h b/src/WINNT/afsd/cm_config.h
index 53d37e119..84b4f9453 100644
--- a/src/WINNT/afsd/cm_config.h
+++ b/src/WINNT/afsd/cm_config.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __CONFIG_H_ENV_
-#define __CONFIG_H_ENV_ 1
+#ifndef OPENAFS_WINNT_AFSD_CONFIG_H
+#define OPENAFS_WINNT_AFSD_CONFIG_H 1
 
 #define CM_CONFIGDEFAULT_CACHESIZE	98304
 #define CM_CONFIGDEFAULT_BLOCKSIZE	4096
@@ -87,4 +87,4 @@ extern void cm_GetConfigDir(char *dir, afs_uint32 len);
 
 #endif /* __CM_CONFIG_INTERFACES_ONLY__ */
 
-#endif /* __CONFIG_H_ENV_ */
+#endif /* OPENAFS_WINNT_AFSD_CONFIG_H */
diff --git a/src/WINNT/afsd/cm_conn.h b/src/WINNT/afsd/cm_conn.h
index c138b692d..32c5c2d6f 100644
--- a/src/WINNT/afsd/cm_conn.h
+++ b/src/WINNT/afsd/cm_conn.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __CM_CONN_H_ENV__
-#define __CM_CONN_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_CM_CONN_H
+#define OPENAFS_WINNT_AFSD_CM_CONN_H 1
 
 #define	CM_CONN_DEFAULTRDRTIMEOUT	45
 #ifndef CM_CONN_CONNDEADTIME
@@ -152,4 +152,4 @@ extern void cm_ForceNewConnections(cm_server_t *serverp);
 
 extern long cm_ServerAvailable(struct cm_fid *fidp, struct cm_user *userp);
 
-#endif /*  __CM_CONN_H_ENV__ */
+#endif /*  OPENAFS_WINNT_AFSD_CM_CONN_H */
diff --git a/src/WINNT/afsd/cm_daemon.h b/src/WINNT/afsd/cm_daemon.h
index 5dd3771e5..7d5a0232f 100644
--- a/src/WINNT/afsd/cm_daemon.h
+++ b/src/WINNT/afsd/cm_daemon.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __CM_DAEMON_H_ENV_
-#define __CM_DAEMON_H_ENV_ 1
+#ifndef OPENAFS_WINNT_AFSD_CM_DAEMON_H
+#define OPENAFS_WINNT_AFSD_CM_DAEMON_H 1
 
 /* externs */
 extern long cm_daemonCheckDownInterval;
@@ -43,4 +43,4 @@ extern void cm_QueueBKGRequest(cm_scache_t *scp, cm_bkgProc_t *procp, afs_uint32
 
 #define CM_MAX_DAEMONS 64
 
-#endif /*  __CM_DAEMON_H_ENV_ */
+#endif /*  OPENAFS_WINNT_AFSD_CM_DAEMON_H */
diff --git a/src/WINNT/afsd/cm_dcache.h b/src/WINNT/afsd/cm_dcache.h
index 9eb2fa30a..f68501bd1 100644
--- a/src/WINNT/afsd/cm_dcache.h
+++ b/src/WINNT/afsd/cm_dcache.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __CM_DCACHE_ENV__
-#define __CM_DCACHE_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_CM_DCACHE_H
+#define OPENAFS_WINNT_AFSD_CM_DCACHE_H 1
 
 /* bulk I/O descriptor */
 typedef struct cm_bulkIO {
@@ -60,4 +60,4 @@ extern long cm_ShutdownDCache(void);
 extern long cm_BufWrite(void *vscp, osi_hyper_t *offsetp, long length, long flags,
                  cm_user_t *userp, cm_req_t *reqp);
 
-#endif /*  __CM_DCACHE_ENV__ */
+#endif /*  OPENAFS_WINNT_AFSD_CM_DCACHE_H */
diff --git a/src/WINNT/afsd/cm_dir.h b/src/WINNT/afsd/cm_dir.h
index a10420590..ade369e59 100644
--- a/src/WINNT/afsd/cm_dir.h
+++ b/src/WINNT/afsd/cm_dir.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __CM_DIR_ENV__
-#define __CM_DIR_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_CM_DIR_H
+#define OPENAFS_WINNT_AFSD_CM_DIR_H 1
 
 /* These data structures are derived from src/dir/dir.h and should not
  * be changed as they describe AFS3 wire protocol.
@@ -193,4 +193,4 @@ cm_MemDumpDirStats(FILE *outputFile, char *cookie, int lock);
 
 extern afs_uint64 dir_enums;
 
-#endif /*  __CM_DIR_ENV__ */
+#endif /*  OPENAFS_WINNT_AFSD_CM_DIR_H */
diff --git a/src/WINNT/afsd/cm_ioctl.h b/src/WINNT/afsd/cm_ioctl.h
index c47ecbb27..048683c07 100644
--- a/src/WINNT/afsd/cm_ioctl.h
+++ b/src/WINNT/afsd/cm_ioctl.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __CM_IOCTL_H_ENV__
-#define __CM_IOCTL_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_CM_IOCTL_H
+#define OPENAFS_WINNT_AFSD_CM_IOCTL_H 1
 
 #ifndef __CM_IOCTL_INTERFACES_ONLY__
 #include "cm_user.h"
@@ -287,4 +287,4 @@ extern afs_int32 cm_IoctlSetUnixMode(cm_ioctl_t *ioctlp, cm_user_t *userp, cm_sc
 
 #endif /* __CM_IOCTL_INTERFACES_ONLY__ */
 
-#endif /*  __CM_IOCTL_H_ENV__ */
+#endif /*  OPENAFS_WINNT_AFSD_CM_IOCTL_H */
diff --git a/src/WINNT/afsd/cm_nls.h b/src/WINNT/afsd/cm_nls.h
index 60bdccd8e..403047abc 100644
--- a/src/WINNT/afsd/cm_nls.h
+++ b/src/WINNT/afsd/cm_nls.h
@@ -22,8 +22,8 @@
  * SOFTWARE.
  */
 
-#ifndef __CM_NLS_H_ENV__
-#define __CM_NLS_H_ENV__
+#ifndef OPENAFS_WINNT_AFSD_CM_NLS_H
+#define OPENAFS_WINNT_AFSD_CM_NLS_H 1
 
 /* Character types
 
diff --git a/src/WINNT/afsd/cm_scache.h b/src/WINNT/afsd/cm_scache.h
index a04f31402..b141c7531 100644
--- a/src/WINNT/afsd/cm_scache.h
+++ b/src/WINNT/afsd/cm_scache.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __CM_SCACHE_H_ENV__
-#define __CM_SCACHE_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_CM_SCACHE_H
+#define OPENAFS_WINNT_AFSD_CM_SCACHE_H 1
 
 #define MOUNTPOINTLEN   1024    /* max path length for symlink; same as AFSPATHMAX */
 
@@ -432,4 +432,4 @@ extern int cm_DumpSCache(FILE *outputFile, char *cookie, int lock);
 extern void cm_ResetSCacheDirectory(cm_scache_t *scp, afs_int32 locked);
 
 extern cm_scache_t * cm_RootSCachep(cm_user_t *userp, cm_req_t *reqp);
-#endif /*  __CM_SCACHE_H_ENV__ */
+#endif /*  OPENAFS_WINNT_AFSD_CM_SCACHE_H */
diff --git a/src/WINNT/afsd/cm_server.h b/src/WINNT/afsd/cm_server.h
index 277464035..4dfe3fbbc 100644
--- a/src/WINNT/afsd/cm_server.h
+++ b/src/WINNT/afsd/cm_server.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __CM_SERVER_H_ENV__
-#define __CM_SERVER_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_CM_SERVER_H
+#define OPENAFS_WINNT_AFSD_CM_SERVER_H 1
 
 #include <winsock2.h>
 #include <osi.h>
@@ -150,4 +150,4 @@ extern int cm_SubnetMask[CM_MAXINTERFACE_ADDR];/* client's subnet mask in host o
 extern int cm_NetMtu[CM_MAXINTERFACE_ADDR];    /* client's MTU sizes */
 extern int cm_NetFlags[CM_MAXINTERFACE_ADDR];  /* network flags */
 extern int cm_LanAdapterChangeDetected;
-#endif /*  __CM_SERVER_H_ENV__ */
+#endif /*  OPENAFS_WINNT_AFSD_CM_SERVER_H */
diff --git a/src/WINNT/afsd/cm_user.h b/src/WINNT/afsd/cm_user.h
index d3ad4dc15..40184fd8c 100644
--- a/src/WINNT/afsd/cm_user.h
+++ b/src/WINNT/afsd/cm_user.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __CM_USER_H_ENV__
-#define __CM_USER_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_CM_USER_H
+#define OPENAFS_WINNT_AFSD_CM_USER_H 1
 
 #include <osi.h>
 #include <rx/rxkad.h>
@@ -72,4 +72,4 @@ extern void cm_CheckTokenCache(time_t now);
 
 extern cm_user_t *cm_rootUserp;
 
-#endif /*  __CM_USER_H_ENV__ */
+#endif /*  OPENAFS_WINNT_AFSD_CM_USER_H */
diff --git a/src/WINNT/afsd/cm_utils.h b/src/WINNT/afsd/cm_utils.h
index 97f26c0c8..a7fafbaae 100644
--- a/src/WINNT/afsd/cm_utils.h
+++ b/src/WINNT/afsd/cm_utils.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __CM_UTILS_H_ENV__
-#define __CM_UTILS_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_CM_UTILS_H
+#define OPENAFS_WINNT_AFSD_CM_UTILS_H 1
 
 #define CM_UTILS_SPACESIZE		8192	/* space to allocate */
 typedef struct cm_space {
@@ -110,4 +110,4 @@ extern void cm_utilsInit(void);
 
 extern void cm_utilsCleanup(void);
 
-#endif /*  __CM_UTILS_H_ENV__ */
+#endif /*  OPENAFS_WINNT_AFSD_CM_UTILS_H */
diff --git a/src/WINNT/afsd/cm_vnodeops.h b/src/WINNT/afsd/cm_vnodeops.h
index ae8e566f5..19870e62e 100644
--- a/src/WINNT/afsd/cm_vnodeops.h
+++ b/src/WINNT/afsd/cm_vnodeops.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __CM_VNODEOPS_H_ENV__
-#define __CM_VNODEOPS_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_CM_VNODEOPS_H
+#define OPENAFS_WINNT_AFSD_CM_VNODEOPS_H 1
 
 extern unsigned int cm_mountRootGen;
 
@@ -259,4 +259,4 @@ typedef struct cm_bulkStat {
 extern afs_int32 cm_TryBulkStatRPC(cm_scache_t *dscp, cm_bulkStat_t *bbp,
                                    cm_user_t *userp, cm_req_t *reqp);
 
-#endif /*  __CM_VNODEOPS_H_ENV__ */
+#endif /*  OPENAFS_WINNT_AFSD_CM_VNODEOPS_H */
diff --git a/src/WINNT/afsd/cm_volume.h b/src/WINNT/afsd/cm_volume.h
index 44f92c6ee..7be726aae 100644
--- a/src/WINNT/afsd/cm_volume.h
+++ b/src/WINNT/afsd/cm_volume.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __CM_VOLUME_H_ENV__
-#define __CM_VOLUME_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_CM_VOLUME_H
+#define OPENAFS_WINNT_AFSD_CM_VOLUME_H 1
 
 #define VL_MAXNAMELEN                   65
 
@@ -151,4 +151,4 @@ extern cm_vol_state_t * cm_VolumeStateByName(cm_volume_t *volp, char *volname);
 extern afs_int32 cm_VolumeType(cm_volume_t *volp, afs_uint32 id);
 
 extern osi_rwlock_t cm_volumeLock;
-#endif /*  __CM_VOLUME_H_ENV__ */
+#endif /*  OPENAFS_WINNT_AFSD_CM_VOLUME_H */
diff --git a/src/WINNT/afsd/fs.h b/src/WINNT/afsd/fs.h
index c8a054544..be14e8a7e 100644
--- a/src/WINNT/afsd/fs.h
+++ b/src/WINNT/afsd/fs.h
@@ -7,9 +7,9 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __FS_H_ENV__
-#define __FS_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_FS_H
+#define OPENAFS_WINNT_AFSD_FS_H 1
 
 void Die(int code, char *filename);
 
-#endif /* FS_H_ENV */
+#endif /* OPENAFS_WINNT_AFSD_FS_H */
diff --git a/src/WINNT/afsd/fs_utils.h b/src/WINNT/afsd/fs_utils.h
index 9c3aadbf4..283d20e0f 100644
--- a/src/WINNT/afsd/fs_utils.h
+++ b/src/WINNT/afsd/fs_utils.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __FS_UTILS_H_ENV__
-#define __FS_UTILS_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_FS_UTILS_H
+#define OPENAFS_WINNT_AFSD_FS_UTILS_H 1
 
 
 /* pioctl opcode constants */
@@ -43,4 +43,4 @@ extern char *cm_mount_root;             /*"afs"*/
 extern char *cm_slash_mount_root;       /*"/afs"*/
 extern char *cm_back_slash_mount_root;  /*"\\afs"*/
 extern void fs_utils_InitMountRoot();
-#endif /* FS_UTILS_H_ENV */
+#endif /* OPENAFS_WINNT_AFSD_FS_UTILS_H */
diff --git a/src/WINNT/afsd/smb.h b/src/WINNT/afsd/smb.h
index 88e4d3ed9..0bd48dbd7 100644
--- a/src/WINNT/afsd/smb.h
+++ b/src/WINNT/afsd/smb.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __SMB_H_ENV__
-#define __SMB_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_SMB_H
+#define OPENAFS_WINNT_AFSD_SMB_H 1
 
 /* #define DEBUG_SMB_REFCOUNT 1 */
 
diff --git a/src/WINNT/afsd/smb3.h b/src/WINNT/afsd/smb3.h
index 3f09b1898..a8e334091 100644
--- a/src/WINNT/afsd/smb3.h
+++ b/src/WINNT/afsd/smb3.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __SMB3_H_ENV__
-#define __SMB3_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_SMB3_H
+#define OPENAFS_WINNT_AFSD_SMB3_H 1
 
 typedef struct smb_tran2Packet {
 	osi_queue_t q;			/* queue of all packets */
@@ -449,4 +449,4 @@ extern afs_uint32 smb_GetLogonSID(HANDLE hToken, PSID *ppsid);
 extern afs_uint32 smb_GetUserSID(HANDLE hToken, PSID *ppsid);
 extern void smb_FreeSID (PSID psid);
 
-#endif /*  __SMB3_H_ENV__ */
+#endif /*  OPENAFS_WINNT_AFSD_SMB3_H */
diff --git a/src/WINNT/afsd/smb_iocons.h b/src/WINNT/afsd/smb_iocons.h
index 2310853db..0fb54ae88 100644
--- a/src/WINNT/afsd/smb_iocons.h
+++ b/src/WINNT/afsd/smb_iocons.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __SMB_IOCONS_H_ENV_
-#define __SMB_IOCONS_H_ENV_ 1
+#ifndef OPENAFS_WINNT_AFSD_SMB_IOCONS_H
+#define OPENAFS_WINNT_AFSD_SMB_IOCONS_H 1
 
 /* included in both AFSD and fs commands */
 
@@ -116,4 +116,4 @@ struct sbstruct {
 #define CM_IOCTL_MAXDATA	        8192*2
 #define CM_IOCTL_MAXPROCS               64
 
-#endif /*  __SMB_IOCONS_H_ENV_ */
+#endif /*  OPENAFS_WINNT_AFSD_SMB_IOCONS_H */
diff --git a/src/WINNT/afsd/smb_ioctl.h b/src/WINNT/afsd/smb_ioctl.h
index 5f0c09043..9defd83b6 100644
--- a/src/WINNT/afsd/smb_ioctl.h
+++ b/src/WINNT/afsd/smb_ioctl.h
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef __SMB_IOCTL_H_ENV__
-#define __SMB_IOCTL_H_ENV__ 1
+#ifndef OPENAFS_WINNT_AFSD_SMB_IOCTL_H
+#define OPENAFS_WINNT_AFSD_SMB_IOCTL_H 1
 
 #include <cm_ioctl.h>
 #include <smb_iocons.h>
@@ -211,4 +211,4 @@ extern afs_int32 smb_IoctlGetUnixMode(struct smb_ioctl *ioctlp, struct cm_user *
 
 extern afs_int32 smb_IoctlSetUnixMode(struct smb_ioctl *ioctlp, struct cm_user *userp, afs_uint32 flags);
 
-#endif /*  __SMB_IOCTL_H_ENV__ */
+#endif /*  OPENAFS_WINNT_AFSD_SMB_IOCTL_H */
diff --git a/src/WINNT/client_osi/basic.h b/src/WINNT/client_osi/basic.h
index bc34d28ff..56026bca3 100644
--- a/src/WINNT/client_osi/basic.h
+++ b/src/WINNT/client_osi/basic.h
@@ -9,10 +9,10 @@
 
 /* Copyright (C) 1994 Cazamar Systems, Inc. */
 
-#ifndef __BASIC_H_ENV_
-#define __BASIC_H_ENV_ 1
+#ifndef OPENAFS_WINNT_CLIENT_OSI_BASIC_H
+#define OPENAFS_WINNT_CLIENT_OSI_BASIC_H 1
 
 extern int main_BasicTest(HANDLE);
 
-#endif /* __BASIC_H_ENV_ */
+#endif /* OPENAFS_WINNT_CLIENT_OSI_BASIC_H */
 
diff --git a/src/WINNT/client_osi/osi.h b/src/WINNT/client_osi/osi.h
index 2a9a7d56f..aad1fc02e 100644
--- a/src/WINNT/client_osi/osi.h
+++ b/src/WINNT/client_osi/osi.h
@@ -9,8 +9,8 @@
 
 /* Copyright (C) 1994 Cazamar Systems, Inc. */
 
-#ifndef _OSI_H_ENV_
-#define _OSI_H_ENV_ 1
+#ifndef OPENAFS_WINNT_CLIENT_OSI_OSI_H
+#define OPENAFS_WINNT_CLIENT_OSI_OSI_H 1
 
 #include <afs/param.h>
 
@@ -86,4 +86,4 @@ typedef int int32;
 /* log stuff */
 #include "osilog.h"
 
-#endif /*_OSI_H_ENV_ */
+#endif /* OPENAFS_WINNT_CLIENT_OSI_OSI_H */
diff --git a/src/WINNT/client_osi/osibasel.h b/src/WINNT/client_osi/osibasel.h
index 6839d8d93..73679dd78 100644
--- a/src/WINNT/client_osi/osibasel.h
+++ b/src/WINNT/client_osi/osibasel.h
@@ -9,8 +9,8 @@
 
 /* Copyright (C) 1994 Cazamar Systems, Inc. */
 
-#ifndef _OSIBASEL_H_ENV_
-#define _OSIBASEL_H_ENV_ 1
+#ifndef OPENAFS_WINNT_CLIENT_OSI_OSIBASEL_H
+#define OPENAFS_WINNT_CLIENT_OSI_OSIBASEL_H 1
 
 /* flags for osi_mutex_t and osi_rwlock_t flags fields.  Some bits
  * are used only in one structure or another.
@@ -155,4 +155,4 @@ extern void osi_SetLockOrderValidation(int);
 
 #define lock_AssertMutex(x) osi_assertx(lock_GetMutexState(x) & OSI_MUTEX_HELD, "!OSI_MUTEX_HELD")
 
-#endif /*_OSIBASEL_H_ENV_ */
+#endif /* OPENAFS_WINNT_CLIENT_OSI_OSIBASEL_H */
diff --git a/src/WINNT/client_osi/osidb.h b/src/WINNT/client_osi/osidb.h
index 3af036a50..93bd7bb5c 100644
--- a/src/WINNT/client_osi/osidb.h
+++ b/src/WINNT/client_osi/osidb.h
@@ -9,8 +9,8 @@
 
 /* Copyright (C) 1994 Cazamar Systems, Inc. */
 
-#ifndef __OSIDB_H_ENV_
-#define __OSIDB_H_ENV_ 1
+#ifndef OPENAFS_WINNT_CLIENT_OSI_OSIDB_H
+#define OPENAFS_WINNT_CLIENT_OSI_OSIDB_H 1
 
 /* mapped over remote debugging integer array for rwlock and mutexes
  * mutexes only have writers
@@ -57,5 +57,5 @@ extern long osi_maxCalls;
 /* use this from outside of the OSI package */
 extern long *osi_maxCallsp;
 
-#endif /* __OSIDB_H_ENV_ */
+#endif /* OPENAFS_WINNT_CLIENT_OSI_OSIDB_H */
 
diff --git a/src/WINNT/client_osi/osifd.h b/src/WINNT/client_osi/osifd.h
index f62b7c182..c02f2390f 100644
--- a/src/WINNT/client_osi/osifd.h
+++ b/src/WINNT/client_osi/osifd.h
@@ -9,8 +9,8 @@
 
 /* Copyright (C) 1994 Cazamar Systems, Inc. */
 
-#ifndef _OSIFD_H_ENV_
-#define _OSIFD_H_ENV_ 1
+#ifndef OPENAFS_WINNT_CLIENT_OSI_OSIFD_H
+#define OPENAFS_WINNT_CLIENT_OSI_OSIFD_H 1
 
 #include "dbrpc.h"
 #include "osiqueue.h"
@@ -92,5 +92,5 @@ extern long osi_FDTypeGetInfo(osi_fd_t *, osi_remGetInfoParms_t *);
 
 extern long osi_FDTypeClose(osi_fd_t *);
 
-#endif /* _OSIFD_H_ENV_ */
+#endif /* OPENAFS_WINNT_CLIENT_OSI_OSIFD_H */
 
diff --git a/src/WINNT/client_osi/osiltype.h b/src/WINNT/client_osi/osiltype.h
index 19a1f24d7..cf44c5704 100644
--- a/src/WINNT/client_osi/osiltype.h
+++ b/src/WINNT/client_osi/osiltype.h
@@ -8,8 +8,8 @@
 
 /* Copyright (C) 1994 Cazamar Systems, Inc. */
 
-#ifndef _OSILTYPE_H_ENV_
-#define _OSILTYPE_H_ENV_ 1
+#ifndef OPENAFS_WINNT_CLIENT_OSI_OSILTYPE_H
+#define OPENAFS_WINNT_CLIENT_OSI_OSILTYPE_H 1
 
 /* number of dynamic lock types we permit */
 #define OSI_NLOCKTYPES		32	/* should be enough */
@@ -55,4 +55,4 @@ int osi_LockTypeSetDefault(char *);
 #define OSI_RWLOCK_READHELD	1		/* locked for read */
 #define OSI_RWLOCK_WRITEHELD	2		/* locked for write */
 
-#endif /* _OSILTYPE_H_ENV_ */
+#endif /* OPENAFS_WINNT_CLIENT_OSI_OSILTYPE_H */
diff --git a/src/WINNT/client_osi/osiqueue.h b/src/WINNT/client_osi/osiqueue.h
index 1bff1959d..f78e155ac 100644
--- a/src/WINNT/client_osi/osiqueue.h
+++ b/src/WINNT/client_osi/osiqueue.h
@@ -9,8 +9,8 @@
 
 /* Copyright (C) 1994 Cazamar Systems, Inc. */
 
-#ifndef _OSI_QUEUE_H_ENV_
-#define _OSI_QUEUE_H_ENV_ 1
+#ifndef OPENAFS_WINNT_CLIENT_OSI_OSI_QUEUE_H
+#define OPENAFS_WINNT_CLIENT_OSI_OSI_QUEUE_H 1
 
 /* this package implements a doubly linked queue of elements.
  * Each element starts with an osi_queue_t element.
@@ -88,4 +88,4 @@ extern void osi_QDFree(osi_queueData_t *);
 /* find out if a queue is empty */
 #define osi_QIsEmpty(x)	((*x) == ((osi_queue_t *) 0))
 
-#endif /* _OSI_QUEUE_H_ENV_ */
+#endif /* OPENAFS_WINNT_CLIENT_OSI_OSI_QUEUE_H */
diff --git a/src/WINNT/client_osi/osisleep.h b/src/WINNT/client_osi/osisleep.h
index 0306563a4..4c7fb9b89 100644
--- a/src/WINNT/client_osi/osisleep.h
+++ b/src/WINNT/client_osi/osisleep.h
@@ -9,8 +9,8 @@
 
 /* Copyright (C) 1994 Cazamar Systems, Inc. */
 
-#ifndef _OSISLEEP_H_ENV_
-#define _OSISLEEP_H_ENV_ 1
+#ifndef OPENAFS_WINNT_CLIENT_OSI_OSISLEEP_H
+#define OPENAFS_WINNT_CLIENT_OSI_OSISLEEP_H 1
 
 /*#include "osi.h"*/
 #include "osifd.h"
@@ -157,4 +157,4 @@ extern void osi_TSignalForMLs(osi_turnstile_t *turnp, int stillHaveReaders, Crit
 
 #define osi_TEmpty(t)	((t)->firstp == NULL)
 
-#endif /*_OSISLEEP_H_ENV_ */
+#endif /* OPENAFS_WINNT_CLIENT_OSI_OSISLEEP_H */
diff --git a/src/WINNT/client_osi/osistatl.h b/src/WINNT/client_osi/osistatl.h
index 236587718..b81a3a864 100644
--- a/src/WINNT/client_osi/osistatl.h
+++ b/src/WINNT/client_osi/osistatl.h
@@ -9,8 +9,8 @@
 
 /* Copyright (C) 1994 Cazamar Systems, Inc. */
 
-#ifndef _OSISTATL_H_ENV_
-#define _OSISTATL_H_ENV_ 1
+#ifndef OPENAFS_WINNT_CLIENT_OSI_OSISTATL_H
+#define OPENAFS_WINNT_CLIENT_OSI_OSISTATL_H 1
 
 #include "osibasel.h"
 #if !defined(_MSC_VER) || (_MSC_VER < 1300)
@@ -117,4 +117,4 @@ extern void osi_SetStatLog(struct osi_log *logp);
 
 extern void osi_SetWatchProc(long ms, osi_watchProc_t *procp, void *rockp);
 
-#endif /*_OSISTATL_H_ENV_ */
+#endif /* OPENAFS_WINNT_CLIENT_OSI_OSISTATL_H */
diff --git a/src/WINNT/client_osi/osiutils.h b/src/WINNT/client_osi/osiutils.h
index a7ef5b4b1..7cb871d60 100644
--- a/src/WINNT/client_osi/osiutils.h
+++ b/src/WINNT/client_osi/osiutils.h
@@ -9,11 +9,11 @@
 
 /* Copyright (C) 1994 Cazamar Systems, Inc. */
 
-#ifndef _OSIUTILS_H_ENV_
-#define _OSIUTILS_H_ENV_ 1
+#ifndef OPENAFS_WINNT_CLIENT_OSI_OSIUTILS_H
+#define OPENAFS_WINNT_CLIENT_OSI_OSIUTILS_H 1
 
 extern int osi_UIDCmp(UUID *uid1, UUID *uid2);
 
 extern void osi_LongToUID(long inval, UUID *outuidp);
 
-#endif /*_OSIUTILS_H_ENV_ */
+#endif /* OPENAFS_WINNT_CLIENT_OSI_OSIUTILS_H */
diff --git a/src/WINNT/client_osi/perf.h b/src/WINNT/client_osi/perf.h
index f360107e5..82d9a0bef 100644
--- a/src/WINNT/client_osi/perf.h
+++ b/src/WINNT/client_osi/perf.h
@@ -9,9 +9,9 @@
 
 /* Copyright (C) 1994 Cazamar Systems, Inc. */
 
-#ifndef __PERF_H_ENV_
-#define __PERF_H_ENV_ 1
+#ifndef OPENAFS_WINNT_CLIENT_OSI_PERF_H
+#define OPENAFS_WINNT_CLIENT_OSI_PERF_H 1
 
 extern int main_PerfTest(HANDLE);
 
-#endif /* __PERF_H_ENV_ */
+#endif /* OPENAFS_WINNT_CLIENT_OSI_PERF_H */
diff --git a/src/WINNT/client_osi/trylock.h b/src/WINNT/client_osi/trylock.h
index 4b1e7182e..362fcd860 100644
--- a/src/WINNT/client_osi/trylock.h
+++ b/src/WINNT/client_osi/trylock.h
@@ -9,9 +9,9 @@
 
 /* Copyright (C) 1994 Cazamar Systems, Inc. */
 
-#ifndef __TRYLOCK_H_ENV_
-#define __TRYLOCK_H_ENV_ 1
+#ifndef OPENAFS_WINNT_CLIENT_OSI_TRYLOCK_H
+#define OPENAFS_WINNT_CLIENT_OSI_TRYLOCK_H 1
 
 extern int main_TryLockTest(HANDLE);
 
-#endif /* __TRYLOCK_H_ENV_ */
+#endif /* OPENAFS_WINNT_CLIENT_OSI_TRYLOCK_H */
-- 
2.39.5