--- ray/src/common/header.c	2003/06/30 14:59:11	2.17
+++ ray/src/common/header.c	2003/07/21 22:30:17	2.19
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: header.c,v 2.17 2003/06/30 14:59:11 schorsch Exp $";
+static const char	RCSid[] = "$Id: header.c,v 2.19 2003/07/21 22:30:17 schorsch Exp $";
 #endif
 /*
  *  header.c - routines for reading and writing information headers.
@@ -26,12 +26,11 @@ static const char	RCSid[] = "$Id: header.c,v 2.17 2003
 
 #include "copyright.h"
 
-#include  <stdio.h>
-#include  <string.h>
 #include  <time.h>
 #include  <ctype.h>
 
-#include "resolu.h"
+#include  "rtio.h"
+#include  "resolu.h"
 
 #define	 MAXLINE	512
 
@@ -41,8 +40,6 @@ char  FMTSTR[] = "FORMAT=";	/* format identifier */
 
 char  TMSTR[] = "CAPDATE=";	/* capture date identifier */
 
-extern void	fputword(char *s, FILE *fp);
-
 static int mycheck();
 
 
@@ -314,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 */
 }