Index: executor/spi.h
===================================================================
RCS file: /home/alvherre/Code/cvs/pgsql/src/include/executor/spi.h,v
retrieving revision 1.53
diff -c -r1.53 spi.h
*** executor/spi.h	15 Oct 2005 02:49:44 -0000	1.53
--- executor/spi.h	2 Nov 2005 10:32:33 -0000
***************
*** 28,34 ****
  #include "tcop/pquery.h"
  #include "tcop/tcopprot.h"
  #include "tcop/utility.h"
! #include "tcop/dest.h"
  #include "nodes/params.h"
  #include "utils/builtins.h"
  #include "utils/datum.h"
--- 28,34 ----
  #include "tcop/pquery.h"
  #include "tcop/tcopprot.h"
  #include "tcop/utility.h"
! #include "executor/portalforw.h"
  #include "nodes/params.h"
  #include "utils/builtins.h"
  #include "utils/datum.h"
Index: tcop/dest.h
===================================================================
RCS file: /home/alvherre/Code/cvs/pgsql/src/include/tcop/dest.h,v
retrieving revision 1.47
diff -c -r1.47 dest.h
*** tcop/dest.h	15 Oct 2005 02:49:46 -0000	1.47
--- tcop/dest.h	2 Nov 2005 10:18:40 -0000
***************
*** 62,67 ****
--- 62,68 ----
  #define DEST_H
  
  #include "executor/tuptable.h"
+ #include "executor/portalforw.h"
  
  
  /* buffer size to use for command completion tags */
***************
*** 117,126 ****
  
  extern DestReceiver *None_Receiver;		/* permanent receiver for None */
  
- /* This is a forward reference to utils/portal.h */
- 
- typedef struct PortalData *Portal;
- 
  /* The primary destination management functions */
  
  extern void BeginCommand(const char *commandTag, CommandDest dest);
--- 118,123 ----