Finished Svcconf

15 files changed, 50 insertions, 654 deletions

diff --git a/ace/Svc_Conf.l b/ace/Svc_Conf.l
deleted file mode 100644
index bb1f3e2dc0c..00000000000
--- a/ace/Svc_Conf.l
+++ /dev/null
@@ -1,140 +0,0 @@
-%{
-// $Id$
-// Sample lexical analysis for regular expression subset.  Must be
-// compiled with FLEX and an ANSI C++ compiler.
-
-// Lexical tokens values defined by YACC.
-#include "ace/Svc_Conf.h"
-#include "ace/Svc_Conf_Tokens.h"
-#include "ace/Svc_Conf_Lexer_Guard.h"
-
-ACE_RCSID (ace,
-	   Svc_Conf_l,
-	   "$Id$")
-
-// Keeps track of the current line for debugging output.
-int yylineno = 1;
-
-#define token(x)  x
-%}
-
-%s PARAMETERS
-%s NORMAL
-
-letter	        [a-zA-Z_]
-letter_or_digit	[a-zA-Z_0-9]
-digit           [0-9]
-ident           {letter}{letter_or_digit}*
-pathname        ([A-Za-z\%]:)?[a-zA-Z_0-9/\%\.\\~-]+
-symbol		[ -~]
-string		(\"{symbol}*\"|\'{symbol}*\')
-white_space	[ \t]
-newline         \n
-other		.
-
-%%
-
-^#{other}*$   	      ; /* EMPTY */
-dynamic	              { return token (ACE_DYNAMIC); }
-static	              { return token (ACE_STATIC); }
-suspend	              { return token (ACE_SUSPEND); }
-resume	              { return token (ACE_RESUME); }
-remove	              { return token (ACE_REMOVE); }
-stream	              { return token (ACE_USTREAM); }
-Module		      { return token (ACE_MODULE_T); }
-Service_Object	      { return token (ACE_SVC_OBJ_T); }
-STREAM		      { return token (ACE_STREAM_T); }
-active	              { return token (ACE_ACTIVE); }
-inactive	      { return token (ACE_INACTIVE); }
-":"		      { return token (':'); }
-"*"		      { return token ('*'); }
-"("                   { return token ('('); }
-")"                   { return token (')'); }
-"{"                   { return token ('{'); }
-"}"                   { return token ('}'); }
-{string}	      {
-                        // Check for first type of string, i.e.,
-                        // "double quotes" delimited.  
-                        ACE_TCHAR *s = ACE_OS::strrchr (yytext, '"');
-                        if (s == 0)
-                          // Check for second type of string, i.e.,
-                          // 'single quotes' delimited.
-                          s = ACE_OS::strrchr (yytext, '\'');
-
-                        ACE_ASSERT (s != 0);
-                        // Eliminate the opening and closing double or
-                        // single quotes.
-                        *s = '\0';
-			yyleng -= 1;
-                        yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (yytext + 1, yyleng);
-			return token (ACE_STRING); }
-{ident}		      {
-		        yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (yytext, yyleng);
-			return token (ACE_IDENT);
-		      }
-{pathname}	      {
-		        yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (yytext, yyleng);
-			return token (ACE_PATHNAME);
-		      }
-{white_space}+	      ; /* EMPTY */
-{newline}	      { ACE_SVC_CONF_PARAM->yylineno++; ace_yylineno++; }
-{other}		      {
-                         ACE_ERROR ((LM_ERROR,
-                                     ACE_LIB_TEXT ("unknown character = (%d"), 
-                                                   *yytext));
-                        if (ACE_OS::ace_isprint (*yytext))
-                          ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("|%c"), *yytext));
-                        ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT (")\n")));
-                      }
-<<EOF>>               { yyterminate(); }
-%%
-int
-yywrap (void)
-{
-  ::fflush (yyin);
-  yytext[0] = '#';
-  yyleng = 0;
-
-  return 1;
-}
-
-void
-yy_push_buffer (FILE *file, yy_buffer_state *&buffer)
-{
-  // External synchronization is required.
-
-  if (buffer == 0)
-    buffer = yy_create_buffer (file, YY_BUF_SIZE);
-
-  yy_switch_to_buffer (buffer);
-}
-
-void
-yy_push_buffer (const ACE_TCHAR *directive, yy_buffer_state *&buffer)
-{
-  // External synchronization is required.
-
-  // yyparse() may invoke yylex() multiple times when parsing
-  // a single directive.  Prevent a new buffer from created during
-  // each call to yylex().
-  if (YY_CURRENT_BUFFER != 0
-      && directive == YY_CURRENT_BUFFER->yy_ch_buf)
-    return;
-
-  if (buffer == 0)
-    {
-      // yy_scan_string() already switches the buffer so there is
-      // no need to explicitly make the switch.
-      buffer = yy_scan_string (directive);
-    }
-  else
-    yy_switch_to_buffer (buffer);
-}
-
-void
-yy_pop_buffer (yy_buffer_state *buffer)
-{
-  // External synchronization is required.
-
-  yy_switch_to_buffer (buffer);
-}
diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y
deleted file mode 100644
index 326c9d9b442..00000000000
--- a/ace/Svc_Conf.y
+++ /dev/null
@@ -1,464 +0,0 @@
-%{
-// $Id$
-
-#include "ace/ARGV.h"
-#include "ace/Svc_Conf.h"
-#include "ace/Module.h"
-#include "ace/Stream.h"
-
-ACE_RCSID (ace,
-           Svc_Conf_y,
-           "$Id$")
-
-// Prototypes.
-static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec,
-                                        ACE_Static_Node *svc_type);
-static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec,
-                                        const ACE_TCHAR *svc_name);
-
-#define YYDEBUG_LEXER_TEXT (yytext[yyleng] = '\0', yytext)
-
-// Force the pretty debugging code to compile.
-// #define YYDEBUG 1
-
-// Keeps track of the number of errors encountered so far.
-int yyerrno = 0;
-
-%}
-
-%token ACE_DYNAMIC ACE_STATIC ACE_SUSPEND ACE_RESUME ACE_REMOVE ACE_USTREAM
-%token ACE_MODULE_T ACE_STREAM_T ACE_SVC_OBJ_T ACE_ACTIVE ACE_INACTIVE
-%token ACE_PATHNAME ACE_IDENT ACE_STRING
-
-%start svc_config_entries
-
-%type <ident_> ACE_IDENT ACE_STRING ACE_PATHNAME pathname parameters_opt
-%type <type_> type status
-%type <parse_node_> dynamic static suspend resume remove module_list stream
-%type <parse_node_> stream_modules module svc_config_entry
-%type <static_node_> stream_ops
-%type <svc_record_> svc_location
-%type <location_node_> svc_initializer
-
-// Generate a pure (reentrant) parser -- GNU Bison only
-%pure_parser
-
-%%
-
-svc_config_entries
-  : svc_config_entries svc_config_entry
-    {
-      if ($2 != 0)
-      {
-        $2->apply (); delete $2;
-      }
-      ACE_SVC_CONF_PARAM->obstack.release ();
-    }
-  | svc_config_entries error
-    {
-      ACE_SVC_CONF_PARAM->obstack.release ();
-    }
-  | /* EMPTY */
-  ;
-
-svc_config_entry
-  : dynamic
-  | static
-  | suspend
-  | resume
-  | remove
-  | stream
-  ;
-
-dynamic
-  : ACE_DYNAMIC svc_location parameters_opt
-    {
-      if ($2 != 0)
-        $$ = new ACE_Dynamic_Node ($2, $3);
-      else
-        $$ = 0;
-    }
-  ;
-
-static
-  : ACE_STATIC ACE_IDENT parameters_opt
-    {
-      $$ = new ACE_Static_Node ($2, $3);
-    }
-  ;
-
-suspend
-  : ACE_SUSPEND ACE_IDENT
-    {
-      $$ = new ACE_Suspend_Node ($2);
-    }
-  ;
-
-resume
-  : ACE_RESUME ACE_IDENT
-    {
-      $$ = new ACE_Resume_Node ($2);
-    }
-  ;
-
-remove
-  : ACE_REMOVE ACE_IDENT
-    {
-      $$ = new ACE_Remove_Node ($2);
-    }
-  ;
-
-stream
-  : ACE_USTREAM stream_ops stream_modules
-    {
-      $$ = new ACE_Stream_Node ($2, $3);
-    }
-  | ACE_USTREAM ACE_IDENT { $<static_node_>$ = new ACE_Static_Node ($2); } stream_modules
-    {
-      $$ = new ACE_Dummy_Node ($<static_node_>3, $4);
-    }
-  ;
-
-stream_ops
-  : dynamic
-    {
-    }
-  | static
-    {
-    }
-  ;
-
-stream_modules
-  : '{'
-    {
-      // Initialize left context...
-      $<static_node_>$ = $<static_node_>0;
-    }
-   module_list '}'
-    {
-      $$ = $3;
-    }
-  | /* EMPTY */ { $$ = 0; }
-  ;
-
-module_list
-  : module_list module
-    {
-      if ($2 != 0)
-        {
-          $2->link ($1);
-          $$ = $2;
-        }
-    }
-  | /* EMPTY */ { $$ = 0; }
-  ;
-
-module
-  : dynamic
-    {
-      ACE_Static_Node *svc_type = $<static_node_>1;
-
-      if (svc_type != 0)
-        {
-          ACE_Static_Node *module = $<static_node_>-1;
-
-          ACE_ARGV args (svc_type->parameters ());
-          ACE_Module_Type *mt = ace_get_module (module,
-                                                svc_type);
-          ACE_Stream_Type *st =
-            ACE_dynamic_cast (ACE_Stream_Type *,
-                              ACE_const_cast (ACE_Service_Type_Impl *,
-                                              module->record ()->type ()));
-
-          if (mt->init (args.argc (), args.argv ()) == -1
-              || st->push (mt) == -1)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_LIB_TEXT ("dynamic initialization failed for Module %s\n"),
-                          svc_type->name ()));
-              ACE_SVC_CONF_PARAM->yyerrno++;
-            }
-        }
-    }
-  | static
-    {
-      ACE_Module_Type *mt = ace_get_module ($<static_node_>-1, $<static_node_>1->name ());
-
-      if (((ACE_Stream_Type *) ($<static_node_>-1)->record ()->type ())->push (mt) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_LIB_TEXT ("Problem with static\n")));
-          ACE_SVC_CONF_PARAM->yyerrno++;
-        }
-    }
-  | suspend
-    {
-      ACE_Module_Type *mt = ace_get_module ($<static_node_>-1,
-                                            $<static_node_>1->name ());
-      if (mt != 0)
-        mt->suspend ();
-    }
-  | resume
-    {
-      ACE_Module_Type *mt = ace_get_module ($<static_node_>-1,
-                                            $<static_node_>1->name ());
-      if (mt != 0)
-        mt->resume ();
-    }
-  | remove
-    {
-      ACE_Static_Node *stream = $<static_node_>-1;
-      ACE_Static_Node *module = $<static_node_>1;
-      ACE_Module_Type *mt = ace_get_module (stream,
-                                            module->name ());
-
-      ACE_Stream_Type *st =
-        ACE_dynamic_cast (ACE_Stream_Type *,
-                          ACE_const_cast (ACE_Service_Type_Impl *,
-                                          stream->record ()->type ()));
-      if (mt != 0 && st->remove (mt) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_LIB_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"),
-                      module->name (),
-                      stream->name ()));
-          ACE_SVC_CONF_PARAM->yyerrno++;
-        }
-    }
-  ;
-
-svc_location
-  : ACE_IDENT type svc_initializer status
-    {
-      u_int flags
-        = ACE_Service_Type::DELETE_THIS
-        | ($3->dispose () == 0 ? 0 : ACE_Service_Type::DELETE_OBJ);
-      ACE_Service_Object_Exterminator gobbler = 0;
-      void *sym = $3->symbol (&gobbler);
-
-      if (sym != 0)
-        {
-          ACE_Service_Type_Impl *stp
-            = ace_create_service_type ($1,
-                                       $2,
-                                       sym,
-                                       flags,
-                                       gobbler);
-          $$ = new ACE_Service_Type ($1,
-                                     stp,
-                                     $3->handle (),
-                                     $4);
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_LIB_TEXT ("Unable to find service: %s\n"),
-                      $1));
-          ++ACE_SVC_CONF_PARAM->yyerrno;
-          $$ = 0;
-        }
-      delete $3;
-    }
-  ;
-
-status
-  : ACE_ACTIVE
-    {
-      $$ = 1;
-    }
-  | ACE_INACTIVE
-    {
-      $$ = 0;
-    }
-  | /* EMPTY */
-    {
-      $$ = 1;
-    }
-  ;
-
-svc_initializer
-  : pathname ':' ACE_IDENT
-    {
-      $$ = new ACE_Object_Node ($1, $3);
-    }
-  | pathname ':' ACE_IDENT '(' ')'
-    {
-      $$ = new ACE_Function_Node ($1, $3);
-    }
-  | ':' ACE_IDENT '(' ')'
-    {
-      $$ = new ACE_Static_Function_Node ($2);
-    }
-  ;
-
-type
-  : ACE_MODULE_T '*'
-    {
-      $$ = ACE_MODULE_T;
-    }
-  | ACE_SVC_OBJ_T '*'
-    {
-      $$ = ACE_SVC_OBJ_T;
-    }
-  | ACE_STREAM_T '*'
-    {
-      $$ = ACE_STREAM_T;
-    }
-  ;
-
-parameters_opt
-  : ACE_STRING
-  | /* EMPTY */ { $$ = 0; }
-  ;
-
-pathname
-  : ACE_PATHNAME
-  | ACE_IDENT
-  | ACE_STRING
-  ;
-
-%%
-// Prints the error string to standard output.  Cleans up the error
-// messages.
-
-void
-yyerror (const ACE_TCHAR *s)
-{
-#if defined (ACE_NLOGGING)
-  ACE_UNUSED_ARG (s);
-#endif /* ACE_NLOGGING */
-
-  ACE_ERROR ((LM_ERROR,
-              ACE_LIB_TEXT ("[error %d] on line %d: %s\n"),
-              yyerrno,
-              yylineno,
-              s));
-}
-
-// Note that SRC_REC represents left context, which is the STREAM *
-// record.
-
-static ACE_Module_Type *
-ace_get_module (ACE_Static_Node *str_rec,
-                const ACE_TCHAR *svc_name)
-{
-  const ACE_Service_Type *sr = str_rec->record ();
-  const ACE_Service_Type_Impl *type = sr->type ();
-  ACE_Stream_Type *st = sr == 0
-    ? 0
-    : ACE_dynamic_cast (ACE_Stream_Type *,
-                        ACE_const_cast (ACE_Service_Type_Impl *,
-                                        type));
-  ACE_Module_Type *mt = st == 0 ? 0 : st->find (svc_name);
-
-  if (sr == 0 || st == 0 || mt == 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_LIB_TEXT ("cannot locate Module_Type %s in STREAM_Type %s\n"),
-                  svc_name,
-                  str_rec->name ()));
-      yyerrno++;
-    }
-
-  return mt;
-}
-
-static ACE_Module_Type *
-ace_get_module (ACE_Static_Node *str_rec,
-                ACE_Static_Node *svc_type)
-{
-  const ACE_Service_Type *sr = str_rec->record ();
-  const ACE_Service_Type_Impl *type = sr->type ();
-  ACE_Stream_Type *st = sr == 0 ? 0 : (ACE_Stream_Type *) type;
-  const ACE_Service_Type *sv = svc_type->record ();
-  type = sv->type ();
-  ACE_Module_Type *mt = (ACE_Module_Type *) type;
-  const ACE_TCHAR *module_type_name = svc_type->name ();
-
-  if (sr == 0 || st == 0 || mt == 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_LIB_TEXT ("cannot locate Module_Type %s or STREAM_Type %s\n"),
-                  module_type_name,
-                  str_rec->name ()));
-      yyerrno++;
-    }
-
-  // Make sure that the Module has the same name as the
-  // Module_Type object from the svc.conf file.
-  ACE_Module<ACE_SYNCH> *mp = (ACE_Module<ACE_SYNCH> *) mt->object ();
-
-  if (ACE_OS::strcmp (mp->name (), module_type_name) != 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_LIB_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"),
-                  module_type_name,
-                  mp->name ()));
-      mp->name (module_type_name);
-    }
-
-  return mt;
-}
-
-ACE_Service_Type_Impl *
-ace_create_service_type (const ACE_TCHAR *name,
-                         int type,
-                         void *symbol,
-                         u_int flags,
-                         ACE_Service_Object_Exterminator gobbler)
-{
-  ACE_Service_Type_Impl *stp = 0;
-
-  // Note, the only place we need to put a case statement.  This is
-  // also the place where we'd put the RTTI tests, if the compiler
-  // actually supported them!
-
-  switch (type)
-    {
-    case ACE_SVC_OBJ_T:
-      ACE_NEW_RETURN (stp,
-                      ACE_Service_Object_Type ((ACE_Service_Object *) symbol,
-                                               name, flags,
-                                               gobbler),
-                      0);
-      break;
-    case ACE_MODULE_T:
-      ACE_NEW_RETURN (stp,
-                      ACE_Module_Type (symbol, name, flags),
-                      0);
-      break;
-    case ACE_STREAM_T:
-      ACE_NEW_RETURN (stp,
-                      ACE_Stream_Type (symbol, name, flags),
-                      0);
-      break;
-    default:
-      ACE_ERROR ((LM_ERROR,
-                  ACE_LIB_TEXT ("unknown case\n")));
-      yyerrno++;
-      break;
-    }
-  return stp;
-}
-
-#if defined (DEBUGGING)
-// Current line number.
-int yylineno = 1;
-
-// Name given on the command-line to envoke the program.
-ACE_TCHAR *program_name;
-
-// Main driver program.
-
-int
-main (int argc, char *argv[])
-{
-  ACE_Svc_Conf_Param param (stdin);
-
-  // Try to reopen any filename argument to use YYIN.
-  if (argc > 1 && (yyin = freopen (argv[1], "r", stdin)) == 0)
-    (void) ::fprintf (stderr, "usage: %s [file]\n", argv[0]), ACE_OS::exit (1);
-
-  return yyparse (&param);
-}
-#endif /* DEBUGGING */
diff --git a/ace/Svcconf/Parse_Node.cpp b/ace/Svcconf/Parse_Node.cpp
index 899398bae90..c772a98cf67 100644
--- a/ace/Svcconf/Parse_Node.cpp
+++ b/ace/Svcconf/Parse_Node.cpp
@@ -1,15 +1,15 @@
 // $Id$
 
