diff --git a/src/special/addRecordRegister.cpp b/src/special/addRecordRegister.cpp
index 4a14fa3..8ec2158 100644
--- a/src/special/addRecordRegister.cpp
+++ b/src/special/addRecordRegister.cpp
@@ -10,16 +10,15 @@
 
 
 /* Author: Marty Kraimer */
-#include <epicsThread.h>
 #include <iocsh.h>
-#include <pv/event.h>
-#include <pv/pvAccess.h>
-#include <pv/serverContext.h>
-#include <pv/pvData.h>
+#include <pv/standardField.h>
+#include <pv/standardPVField.h>
+#include <pv/timeStamp.h>
 #include <pv/pvTimeStamp.h>
-#include <pv/rpcService.h>
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
+#include <pv/alarm.h>
+#include <pv/pvAlarm.h>
+#include <pv/pvDatabase.h>
+#include <pv/pvaClient.h>
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>
diff --git a/src/special/processRecordRegister.cpp b/src/special/processRecordRegister.cpp
index 137c9b7..ee77594 100644
--- a/src/special/processRecordRegister.cpp
+++ b/src/special/processRecordRegister.cpp
@@ -10,17 +10,15 @@
 
 
 /* Author: Marty Kraimer */
-
-#include <epicsThread.h>
 #include <iocsh.h>
-#include <pv/event.h>
-#include <pv/pvAccess.h>
-#include <pv/serverContext.h>
-#include <pv/pvData.h>
+#include <pv/standardField.h>
+#include <pv/standardPVField.h>
+#include <pv/timeStamp.h>
 #include <pv/pvTimeStamp.h>
-#include <pv/rpcService.h>
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
+#include <pv/alarm.h>
+#include <pv/pvAlarm.h>
+#include <pv/pvDatabase.h>
+#include <pv/pvaClient.h>
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>
diff --git a/src/special/pvdbcrProcessRecordRegister.cpp b/src/special/pvdbcrProcessRecordRegister.cpp
index f029fd8..df7e4cc 100644
--- a/src/special/pvdbcrProcessRecordRegister.cpp
+++ b/src/special/pvdbcrProcessRecordRegister.cpp
@@ -7,8 +7,7 @@
  * @author mrk
  * @date 2021.03.12
  */
-#include <epicsThread.h>
-#include <pv/event.h>
+ #include <epicsThread.h>
 #include <iocsh.h>
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
diff --git a/src/special/removeRecordRegister.cpp b/src/special/removeRecordRegister.cpp
index efba5fb..f57a901 100644
--- a/src/special/removeRecordRegister.cpp
+++ b/src/special/removeRecordRegister.cpp
@@ -12,14 +12,14 @@
 /* Author: Marty Kraimer */
 #include <epicsThread.h>
 #include <iocsh.h>
-#include <pv/event.h>
-#include <pv/pvAccess.h>
-#include <pv/serverContext.h>
-#include <pv/pvData.h>
+#include <pv/standardField.h>
+#include <pv/standardPVField.h>
+#include <pv/timeStamp.h>
 #include <pv/pvTimeStamp.h>
-#include <pv/rpcService.h>
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
+#include <pv/alarm.h>
+#include <pv/pvAlarm.h>
+#include <pv/pvDatabase.h>
+#include <pv/pvaClient.h>
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>
diff --git a/src/special/traceRecordRegister.cpp b/src/special/traceRecordRegister.cpp
index 3f56f01..c0c87f9 100644
--- a/src/special/traceRecordRegister.cpp
+++ b/src/special/traceRecordRegister.cpp
@@ -10,17 +10,15 @@
 
 
 /* Author: Marty Kraimer */
-
-#include <epicsThread.h>
 #include <iocsh.h>
-#include <pv/event.h>
-#include <pv/pvAccess.h>
-#include <pv/serverContext.h>
-#include <pv/pvData.h>
+#include <pv/standardField.h>
+#include <pv/standardPVField.h>
+#include <pv/timeStamp.h>
 #include <pv/pvTimeStamp.h>
-#include <pv/rpcService.h>
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
+#include <pv/alarm.h>
+#include <pv/pvAlarm.h>
+#include <pv/pvDatabase.h>
+#include <pv/pvaClient.h>
 
 // The following must be the last include for code pvDatabase uses
 #include <epicsExport.h>