diff --git a/src/as/asLib.h b/src/as/asLib.h
index a42245d17..b3da2f836 100644
--- a/src/as/asLib.h
+++ b/src/as/asLib.h
@@ -1,11 +1,10 @@
 /* asLib.h */
 /*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+* Copyright (c) 2009 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. 
 \*************************************************************************/
 /* Author:  Marty Kraimer Date:    09-27-93*/
@@ -15,6 +14,7 @@
 
 #include "shareLib.h"
 #include "ellLib.h"
+#include "errMdef.h"
 #include "errlog.h"
 
 #ifdef __cplusplus
diff --git a/src/cas/example/directoryService/main.cc b/src/cas/example/directoryService/main.cc
index b401db96c..afd4f813c 100644
--- a/src/cas/example/directoryService/main.cc
+++ b/src/cas/example/directoryService/main.cc
@@ -3,13 +3,14 @@
 *     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. 
 \*************************************************************************/
 
 #include <stdio.h>
 
+#include "errlog.h"
+
 #include "directoryServer.h"
 #include "fdManager.h"
 
diff --git a/src/cas/generic/beaconTimer.cc b/src/cas/generic/beaconTimer.cc
index 579c275ff..58aca2bf1 100644
--- a/src/cas/generic/beaconTimer.cc
+++ b/src/cas/generic/beaconTimer.cc
@@ -4,8 +4,7 @@
 *     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. 
 \*************************************************************************/
 /*
@@ -18,6 +17,7 @@
 
 #include "fdManager.h"
 #include "envDefs.h"
+#include "errlog.h"
 
 #define epicsExportSharedSymbols
 #include "caServerI.h"
diff --git a/src/cas/generic/caServerI.cc b/src/cas/generic/caServerI.cc
index fb80a3edf..2730b7255 100644
--- a/src/cas/generic/caServerI.cc
+++ b/src/cas/generic/caServerI.cc
@@ -15,10 +15,12 @@
  *              505 665 1831
  */
 
+#include <stdarg.h>
 #include <stdexcept>
 
 #include "epicsGuard.h"
 #include "epicsVersion.h"
+#include "errlog.h"
 
 #include "addrList.h"
 
diff --git a/src/cas/generic/casAsyncIOI.cc b/src/cas/generic/casAsyncIOI.cc
index 0513f99a7..07c824661 100644
--- a/src/cas/generic/casAsyncIOI.cc
+++ b/src/cas/generic/casAsyncIOI.cc
@@ -3,8 +3,7 @@
 *     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. 
 \*************************************************************************/
 /*
@@ -18,6 +17,8 @@
 #include <string>
 #include <stdexcept>
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "casAsyncIOI.h"
 
diff --git a/src/cas/generic/casAsyncPVAttachIOI.cpp b/src/cas/generic/casAsyncPVAttachIOI.cpp
index c3fbc260c..870570daa 100644
--- a/src/cas/generic/casAsyncPVAttachIOI.cpp
+++ b/src/cas/generic/casAsyncPVAttachIOI.cpp
@@ -4,8 +4,7 @@
 *     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. 
 \*************************************************************************/
 /*
@@ -16,6 +15,8 @@
  *              505 665 1831
  */
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "casAsyncPVAttachIOI.h"
 
diff --git a/src/cas/generic/casAsyncPVExistIOI.cpp b/src/cas/generic/casAsyncPVExistIOI.cpp
index 271f96cfd..f76755a85 100644
--- a/src/cas/generic/casAsyncPVExistIOI.cpp
+++ b/src/cas/generic/casAsyncPVExistIOI.cpp
@@ -4,8 +4,7 @@
 *     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. 
 \*************************************************************************/
 /*
@@ -16,6 +15,8 @@
  *              505 665 1831
  */
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "casAsyncPVExistIOI.h"
 
diff --git a/src/cas/generic/casAsyncReadIOI.cc b/src/cas/generic/casAsyncReadIOI.cc
index c753e272a..d598906b5 100644
--- a/src/cas/generic/casAsyncReadIOI.cc
+++ b/src/cas/generic/casAsyncReadIOI.cc
@@ -3,8 +3,7 @@
 *     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. 
 \*************************************************************************/
 /*
@@ -15,6 +14,8 @@
  *              505 665 1831
  */
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "casAsyncReadIOI.h"
 #include "casChannelI.h"