-#include "ace/Service_Config.h"
-#include "ace/Service_Repository.h"
-#include "ace/Task.h"
-#include "ace/Parse_Node.h"
+#include "ace/Svcconf/Service_Config.h"
+#include "ace/Svcconf/Service_Repository.h"
+#include "ace/Streams/Task.h"
+#include "ace/Svcconf/Parse_Node.h"
 
 // Provide the class hierarchy that defines the parse tree of Service
 // Nodes.
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Parse_Node.i"
+#include "ace/Svcconf/Parse_Node.i"
 #endif /* ____ */
 
 ACE_RCSID(ace, Parse_Node, "$Id$")
diff --git a/ace/Svcconf/Parse_Node.h b/ace/Svcconf/Parse_Node.h
index 6df9def1915..9ff765fa153 100644
--- a/ace/Svcconf/Parse_Node.h
+++ b/ace/Svcconf/Parse_Node.h
@@ -15,8 +15,8 @@
 #define ACE_PARSE_NODE_H
 #include "ace/pre.h"
 
-#include "ace/Service_Types.h"
-#include "ace/DLL.h"
+#include "ace/Svcconf/Service_Types.h"
+#include "ace/Svcconf/DLL.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -329,7 +329,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "ace/Parse_Node.i"
+#include "ace/Svcconf/Parse_Node.i"
 #endif /* __ACE_INLINE__ */
 
 // Keeps track of the number of errors encountered so far.
