--- ray/src/rt/rtotypes.h	2004/03/30 16:21:40	1.1
+++ ray/src/rt/rtotypes.h	2011/02/18 00:40:25	1.3
@@ -1,22 +1,22 @@
+/* RCSid $Id: rtotypes.h,v 1.3 2011/02/18 00:40:25 greg Exp $ */
+/*
+ * External functions implementing Radiance object types
+ */
 
-#include "ray.h"
-#include "otypes.h"
+typedef int otype_implf(OBJREC *o, RAY *r);
 
-typedef int otype_tracef(OBJREC *o, RAY *r);
+extern otype_implf o_sphere, o_face, o_cone, o_instance, o_mesh;
 
-extern otype_tracef o_sphere, o_face, o_cone, o_instance, o_mesh;
+extern otype_implf m_aniso, m_dielectric, m_glass, m_alias, m_light,
+	m_normal, m_mist, m_mirror, m_direct, m_clip, m_brdf, m_brdf2, m_bsdf;
 
-extern otype_tracef m_aniso, m_dielectric, m_glass, m_alias, m_light,
-	m_normal, m_mist, m_mirror, m_direct, m_clip, m_brdf, m_brdf2;
+extern otype_implf t_func, t_data;
 
-extern otype_tracef t_func, t_data;
+extern otype_implf p_cfunc, p_bfunc, p_pdata, p_cdata, p_bdata;
 
-extern otype_tracef p_cfunc, p_bfunc, p_pdata, p_cdata, p_bdata;
+extern otype_implf mx_func, mx_data, mx_pdata;
 
-extern otype_tracef mx_func, mx_data, mx_pdata;
-
-extern otype_tracef do_text;
-
+extern otype_implf do_text;
 
 	/* text.c */
 extern void freetext(OBJREC *m);