diff --git a/src/remote/channelSearchManager.cpp b/src/remote/channelSearchManager.cpp
index 82ea297..a11cd4e 100644
--- a/src/remote/channelSearchManager.cpp
+++ b/src/remote/channelSearchManager.cpp
@@ -8,6 +8,9 @@
 #include <time.h>
 #include <vector>
 
+#include <epicsMutex.h>
+
+#include <pv/serializationHelper.h>
 #include <pv/timeStamp.h>
 
 #define epicsExportSharedSymbols
diff --git a/src/remote/serializationHelper.cpp b/src/remote/serializationHelper.cpp
index dc99abd..e1bad43 100644
--- a/src/remote/serializationHelper.cpp
+++ b/src/remote/serializationHelper.cpp
@@ -4,6 +4,8 @@
  * in file LICENSE that is included with this distribution.
  */
 
+#include <epicsAssert.h>
+
 #include <pv/serialize.h>
 #include <pv/pvData.h>
 #include <pv/noDefaultMethods.h>