diff --git a/ace/Svcconf/Service_Config.cpp b/ace/Svcconf/Service_Config.cpp
index 05768a716ef..bcb060f7898 100644
--- a/ace/Svcconf/Service_Config.cpp
+++ b/ace/Svcconf/Service_Config.cpp
@@ -1,22 +1,22 @@
 // $Id$
 
-#include "ace/Svc_Conf.h"
-#include "ace/Get_Opt.h"
-#include "ace/ARGV.h"
-#include "ace/Malloc.h"
-#include "ace/Service_Manager.h"
-#include "ace/Service_Repository.h"
-#include "ace/Service_Types.h"
-#include "ace/Containers.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Reactor.h"
-#include "ace/Proactor.h"
-#include "ace/Thread_Manager.h"
-
-#include "ace/Service_Config.h"
+#include "ace/Svcconf/Svc_Conf.h"
+#include "ace/Utils/Get_Opt.h"
+#include "ace/Utils/ARGV.h"
+#include "ace/Memory/Malloc.h"
+#include "ace/Svcconf/Service_Manager.h"
+#include "ace/Svcconf/Service_Repository.h"
+#include "ace/Svcconf/Service_Types.h"
+#include "ace/Utils/Containers.h"
+#include "ace/Utils/Templates/Auto_Ptr.h"
+#include "ace/Demux/Reactor.h"
+#include "ace/Demux/Proactor.h"
+#include "ace/Threads/Thread_Manager.h"
+
+#include "ace/Svcconf/Service_Config.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Service_Config.i"
+#include "ace/Svcconf/Service_Config.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (ace,
diff --git a/ace/Svcconf/Service_Object.cpp b/ace/Svcconf/Service_Object.cpp
index c5dfa7ce240..87052f09f56 100644
--- a/ace/Svcconf/Service_Object.cpp
+++ b/ace/Svcconf/Service_Object.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "ace/Service_Types.h"
-#include "ace/Service_Object.h"
+#include "ace/Svcconf/Service_Types.h"
+#include "ace/Svcconf/Service_Object.h"
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Service_Object.i"
+#include "ace/Svcconf/Service_Object.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Service_Object, "$Id$")
diff --git a/ace/Svcconf/Service_Repository.cpp b/ace/Svcconf/Service_Repository.cpp
index 34062fb3bcc..b3703a8fc09 100644
--- a/ace/Svcconf/Service_Repository.cpp
+++ b/ace/Svcconf/Service_Repository.cpp
@@ -5,7 +5,7 @@
 #include "ace/Utils/Object_Manager.h"
 
 #ifdef ACE_SUBSET_0