diff --git a/src/cas/generic/casAsyncWriteIOI.cpp b/src/cas/generic/casAsyncWriteIOI.cpp
index 051a0dbe6..4e664b236 100644
--- a/src/cas/generic/casAsyncWriteIOI.cpp
+++ b/src/cas/generic/casAsyncWriteIOI.cpp
@@ -4,8 +4,7 @@
 *     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. 
 \*************************************************************************/
 /*
@@ -16,6 +15,8 @@
  *              505 665 1831
  */
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "casAsyncWriteIOI.h"
 #include "casChannelI.h"
diff --git a/src/cas/generic/casCoreClient.cc b/src/cas/generic/casCoreClient.cc
index 39c0f093b..0a1f57328 100644
--- a/src/cas/generic/casCoreClient.cc
+++ b/src/cas/generic/casCoreClient.cc
@@ -15,6 +15,8 @@
  *              505 665 1831
  */
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "casCoreClient.h"
 #include "casAsyncPVExistIOI.h"
diff --git a/src/cas/generic/casDGClient.cc b/src/cas/generic/casDGClient.cc
index 0604c46e2..2375a8e4a 100644
--- a/src/cas/generic/casDGClient.cc
+++ b/src/cas/generic/casDGClient.cc
@@ -18,6 +18,7 @@
 #include "gddApps.h"
 #include "caerr.h"
 #include "osiWireFormat.h"
+#include "errlog.h"
 
 #define epicsExportSharedSymbols
 #include "casDGClient.h"
diff --git a/src/cas/generic/casEventMask.cc b/src/cas/generic/casEventMask.cc
index e9a54d41e..a4cf83cd9 100644
--- a/src/cas/generic/casEventMask.cc
+++ b/src/cas/generic/casEventMask.cc
@@ -3,8 +3,7 @@
 *     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. 
 \*************************************************************************/
 /*
@@ -18,6 +17,8 @@
 #include <stdio.h>
 #include <limits.h>
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "casdef.h"
 #include "casEventRegistry.h"
diff --git a/src/cas/generic/casEventSys.cc b/src/cas/generic/casEventSys.cc
index 1efcdea54..dbeb62f91 100644
--- a/src/cas/generic/casEventSys.cc
+++ b/src/cas/generic/casEventSys.cc
@@ -3,8 +3,7 @@
 *     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. 
 \*************************************************************************/
 /*
@@ -17,6 +16,8 @@
 
 #include <string.h>
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "caHdrLargeArray.h"
 #include "casCoreClient.h"
diff --git a/src/cas/generic/casMonEvent.cc b/src/cas/generic/casMonEvent.cc
index e90bdd8d6..fd81b9b3a 100644
--- a/src/cas/generic/casMonEvent.cc
+++ b/src/cas/generic/casMonEvent.cc
@@ -3,8 +3,7 @@
 *     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. 
 \*************************************************************************/
 /*
@@ -18,6 +17,8 @@
 #include <string>
 #include <stdexcept>
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "casMonEvent.h"
 #include "casMonitor.h"
diff --git a/src/cas/generic/casMonitor.cc b/src/cas/generic/casMonitor.cc
index 0db4c5542..bae1c4a14 100644
--- a/src/cas/generic/casMonitor.cc
+++ b/src/cas/generic/casMonitor.cc
@@ -3,8 +3,7 @@
 *     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. 
 \*************************************************************************/
 /*
@@ -15,6 +14,8 @@
  *              505 665 1831
  */
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "casMonitor.h"
 #include "casChannelI.h"
diff --git a/src/cas/generic/casPVI.cc b/src/cas/generic/casPVI.cc
index d271daad0..ff5ddf96f 100644
--- a/src/cas/generic/casPVI.cc
+++ b/src/cas/generic/casPVI.cc
@@ -3,8 +3,7 @@
 *     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. 
 \*************************************************************************/
 /*
@@ -19,6 +18,7 @@
 #include "gddAppTable.h" // EPICS application type table
 #include "gddApps.h"
 #include "dbMapper.h" // EPICS application type table
+#include "errlog.h"
 
 #define epicsExportSharedSymbols
 #include "caServerDefs.h"
diff --git a/src/cas/generic/casStrmClient.cc b/src/cas/generic/casStrmClient.cc
index 8dc98024e..3d0f7e411 100644
--- a/src/cas/generic/casStrmClient.cc
+++ b/src/cas/generic/casStrmClient.cc
@@ -23,6 +23,7 @@ typedef unsigned long arrayElementCount;
 #include "dbMapper.h"		// ait to dbr types
 #include "gddAppTable.h"    // EPICS application type table
 #include "gddApps.h"		// gdd predefined application type codes
+#include "errlog.h"
 
 #define epicsExportSharedSymbols
 #include "casStrmClient.h"
diff --git a/src/cas/generic/chanIntfForPV.cc b/src/cas/generic/chanIntfForPV.cc
index 4fd64fc60..c321362a0 100644
--- a/src/cas/generic/chanIntfForPV.cc
+++ b/src/cas/generic/chanIntfForPV.cc
@@ -4,8 +4,7 @@
 *     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. 
 \*************************************************************************/
 /*
@@ -16,6 +15,8 @@
  *              505 665 1831
  */
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "chanIntfForPV.h"
 #include "casCoreClient.h"
