diff --git a/src/cas/generic/casPVI.cc b/src/cas/generic/casPVI.cc
index 343108328..c31b301b5 100644
--- a/src/cas/generic/casPVI.cc
+++ b/src/cas/generic/casPVI.cc
@@ -32,8 +32,7 @@
 #include "dbMapper.h" // EPICS application type table
 
 #include "server.h"
-#include "casPVIIL.h" // casPVI inline func
-#include "caServerIIL.h" // caServerI inline func
+#include "casPVIIL.h" // caServerI inline func
 
 //
 // casPVI::casPVI()
diff --git a/src/cas/generic/casPVIIL.h b/src/cas/generic/casPVIIL.h
index cc3a701ec..efedc9793 100644
--- a/src/cas/generic/casPVIIL.h
+++ b/src/cas/generic/casPVIIL.h
@@ -34,6 +34,7 @@
 #define casPVIIL_h
 
 #include "dbMapper.h"
+#include "caServerIIL.h"
 
 //
 // casPVI::getPCAS() 
diff --git a/src/cas/generic/casStrmClient.cc b/src/cas/generic/casStrmClient.cc
index ceee5c2d6..75838a002 100644
--- a/src/cas/generic/casStrmClient.cc
+++ b/src/cas/generic/casStrmClient.cc
@@ -38,7 +38,6 @@
 #include "server.h"
 #include "caServerIIL.h"	// caServerI inline functions
 #include "casChannelIIL.h"	// casChannelI inline functions
-#include "casPVIIL.h"		// casPVI inline functions
 #include "casCtxIL.h"		// casCtx inline functions
 #include "casEventSysIL.h"	// casEventSys inline functions
 #include "inBufIL.h"		// inBuf inline functions