-#include "ace/Log_Msg.h"
+#include "ace/Logging/Log_Msg.h"
 #endif
 
 #if !defined (__ACE_INLINE__)
diff --git a/ace/Svcconf/Service_Templates.cpp b/ace/Svcconf/Service_Templates.cpp
index a4f073d3272..a21509f1f2c 100644
--- a/ace/Svcconf/Service_Templates.cpp
+++ b/ace/Svcconf/Service_Templates.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ace/Service_Templates.h"
+#include "ace/Svcconf/Service_Templates.h"
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Node<ACE_Static_Svc_Descriptor *>;
diff --git a/ace/Svcconf/Service_Templates.h b/ace/Svcconf/Service_Templates.h
index 939081f7813..a8c928c6c95 100644
--- a/ace/Svcconf/Service_Templates.h
+++ b/ace/Svcconf/Service_Templates.h
@@ -14,16 +14,16 @@
 #define ACE_SERVICE_TEMPLATES_H
 #include "ace/pre.h"
 
-#include "ace/Svc_Conf.h"
+#include "ace/Svcconf/Svc_Conf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Auto_Ptr.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Stream_Modules.h"
-#include "ace/Stream.h"
+#include "ace/Utils/Templates/Auto_Ptr.h"
+#include "ace/Threads/Thread_Manager.h"
+#include "ace/Streams/Stream_Modules.h"
+#include "ace/Streams/Stream.h"
 
 #include "ace/post.h"
 #endif /* ACE_SERVICE_TEMPLATES_H */
