diff --git a/src/ioc/db/callback.c b/src/ioc/db/callback.c
index 56a399ff6..f7b9b9e59 100644
--- a/src/ioc/db/callback.c
+++ b/src/ioc/db/callback.c
@@ -24,7 +24,6 @@
 #include "dbDefs.h"
 #include "epicsAtomic.h"
 #include "epicsEvent.h"
-#include "epicsExit.h"
 #include "epicsInterrupt.h"
 #include "epicsRingPointer.h"
 #include "epicsString.h"
diff --git a/src/ioc/db/dbAccess.c b/src/ioc/db/dbAccess.c
index 3da0d627d..ffbfd8b47 100644
--- a/src/ioc/db/dbAccess.c
+++ b/src/ioc/db/dbAccess.c
@@ -32,7 +32,6 @@
 #include "epicsThread.h"
 #include "epicsTime.h"
 #include "errlog.h"
-#include "epicsSpin.h"
 #include "errMdef.h"
 
 #define epicsExportSharedSymbols
diff --git a/src/ioc/db/dbChannel.c b/src/ioc/db/dbChannel.c
index 6c57040df..d60d729a0 100644
--- a/src/ioc/db/dbChannel.c
+++ b/src/ioc/db/dbChannel.c
@@ -19,7 +19,6 @@
 
 #include "cantProceed.h"
 #include "epicsAssert.h"
-#include "epicsExit.h"
 #include "epicsString.h"
 #include "errlog.h"
 #include "freeList.h"
diff --git a/src/ioc/db/dbLink.c b/src/ioc/db/dbLink.c
index 1d5ca9944..5ffd4fc17 100644
--- a/src/ioc/db/dbLink.c
+++ b/src/ioc/db/dbLink.c
@@ -23,7 +23,6 @@
 #include "cantProceed.h"
 #include "cvtFast.h"
 #include "dbDefs.h"
-#include "epicsSpin.h"
 #include "ellLib.h"
 #include "epicsThread.h"
 #include "epicsTime.h"
diff --git a/src/ioc/db/dbLock.c b/src/ioc/db/dbLock.c
index b30d1a28e..b518ebea4 100644
--- a/src/ioc/db/dbLock.c
+++ b/src/ioc/db/dbLock.c
@@ -17,12 +17,12 @@
 #include "dbDefs.h"
 #include "ellLib.h"
 #include "epicsAssert.h"
+#include "epicsAtomic.h"
 #include "epicsMutex.h"
 #include "epicsPrint.h"
+#include "epicsSpin.h"
 #include "epicsStdio.h"
 #include "epicsThread.h"
-#include "epicsSpin.h"
-#include "epicsAtomic.h"
 #include "errMdef.h"
 
 #define epicsExportSharedSymbols
diff --git a/src/ioc/db/dbNotify.c b/src/ioc/db/dbNotify.c
index ede8dd30c..043bf91d1 100644
--- a/src/ioc/db/dbNotify.c
+++ b/src/ioc/db/dbNotify.c
@@ -25,7 +25,6 @@
 #include "ellLib.h"
 #include "epicsAssert.h"
 #include "epicsEvent.h"
-#include "epicsExit.h"
 #include "epicsMutex.h"
 #include "epicsString.h"
 #include "epicsThread.h"
diff --git a/src/ioc/db/dbScan.c b/src/ioc/db/dbScan.c
index e0f2b3603..08a3cd3e2 100644
--- a/src/ioc/db/dbScan.c
+++ b/src/ioc/db/dbScan.c
@@ -25,7 +25,6 @@
 #include "dbDefs.h"
 #include "ellLib.h"
 #include "epicsEvent.h"
-#include "epicsExit.h"
 #include "epicsMutex.h"
 #include "epicsPrint.h"
 #include "epicsRingBytes.h"