diff --git a/src/cas/generic/outBuf.cc b/src/cas/generic/outBuf.cc
index 49c34921c..d7eebad28 100644
--- a/src/cas/generic/outBuf.cc
+++ b/src/cas/generic/outBuf.cc
@@ -3,8 +3,7 @@
 *     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. 
 \*************************************************************************/
 /*
@@ -15,6 +14,8 @@
  *              505 665 1831
  */
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "outBuf.h" 
 #include "osiWireFormat.h"
diff --git a/src/cas/generic/st/casDGIntfOS.cc b/src/cas/generic/st/casDGIntfOS.cc
index ef7b605bf..eed14492e 100644
--- a/src/cas/generic/st/casDGIntfOS.cc
+++ b/src/cas/generic/st/casDGIntfOS.cc
@@ -3,8 +3,7 @@
 *     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. 
 \*************************************************************************/
 
@@ -15,6 +14,7 @@
 
 
 #include "fdManager.h"
+#include "errlog.h"
 
 #define epicsExportSharedFunc
 #include "casDGIntfOS.h"
diff --git a/src/cas/generic/st/casStreamOS.cc b/src/cas/generic/st/casStreamOS.cc
index 2775cbdf7..3a142327a 100644
--- a/src/cas/generic/st/casStreamOS.cc
+++ b/src/cas/generic/st/casStreamOS.cc
@@ -3,8 +3,7 @@
 *     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. 
 \*************************************************************************/
 //
@@ -19,6 +18,7 @@
 //
 
 #include "fdManager.h"
+#include "errlog.h"
 
 #define epicsExportSharedFunc
 #include "casStreamOS.h"
diff --git a/src/cas/io/bsdSocket/caServerIO.cc b/src/cas/io/bsdSocket/caServerIO.cc
index a15d36dee..d982013c7 100644
--- a/src/cas/io/bsdSocket/caServerIO.cc
+++ b/src/cas/io/bsdSocket/caServerIO.cc
@@ -3,8 +3,7 @@
 *     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. 
 \*************************************************************************/
 //
@@ -19,6 +18,7 @@
 #include "epicsSignal.h"
 #include "envDefs.h"
 #include "caProto.h"
+#include "errlog.h"
 
 #define epicsExportSharedSymbols
 #include "caServerIO.h"
diff --git a/src/cas/io/bsdSocket/casDGIntfIO.cc b/src/cas/io/bsdSocket/casDGIntfIO.cc
index 476c6d6de..b2520c83e 100644
--- a/src/cas/io/bsdSocket/casDGIntfIO.cc
+++ b/src/cas/io/bsdSocket/casDGIntfIO.cc
@@ -3,8 +3,7 @@
 *     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. 
 \*************************************************************************/
 /*
@@ -18,6 +17,7 @@
 //
 
 #include "addrList.h"
+#include "errlog.h"
 
 #define epicsExportSharedSymbols
 #include "casDGIntfIO.h"
diff --git a/src/cas/io/bsdSocket/casStreamIO.cc b/src/cas/io/bsdSocket/casStreamIO.cc
index 982abc5e1..ce07ddc34 100644
--- a/src/cas/io/bsdSocket/casStreamIO.cc
+++ b/src/cas/io/bsdSocket/casStreamIO.cc
@@ -3,14 +3,15 @@
 *     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. 
 \*************************************************************************/
 //
 // $Id$
 //
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "casStreamIO.h"
 
diff --git a/src/db/dbChannelIO.cpp b/src/db/dbChannelIO.cpp
index 510921b64..d66e96768 100644
--- a/src/db/dbChannelIO.cpp
+++ b/src/db/dbChannelIO.cpp
@@ -1,10 +1,9 @@
 /*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+* Copyright (c) 2009 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. 
 \*************************************************************************/
 
