diff --git a/src/ioc/as/asCa.c b/src/ioc/as/asCa.c
index 4db25c395..d0180448b 100644
--- a/src/ioc/as/asCa.c
+++ b/src/ioc/as/asCa.c
@@ -15,26 +15,28 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "alarm.h"
+#include "asLib.h"
+#include "cantProceed.h"
+#include "db_access.h"
 #include "dbDefs.h"
 #include "ellLib.h"
-#include "epicsThread.h"
-#include "epicsMutex.h"
 #include "epicsEvent.h"
-#include "cantProceed.h"
+#include "epicsMutex.h"
+#include "epicsStdio.h"
+#include "epicsThread.h"
 #include "errlog.h"
 #include "taskwd.h"
-#include "callback.h"
-#include "db_access.h"
+
 #include "cadef.h"
 #include "caerr.h"
 #include "caeventmask.h"
-#include "alarm.h"
-#include "epicsStdio.h"
 
-#include "asLib.h"
-#include "epicsExport.h"
-#include "asDbLib.h"
+#define epicsExportSharedSymbols
 #include "asCa.h"
+#include "asDbLib.h"
+#include "callback.h"
+#include "epicsExport.h"
 
 int asCaDebug = 0;
 epicsExportAddress(int,asCaDebug);
diff --git a/src/ioc/as/asDbLib.c b/src/ioc/as/asDbLib.c
index d0322bfd1..c0fe192b0 100644
--- a/src/ioc/as/asDbLib.c
+++ b/src/ioc/as/asDbLib.c
@@ -13,26 +13,28 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "errlog.h"
-#include "cantProceed.h"
-#include "epicsThread.h"
-#include "epicsStdio.h"
-#include "dbDefs.h"
-#include "taskwd.h"
-#include "asLib.h"
-#define epicsExportSharedSymbols
 #include "alarm.h"
+#include "asLib.h"
+#include "cantProceed.h"
+#include "dbDefs.h"
+#include "epicsStdio.h"
+#include "epicsThread.h"
+#include "errlog.h"
+#include "taskwd.h"
+
 #include "caeventmask.h"
-#include "callback.h"
-#include "dbStaticLib.h"
-#include "dbChannel.h"
-#include "dbAccess.h"
-#include "db_field_log.h"
-#include "dbEvent.h"
-#include "dbCommon.h"
-#include "recSup.h"
+
+#define epicsExportSharedSymbols
 #include "asCa.h"
 #include "asDbLib.h"
+#include "callback.h"
+#include "dbAccess.h"
+#include "dbChannel.h"
+#include "dbCommon.h"
+#include "dbEvent.h"
+#include "db_field_log.h"
+#include "dbStaticLib.h"
+#include "recSup.h"
 
 static char	*pacf=NULL;
 static char	*psubstitutions=NULL;
diff --git a/src/ioc/as/asIocRegister.c b/src/ioc/as/asIocRegister.c
index f276b26ad..16cba90c6 100644
--- a/src/ioc/as/asIocRegister.c
+++ b/src/ioc/as/asIocRegister.c
@@ -7,11 +7,12 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 
-#include "iocsh.h"
 #include "asLib.h"
+#include "iocsh.h"
+
 #define epicsExportSharedSymbols
-#include "asDbLib.h"
 #include "asCa.h"
+#include "asDbLib.h"
 #include "asIocRegister.h"
 
 /* asSetFilename */
diff --git a/src/ioc/as/ascheck.c b/src/ioc/as/ascheck.c
index 666a1a9ae..e7303f87f 100644
--- a/src/ioc/as/ascheck.c
+++ b/src/ioc/as/ascheck.c
@@ -3,9 +3,8 @@
 *     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
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /* $Revision-Id$ */
@@ -16,9 +15,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "errlog.h"
 #include "asLib.h"
 #include "dbStaticLib.h"
