diff --git a/src/db/dbAccess.c b/src/db/dbAccess.c
index c63f15085..a55fce685 100644
--- a/src/db/dbAccess.c
+++ b/src/db/dbAccess.c
@@ -86,7 +86,7 @@
 #include	<dbBkpt.h>
 #include	<dbStaticLib.h>
 #include	<dbScan.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<dbFldTypes.h>
 #include 	<dbRecDes.h>
 #include 	<dbRecType.h>
diff --git a/src/db/dbBkpt.c b/src/db/dbBkpt.c
index d613c9672..c203a8e96 100644
--- a/src/db/dbBkpt.c
+++ b/src/db/dbBkpt.c
@@ -72,7 +72,7 @@
 #include	<dbAccess.h>
 #include	<dbManipulate.h>
 #include	<dbScan.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<dbFldTypes.h>
 #include 	<dbRecDes.h>
 #include 	<dbRecType.h>
diff --git a/src/db/dbCaDblink.c b/src/db/dbCaDblink.c
index daa4bf093..0577f08f8 100644
--- a/src/db/dbCaDblink.c
+++ b/src/db/dbCaDblink.c
@@ -58,7 +58,7 @@
 
 /* needed for struct dbCommon ... should be removed when */
 /* MAXSEVERITY_FROM_PDBADDR moved to another header file */
-#include <rec/dbCommon.h>
+#include <dbCommon.h>
 
 /* needed for (db_field_log *) NULL parm passed to dbGet() */
 #include <db_field_log.h>
diff --git a/src/db/dbEvent.c b/src/db/dbEvent.c
index 6f733f32a..e02cf7e06 100644
--- a/src/db/dbEvent.c
+++ b/src/db/dbEvent.c
@@ -80,7 +80,7 @@
 #include	<taskwd.h>
 #include 	<tsDefs.h>
 #include	<dbDefs.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<task_params.h>
 #include	<db_access.h>
 #include 	<dbEvent.h>
diff --git a/src/db/dbFastLinkConv.c b/src/db/dbFastLinkConv.c
index 69b546a34..8c18bcc32 100644
--- a/src/db/dbFastLinkConv.c
+++ b/src/db/dbFastLinkConv.c
@@ -47,7 +47,7 @@
 #include        <dbAccess.h>
 #include        <dbStaticLib.h>
 #include        <dbScan.h>
-#include        <rec/dbCommon.h>
+#include        <dbCommon.h>
 #include        <dbFldTypes.h>
 #include        <dbRecDes.h>
 #include        <dbRecType.h>
diff --git a/src/db/dbLink.c b/src/db/dbLink.c
index be266ff97..b43dea59d 100644
--- a/src/db/dbLink.c
+++ b/src/db/dbLink.c
@@ -79,7 +79,7 @@
 #include	<dbAccess.h>
 #include	<dbStaticLib.h>
 #include	<dbScan.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<dbFldTypes.h>
 #include 	<dbRecDes.h>
 #include 	<dbRecType.h>
diff --git a/src/db/dbScan.c b/src/db/dbScan.c
index 6a45e294b..5f86abe71 100644
--- a/src/db/dbScan.c
+++ b/src/db/dbScan.c
@@ -59,7 +59,7 @@
 #include	<taskwd.h>
 #include	<callback.h>
 #include	<dbBase.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<dbRecords.h>
 #include	<devSup.h>
 #include	<task_params.h>
diff --git a/src/db/dbTest.c b/src/db/dbTest.c
index 6715543a8..725e2486f 100644
--- a/src/db/dbTest.c
+++ b/src/db/dbTest.c
@@ -107,7 +107,7 @@
 #include	<dbBase.h>
 #include	<dbRecType.h>
 #include	<dbRecords.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<recSup.h>
 #include	<devSup.h>
 #include	<drvSup.h>
diff --git a/src/db/db_access.c b/src/db/db_access.c
index a40c3269b..435e8cfef 100644
--- a/src/db/db_access.c
+++ b/src/db/db_access.c
@@ -52,7 +52,7 @@
 #include        <string.h>
 #include        <dbDefs.h>
 #include        <dbAccess.h>
-#include        <rec/dbCommon.h>
+#include        <dbCommon.h>
 #include        <errMdef.h>
 #include        <recSup.h>
 
