1 files changed, 21 insertions, 28 deletions
diff --git a/TM_Proxy/Utility.h b/TM_Proxy/Utility.h
index 6793b892d00..a63e4a1dedc 100644
--- a/TM_Proxy/Utility.h
+++ b/TM_Proxy/Utility.h
@@ -13,37 +13,30 @@
 #include "TM_Proxy_exec_export.h"
 #include "tao/LocalObject.h"
 
-#include "TM_DaemonC.h"
-#include "Logger.h"
+#include "TM_Daemon/TM_DaemonC.h"
+#include "utils/Logger.h"
 
-namespace CIAO
+using namespace CIAO::RACE;
+
+namespace CIAO_CIAO_RACE_TM_Proxy_TM_Proxy_Component_Impl
 {
-  namespace RACE
+  class TM_PROXY_EXEC_Export Utility_exec_i
+    : public virtual ::CIAO::RACE::TM_Proxy::CCM_Utility,
+      public virtual TAO_Local_RefCounted_Object
   {
-    namespace TM_Proxy
-    {
-      namespace CIDL_TM_Proxy_Component_Impl
-      {
-        class TM_PROXY_EXEC_Export Utility_exec_i
-          : public virtual ::CIAO::RACE::TM_Proxy::CCM_Utility,
-            public virtual TAO_Local_RefCounted_Object
-        {
-          public:
-          Utility_exec_i (::CIAO::TM_Daemon::Daemon_ptr TM, Logger &logger);
-
-          virtual ~Utility_exec_i (void);
-
-          virtual ::Deployment::Domain* getInitialDomain ();
-
-        private:
-          ::CIAO::TM_Daemon::Daemon_var TM_Daemon_;
-
-          Logger &logger_;
-
-        };
-      }
-    }
-  }
+  public:
+    Utility_exec_i (::CIAO::TM_Daemon::Daemon_ptr TM, Logger &logger);
+
+    virtual ~Utility_exec_i (void);
+
+    virtual ::Deployment::Domain* getInitialDomain ();
+
+  private:
+    ::CIAO::TM_Daemon::Daemon_var TM_Daemon_;
+
+    Logger &logger_;
+
+  };
 }
 
 #include /**/ "ace/post.h"