--- orig/GIOPC.h	2003-04-27 11:09:17.000000000 -0500
+++ ./GIOPC.h	2003-04-27 11:15:10.000000000 -0500
@@ -30,20 +30,17 @@
 
 #ifndef _TAO_IDL_ORIG_GIOPC_H_
 #define _TAO_IDL_ORIG_GIOPC_H_
-
 #include "ace/pre.h"
 
-#include "tao/corba.h"
+#include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-#include "tao/TAO_Export.h"
-
-#include "IOPC.h"
-#include "OctetSeqC.h"
+#include "tao/IOP_IORC.h"
+#include "tao/VarOut_T.h"
+#include "tao/Any_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
--- orig/GIOPC.cpp	2003-04-27 11:09:17.000000000 -0500
+++ ./GIOPC.cpp	2003-04-27 11:16:07.000000000 -0500
@@ -30,16 +30,6 @@
 
 
 #include "GIOPC.h"
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig