--- ray/src/common/header.c	2003/06/27 06:53:21	2.16
+++ ray/src/common/header.c	2003/07/27 22:12:01	2.20
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: header.c,v 2.16 2003/06/27 06:53:21 greg Exp $";
+static const char	RCSid[] = "$Id: header.c,v 2.20 2003/07/27 22:12:01 schorsch Exp $";
 #endif
 /*
  *  header.c - routines for reading and writing information headers.
@@ -25,13 +25,13 @@ static const char	RCSid[] = "$Id: header.c,v 2.16 2003
  */
 
 #include "copyright.h"
-#include "resolu.h"
 
-#include  <stdio.h>
-#include  <string.h>
 #include  <time.h>
 #include  <ctype.h>
 
+#include  "rtio.h"
+#include  "resolu.h"
+
 #define	 MAXLINE	512
 
 char  HDRSTR[] = "#?";		/* information header magic number */
@@ -40,8 +40,6 @@ char  FMTSTR[] = "FORMAT=";	/* format identifier */
 
 char  TMSTR[] = "CAPDATE=";	/* capture date identifier */
 
-extern void	fputword(char *s, FILE *fp);
-
 static int mycheck();
 
 
@@ -313,11 +311,12 @@ FILE  *fout;
 	if (!cdat.fs[0])
 		return(0);
 	for (cp = fmt; *cp; cp++)		/* check for globbing */
-		if (*cp == '?' | *cp == '*')
+		if ((*cp == '?') | (*cp == '*')) {
 			if (globmatch(fmt, cdat.fs)) {
 				strcpy(fmt, cdat.fs);
 				return(1);
 			} else
 				return(-1);
+		}
 	return(strcmp(fmt, cdat.fs) ? -1 : 1);	/* literal match */
 }