diff --git a/dcapi/boinc/validate_util.C b/dcapi/boinc/validate_util.C
index 1ce998c8b5..66cd9e8454 100644
--- a/dcapi/boinc/validate_util.C
+++ b/dcapi/boinc/validate_util.C
@@ -22,6 +22,10 @@
 // (see validate_trivial.C),
 // or that requires strict or fuzzy equality.
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <cassert>
 
 #include <error_numbers.h>
diff --git a/dcapi/boinc/wu.C b/dcapi/boinc/wu.C
index 6786a137e2..8f82d92e52 100644
--- a/dcapi/boinc/wu.C
+++ b/dcapi/boinc/wu.C
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 /* Include BOINC Headers */
 //#include "rsaeuro.h"
 //#include "crypt.h"
diff --git a/dcapi/configure.ac b/dcapi/configure.ac
index 9b0f90aa21..e645ecc4ed 100644
--- a/dcapi/configure.ac
+++ b/dcapi/configure.ac
@@ -70,7 +70,7 @@ if test "$no_boinc" != yes; then
 			[dc_cv_boinc_version=5])
 		])
 	CPPFLAGS="$save_CPPFLAGS"
-	AC_DEFINE([BOINC_VERSION], [$dc_cv_boinc_version])
+	AC_DEFINE_UNQUOTED([BOINC_VERSION], [$dc_cv_boinc_version])
 fi
 
 AC_ARG_WITH([clgr], AS_HELP_STRING([--with-clgr@<:@=DIR@:>@],