+#include "errlog.h"
+
 int main(int argc,char **argv)
 {
     int         argn = 1;
diff --git a/src/ioc/db/callback.c b/src/ioc/db/callback.c
index bcefe292c..56a399ff6 100644
--- a/src/ioc/db/callback.c
+++ b/src/ioc/db/callback.c
@@ -22,29 +22,30 @@
 
 #include "cantProceed.h"
 #include "dbDefs.h"
+#include "epicsAtomic.h"
 #include "epicsEvent.h"
-#include "epicsThread.h"
 #include "epicsExit.h"
 #include "epicsInterrupt.h"
-#include "epicsString.h"
-#include "epicsTimer.h"
 #include "epicsRingPointer.h"
-#include "epicsAtomic.h"
+#include "epicsString.h"
+#include "epicsThread.h"
+#include "epicsTimer.h"
 #include "errlog.h"
-#include "dbStaticLib.h"
-#include "dbBase.h"
-#include "link.h"
-#include "dbFldTypes.h"
-#include "recSup.h"
-#include "taskwd.h"
 #include "errMdef.h"
-#include "dbCommon.h"
-#include "epicsExport.h"
+#include "taskwd.h"
+
 #define epicsExportSharedSymbols
-#include "dbAddr.h"
-#include "dbAccessDefs.h"
-#include "dbLock.h"
 #include "callback.h"
+#include "dbAccessDefs.h"
+#include "dbAddr.h"
+#include "dbBase.h"
+#include "dbCommon.h"
+#include "dbFldTypes.h"
+#include "dbLock.h"
+#include "dbStaticLib.h"
+#include "epicsExport.h"
+#include "link.h"
+#include "recSup.h"
 
 
 static int callbackQueueSize = 2000;
diff --git a/src/ioc/db/chfPlugin.c b/src/ioc/db/chfPlugin.c
index 00e565e71..60ba7f09b 100644
--- a/src/ioc/db/chfPlugin.c
+++ b/src/ioc/db/chfPlugin.c
@@ -19,17 +19,16 @@
 #include <limits.h>
 #include <math.h>
 
-#include <dbDefs.h>
-#include <dbStaticLib.h>
-#include <epicsTypes.h>
-#include <epicsStdio.h>
-#include <epicsStdlib.h>
-#include <epicsString.h>
-#include <errlog.h>
-#include <shareLib.h>
+#include "dbDefs.h"
+#include "epicsStdio.h"
+#include "epicsStdlib.h"
+#include "epicsString.h"
+#include "epicsTypes.h"
+#include "errlog.h"
 
 #define epicsExportSharedSymbols
 #include "chfPlugin.h"
+#include "dbStaticLib.h"
 
 /*
  * Data for a chfPlugin
diff --git a/src/ioc/db/cvtBpt.c b/src/ioc/db/cvtBpt.c
index fbcae4b47..21d6938b0 100644
--- a/src/ioc/db/cvtBpt.c
+++ b/src/ioc/db/cvtBpt.c
@@ -19,10 +19,10 @@
 #include "epicsPrint.h"
 
 #define epicsExportSharedSymbols
+#include "cvtTable.h"
+#include "dbAccess.h"
 #include "dbBase.h"
 #include "dbStaticLib.h"
-#include "dbAccess.h"
-#include "cvtTable.h"
 
 static brkTable *findBrkTable(short linr)
 { 
diff --git a/src/ioc/db/dbAccess.c b/src/ioc/db/dbAccess.c
index c8e1a8f9b..62a5247ad 100644
--- a/src/ioc/db/dbAccess.c
+++ b/src/ioc/db/dbAccess.c
@@ -23,43 +23,44 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "dbDefs.h"
-#include "epicsThread.h"
-#include "errlog.h"
+#include "alarm.h"
 #include "cantProceed.h"
 #include "cvtFast.h"
-#include "epicsMath.h"
-#include "epicsTime.h"
-#include "alarm.h"
+#include "dbDefs.h"
 #include "ellLib.h"
+#include "epicsMath.h"
+#include "epicsThread.h"
+#include "epicsTime.h"
+#include "errlog.h"
 #include "errMdef.h"
+
 #define epicsExportSharedSymbols
-#include "dbStaticLib.h"
-#include "dbBase.h"
-#include "link.h"
-#include "dbFldTypes.h"
-#include "recSup.h"
-#include "devSup.h"
 #include "caeventmask.h"
-#include "db_field_log.h"
-#include "dbCommon.h"
-#include "dbFldTypes.h"
-#include "special.h"
-#include "dbAddr.h"
 #include "callback.h"
-#include "dbScan.h"
+#include "dbAccessDefs.h"
+#include "dbAddr.h"
+#include "dbBase.h"
+#include "dbBkpt.h"
+#include "dbCa.h"
+#include "dbCommon.h"
+#include "dbConvertFast.h"
+#include "dbConvert.h"
+#include "dbEvent.h"
+#include "db_field_log.h"
+#include "dbFldTypes.h"
+#include "dbFldTypes.h"
 #include "dbLink.h"
 #include "dbLock.h"
-#include "dbEvent.h"
-#include "dbConvert.h"
-#include "dbConvertFast.h"
-#include "epicsEvent.h"
-#include "dbCa.h"
-#include "dbBkpt.h"
 #include "dbNotify.h"
-#include "dbAccessDefs.h"
-#include "recGbl.h"
+#include "dbScan.h"
 #include "dbServer.h"
+#include "dbStaticLib.h"
+#include "devSup.h"
+#include "epicsEvent.h"
+#include "link.h"
+#include "recGbl.h"
+#include "recSup.h"
+#include "special.h"
 
 epicsShareDef struct dbBase *pdbbase = 0;
 epicsShareDef volatile int interruptAccept=FALSE;
diff --git a/src/ioc/db/dbBkpt.c b/src/ioc/db/dbBkpt.c
index 86a198ace..bf890a8b6 100644
--- a/src/ioc/db/dbBkpt.c
+++ b/src/ioc/db/dbBkpt.c
@@ -44,33 +44,34 @@
 #include <stdarg.h>
 #include <string.h>
 
-#include "dbDefs.h"
-#include "epicsThread.h"
-#include "epicsMutex.h"
-#include "epicsEvent.h"
-#include "epicsTime.h"
-#include "ellLib.h"
-#include "errlog.h"
 #include "alarm.h"
-#include "dbBase.h"
-#include "dbFldTypes.h"
-#include "link.h"
-#include "dbCommon.h"
-#include "dbFldTypes.h"
-#include "db_field_log.h"
-#include "errMdef.h"
-#include "recSup.h"
-#include "special.h"
+#include "dbDefs.h"
+#include "ellLib.h"
+#include "epicsEvent.h"
 #include "epicsExit.h"
+#include "epicsMutex.h"
+#include "epicsThread.h"
+#include "epicsTime.h"
+#include "errlog.h"
+#include "errMdef.h"
+
 #define epicsExportSharedSymbols
-#include "dbAddr.h"
 #include "dbAccessDefs.h"
-#include "dbScan.h"
+#include "dbAddr.h"
+#include "dbBase.h"
+#include "dbBkpt.h"
+#include "dbCommon.h"
+#include "db_field_log.h"
+#include "dbFldTypes.h"
+#include "dbFldTypes.h"
 #include "dbLink.h"
 #include "dbLock.h"
-#include "recGbl.h"
+#include "dbScan.h"
 #include "dbTest.h"
-#include "dbBkpt.h"
+#include "link.h"
+#include "recGbl.h"
+#include "recSup.h"
+#include "special.h"
 
 /* private routines */
 static void dbBkptCont(dbCommon *precord);
diff --git a/src/ioc/db/dbCa.c b/src/ioc/db/dbCa.c
index c64f5713f..39e7cfeff 100644
--- a/src/ioc/db/dbCa.c
+++ b/src/ioc/db/dbCa.c
@@ -20,34 +20,35 @@
 #include <string.h>
 #include <errno.h>
 
+#include "alarm.h"
+#include "cantProceed.h"
 #include "dbDefs.h"
-#include "epicsMutex.h"
+#include "epicsAssert.h"
 #include "epicsEvent.h"
+#include "epicsExit.h"
+#include "epicsMutex.h"
+#include "epicsPrint.h"
+#include "epicsString.h"
 #include "epicsThread.h"
 #include "epicsTime.h"
-#include "epicsString.h"
 #include "errlog.h"
-#include "taskwd.h"
-#include "alarm.h"
-#include "link.h"
 #include "errMdef.h"
-#include "epicsPrint.h"
-#include "dbCommon.h"
+#include "taskwd.h"
+
 #include "cadef.h"
-#include "epicsAssert.h"
-#include "epicsExit.h"
-#include "cantProceed.h"
 
 /* We can't include dbStaticLib.h here */
 #define dbCalloc(nobj,size) callocMustSucceed(nobj,size,"dbCalloc")
 
 #define epicsExportSharedSymbols
 #include "db_access_routines.h"
-#include "db_convert.h"
-#include "dbScan.h"
-#include "dbLock.h"
 #include "dbCa.h"
 #include "dbCaPvt.h"
+#include "dbCommon.h"
+#include "db_convert.h"
+#include "dbLock.h"
+#include "dbScan.h"
+#include "link.h"
 #include "recSup.h"
 
 extern void dbServiceIOInit();
diff --git a/src/ioc/db/dbCaPvt.h b/src/ioc/db/dbCaPvt.h
index 9625bfbd6..cab596dba 100644
--- a/src/ioc/db/dbCaPvt.h
+++ b/src/ioc/db/dbCaPvt.h
@@ -3,9 +3,8 @@
 *     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
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /* dbCaPvt.h */
 /****************************************************************
@@ -16,8 +15,14 @@
 *
 ****************************************************************/
 
-#ifndef INCdbCaPvth
-#define INCdbCaPvth 1
+#ifndef INC_dbCaPvt_H
+#define INC_dbCaPvt_H
+
+#include "dbCa.h"
+#include "ellLib.h"
+#include "epicsMutex.h"
+#include "epicsTypes.h"
+#include "link.h"
 
 /* link_action mask */
 #define	CA_CLEAR_CHANNEL		0x1
@@ -85,4 +90,4 @@ typedef struct caLink
 	unsigned long	nNoWrite; /*only modified by dbCaPutLink*/
 }caLink;
 
