--- ray/src/common/standard.h	1989/02/02 10:34:23	1.1
+++ ray/src/common/standard.h	2003/06/27 06:53:22	2.31
@@ -1,40 +1,16 @@
-/* Copyright (c) 1988 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid $Id: standard.h,v 2.31 2003/06/27 06:53:22 greg Exp $ */
 /*
- *	Miscellaneous definitions required by many routines.
+ *	Collected includes required by many Radiance callers
  */
+#ifndef _RAD_STANDARD_H_
+#define _RAD_STANDARD_H_
 
-#include  <stdio.h>
+#include  "copyright.h"
 
-#include  <math.h>
+#include  "rtio.h"
+#include  "rtmisc.h"
+#include  "rtmath.h"
+#include  "rterror.h"
 
-#include  <errno.h>
+#endif /* _RAD_STANDARD_H_ */
 
-#include  "fvect.h"
-
-#define  FHUGE		(1e10)		/* large real number */
-#define  FTINY		(1e-6)		/* small real number */
-
-#ifdef  M_PI
-#define  PI		M_PI
-#else
-#define  PI		3.14159265358979323846
-#endif
-				/* error codes */
-#define  WARNING	1		/* non-fatal error */
-#define  USER		2		/* fatal user-caused error */
-#define  SYSTEM		3		/* fatal system-related error */
-#define  INTERNAL	4		/* fatal program-related error */
-#define  CONSISTENCY	5		/* bad consistency check, abort */
-#define  COMMAND	6		/* interactive error */
-
-extern char  errmsg[];			/* global buffer for error messages */
-
-extern int  errno;			/* system error number */
-
-extern char  *sskip();
-extern char  *getpath();
-extern char  *malloc(), *calloc(), *realloc();
-extern char  *bmalloc(), *savestr(), *savqstr();