1 files changed, 5 insertions, 14 deletions
diff --git a/TAO/tao/Utils/Server_Main.h b/TAO/tao/Utils/Server_Main.h
index c5d3ea2d825..99016b8052c 100644
--- a/TAO/tao/Utils/Server_Main.h
+++ b/TAO/tao/Utils/Server_Main.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    Server_Main.h
@@ -50,18 +49,12 @@
 #ifndef TAO_UTILS_SERVANTMAIN_H
 #define TAO_UTILS_SERVANTMAIN_H
 
-#include /**/ "ace/pre.h"
-
-#include "ace/ACE.h"
-
+#include <ace/ACE.h>
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/orbconf.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
+#include /**/ <ace/pre.h>
 namespace TAO
 {
   namespace Utils
@@ -85,16 +78,14 @@ namespace TAO
   } // namespace UTILS
 } // namespace TAO
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-# include "tao/Utils/Server_Main.cpp"
+# include "Server_Main.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 # pragma implementation "Server_Main.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
-#include /**/ "ace/post.h"
+#include /**/ <ace/post.h>
 
 #endif //TAO_UTILS_SERVANTMAIN_H