5 files changed, 6 insertions, 2 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 92cf89a0d5b..6602e7a0a88 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -13,6 +13,7 @@
 #include "tao/Messaging/Messaging.h"
 
 #include "ace/ARGV.h"
+#include "ace/OS_NS_sys_time.h"
 
 static const int DEFAULT_START_LIMIT = 1;
 static const int IS_ALIVE_RETRY_COUNT = 60;
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
index 325a803e0ad..1d0c3ff998f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
@@ -18,8 +18,8 @@ project(ImR_Activator_IDL) : orbsvcslib, portableserver, messaging {
 
 project(ImR_Locator_IDL) : orbsvcslib, portableserver {
   sharedname   = TAO_ImR_Locator_IDL
-  after       += ImR_Activator_IDL
-  libs        += TAO_ImR_Activator_IDL
+  after       += ImR_Activator_IDL TAO_Valuetype
+  libs        += TAO_ImR_Activator_IDL TAO_Valuetype
   dynamicflags = LOCATOR_IDL_BUILD_DLL
   idlflags    += -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h
   idl_files {
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
index cd46ff14751..7c812bd0e15 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
@@ -18,6 +18,7 @@
 #include "locator_export.h"
 
 #include "ace/SString.h"
+#include "ace/Time_Value.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index 506d21ff9e5..1f371a1a2f8 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -1,6 +1,7 @@
 #include "Locator_Repository.h"
 #include "Locator_XMLHandler.h"
 #include "utils.h"
+#include "ace/OS_NS_stdio.h"
 
 #include "ACEXML/parser/parser/Parser.h"
 #include "ACEXML/common/FileCharStream.h"
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
index eb2e58313ec..2c2e76bb9ca 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
@@ -32,6 +32,7 @@
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_Dgram_Mcast.h"
 #include "ace/Reactor.h"
+#include "ace/SString.h"
 
 class TAO_Svc_Utils_Export TAO_IOR_Multicast : public ACE_Event_Handler
 {