diff --git a/ace/Svcconf/Service_Types.cpp b/ace/Svcconf/Service_Types.cpp
index cb6c6b51c28..e26ae9b0780 100644
--- a/ace/Svcconf/Service_Types.cpp
+++ b/ace/Svcconf/Service_Types.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "ace/Svcconf/Service_Types.h"
-#include "ace/Svcconf/Stream_Modules.h"
+#include "ace/Streams/Stream_Modules.h"
 #include "ace/Streams/Stream.h"
 
 ACE_RCSID(ace, Service_Types, "$Id$")
diff --git a/ace/Svcconf/Shared_Object.cpp b/ace/Svcconf/Shared_Object.cpp
index b7237bfb1a3..b39276d1216 100644
--- a/ace/Svcconf/Shared_Object.cpp
+++ b/ace/Svcconf/Shared_Object.cpp
@@ -1,12 +1,12 @@
 // Shared_Object.cpp
 // $Id$
 
-#include "ace/Shared_Object.h"
+#include "ace/Svcconf/Shared_Object.h"
 /* Provide the abstract base class used to access dynamic linking
    facilities */
 
 #if !defined (__ACE_INLINE__)
-#include "ace/Shared_Object.i"
+#include "ace/Svcconf/Shared_Object.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(ace, Shared_Object, "$Id$")
diff --git a/ace/Svcconf/Svc_Conf.h b/ace/Svcconf/Svc_Conf.h
index ecf285baebf..2d44667a778 100644
--- a/ace/Svcconf/Svc_Conf.h
+++ b/ace/Svcconf/Svc_Conf.h
@@ -19,14 +19,14 @@
 // Globally visible macros, type decls, and extern var decls for
 // Service Configurator utility.
 
