--- orig/CurrentC.h	2003-12-24 12:45:50.000000000 -0600
+++ CurrentC.h	2003-12-24 12:27:34.000000000 -0600
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id$
+// $Id$
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -33,17 +33,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+#include "tao/Object.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -167,10 +162,7 @@
 
 #endif /* end #if !defined */
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
 
 // TAO_IDL - Generated from
 // be/be_visitor_module/module_ch.cpp:66
--- orig/CurrentC.i	2003-12-24 12:45:50.000000000 -0600
+++ CurrentC.i	2003-12-23 19:11:35.000000000 -0600
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id$
+// $Id$
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
--- orig/CurrentC.cpp	2003-12-24 12:45:50.000000000 -0600
+++ CurrentC.cpp	2003-12-24 12:28:57.000000000 -0600
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id$
+// $Id$
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -30,7 +30,6 @@
 
 
 #include "CurrentC.h"
-#include "tao/Typecode.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -196,40 +195,6 @@
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_Current[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4375), 
-  ACE_NTOHL (0x7272656e), 
-  ACE_NTOHL (0x743a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Current:1.0
-    8,
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e7400),  // name = Current
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Current (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_Current),
-    (char *) &_oc_CORBA_Current,
-    0,
-    sizeof (CORBA::Current)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_Current =
-    &_tc_TAO_tc_CORBA_Current;
-}
-
-// TAO_IDL - Generated from
 // be/be_visitor_root/root.cpp:1725
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
--- orig/CurrentA.h	2003-12-24 12:45:50.000000000 -0600
+++ CurrentA.h	2003-12-24 12:27:40.000000000 -0600
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id$
+// $Id$
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -33,6 +33,15 @@
 
 #include /**/ "ace/pre.h"
 
+// ======= Handcrafted
+namespace CORBA
+{
+  // TAO_IDL - Generated from
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
+}
+
 // TAO_IDL - Generated from
 // be/be_visitor_interface/any_op_ch.cpp:52
 
--- orig/CurrentA.cpp	2003-12-24 12:45:50.000000000 -0600
+++ CurrentA.cpp	2003-12-24 12:28:48.000000000 -0600
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id$
+// $Id$
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -30,6 +30,41 @@
 #include "tao/Typecode.h"
 #include "tao/Any_Impl_T.h"
 
+
+// ======= Handcrafted
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+static const CORBA::Long _oc_CORBA_Current[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  30,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4375),
+  ACE_NTOHL (0x7272656e),
+  ACE_NTOHL (0x743a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Current:1.0
+    8,
+  ACE_NTOHL (0x43757272),
+  ACE_NTOHL (0x656e7400),  // name = Current
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_Current (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_Current),
+    (char *) &_oc_CORBA_Current,
+    0,
+    sizeof (CORBA::Current)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_Current =
+    &_tc_TAO_tc_CORBA_Current;
+}
+
 // TAO_IDL - Generated from
 // be/be_visitor_interface/any_op_cs.cpp:50