@@ -33,6 +32,7 @@
 #include "epicsMutex.h"
 #include "epicsEvent.h"
 #include "db_access.h"
+#include "errlog.h"
 
 #define epicsExportSharedSymbols
 #include "db_access_routines.h"
diff --git a/src/db/dbContext.cpp b/src/db/dbContext.cpp
index cb0e40466..7e879a842 100644
--- a/src/db/dbContext.cpp
+++ b/src/db/dbContext.cpp
@@ -1,10 +1,9 @@
 /*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+* Copyright (c) 2009 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. 
 \*************************************************************************/
 /*  
@@ -33,6 +32,7 @@
 #include "caerr.h" // should be eliminated here in the future
 #include "epicsEvent.h"
 #include "epicsThread.h"
+#include "errlog.h"
 
 #define epicsExportSharedSymbols
 #include "db_access_routines.h"
diff --git a/src/db/dbPutNotifyBlocker.cpp b/src/db/dbPutNotifyBlocker.cpp
index 34be38de7..a4f748a53 100644
--- a/src/db/dbPutNotifyBlocker.cpp
+++ b/src/db/dbPutNotifyBlocker.cpp
@@ -36,6 +36,7 @@
 #include "epicsTime.h"
 #include "tsFreeList.h"
 #include "errMdef.h"
+#include "errlog.h"
 
 #include "caerr.h" // this needs to be eliminated
 #include "db_access.h" // this needs to be eliminated
diff --git a/src/db/dbSubscriptionIO.cpp b/src/db/dbSubscriptionIO.cpp
index 6c0203cf3..9b01ed5fa 100644
--- a/src/db/dbSubscriptionIO.cpp
+++ b/src/db/dbSubscriptionIO.cpp
@@ -1,10 +1,9 @@
 /*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+* Copyright (c) 2009 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. 
 \*************************************************************************/
 
@@ -35,6 +34,7 @@
 
 #include "db_access.h" // need to eliminate this
 #include "cadef.h" // this can be eliminated when the callbacks use the new interface
+#include "errlog.h"
 
 #define epicsExportSharedSymbols
 #include "dbCAC.h"
diff --git a/src/dbStatic/dbBase.h b/src/dbStatic/dbBase.h
index 92917ea8d..469a32a26 100644
--- a/src/dbStatic/dbBase.h
+++ b/src/dbStatic/dbBase.h
@@ -15,6 +15,7 @@
 #ifndef INCdbBaseh
 #define INCdbBaseh 1
 
+#include "epicsTypes.h"
 #include "dbFldTypes.h"
 #include "ellLib.h"
 #include "dbDefs.h"
diff --git a/src/dbStatic/devSup.h b/src/dbStatic/devSup.h
index 111d479af..b11946da2 100644
--- a/src/dbStatic/devSup.h
+++ b/src/dbStatic/devSup.h
@@ -1,5 +1,5 @@
 /*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+* Copyright (c) 2009 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.
@@ -16,6 +16,7 @@
 #ifndef INCdevSuph
 #define INCdevSuph 1
 
+#include "errMdef.h"
 #include "shareLib.h"
 
 /* structures defined elsewhere */
diff --git a/src/dbStatic/drvSup.h b/src/dbStatic/drvSup.h
index 82421b94b..489c516f2 100644
--- a/src/dbStatic/drvSup.h
+++ b/src/dbStatic/drvSup.h
@@ -1,10 +1,9 @@
 /*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+* Copyright (c) 2009 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. 
 \*************************************************************************/
 /* drvSup.h	Driver Support	*/
@@ -18,6 +17,8 @@
 #ifndef INCdrvSuph
 #define INCdrvSuph 1
 
