--- ray/src/gen/genmarble.c	1991/11/12 17:04:39	2.1
+++ ray/src/gen/genmarble.c	2003/02/22 02:07:23	2.5
@@ -1,9 +1,6 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: genmarble.c,v 2.5 2003/02/22 02:07:23 greg Exp $";
 #endif
-
 /*
  *  genmarble.c - generate a marble with bubbles inside.
  *
@@ -12,9 +9,12 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <stdio.h>
 
-#include  "random.h"
+#include <stdlib.h>
 
+#include  <math.h>
 
+#include  "random.h"
+
 #define  PI	3.14159265359
 
 typedef double  FVECT[3];
@@ -26,7 +26,6 @@ main(argc, argv)
 int  argc;
 char  **argv;
 {
-	double  atof();
 	char  *cmtype, *cname;
 	FVECT  cent;
 	double  rad;
@@ -73,7 +72,6 @@ bubble(v, cent, rad, bubrad)	/* compute location of ra
 FVECT  v, cent;
 double  rad, bubrad;
 {
-	double  sqrt();
 	double  r, ro, theta, phi;
 
 	r = frandom()*bubrad;
@@ -90,7 +88,6 @@ sphere_cart(v, ro, theta, phi)	/* spherical to cartesi
 FVECT  v;
 double  ro, theta, phi;
 {
-	double  sin(), cos();
 	double  d;
 	
 	d = sin(phi);