--- /tmp/splash2/original/codes/apps/raytrace/rt.H	2005-08-15 15:39:41.000000000 -0400
+++ rt.H	2004-09-01 15:43:03.000000000 -0400
@@ -275,6 +275,11 @@
 typedef VEC3	COLOR;			/* An r, g, b color.		     */
 
 
+//forward decls
+struct poly;
+struct sphere;
+struct tri;
+
 
 /*
  *	Define primitive procedures.
@@ -746,7 +751,7 @@
 extern	char LookupCommand(char *s);
 extern	void ReadEnvFile(char *EnvFileName);
 
-extern	void RunLengthEncode(struct _iobuf *pf,struct pixel *fb,long xsize);
+extern	void RunLengthEncode(FILE *pf,struct pixel *fb,long xsize);
 extern	void OpenFrameBuffer(void);
 extern	void AddPixelColor(double *c,long x,long y);
 extern	void CloseFrameBuffer(char *PicFileName);
@@ -833,12 +838,12 @@
 extern	long PolyPeIntersect(struct ray *pr,struct element *pe,struct irecord *hit);
 extern	long PolyIntersect(struct ray *pr,struct object *po,struct irecord *hit);
 extern	void PolyTransform(struct object *po,double (*xtrans)[4],double (*xinvT)[4]);
-extern	void PolyRead(struct object *po,struct _iobuf *pf);
+extern	void PolyRead(struct object *po,FILE *pf);
 
 extern	void CopyRayMsg(struct ray *rdst,struct ray *rsrc);
-extern	void InitRayTreeStack(long TreeDepth, int pid);
-extern	void PushRayTreeStack(struct ray *rmsg, int pid);
-extern	long PopRayTreeStack(struct ray *rmsg, int pid);
+extern	void InitRayTreeStack(long TreeDepth, INT pid);
+extern	void PushRayTreeStack(struct ray *rmsg, INT pid);
+extern	long PopRayTreeStack(struct ray *rmsg, INT pid);
 
 extern	void SpecularDirection(double *R,double *N,double *I);
 extern	unsigned long TransmissionDirection(double *T,double *N,double *I,double kn);
@@ -857,7 +862,7 @@
 extern	long SphPeIntersect(struct ray *pr,struct element *pe,struct irecord *hit);
 extern	long SphIntersect(struct ray *pr,struct object *po,struct irecord *hit);
 extern	void SphTransform(struct object *po,double (*xtrans)[4],double (*xinvT)[4]);
-extern	void SphRead(struct object *po,struct _iobuf *pf);
+extern	void SphRead(struct object *po,FILE *pf);
 
 extern	unsigned long GetRayJobFromBundle(struct rayjob *job,long *x,long *y);
 extern	void ConvertPrimRayJobToRayMsg(struct ray *ray,double x,double y);
@@ -876,7 +881,7 @@
 extern	long TriPeIntersect(struct ray *pr,struct element *pe,struct irecord *hit);
 extern	long TriIntersect(struct ray *pr,struct object *po,struct irecord *hit);
 extern	void TriTransform(struct object *po,double (*xtrans)[4],double (*xinvT)[4]);
-extern	void TriRead(struct object *po,struct _iobuf *pf);
+extern	void TriRead(struct object *po,FILE *pf);
 
 extern	void InitWorkPool(long pid);
 extern	void PrintWorkPool(long pid);