--- orig/OctetSeqC.h	2004-01-12 12:01:14.000000000 -0600
+++ OctetSeqC.h	2004-01-12 12:13:43.000000000 -0600
@@ -33,15 +33,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+#include "tao/Sequence.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 
@@ -131,11 +129,6 @@
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OctetSeq;
-
-// TAO_IDL - Generated from
 // be/be_visitor_module/module_ch.cpp:66
 
 } // module CORBA
--- orig/OctetSeqC.cpp	2004-01-12 12:01:14.000000000 -0600
+++ OctetSeqC.cpp	2004-01-12 12:14:03.000000000 -0600
@@ -103,47 +103,7 @@
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_OctetSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f4f63), 
-  ACE_NTOHL (0x74657453), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-    9,
-  ACE_NTOHL (0x4f637465), 
-  ACE_NTOHL (0x74536571), 
-  ACE_NTOHL (0x0),  // name = OctetSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_OctetSeq),
-    (char *) &_oc_CORBA_OctetSeq,
-    0,
-    sizeof (CORBA::OctetSeq)
-  );
 
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_OctetSeq =
-    &_tc_TAO_tc_CORBA_OctetSeq;
-}
 
 // TAO_IDL - Generated from
 // be/be_visitor_sequence/cdr_op_cs.cpp:95
--- orig/OctetSeqA.h	2004-01-12 12:01:14.000000000 -0600
+++ OctetSeqA.h	2004-01-12 12:13:40.000000000 -0600
@@ -40,6 +40,15 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
+//======= Handcrafted
+namespace CORBA
+{
+  // TAO_IDL - Generated from
+  // be/be_visitor_typecode/typecode_decl.cpp:44
+
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OctetSeq;
+}
+
 // TAO_IDL - Generated from
 // be/be_visitor_sequence/any_op_ch.cpp:52
 
--- orig/OctetSeqA.cpp	2004-01-12 12:01:14.000000000 -0600
+++ OctetSeqA.cpp	2004-01-12 12:15:04.000000000 -0600
@@ -30,6 +30,50 @@
 #include "tao/Typecode.h"
 #include "tao/Any_Dual_Impl_T.h"
 
+
+// ======== Handcrafted
+// TAO_IDL - Generated from
+// be/be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_CORBA_OctetSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  31,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4f63),
+  ACE_NTOHL (0x74657453),
+  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
+    9,
+  ACE_NTOHL (0x4f637465),
+  ACE_NTOHL (0x74536571),
+  ACE_NTOHL (0x0),  // name = OctetSeq
+    CORBA::tk_sequence, // typecode kind
+  12, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_octet,
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_OctetSeq),
+    (char *) &_oc_CORBA_OctetSeq,
+    0,
+    sizeof (CORBA::OctetSeq)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_OctetSeq =
+    &_tc_TAO_tc_CORBA_OctetSeq;
+}
+
 // TAO_IDL - Generated from 
 // be/be_visitor_sequence/any_op_cs.cpp:54