diff --git a/api/graphics_api.C b/api/graphics_api.C
index ec02fe56b9..7b1d53d6b0 100755
--- a/api/graphics_api.C
+++ b/api/graphics_api.C
@@ -45,6 +45,7 @@ HANDLE graphics_threadh=NULL;
 #include "error_numbers.h"
 #include "boinc_api.h"
 #include "graphics_api.h"
+#include "filesys.h"
 
 double boinc_max_fps = 30.;
 double boinc_max_gfx_cpu_frac = 0.5;
diff --git a/api/gutil.C b/api/gutil.C
index 9114bc6d02..7caeb24ac3 100755
--- a/api/gutil.C
+++ b/api/gutil.C
@@ -67,6 +67,7 @@
 #endif
 
 #include "gutil.h"
+#include "filesys.h"
 
 #define MAX_DRAW_DISTANCE 2250000
 
diff --git a/lib/base64.C b/lib/base64.C
index bc04b6dab7..418e4e9d93 100644
--- a/lib/base64.C
+++ b/lib/base64.C
@@ -105,7 +105,7 @@ string r_base64_encode (const char* from, size_t length) throw(InvalidBase64Exce
   ((Character) == ' ' || (Character) == '\t' || (Character) == '\n' \
    || (Character) == '\f' || (Character) == '\r')
 
-#define READ_QUADRUPLET_BYTE(retval)                              \
+#define READ_QUADRUPLET_BYTE()                                    \
     do {                                                          \
         if (i == length) return result;                           \
         c = from[i++];                                            \