diff --git a/.gitignore b/.gitignore
index 110795f..bbf875c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,12 @@
 /.vs
 /afl-output
 /autom4te.cache
+/config.log
+/config.status
 /doc/pdfio.epub
+/Makefile
 /packages
+/pdfio.pc
 /pdfio.xcodeproj/xcshareddata
 /pdfio-*.tar.gz*
 /pdfio-*.zip*
diff --git a/pdfio-content.c b/pdfio-content.c
index 6699407..c3edd1e 100644
--- a/pdfio-content.c
+++ b/pdfio-content.c
@@ -1393,8 +1393,7 @@ pdfioFileCreateFontObjFromFile(
 			start,		// Start character
 			num_cmap;	// Number of CMap entries
     const int		*cmap;		// CMap entries
-    int			glyph,		// Current glyph
-			min_glyph,	// First glyph
+    int			min_glyph,	// First glyph
 			max_glyph;	// Last glyph
     unsigned short	glyphs[65536];	// Glyph to Unicode mapping
     unsigned char	*bufptr,	// Pointer into buffer
diff --git a/pdfio-file.c b/pdfio-file.c
index 08c740e..3e91373 100644
--- a/pdfio-file.c
+++ b/pdfio-file.c
@@ -1925,12 +1925,12 @@ load_xref(
 	}
       }
     }
-    else if (!strncmp(line, "xref", 4) && !line[4] || isspace(line[4] & 255))
+    else if (!strncmp(line, "xref", 4) && (!line[4] || isspace(line[4] & 255)))
     {
       // Read the xref tables
       while (_pdfioFileGets(pdf, line, sizeof(line)))
       {
-	if (!strncmp(line, "trailer", 7) && !line[7] || isspace(line[7] & 255))
+	if (!strncmp(line, "trailer", 7) && (!line[7] || isspace(line[7] & 255)))
 	  break;
 	else if (!line[0])
 	  continue;