-#endif /*INCdbCaPvth*/
+#endif /* INC_dbCaPvt_H */
diff --git a/src/ioc/db/dbCaTest.c b/src/ioc/db/dbCaTest.c
index 4d7c9cbce..3a2d6cfcb 100644
--- a/src/ioc/db/dbCaTest.c
+++ b/src/ioc/db/dbCaTest.c
@@ -20,11 +20,14 @@
 #include <string.h>
 #include <errno.h>
 
+#include "dbDefs.h"
+#include "epicsEvent.h"
+#include "epicsPrint.h"
+#include "epicsStdio.h"
+
 #define epicsExportSharedSymbols
 #include "dbStaticLib.h"
-#include "link.h"
 #undef epicsExportSharedSymbols
-#include "epicsStdio.h"
 /*definitions needed because of old vs new database access*/
 #undef DBR_SHORT
 #undef DBR_PUT_ACKT
@@ -32,23 +35,22 @@
 #undef VALID_DB_REQ
 #undef INVALID_DB_REQ
 /*end of conflicting definitions*/
+
 #include "cadef.h"
-#include "db_access.h"
-#include "dbDefs.h"
-#include "epicsPrint.h"
-#include "dbCommon.h"
-#include "epicsEvent.h"
 
 /*define DB_CONVERT_GBLSOURCE because db_access.c does not include db_access.h*/
 #define DB_CONVERT_GBLSOURCE
 
 #define epicsExportSharedSymbols
-#include "dbLock.h"
+#include "db_access.h"
 #include "db_access_routines.h"
-#include "db_convert.h"
 #include "dbCa.h"
 #include "dbCaPvt.h"
 #include "dbCaTest.h"
+#include "dbCommon.h"
+#include "db_convert.h"
+#include "dbLock.h"
+#include "link.h"
 
 
 long dbcar(char *precordname, int level)
diff --git a/src/ioc/db/dbChannel.c b/src/ioc/db/dbChannel.c
index 86f23627b..b6ed43efa 100644
--- a/src/ioc/db/dbChannel.c
+++ b/src/ioc/db/dbChannel.c
@@ -19,24 +19,24 @@
 
 #include "cantProceed.h"
 #include "epicsAssert.h"
-#include "epicsString.h"
 #include "epicsExit.h"
+#include "epicsString.h"
 #include "errlog.h"
 #include "freeList.h"
 #include "gpHash.h"
 #include "yajl_parse.h"
 
 #define epicsExportSharedSymbols
+#include "dbAccessDefs.h"
 #include "dbBase.h"
+#include "dbChannel.h"
+#include "dbCommon.h"
+#include "dbEvent.h"
+#include "dbLock.h"
 #include "dbStaticLib.h"
 #include "link.h"
 #include "recSup.h"
 #include "special.h"
-#include "dbChannel.h"
-#include "dbCommon.h"
-#include "dbEvent.h"
-#include "dbAccessDefs.h"
-#include "dbLock.h"
 
 /* The following is defined in db_convert.h */
 extern unsigned short dbDBRnewToDBRold[DBR_ENUM+1];
diff --git a/src/ioc/db/dbConvert.c b/src/ioc/db/dbConvert.c
index 59335b0c3..8d3a54c82 100644
--- a/src/ioc/db/dbConvert.c
+++ b/src/ioc/db/dbConvert.c
@@ -22,21 +22,22 @@
 #include <math.h>
 #include <float.h>
 
-#include "epicsConvert.h"
-#include "dbDefs.h"
-#include "errlog.h"
 #include "cvtFast.h"
+#include "dbDefs.h"
+#include "epicsConvert.h"
+#include "errlog.h"
+#include "errMdef.h"
+
+#define epicsExportSharedSymbols
+#include "dbAccessDefs.h"
+#include "dbAddr.h"
 #include "dbBase.h"
-#include "link.h"
+#include "dbConvert.h"
 #include "dbFldTypes.h"
 #include "dbStaticLib.h"
-#include "errMdef.h"
-#include "recSup.h"
-#define epicsExportSharedSymbols
-#include "dbAddr.h"
-#include "dbAccessDefs.h"
+#include "link.h"
 #include "recGbl.h"
-#include "dbConvert.h"
+#include "recSup.h"
 
 /* Helper for copy as bytes with no type conversion.
  * Assumes nRequest <= no_bytes
diff --git a/src/ioc/db/dbEvent.c b/src/ioc/db/dbEvent.c
index fba01eadb..ec29bc989 100644
--- a/src/ioc/db/dbEvent.c
+++ b/src/ioc/db/dbEvent.c
@@ -23,27 +23,29 @@
 #include <errno.h>
 #include <limits.h>
 
-#include "epicsAssert.h"
 #include "cantProceed.h"
 #include "dbDefs.h"
-#include "epicsMutex.h"
+#include "epicsAssert.h"
 #include "epicsEvent.h"
+#include "epicsMutex.h"
 #include "epicsThread.h"
 #include "errlog.h"
-#include "taskwd.h"
 #include "freeList.h"
-#include "dbBase.h"
-#include "dbFldTypes.h"
-#include "link.h"
-#include "dbCommon.h"
+#include "taskwd.h"
+
 #include "caeventmask.h"
-#include "db_field_log.h"
+
 #define epicsExportSharedSymbols
-#include "dbAddr.h"
-#include "dbChannel.h"
-#include "dbLock.h"
 #include "dbAccessDefs.h"
+#include "dbAddr.h"
+#include "dbBase.h"
+#include "dbChannel.h"
+#include "dbCommon.h"
 #include "dbEvent.h"
+#include "db_field_log.h"
+#include "dbFldTypes.h"
+#include "dbLock.h"
+#include "link.h"
 
 #define EVENTSPERQUE    32
 #define EVENTENTRIES    4      /* the number of que entries for each event */
diff --git a/src/ioc/db/dbExtractArray.c b/src/ioc/db/dbExtractArray.c
index 29d532530..e16ab4cd2 100644
--- a/src/ioc/db/dbExtractArray.c
+++ b/src/ioc/db/dbExtractArray.c
@@ -20,8 +20,9 @@
 #include <string.h>
 
 #include "epicsTypes.h"
-#include "dbAddr.h"
+
 #define epicsExportSharedSymbols