+#include "errMdef.h"
+
 typedef long (*DRVSUPFUN) ();	/* ptr to driver support function*/
 
 typedef struct drvet {	/* driver entry table */
diff --git a/src/dbStatic/recSup.h b/src/dbStatic/recSup.h
index 846bde6f0..0bea17411 100644
--- a/src/dbStatic/recSup.h
+++ b/src/dbStatic/recSup.h
@@ -1,10 +1,9 @@
 /*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+* Copyright (c) 2009 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. 
 \*************************************************************************/
 /* recSup.h
@@ -16,6 +15,8 @@
 #ifndef INCrecSuph
 #define INCrecSuph 1
 
+#include "errMdef.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/gdd/gddAppFuncTable.h b/src/gdd/gddAppFuncTable.h
index cdff042c4..e668d2988 100644
--- a/src/gdd/gddAppFuncTable.h
+++ b/src/gdd/gddAppFuncTable.h
@@ -3,8 +3,7 @@
 *     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. 
 \*************************************************************************/
 /*
@@ -29,6 +28,7 @@
 #include "gdd.h"
 #include "gddAppTable.h"
 #include "errMdef.h"
+#include "errlog.h"
 
 typedef aitUint32 gddAppFuncTableStatus;
 
diff --git a/src/libCom/calc/calcPerform.c b/src/libCom/calc/calcPerform.c
index 4e34df766..e242e1e3f 100644
--- a/src/libCom/calc/calcPerform.c
+++ b/src/libCom/calc/calcPerform.c
@@ -12,17 +12,18 @@
  *	Date:	07-27-87
  */
 
-#include	<stdlib.h>
-#include	<stddef.h>
-#include	<stdio.h>
-#include	<string.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
 
 #define epicsExportSharedSymbols
-#include	"osiUnistd.h"
-#include	"dbDefs.h"
-#include	"epicsMath.h"
-#include	"postfix.h"
-#include	"postfixPvt.h"
+#include "osiUnistd.h"
+#include "dbDefs.h"
+#include "epicsMath.h"
+#include "errlog.h"
+#include "postfix.h"
+#include "postfixPvt.h"
 
 static double calcRandom(void);
 static int cond_search(const char **ppinst, int match);
diff --git a/src/libCom/env/envSubr.c b/src/libCom/env/envSubr.c
index d4cb7024f..c739fa525 100644
--- a/src/libCom/env/envSubr.c
+++ b/src/libCom/env/envSubr.c
@@ -44,6 +44,7 @@
 #include "epicsStdlib.h"
 #include "epicsStdioRedirect.h"
 #include "errMdef.h"
+#include "errlog.h"
 #include "envDefs.h"
 #include "epicsAssert.h"
 #include "osiSock.h"
diff --git a/src/libCom/error/errMdef.h b/src/libCom/error/errMdef.h
index 753f1d135..202de8f54 100644
--- a/src/libCom/error/errMdef.h
+++ b/src/libCom/error/errMdef.h
@@ -3,12 +3,11 @@
 *     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. 
 \*************************************************************************/
-/* errMdef.h  err.h - Error Handling definitions */
-/* share/epicsH $Id$ */
+/* Error Handling definitions */
+/* $Id$ */
 /*
  *      Author:          Marty Kraimer
  *      Date:            6-1-90
@@ -17,19 +16,12 @@
 #ifndef INCerrMdefh
 #define INCerrMdefh
 
+#include "shareLib.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdarg.h>
-
-#include "ellLib.h"
-#include "shareLib.h"
-
-/*The following is only included because before 3.13.0beta12 errMessage */
-/*and errPrintf were defined here					*/
-#include "errlog.h"
-
 #define RTN_SUCCESS(STATUS) ((STATUS)==0)
 
 #define M_dbAccess	(501 <<16) /*Database Access Routines */
diff --git a/src/libCom/error/errSymLib.c b/src/libCom/error/errSymLib.c
index 936c2a6fc..697adda42 100644
--- a/src/libCom/error/errSymLib.c
+++ b/src/libCom/error/errSymLib.c
@@ -35,6 +35,8 @@
 #include "dbDefs.h"
 #include "errMdef.h"
 #include "errSymTbl.h"
+#include "ellLib.h"
+#include "errlog.h"
 
 
 static unsigned short errhash(long errNum);
diff --git a/src/libCom/misc/dbDefs.h b/src/libCom/misc/dbDefs.h
index 91025a5f8..adc514bf5 100644
--- a/src/libCom/misc/dbDefs.h
+++ b/src/libCom/misc/dbDefs.h
@@ -1,10 +1,9 @@
 /*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+* Copyright (c) 2009 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. 
 \*************************************************************************/
 /* $Id$
@@ -13,64 +12,38 @@
  *      Date:            6-1-90
  */
 
-#ifndef INCdbDefsh
-#define INCdbDefsh 1
+#ifndef INC_dbDefs_H
+#define INC_dbDefs_H
 
-#if     defined(NO)
-#undef NO
+#ifdef TRUE
+#   undef TRUE
 #endif
-#define NO	0
+#define TRUE 1
 
-#if     defined(YES)
-#undef YES
-#endif
-#define YES            1
-
-#if     defined(TRUE)
-#undef TRUE
-#endif
-#define TRUE            1
-
-#if     defined(FALSE)
-#undef FALSE
-#endif
-#define FALSE           0
-
-#ifndef NONE
-#define NONE            (-1)    /* for times when NULL won't do */
+#ifdef FALSE
+#   undef FALSE
 #endif
+#define FALSE 0
 
 #ifndef LOCAL 
-#define LOCAL static
+#   define LOCAL static
 #endif
 
+/* number of elements in an array */
 #ifndef NELEMENTS
-#define NELEMENTS(array)                /* number of elements in an array */ \
-                (sizeof (array) / sizeof ((array) [0]))
-#endif
-
-#ifndef __cplusplus
-
-#ifndef max
-#define max(x, y)       (((x) < (y)) ? (y) : (x))
-#endif
-#ifndef min
-#define min(x, y)       (((x) < (y)) ? (x) : (y))
-#endif
-
+#   define NELEMENTS(array) (sizeof (array) / sizeof ((array) [0]))
 #endif
 
+/* byte offset of member in structure*/
 #ifndef OFFSET
-#define OFFSET(structure, member)       /* byte offset of member in structure*/\
-                ((int) &(((structure *) 0) -> member))
+#   define OFFSET(structure, member) ((int) &(((structure *) 0) -> member))
 #endif
 
-#define PVNAME_STRINGSZ		61		/* includes NULL terminator for PVNAME_SZ */
-#define	PVNAME_SZ	(PVNAME_STRINGSZ - 1)	/*Process Variable Name Size	*/
+/*Process Variable Name Size */
+/* PVNAME_STRINGSZ includes the nil terminator */
+#define PVNAME_STRINGSZ 61
+#define PVNAME_SZ (PVNAME_STRINGSZ - 1)
 
-#define DB_MAX_CHOICES	30
+#define DB_MAX_CHOICES 30
 
-#include "errMdef.h"
-#include "epicsTypes.h"
-
-#endif /* INCdbDefsh */
+#endif /* INC_dbDefs_H */
diff --git a/src/libCom/osi/devLib.c b/src/libCom/osi/devLib.c
index d88380b67..4929a9d74 100644
--- a/src/libCom/osi/devLib.c
+++ b/src/libCom/osi/devLib.c
@@ -28,6 +28,7 @@ static const char sccsID[] = "@(#) $Id$";
 #include "dbDefs.h"
 #include "epicsMutex.h"
 #include "errlog.h"
+#include "ellLib.h"
 #include "devLib.h"
 
 LOCAL ELLLIST addrAlloc[atLast];
diff --git a/src/libCom/osi/devLib.h b/src/libCom/osi/devLib.h
index 648cadd35..f9dd85751 100644
--- a/src/libCom/osi/devLib.h
+++ b/src/libCom/osi/devLib.h
@@ -20,6 +20,7 @@
 
 #include "dbDefs.h"
 #include "osdVME.h"
+#include "errMdef.h"
 #include "shareLib.h"
 
 #ifdef __cplusplus
diff --git a/src/libCom/osi/os/vxWorks/devLibOSD.c b/src/libCom/osi/os/vxWorks/devLibOSD.c
index 58247084b..e39f3959a 100644
--- a/src/libCom/osi/os/vxWorks/devLibOSD.c
+++ b/src/libCom/osi/os/vxWorks/devLibOSD.c
@@ -29,6 +29,7 @@
 
 #include "epicsFindSymbol.h"
 #include "devLib.h"
+#include "errlog.h"
 
 typedef void    myISR (void *pParam);
 
diff --git a/src/rec/aSubRecord.c b/src/rec/aSubRecord.c
index b15485336..77eb6c54f 100644
--- a/src/rec/aSubRecord.c
+++ b/src/rec/aSubRecord.c
@@ -27,6 +27,7 @@
 #include "dbFldTypes.h"
 #include "dbStaticLib.h"
 #include "errMdef.h"
+#include "errlog.h"
 #include "recSup.h"
 #include "devSup.h"
 #include "special.h"
diff --git a/src/rec/calcoutRecord.c b/src/rec/calcoutRecord.c
index cac7268b6..2a1a4fb75 100644
--- a/src/rec/calcoutRecord.c
+++ b/src/rec/calcoutRecord.c
@@ -29,6 +29,7 @@
 #include "cantProceed.h"
 #include "epicsMath.h"
 #include "errMdef.h"
+#include "errlog.h"
 #include "recSup.h"
 #include "devSup.h"
 #include "recGbl.h"