diff --git a/src/db/iocInit.c b/src/db/iocInit.c
index c7810756a..12f453132 100644
--- a/src/db/iocInit.c
+++ b/src/db/iocInit.c
@@ -81,7 +81,7 @@
 #include	<dbScan.h>
 #include	<taskwd.h>
 #include	<callback.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<dbBase.h>
 #include	<dbFldTypes.h>
 #include 	<dbRecDes.h>
diff --git a/src/db/recGbl.c b/src/db/recGbl.c
index c5a3ba389..7339c299e 100644
--- a/src/db/recGbl.c
+++ b/src/db/recGbl.c
@@ -55,7 +55,7 @@
 #include	<dbAccess.h>
 #include	<dbScan.h>
 #include	<devSup.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<sdrHeader.h>
 #include	<drvTS.h>
 
diff --git a/src/dbtools/dbLoadRecords.y b/src/dbtools/dbLoadRecords.y
index 92175f781..b815c0be5 100644
--- a/src/dbtools/dbLoadRecords.y
+++ b/src/dbtools/dbLoadRecords.y
@@ -43,7 +43,7 @@
 
 #include "dbVarSub.h"
 #include <dbStaticLib.h>
-#include <epicsVersion.h>
+#include <version.h>
 
 static char subst_buffer[VAR_MAX_SUB_SIZE];
 static int subst_used;
diff --git a/src/dbtools/dbLoadTemplate.y b/src/dbtools/dbLoadTemplate.y
index d57eff7eb..999444016 100644
--- a/src/dbtools/dbLoadTemplate.y
+++ b/src/dbtools/dbLoadTemplate.y
@@ -42,7 +42,7 @@
 #endif
 
 #include "dbVarSub.h"
-#include <epicsVersion.h>
+#include <version.h>
 
 static int line_num;
 static int yyerror();
diff --git a/src/dev/devAiTestAsyn.c b/src/dev/devAiTestAsyn.c
index b3db29ac5..6e29808ae 100644
--- a/src/dev/devAiTestAsyn.c
+++ b/src/dev/devAiTestAsyn.c
@@ -53,7 +53,7 @@
 #include	<recSup.h>
 #include	<devSup.h>
 #include	<link.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<aiRecord.h>
 
 /* Create the dset for devAiTestAsyn */
diff --git a/src/dev/devAoTestAsyn.c b/src/dev/devAoTestAsyn.c
index edbebed44..4f527c28e 100644
--- a/src/dev/devAoTestAsyn.c
+++ b/src/dev/devAoTestAsyn.c
@@ -55,7 +55,7 @@
 #include	<recSup.h>
 #include	<devSup.h>
 #include	<link.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<aoRecord.h>
 
 /* Create the dset for devAoTestAsyn */
diff --git a/src/dev/devBiTestAsyn.c b/src/dev/devBiTestAsyn.c
index 904c05248..2a4951b78 100644
--- a/src/dev/devBiTestAsyn.c
+++ b/src/dev/devBiTestAsyn.c
@@ -54,7 +54,7 @@
 #include	<recSup.h>
 #include	<devSup.h>
 #include	<link.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<biRecord.h>
 
 /* Create the dset for devBiTestAsyn */
diff --git a/src/dev/devBoTestAsyn.c b/src/dev/devBoTestAsyn.c
index 526f61922..8dbdec761 100644
--- a/src/dev/devBoTestAsyn.c
+++ b/src/dev/devBoTestAsyn.c
@@ -56,7 +56,7 @@
 #include	<recSup.h>
 #include	<devSup.h>
 #include	<link.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<boRecord.h>
 
 /* Create the dset for devBoTestAsyn */
diff --git a/src/dev/devCommonGpib.c b/src/dev/devCommonGpib.c
index 3f20be84e..aea938adb 100644
--- a/src/dev/devCommonGpib.c
+++ b/src/dev/devCommonGpib.c
@@ -82,7 +82,7 @@
 #include	<drvSup.h>
 #include	<link.h>
 #include	<module_types.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<aiRecord.h>
 #include	<aoRecord.h>
 #include	<biRecord.h>
diff --git a/src/dev/devHistogramTestAsyn.c b/src/dev/devHistogramTestAsyn.c
index 67d542742..bbaa236bf 100644
--- a/src/dev/devHistogramTestAsyn.c
+++ b/src/dev/devHistogramTestAsyn.c
@@ -53,7 +53,7 @@
 #include	<recSup.h>
 #include	<devSup.h>
 #include	<link.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<histogramRecord.h>
 
 /* Create the dset for devHistogramTestAsyn */