-#include "ace/Obstack.h"
+#include "ace/Memory/Obstack.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Config.h"
-#include "ace/Parse_Node.h"
+#include "ace/Svcconf/Service_Config.h"
+#include "ace/Svcconf/Parse_Node.h"
 
 // Forward declarations.
 struct ace_yy_buffer_state;
diff --git a/ace/Svcconf/Svc_Conf_Lexer_Guard.cpp b/ace/Svcconf/Svc_Conf_Lexer_Guard.cpp
index 13848feaac9..619fd590bdb 100644
--- a/ace/Svcconf/Svc_Conf_Lexer_Guard.cpp
+++ b/ace/Svcconf/Svc_Conf_Lexer_Guard.cpp
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 
-#include "ace/Svc_Conf.h"
+#include "ace/Svcconf/Svc_Conf.h"
 
-#include "ace/Svc_Conf_Lexer_Guard.h"
+#include "ace/Svcconf/Svc_Conf_Lexer_Guard.h"
 
 ACE_RCSID (ace,
            Svc_Conf_Lexer_Guard,
diff --git a/ace/Svcconf/Svc_Conf_l.cpp b/ace/Svcconf/Svc_Conf_l.cpp
index be53770e146..9c972cff7ab 100644
--- a/ace/Svcconf/Svc_Conf_l.cpp
+++ b/ace/Svcconf/Svc_Conf_l.cpp
@@ -19,8 +19,8 @@
 
 #ifdef __cplusplus
 
-#include "ace/OS.h"
-#include "ace/Object_Manager.h"
+#include "ace/OS/OS.h"
+#include "ace/Utils/Object_Manager.h"
 
 /* Use prototypes in function declarations. */
 #define ACE_YY_USE_PROTOS
@@ -506,9 +506,9 @@ ACE_TCHAR *ace_yytext;
 // compiled with FLEX and an ANSI C++ compiler.
 
 // Lexical tokens values defined by YACC.
-#include "ace/Svc_Conf.h"
-#include "ace/Svc_Conf_Tokens.h"
-#include "ace/Svc_Conf_Lexer_Guard.h"
+#include "ace/Svcconf/Svc_Conf.h"
+#include "ace/Svcconf/Svc_Conf_Tokens.h"
+#include "ace/Svcconf/Svc_Conf_Lexer_Guard.h"
 
 ACE_RCSID (ace,
 	   Svc_Conf_l,
diff --git a/ace/Svcconf/Svc_Conf_y.cpp b/ace/Svcconf/Svc_Conf_y.cpp
index 5c76230b920..621145d39d2 100644
--- a/ace/Svcconf/Svc_Conf_y.cpp
+++ b/ace/Svcconf/Svc_Conf_y.cpp
@@ -22,10 +22,10 @@
 
 // $Id$
 
-#include "ace/ARGV.h"
-#include "ace/Svc_Conf.h"
-#include "ace/Module.h"
-#include "ace/Stream.h"
+#include "ace/Utils/ARGV.h"
+#include "ace/Svcconf/Svc_Conf.h"
+#include "ace/Streams/Module.h"
+#include "ace/Streams/Stream.h"
 
 ACE_RCSID (ace,
            Svc_Conf_y,