2 files changed, 2 insertions, 6 deletions
diff --git a/TAO/tests/Bug_3647_Regression/backend_server.cpp b/TAO/tests/Bug_3647_Regression/backend_server.cpp
index 91596290ca3..fa06b75a0a3 100644
--- a/TAO/tests/Bug_3647_Regression/backend_server.cpp
+++ b/TAO/tests/Bug_3647_Regression/backend_server.cpp
@@ -2,10 +2,7 @@
 // $Id$
 
 #include "Backend_Impl.h"
-
 #include "tao/Strategies/advanced_resource.h"
-
-#include "tao/Utils/Servant_Var.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
@@ -69,7 +66,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         return 1;
 
       using namespace Bug_3647_Regression;
-      TAO::Utils::Servant_Var<Backend_Impl> impl(
+      PortableServer::ServantBase_var impl(
           new Backend_Impl(orb.in(), verbose));
 
       PortableServer::ObjectId_var id =
diff --git a/TAO/tests/Bug_3647_Regression/middle_server.cpp b/TAO/tests/Bug_3647_Regression/middle_server.cpp
index 4b901c066a3..23f29e825db 100644
--- a/TAO/tests/Bug_3647_Regression/middle_server.cpp
+++ b/TAO/tests/Bug_3647_Regression/middle_server.cpp
@@ -4,7 +4,6 @@
 #include "Middle_Impl.h"
 
 #include "tao/Utils/PolicyList_Destroyer.h"
-#include "tao/Utils/Servant_Var.h"
 #include "tao/Utils/RIR_Narrow.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/Messaging/Messaging.h"
@@ -169,7 +168,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       using namespace Bug_3647_Regression;
-      TAO::Utils::Servant_Var<Middle_Impl> impl(
+      PortableServer::ServantBase_var impl(
           new Middle_Impl(backend.in(), orb.in(), verbose,
                           timeout));