--- ray/src/common/octree.h	2003/06/06 16:38:47	2.9
+++ ray/src/common/octree.h	2009/11/01 04:41:55	2.12
@@ -1,4 +1,4 @@
-/* RCSid $Id: octree.h,v 2.9 2003/06/06 16:38:47 schorsch Exp $ */
+/* RCSid $Id: octree.h,v 2.12 2009/11/01 04:41:55 greg Exp $ */
 /*
  *  octree.h - header file for routines using octrees.
  */
@@ -8,8 +8,6 @@
 extern "C" {
 #endif
 
-#include "copyright.h"
-
 /*
  *	An octree is expressed as an integer which is either
  *	an index to eight other nodes, the empty tree, or an index
@@ -55,9 +53,9 @@ extern OCTREE  *octblock[MAXOBLK];	/* octree blocks */
  */
 
 typedef struct {
-	OCTREE  cutree;			/* the octree for this cube */
 	FVECT  cuorg;			/* the cube origin */
 	double  cusize;			/* the cube size */
+	OCTREE  cutree;			/* the octree for this cube */
 }  CUBE;
 
 extern CUBE  thescene;			/* the main scene */
@@ -90,7 +88,6 @@ extern void	octfree(OCTREE ot);
 extern void	octdone(void);
 extern OCTREE	combine(OCTREE ot);
 extern void	culocate(CUBE *cu, FVECT pt);
-extern void	cucopy(CUBE *cu1, CUBE *cu2);
 extern int	incube(CUBE *cu, FVECT pt);
 
 extern int	readoct(char *fname, int load, CUBE *scene, char *ofn[]);