diff --git a/src/dev/devMbbiDirectTestAsyn.c b/src/dev/devMbbiDirectTestAsyn.c
index c2bb88559..f094fa76e 100644
--- a/src/dev/devMbbiDirectTestAsyn.c
+++ b/src/dev/devMbbiDirectTestAsyn.c
@@ -49,7 +49,7 @@
 #include	<recSup.h>
 #include	<devSup.h>
 #include	<link.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<mbbiDirectRecord.h>
 
 /* Create the dset for devMbbiDirectTestAsyn */
diff --git a/src/dev/devMbbiTestAsyn.c b/src/dev/devMbbiTestAsyn.c
index d807be4f9..a44feba50 100644
--- a/src/dev/devMbbiTestAsyn.c
+++ b/src/dev/devMbbiTestAsyn.c
@@ -54,7 +54,7 @@
 #include	<recSup.h>
 #include	<devSup.h>
 #include	<link.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<mbbiRecord.h>
 
 /* Create the dset for devMbbiTestAsyn */
diff --git a/src/dev/devMbboDirectTestAsyn.c b/src/dev/devMbboDirectTestAsyn.c
index f355daa4b..d1df032f9 100644
--- a/src/dev/devMbboDirectTestAsyn.c
+++ b/src/dev/devMbboDirectTestAsyn.c
@@ -50,7 +50,7 @@
 #include	<recSup.h>
 #include	<devSup.h>
 #include	<link.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<mbboDirectRecord.h>
 
 /* Create the dset for devMbboDirectTestAsyn */
diff --git a/src/dev/devMbboTestAsyn.c b/src/dev/devMbboTestAsyn.c
index acf99dd93..5dd5c68a9 100644
--- a/src/dev/devMbboTestAsyn.c
+++ b/src/dev/devMbboTestAsyn.c
@@ -55,7 +55,7 @@
 #include	<recSup.h>
 #include	<devSup.h>
 #include	<link.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<mbboRecord.h>
 
 /* Create the dset for devMbboTestAsyn */
diff --git a/src/dev/devMz8310.c b/src/dev/devMz8310.c
index 057e101f8..c0c4e7299 100644
--- a/src/dev/devMz8310.c
+++ b/src/dev/devMz8310.c
@@ -57,7 +57,7 @@
 #include	<dbRecType.h>
 #include	<dbDefs.h>
 #include	<dbAccess.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<fast_lock.h>
 #include        <recSup.h>
 #include	<devSup.h>
diff --git a/src/dev/devSiTestAsyn.c b/src/dev/devSiTestAsyn.c
index 7043642c2..3ab207df9 100644
--- a/src/dev/devSiTestAsyn.c
+++ b/src/dev/devSiTestAsyn.c
@@ -53,7 +53,7 @@
 #include	<recSup.h>
 #include	<devSup.h>
 #include	<link.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<stringinRecord.h>
 
 /* Create the dset for devSiTestAsyn */
diff --git a/src/dev/devSoTestAsyn.c b/src/dev/devSoTestAsyn.c
index 3a740fdfa..720c8a8ca 100644
--- a/src/dev/devSoTestAsyn.c
+++ b/src/dev/devSoTestAsyn.c
@@ -54,7 +54,7 @@
 #include	<recSup.h>
 #include	<devSup.h>
 #include	<link.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<stringoutRecord.h>
 
 /* Create the dset for devSoTestAsyn */
diff --git a/src/dev/devVxiTDM.c b/src/dev/devVxiTDM.c
index edd1241a5..85957c338 100644
--- a/src/dev/devVxiTDM.c
+++ b/src/dev/devVxiTDM.c
@@ -82,9 +82,9 @@
 #include	<dbRecType.h>
 #include	<dbDefs.h>
 #include	<dbAccess.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<fast_lock.h>
-#include    <recSup.h>
+#include	<recSup.h>
 #include	<devSup.h>
 #include	<dbScan.h>
 #include	<special.h>
diff --git a/src/dev/devWfTestAsyn.c b/src/dev/devWfTestAsyn.c
index d798e9e5b..46a3bc1bb 100644
--- a/src/dev/devWfTestAsyn.c
+++ b/src/dev/devWfTestAsyn.c
@@ -54,7 +54,7 @@
 #include        <recSup.h>
 #include	<devSup.h>
 #include	<link.h>
-#include	<rec/dbCommon.h>
+#include	<dbCommon.h>
 #include	<waveformRecord.h>
 
 /* Create the dset for devWfTestAsyn */