diff --git a/src/db/dbAccess.c b/src/db/dbAccess.c
index c644f18b3..09264bec3 100644
--- a/src/db/dbAccess.c
+++ b/src/db/dbAccess.c
@@ -87,7 +87,7 @@
 #include	<dbAccess.h>
 #include	<dbStaticLib.h>
 #include	<dbScan.h>
-#include	<dbCommon.h>
+#include	<rec/dbCommon.h>
 #include	<dbFldTypes.h>
 #include 	<dbRecDes.h>
 #include 	<dbRecType.h>
diff --git a/src/db/dbCaDblink.c b/src/db/dbCaDblink.c
index e345a3a2d..d870f9e3b 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 <dbCommon.h>
+#include <rec/dbCommon.h>
 
 /* needed for (db_field_log *) NULL parm passed to dbGetField() */
 #include <db_field_log.h>
diff --git a/src/db/dbEvent.c b/src/db/dbEvent.c
index cc931c605..19e4ffd8e 100644
--- a/src/db/dbEvent.c
+++ b/src/db/dbEvent.c
@@ -68,7 +68,7 @@
 #include 	<tsDefs.h>
 #include	<dbDefs.h>
 #include	<db_access.h>
-#include	<dbCommon.h>
+#include	<rec/dbCommon.h>
 #include	<task_params.h>
 
 
diff --git a/src/db/dbScan.c b/src/db/dbScan.c
index ae5175cd6..49d89bf32 100644
--- a/src/db/dbScan.c
+++ b/src/db/dbScan.c
@@ -55,7 +55,7 @@
 #include	<taskwd.h>
 #include	<callback.h>
 #include	<dbBase.h>
-#include	<dbCommon.h>
+#include	<rec/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 c2700de89..c6f12825e 100644
--- a/src/db/dbTest.c
+++ b/src/db/dbTest.c
@@ -88,7 +88,7 @@
 #include	<dbBase.h>
 #include	<dbRecType.h>
 #include	<dbRecords.h>
-#include	<dbCommon.h>
+#include	<rec/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 a5ce26a58..ebae9b068 100644
--- a/src/db/db_access.c
+++ b/src/db/db_access.c
@@ -51,7 +51,7 @@
 #include        <string.h>
 #include        <dbDefs.h>
 #include        <dbAccess.h>
-#include        <dbCommon.h>
+#include        <rec/dbCommon.h>
 #include        <errMdef.h>
 #include        <recSup.h>
 
diff --git a/src/db/iocInit.c b/src/db/iocInit.c
index 31239b4d8..a651cb476 100644
--- a/src/db/iocInit.c
+++ b/src/db/iocInit.c
@@ -77,7 +77,7 @@
 #include	<dbScan.h>
 #include	<taskwd.h>
 #include	<callback.h>
-#include	<dbCommon.h>
+#include	<rec/dbCommon.h>
 #include	<dbBase.h>
 #include	<dbFldTypes.h>
 #include 	<dbRecDes.h>
diff --git a/src/db/recGbl.c b/src/db/recGbl.c
index 62f2dce22..0ae8bef88 100644
--- a/src/db/recGbl.c
+++ b/src/db/recGbl.c
@@ -53,7 +53,7 @@
 #include	<dbRecDes.h>
 #include	<dbAccess.h>
 #include	<devSup.h>
-#include	<dbCommon.h>
+#include	<rec/dbCommon.h>
 #include	<sdrHeader.h>
 
 extern struct dbBase *pdbBase;