+#include "dbAddr.h"
 #include "dbExtractArray.h"
 
 void dbExtractArrayFromRec(const dbAddr *paddr, void *pto,
diff --git a/src/ioc/db/dbFastLinkConv.c b/src/ioc/db/dbFastLinkConv.c
index 748716cde..e358eaa2e 100644
--- a/src/ioc/db/dbFastLinkConv.c
+++ b/src/ioc/db/dbFastLinkConv.c
@@ -14,31 +14,31 @@
  *      Date:              12-9-93
  */
 #include <stddef.h>
-#include <epicsStdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
 #include <float.h>
 
-#include "epicsConvert.h"
-#include "dbDefs.h"
-#include "errlog.h"
-#include "cvtFast.h"
 #include "alarm.h"
+#include "cvtFast.h"
+#include "dbDefs.h"
+#include "epicsConvert.h"
+#include "epicsStdlib.h"
+#include "errlog.h"
+#include "errMdef.h"
+
+#define epicsExportSharedSymbols
+#include "dbAccessDefs.h"
+#include "dbAddr.h"
 #include "dbBase.h"
-#include "link.h"
+#include "dbCommon.h"
+#include "dbConvertFast.h"
 #include "dbFldTypes.h"
 #include "dbStaticLib.h"
-#include "dbCommon.h"
-#include "dbFldTypes.h"
-#include "errMdef.h"
+#include "link.h"
+#include "recGbl.h"
 #include "recSup.h"
 #include "special.h"
-#define epicsExportSharedSymbols
-#include "dbAddr.h"
-#include "dbAccessDefs.h"
-#include "recGbl.h"
-#include "dbConvertFast.h"
  
 
 /*
diff --git a/src/ioc/db/dbIocRegister.c b/src/ioc/db/dbIocRegister.c
index c543f98fa..9edec59dc 100644
--- a/src/ioc/db/dbIocRegister.c
+++ b/src/ioc/db/dbIocRegister.c
@@ -10,19 +10,19 @@
 #include "iocsh.h"
 
 #define epicsExportSharedSymbols
-#include "dbBkpt.h"
+#include "callback.h"
 #include "dbAccess.h"
+#include "dbBkpt.h"
 #include "dbCaTest.h"
 #include "dbEvent.h"
-#include "dbTest.h"
-#include "db_test.h"
+#include "dbIocRegister.h"
 #include "dbLock.h"
+#include "dbNotify.h"
 #include "dbScan.h"
 #include "dbServer.h"
-#include "dbNotify.h"
-#include "callback.h"
-#include "dbIocRegister.h"
 #include "dbState.h"
+#include "db_test.h"
+#include "dbTest.h"
 
 epicsShareExtern int callbackParallelThreadsDefault;
 
diff --git a/src/ioc/db/dbLink.c b/src/ioc/db/dbLink.c
index be0a3b70a..6d0ca3dee 100644
--- a/src/ioc/db/dbLink.c
+++ b/src/ioc/db/dbLink.c
@@ -19,41 +19,43 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "dbDefs.h"
-#include "epicsThread.h"
-#include "errlog.h"
+#include "alarm.h"
 #include "cantProceed.h"
 #include "cvtFast.h"
-#include "epicsTime.h"
-#include "alarm.h"
+#include "dbDefs.h"
 #include "ellLib.h"
-#include "dbStaticLib.h"
-#include "dbBase.h"
-#include "link.h"
-#include "dbFldTypes.h"
-#include "recSup.h"
-#include "devSup.h"
+#include "epicsThread.h"
+#include "epicsTime.h"
+#include "errlog.h"
+
 #include "caeventmask.h"
-#include "db_field_log.h"
-#include "dbCommon.h"
-#include "dbFldTypes.h"
-#include "special.h"
-#include "errMdef.h"
+
 #define epicsExportSharedSymbols
-#include "dbAddr.h"
-#include "dbLink.h"
 #include "callback.h"
-#include "dbScan.h"
-#include "dbLock.h"
-#include "dbEvent.h"
-#include "dbConvert.h"
-#include "dbConvertFast.h"
-#include "epicsEvent.h"
-#include "dbCa.h"
-#include "dbBkpt.h"
-#include "dbNotify.h"
 #include "dbAccessDefs.h"
+#include "dbAddr.h"
+#include "dbBase.h"
+#include "dbBkpt.h"
+#include "dbCa.h"
+#include "dbCommon.h"
+#include "dbConvertFast.h"
+#include "dbConvert.h"
+#include "dbEvent.h"
+#include "db_field_log.h"
+#include "dbFldTypes.h"
+#include "dbFldTypes.h"
+#include "dbLink.h"
+#include "dbLock.h"
+#include "dbNotify.h"
+#include "dbScan.h"
+#include "dbStaticLib.h"
+#include "devSup.h"
+#include "epicsEvent.h"
+#include "errMdef.h"
+#include "link.h"
 #include "recGbl.h"
+#include "recSup.h"
+#include "special.h"
 
 static void inherit_severity(const struct pv_link *ppv_link, dbCommon *pdest,
         epicsEnum16 stat, epicsEnum16 sevr)
diff --git a/src/ioc/db/dbLock.c b/src/ioc/db/dbLock.c
index f16eecacc..c12cefaf9 100644
--- a/src/ioc/db/dbLock.c
+++ b/src/ioc/db/dbLock.c
@@ -47,25 +47,26 @@ since this will delay all other threads.
 #include <stdio.h>
 #include <string.h>
 
-#include "epicsStdio.h"
+#include "cantProceed.h"
 #include "dbDefs.h"
-#include "epicsPrint.h"
-#include "errMdef.h"
-#include "epicsMutex.h"
-#include "epicsThread.h"
+#include "ellLib.h"
 #include "epicsAssert.h"
 #include "epicsExit.h"
-#include "cantProceed.h"
-#include "ellLib.h"
+#include "epicsMutex.h"
+#include "epicsPrint.h"
+#include "epicsStdio.h"
+#include "epicsThread.h"
+#include "errMdef.h"
+
 #define epicsExportSharedSymbols
-#include "dbBase.h"
-#include "dbStaticLib.h"
-#include "dbFldTypes.h"
-#include "link.h"
-#include "dbCommon.h"
-#include "dbAddr.h"
 #include "dbAccessDefs.h"
+#include "dbAddr.h"
+#include "dbBase.h"
+#include "dbCommon.h"
+#include "dbFldTypes.h"
 #include "dbLock.h"
+#include "dbStaticLib.h"
+#include "link.h"
 
 
 static int dbLockIsInitialized = FALSE;
diff --git a/src/ioc/db/dbNotify.c b/src/ioc/db/dbNotify.c
index 66253736c..f96edf45f 100644
--- a/src/ioc/db/dbNotify.c
+++ b/src/ioc/db/dbNotify.c
@@ -20,32 +20,32 @@
 #include <string.h>
 #include <limits.h>
 
+#include "cantProceed.h"
 #include "dbDefs.h"
 #include "ellLib.h"
 #include "epicsAssert.h"
 #include "epicsEvent.h"
+#include "epicsExit.h"
 #include "epicsMutex.h"
 #include "epicsString.h"
 #include "epicsThread.h"
+#include "epicsTime.h"
 #include "errlog.h"
 #include "errMdef.h"
-#include "dbBase.h"
-#include "dbStaticLib.h"
-#include "dbFldTypes.h"
-#include "link.h"
-#include "dbCommon.h"
+
 #define epicsExportSharedSymbols
 #include "callback.h"
-#include "dbChannel.h"
-#include "dbScan.h"
-#include "dbLock.h"
-#include "callback.h"
 #include "dbAccessDefs.h"
-#include "recGbl.h"
+#include "dbBase.h"
+#include "dbChannel.h"
+#include "dbCommon.h"
+#include "dbFldTypes.h"
+#include "dbLock.h"
 #include "dbNotify.h"
-#include "epicsTime.h"
-#include "epicsExit.h"
-#include "cantProceed.h"
+#include "dbScan.h"
+#include "dbStaticLib.h"
+#include "link.h"
+#include "recGbl.h"
 
 /*notify state values */
 typedef enum {
diff --git a/src/ioc/db/dbScan.c b/src/ioc/db/dbScan.c
index b7ac0e788..ba927a04b 100644
--- a/src/ioc/db/dbScan.c
+++ b/src/ioc/db/dbScan.c
@@ -21,34 +21,35 @@
 #include <math.h>
 #include <ctype.h>
 
-#include "epicsStdlib.h"
-#include "epicsStdio.h"
-#include "epicsString.h"
+#include "cantProceed.h"
 #include "dbDefs.h"
 #include "ellLib.h"
-#include "taskwd.h"
-#include "epicsMutex.h"
 #include "epicsEvent.h"
 #include "epicsExit.h"
 #include "epicsInterrupt.h"
+#include "epicsMutex.h"
+#include "epicsPrint.h"
+#include "epicsRingPointer.h"
+#include "epicsStdio.h"
+#include "epicsStdlib.h"
+#include "epicsString.h"
 #include "epicsThread.h"
 #include "epicsTime.h"
-#include "cantProceed.h"
-#include "epicsRingPointer.h"
-#include "epicsPrint.h"
+#include "taskwd.h"
+
 #define epicsExportSharedSymbols
-#include "dbBase.h"
-#include "dbStaticLib.h"
-#include "dbFldTypes.h"
-#include "link.h"
-#include "devSup.h"
-#include "dbCommon.h"
-#include "dbAddr.h"
 #include "callback.h"
 #include "dbAccessDefs.h"
+#include "dbAddr.h"
+#include "dbBase.h"
+#include "dbCommon.h"
+#include "dbFldTypes.h"
 #include "dbLock.h"
-#include "recGbl.h"
 #include "dbScan.h"
+#include "dbStaticLib.h"
+#include "devSup.h"
+#include "link.h"
+#include "recGbl.h"
 
 
 /* Task Control */
diff --git a/src/ioc/db/dbState.c b/src/ioc/db/dbState.c
index 30e59ea4e..6de7735cd 100644
--- a/src/ioc/db/dbState.c
+++ b/src/ioc/db/dbState.c
@@ -13,15 +13,15 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "iocsh.h"
-#include "epicsString.h"
-#include "epicsMutex.h"
 #include "ellLib.h"
+#include "epicsMutex.h"
+#include "epicsString.h"
+#include "iocsh.h"
 
 #define epicsExportSharedSymbols
-#include "dbStaticLib.h"
 #include "dbDefs.h"
 #include "dbState.h"
+#include "dbStaticLib.h"
 
 static ELLLIST states = ELLLIST_INIT;
 
diff --git a/src/ioc/db/dbTest.c b/src/ioc/db/dbTest.c
index 46b6b2c9d..334998e3d 100644
--- a/src/ioc/db/dbTest.c
+++ b/src/ioc/db/dbTest.c
@@ -14,34 +14,33 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "epicsStdlib.h"
-#include "epicsStdio.h"
-#include "epicsString.h"
 #include "dbDefs.h"
-#include "errlog.h"
 #include "ellLib.h"
 #include "epicsMutex.h"
-#include "ellLib.h"
+#include "epicsStdio.h"
+#include "epicsStdlib.h"
 #include "epicsString.h"
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
+#include "callback.h"
+#include "dbAccessDefs.h"
+#include "dbAddr.h"
 #include "dbBase.h"
-#include "dbStaticLib.h"
-#include "link.h"
+#include "dbCommon.h"
+#include "dbEvent.h"
+#include "db_field_log.h"
 #include "dbFldTypes.h"
-#include "recSup.h"
+#include "dbLock.h"
+#include "dbStaticLib.h"
+#include "dbTest.h"
 #include "devSup.h"
 #include "drvSup.h"
-#include "dbCommon.h"
-#include "special.h"
-#include "db_field_log.h"
-#include "dbAddr.h"
-#include "dbLock.h"
-#include "dbAccessDefs.h"
+#include "link.h"
 #include "recGbl.h"
-#include "dbEvent.h"
-#include "callback.h"
-#include "dbTest.h"
-
+#include "recSup.h"
+#include "special.h"
+
 #define MAXLINE 80
 struct msgBuff {    /* line output structure */
     char            out_buff[MAXLINE + 1];
diff --git a/src/ioc/db/dbUnitTest.c b/src/ioc/db/dbUnitTest.c
index 634993e20..48d92a7fd 100644
--- a/src/ioc/db/dbUnitTest.c
+++ b/src/ioc/db/dbUnitTest.c
@@ -12,18 +12,18 @@
 
 #include <string.h>
 
+#include "dbmf.h"
 #include "epicsUnitTest.h"
 #include "osiFileName.h"
-#include "dbmf.h"
 #include "registry.h"
-#define epicsExportSharedSymbols
-#include "iocInit.h"
-#include "initHooks.h"
-#include "dbBase.h"
-#include "dbAccess.h"
-#include "dbStaticLib.h"
 
+#define epicsExportSharedSymbols
+#include "dbAccess.h"
+#include "dbBase.h"
+#include "dbStaticLib.h"
 #include "dbUnitTest.h"
+#include "initHooks.h"
+#include "iocInit.h"
 
 void testdbPrepare(void)
 {
diff --git a/src/ioc/db/db_access.c b/src/ioc/db/db_access.c
index a73bc88d0..46e1a08a2 100644
--- a/src/ioc/db/db_access.c
+++ b/src/ioc/db/db_access.c
@@ -20,27 +20,28 @@
 #include <math.h>
 #include <float.h>
 
-#include "epicsConvert.h"
-#include "dbDefs.h"
-#include "errlog.h"
-#include "ellLib.h"
-#include "epicsTime.h"
-#include "errMdef.h"
 #include "alarm.h"
+#include "dbDefs.h"
+#include "ellLib.h"
+#include "epicsConvert.h"
+#include "epicsTime.h"
+#include "errlog.h"
+#include "errMdef.h"
+
+#define epicsExportSharedSymbols
 #define db_accessHFORdb_accessC
 #include "db_access.h"
 #undef db_accessHFORdb_accessC
 
-#define epicsExportSharedSymbols
-#include "dbStaticLib.h"
+#include "dbAccessDefs.h"
+#include "db_access_routines.h"
 #include "dbBase.h"
 #include "dbChannel.h"
 #include "dbCommon.h"
-#include "recSup.h"
-#include "dbNotify.h"
-#include "dbAccessDefs.h"
 #include "dbEvent.h"
-#include "db_access_routines.h"
+#include "dbNotify.h"
+#include "dbStaticLib.h"
+#include "recSup.h"
 
 
 #define oldDBF_STRING      0
diff --git a/src/ioc/db/db_test.c b/src/ioc/db/db_test.c
index fe9d3941e..30cb831db 100644
--- a/src/ioc/db/db_test.c
+++ b/src/ioc/db/db_test.c
@@ -16,19 +16,19 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "dbDefs.h"
-#include "errlog.h"
 #include "cadef.h"
+#include "dbDefs.h"
 #include "epicsStdio.h"
 #include "epicsStdlib.h"
 #include "epicsString.h"
+#include "errlog.h"
 
 #define epicsExportSharedSymbols
-#include "dbChannel.h"
 #include "db_access_routines.h"
+#include "dbChannel.h"
+#include "dbCommon.h"
 #include "dbNotify.h"
 #include "db_test.h"
-#include "dbCommon.h"
 
 #define		MAX_ELEMS	10
 
diff --git a/src/ioc/db/initHooks.c b/src/ioc/db/initHooks.c
index a6803f56b..cfd3a4ccf 100644
--- a/src/ioc/db/initHooks.c
+++ b/src/ioc/db/initHooks.c
@@ -19,8 +19,9 @@
 
 #include "dbDefs.h"
 #include "ellLib.h"
-#include "epicsThread.h"
 #include "epicsMutex.h"
+#include "epicsThread.h"
+
 #define epicsExportSharedSymbols
 #include "initHooks.h"
 
diff --git a/src/ioc/db/recGbl.c b/src/ioc/db/recGbl.c
index 5880fdbfd..d1b9fb358 100644
--- a/src/ioc/db/recGbl.c
+++ b/src/ioc/db/recGbl.c
@@ -13,31 +13,33 @@
  */
 
 #include <stddef.h>
-#include <epicsStdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
 
 #include "dbDefs.h"
 #include "epicsMath.h"
-#include "epicsTime.h"
 #include "epicsPrint.h"
-#include "dbBase.h"
-#include "dbFldTypes.h"
-#include "link.h"
-#include "dbAddr.h"
-#include "db_field_log.h"
+#include "epicsStdlib.h"
+#include "epicsTime.h"
 #include "errlog.h"
-#include "devSup.h"
-#include "dbCommon.h"
+
 #include "caeventmask.h"
+
 #define epicsExportSharedSymbols
 #include "dbAccessDefs.h"
+#include "dbAddr.h"
+#include "dbBase.h"
+#include "dbCa.h"
+#include "dbCommon.h"
+#include "dbEvent.h"
+#include "db_field_log.h"
+#include "dbFldTypes.h"
 #include "dbLink.h"
 #include "dbNotify.h"
-#include "dbCa.h"
-#include "dbEvent.h"
 #include "dbScan.h"
+#include "devSup.h"
+#include "link.h"
 #include "recGbl.h"
 
 
diff --git a/src/ioc/db/test/Makefile b/src/ioc/db/test/Makefile
index 320ea5260..9362b497e 100644
--- a/src/ioc/db/test/Makefile
+++ b/src/ioc/db/test/Makefile
@@ -71,6 +71,7 @@ scanIoTest_DBD += menuConvert.dbd
 scanIoTest_DBD += yRecord.dbd
 TESTPROD_HOST += scanIoTest
 scanIoTest_SRCS += scanIoTest.c
+scanIoTest_REGRDDFLAGS = -l
 scanIoTest_SRCS += scanIoTest_registerRecordDeviceDriver.cpp
 testHarness_SRCS += scanIoTest.c
 testHarness_SRCS += scanIoTest_registerRecordDeviceDriver.cpp
diff --git a/src/ioc/dbStatic/dbLexRoutines.c b/src/ioc/dbStatic/dbLexRoutines.c
index d1b3dc67e..6c3d94561 100644
--- a/src/ioc/dbStatic/dbLexRoutines.c
+++ b/src/ioc/dbStatic/dbLexRoutines.c
@@ -17,24 +17,25 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "dbmf.h"
-
 #include "dbDefs.h"
-#include "epicsPrint.h"
-#include "errMdef.h"
+#include "dbmf.h"
 #include "ellLib.h"
-#include "gpHash.h"
-#include "freeList.h"
-#include "guigroup.h"
-#include "special.h"
-#include "macLib.h"
+#include "epicsPrint.h"
 #include "epicsString.h"
-#include "epicsExport.h"
+#include "errMdef.h"
+#include "freeList.h"
+#include "gpHash.h"
+#include "macLib.h"
 
+#define epicsExportSharedSymbols
+#include "dbBase.h"
 #include "dbFldTypes.h"
-#include "link.h"
 #include "dbStaticLib.h"
 #include "dbStaticPvt.h"
+#include "epicsExport.h"
+#include "guigroup.h"
+#include "link.h"
+#include "special.h"
 
 
 
diff --git a/src/ioc/dbStatic/dbPvdLib.c b/src/ioc/dbStatic/dbPvdLib.c
index dbbd19417..15fc5f401 100644
--- a/src/ioc/dbStatic/dbPvdLib.c
+++ b/src/ioc/dbStatic/dbPvdLib.c
@@ -16,11 +16,12 @@
 
 #include "dbDefs.h"
 #include "ellLib.h"
-#include "dbBase.h"
+#include "epicsMutex.h"
 #include "epicsStdio.h"
 #include "epicsString.h"
-#include "epicsMutex.h"
+
 #define epicsExportSharedSymbols
+#include "dbBase.h"
 #include "dbStaticLib.h"
 #include "dbStaticPvt.h"
 
diff --git a/src/ioc/dbStatic/dbStaticIocRegister.c b/src/ioc/dbStatic/dbStaticIocRegister.c
index 079f2d6e5..18d346c70 100644
--- a/src/ioc/dbStatic/dbStaticIocRegister.c
+++ b/src/ioc/dbStatic/dbStaticIocRegister.c
@@ -10,9 +10,9 @@
 #include "iocsh.h"
 
 #define epicsExportSharedSymbols
+#include "dbStaticIocRegister.h"
 #include "dbStaticLib.h"
 #include "dbStaticPvt.h"
-#include "dbStaticIocRegister.h"
 
 /* common arguments */
 
diff --git a/src/ioc/dbStatic/dbStaticLib.c b/src/ioc/dbStatic/dbStaticLib.c
index 636fc59fa..8a830a27a 100644
--- a/src/ioc/dbStatic/dbStaticLib.c
+++ b/src/ioc/dbStatic/dbStaticLib.c
@@ -17,32 +17,33 @@
 #include <ctype.h>
 
 #include "cantProceed.h"
+#include "cvtFast.h"
+#include "dbDefs.h"
+#include "dbmf.h"
+#include "ellLib.h"
+#include "epicsPrint.h"
+#include "epicsStdio.h"
+#include "epicsStdlib.h"
+#include "epicsString.h"
+#include "errlog.h"
+#include "gpHash.h"
+#include "osiFileName.h"
+#include "postfix.h"
+
 #define DBFLDTYPES_GBLSOURCE
 #define GUIGROUPS_GBLSOURCE
 #define SPECIAL_GBLSOURCE
-#include "dbDefs.h"
-#include "epicsPrint.h"
-#include "errlog.h"
-#include "ellLib.h"
-#include "cvtFast.h"
-#include "gpHash.h"
-#include "dbmf.h"
-#include "postfix.h"
-#include "osiFileName.h"
-#include "epicsStdlib.h"
-#include "epicsString.h"
-#include "epicsStdio.h"
 
 #define epicsExportSharedSymbols
-#include "link.h"
 #include "dbChannel.h"
 #include "dbFldTypes.h"
-#include "devSup.h"
-#include "drvSup.h"
-#include "special.h"
-#include "guigroup.h"
 #include "dbStaticLib.h"
 #include "dbStaticPvt.h"
+#include "devSup.h"
+#include "drvSup.h"
+#include "guigroup.h"
+#include "link.h"
+#include "special.h"
 
 int dbStaticDebug = 0;
 static char *pNullString = "";
diff --git a/src/ioc/dbStatic/dbStaticRun.c b/src/ioc/dbStatic/dbStaticRun.c
index 93daa0814..b6caa1552 100644
--- a/src/ioc/dbStatic/dbStaticRun.c
+++ b/src/ioc/dbStatic/dbStaticRun.c
@@ -15,13 +15,13 @@
 #include <string.h>
 #include <math.h>
 
-#include "dbDefs.h"
-#include "errMdef.h"
-#include "epicsPrint.h"
-#include "ellLib.h"
 #include "cvtFast.h"
-#include "epicsTypes.h"
+#include "dbDefs.h"
+#include "ellLib.h"
+#include "epicsPrint.h"
 #include "epicsStdlib.h"
+#include "epicsTypes.h"
+#include "errMdef.h"
 
 #define epicsExportSharedSymbols
 #include "dbBase.h"
diff --git a/src/ioc/misc/epicsRelease.c b/src/ioc/misc/epicsRelease.c
index 8a062d454..d6e87cd35 100644
--- a/src/ioc/misc/epicsRelease.c
+++ b/src/ioc/misc/epicsRelease.c
@@ -14,8 +14,8 @@
 #include <stdio.h>
 
 #include "compilerDependencies.h"
-#include "epicsVersion.h"
 #include "epicsStdio.h"
+#include "epicsVersion.h"
 
 #define epicsExportSharedSymbols
 #include "epicsRelease.h"
diff --git a/src/ioc/misc/iocInit.c b/src/ioc/misc/iocInit.c
index 5e950af47..93c60952c 100644
--- a/src/ioc/misc/iocInit.c
+++ b/src/ioc/misc/iocInit.c
@@ -24,49 +24,49 @@
 #include <limits.h>
 
 #include "dbDefs.h"
-#include "epicsThread.h"
-#include "epicsPrint.h"
-#include "epicsExit.h"
-#include "epicsSignal.h"
 #include "ellLib.h"
 #include "envDefs.h"
+#include "epicsExit.h"
+#include "epicsPrint.h"
+#include "epicsSignal.h"
+#include "epicsThread.h"
 #include "errMdef.h"
-#include "taskwd.h"
-#include "caeventmask.h"
 #include "iocsh.h"
+#include "taskwd.h"
+
+#include "caeventmask.h"
 
 #define epicsExportSharedSymbols
 #include "alarm.h"
+#include "asDbLib.h"
+#include "callback.h"
+#include "dbAccess.h"
+#include "db_access_routines.h"
+#include "dbAddr.h"
 #include "dbBase.h"
+#include "dbBkpt.h"
+#include "dbCa.h"
+#include "dbChannel.h"
+#include "dbCommon.h"
 #include "dbFldTypes.h"
+#include "dbLock.h"
+#include "dbNotify.h"
+#include "dbScan.h"
+#include "dbStaticLib.h"
+#include "devSup.h"
+#include "drvSup.h"
+#include "epicsRelease.h"
+#include "initHooks.h"
+#include "iocInit.h"
 #include "link.h"
 #include "menuConvert.h"
 #include "menuPini.h"
-#include "registryRecordType.h"
+#include "recGbl.h"
+#include "recSup.h"
 #include "registryDeviceSupport.h"
 #include "registryDriverSupport.h"
-#include "devSup.h"
-#include "drvSup.h"
-#include "recSup.h"
-#include "dbStaticLib.h"
-
-#include "callback.h"
-#include "dbAddr.h"
-#include "dbBkpt.h"
-#include "dbCommon.h"
-#include "dbLock.h"
-#include "dbAccess.h"
-#include "recGbl.h"
-#include "dbNotify.h"
-#include "dbCa.h"
-#include "dbScan.h"
-#include "db_access_routines.h"
-#include "initHooks.h"
-#include "dbChannel.h"
-#include "epicsRelease.h"
+#include "registryRecordType.h"
 #include "rsrv.h"
-#include "asDbLib.h"
-#include "iocInit.h"
 
 static enum {
     iocVirgin, iocBuilding, iocBuilt, iocRunning, iocPaused, iocStopped
diff --git a/src/ioc/misc/iocshRegisterCommon.c b/src/ioc/misc/iocshRegisterCommon.c
index 2f8a17edf..0341dfbd6 100644
--- a/src/ioc/misc/iocshRegisterCommon.c
+++ b/src/ioc/misc/iocshRegisterCommon.c
@@ -11,15 +11,15 @@
 #include "libComRegister.h"
 
 #define epicsExportSharedSymbols
-#include "dbAccess.h"
-#include "dbStaticIocRegister.h"
-#include "registryIocRegister.h"
 #include "asIocRegister.h"
+#include "dbAccess.h"
 #include "dbIocRegister.h"
+#include "dbStaticIocRegister.h"
 #include "dbtoolsIocRegister.h"
-#include "rsrvIocRegister.h"
-#include "miscIocRegister.h"
 #include "iocshRegisterCommon.h"
+#include "miscIocRegister.h"
+#include "registryIocRegister.h"
+#include "rsrvIocRegister.h"
 
 void iocshRegisterCommon(void)
 {
diff --git a/src/ioc/misc/miscIocRegister.c b/src/ioc/misc/miscIocRegister.c
index dfddbab45..233852ed2 100644
--- a/src/ioc/misc/miscIocRegister.c
+++ b/src/ioc/misc/miscIocRegister.c
@@ -11,10 +11,10 @@
 
 #include "iocsh.h"
 #include "errlog.h"
-#include "epicsExport.h"
 
 #define epicsExportSharedSymbols
 #include "iocInit.h"
+#include "epicsExport.h"
 #include "epicsRelease.h"
 #include "miscIocRegister.h"
 
diff --git a/src/ioc/registry/registryCommon.c b/src/ioc/registry/registryCommon.c
index 9d3609f0c..e5d5768af 100644
--- a/src/ioc/registry/registryCommon.c
+++ b/src/ioc/registry/registryCommon.c
@@ -16,9 +16,9 @@
 #include "errlog.h"
 
 #define epicsExportSharedSymbols
+#include "registryCommon.h"
 #include "registryDeviceSupport.h"
 #include "registryDriverSupport.h"
-#include "registryCommon.h"
 
 
 void registerRecordTypes(DBBASE *pbase, int nRecordTypes,
diff --git a/src/ioc/registry/registryCommon.h b/src/ioc/registry/registryCommon.h
index 8148ecdad..c4b601665 100644
--- a/src/ioc/registry/registryCommon.h
+++ b/src/ioc/registry/registryCommon.h
@@ -11,6 +11,7 @@
 #define INC_registryCommon_H
 
 #include "dbStaticLib.h"
+#include "devSup.h"
 #include "registryRecordType.h"
 #include "shareLib.h"
 
diff --git a/src/ioc/registry/registryIocRegister.c b/src/ioc/registry/registryIocRegister.c
index 7046c69ec..e36a809df 100644
--- a/src/ioc/registry/registryIocRegister.c
+++ b/src/ioc/registry/registryIocRegister.c
@@ -10,11 +10,11 @@
 #include "iocsh.h"
 
 #define epicsExportSharedSymbols
-#include "registryRecordType.h"
 #include "registryDeviceSupport.h"
 #include "registryDriverSupport.h"
 #include "registryFunction.h"
 #include "registryIocRegister.h"
+#include "registryRecordType.h"
 
 static const iocshArg registryXxxFindArg0 = { "name",iocshArgString};
 static const iocshArg * const registryXxxFindArgs[1] = {&registryXxxFindArg0};
diff --git a/src/ioc/rsrv/camessage.c b/src/ioc/rsrv/camessage.c
index d4d6f3008..f9f0bbc6f 100644
--- a/src/ioc/rsrv/camessage.c
+++ b/src/ioc/rsrv/camessage.c
@@ -23,32 +23,32 @@
 #include <stdarg.h>
 #include <limits.h>
 
-#include "osiSock.h"
-#include "osiPoolStatus.h"
 #include "epicsEvent.h"
+#include "epicsMutex.h"
 #include "epicsStdio.h"
 #include "epicsThread.h"
-#include "epicsMutex.h"
 #include "epicsTime.h"
 #include "errlog.h"
 #include "freeList.h"
+#include "osiPoolStatus.h"
+#include "osiSock.h"
+
 #include "caerr.h"
 #include "net_convert.h"
 
 #define epicsExportSharedSymbols
-#include "db_access_routines.h"
+#include "asDbLib.h"
+#include "callback.h"
 #include "db_access.h"
-#include "special.h"
-#include "db_field_log.h"
-#include "dbEvent.h"
+#include "db_access_routines.h"
 #include "dbChannel.h"
 #include "dbCommon.h"
-#include "dbNotify.h"
+#include "dbEvent.h"
 #include "db_field_log.h"
-#include "callback.h"
-#include "asDbLib.h"
+#include "dbNotify.h"
 #include "rsrv.h"
 #include "server.h"
+#include "special.h"
 
 #define RECORD_NAME(CHAN) (dbChannelRecord(CHAN)->name)
 
diff --git a/src/ioc/rsrv/camsgtask.c b/src/ioc/rsrv/camsgtask.c
index 126bafd80..4eedfc428 100644
--- a/src/ioc/rsrv/camsgtask.c
+++ b/src/ioc/rsrv/camsgtask.c
@@ -21,15 +21,16 @@
 #include <errno.h>
 
 #include "dbDefs.h"
-#include "osiSock.h"
-#include "epicsTime.h"
 #include "epicsStdio.h"
+#include "epicsTime.h"
 #include "errlog.h"
+#include "osiSock.h"
 #include "taskwd.h"
-#include "db_access.h"
+
 #include "caerr.h"
 
 #define epicsExportSharedSymbols
+#include "db_access.h"
 #include "rsrv.h"
 #include "server.h"
 
diff --git a/src/ioc/rsrv/caserverio.c b/src/ioc/rsrv/caserverio.c
index 466e492f0..91cb5e2c6 100644
--- a/src/ioc/rsrv/caserverio.c
+++ b/src/ioc/rsrv/caserverio.c
@@ -22,12 +22,12 @@
 #include <limits.h>
 
 #include "dbDefs.h"
-#include "osiSock.h"
-#include "epicsTime.h"
 #include "epicsSignal.h"
+#include "epicsTime.h"
 #include "errlog.h"
-#include "caerr.h"
+#include "osiSock.h"
 
+#include "caerr.h"
 #include "net_convert.h"
 
 #define epicsExportSharedSymbols
diff --git a/src/ioc/rsrv/caservertask.c b/src/ioc/rsrv/caservertask.c
index 6566048d9..00095eaf1 100644
--- a/src/ioc/rsrv/caservertask.c
+++ b/src/ioc/rsrv/caservertask.c
@@ -21,33 +21,29 @@
 #include <limits.h>
 #include <errno.h>
 
-#include "osiSock.h"
-#include "osiPoolStatus.h"
-#include "epicsSignal.h"
+#include "addrList.h"
 #include "epicsEvent.h"
 #include "epicsMutex.h"
+#include "epicsSignal.h"
 #include "epicsStdio.h"
 #include "epicsTime.h"
 #include "errlog.h"
-#include "taskwd.h"
-#include "addrList.h"
 #include "freeList.h"
-#include "errlog.h"
+#include "osiPoolStatus.h"
+#include "osiSock.h"
+#include "taskwd.h"
 
 #define epicsExportSharedSymbols
-#include "db_field_log.h"
-#include "dbEvent.h"
 #include "dbChannel.h"
 #include "dbCommon.h"
+#include "dbEvent.h"
+#include "db_field_log.h"
 #include "dbServer.h"
 #include "rsrv.h"
+
 #define GLBLSOURCE
 #include "server.h"
 
-#define DELETE_TASK(NAME) \
-    if (threadNameToId(NAME)!=0) \
-        threadDestroy(threadNameToId(NAME));
-
 epicsThreadPrivateId rsrvCurrentClient;
 
 /*
diff --git a/src/ioc/rsrv/cast_server.c b/src/ioc/rsrv/cast_server.c
index 939cc5514..2932f2b62 100644
--- a/src/ioc/rsrv/cast_server.c
+++ b/src/ioc/rsrv/cast_server.c
@@ -36,18 +36,18 @@
 #include <string.h>
 #include <errno.h>
 
-#include "osiSock.h"
-#include "epicsMutex.h"
 #include "dbDefs.h"
-#include "errlog.h"
-#include "taskwd.h"
-#include "epicsTime.h"
 #include "envDefs.h"
+#include "epicsMutex.h"
+#include "epicsTime.h"
+#include "errlog.h"
 #include "freeList.h"
+#include "osiSock.h"
+#include "taskwd.h"
 
 #define epicsExportSharedSymbols
-#include "server.h"
 #include "rsrv.h"
+#include "server.h"
     
 #define TIMEOUT 60.0 /* sec */
 
diff --git a/src/ioc/rsrv/online_notify.c b/src/ioc/rsrv/online_notify.c
index 24af1d493..6ccc5e862 100644
--- a/src/ioc/rsrv/online_notify.c
+++ b/src/ioc/rsrv/online_notify.c
@@ -25,14 +25,11 @@
 #include <string.h>
 #include <errno.h>
 
-/*
- *  EPICS includes
- */
-#include "dbDefs.h"
-#include "osiSock.h"
-#include "errlog.h"
-#include "envDefs.h"
 #include "addrList.h"
+#include "dbDefs.h"
+#include "envDefs.h"
+#include "errlog.h"
+#include "osiSock.h"
 #include "taskwd.h"
 
 #define epicsExportSharedSymbols
diff --git a/src/ioc/rsrv/rsrvIocRegister.c b/src/ioc/rsrv/rsrvIocRegister.c
index 51af07810..7a01fc9f6 100644
--- a/src/ioc/rsrv/rsrvIocRegister.c
+++ b/src/ioc/rsrv/rsrvIocRegister.c
@@ -8,6 +8,7 @@
 \*************************************************************************/
 
 #include "iocsh.h"
+
 #define epicsExportSharedSymbols
 #include "rsrv.h"
 #include "rsrvIocRegister.h"