diff --git a/src/db/dbCaTest.h b/src/db/dbCaTest.h
index 12e88ea65..71d8ba707 100644
--- a/src/db/dbCaTest.h
+++ b/src/db/dbCaTest.h
@@ -1,17 +1,14 @@
 /*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* dbCaTest.h */
 
-/* Author:  Marty Kraimer Date:    25FEB2000 */
-#ifndef INCdbTesth
-#define INCdbTesth 1
+#ifndef INC_dbCaTest_H
+#define INC_dbCaTest_H
 
 #include "shareLib.h"
 
@@ -25,4 +22,4 @@ epicsShareFunc long epicsShareAPI dbcar(char *recordname,int level);
 }
 #endif
 
-#endif /*INCdbTesth */
+#endif /* INC_dbCaTest_H */
diff --git a/src/db/dbTest.h b/src/db/dbTest.h
index 3c2118139..ae25069c1 100644
--- a/src/db/dbTest.h
+++ b/src/db/dbTest.h
@@ -1,28 +1,23 @@
 /*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* dbTest.h */
 
-/* Author:  Marty Kraimer Date:    25FEB2000 */
-
-#ifndef INCdbTesth
-#define INCdbTesth 1
+#ifndef INC_dbTest_H
+#define INC_dbTest_H
 
 #include "shareLib.h"
 
-#include "shareLib.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /*dbAddr info */
-epicsShareFunc long epicsShareAPI dba(const char*pname);
+epicsShareFunc long epicsShareAPI dba(const char *pname);
 /*list records*/
 epicsShareFunc long epicsShareAPI dbl(
     const char *precordTypename,const char *fields);
@@ -52,4 +47,4 @@ epicsShareFunc int epicsShareAPI dbhcr();
 }
 #endif
 
-#endif /*INCdbTesth */
+#endif /* INC_dbTest_H */
diff --git a/src/db/db_test.h b/src/db/db_test.h
index b0036515f..52b00a979 100644
--- a/src/db/db_test.h
+++ b/src/db/db_test.h
@@ -1,23 +1,21 @@
 /*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/* base/include/db_test.h */
 
 #ifndef INCLdb_testh
 #define INCLdb_testh
 
+#include "shareLib.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "shareLib.h"
-
 epicsShareFunc int epicsShareAPI gft(char *pname);
 epicsShareFunc int epicsShareAPI pft(char *pname,char *pvalue);
 epicsShareFunc int epicsShareAPI tpn(char     *pname,char *pvalue);