diff --git a/ChangeLog b/ChangeLog
index 8be63b814c49e92f1da30a7088562785253876df..c096a56ca826d84faa28f291cca2bceb76d66711 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Tue Apr 29 15:20:12 CEST 2008 Jim Meyering <meyering@redhat.com>
 
+	Avoid "make syntax-check" failures.
+	* src/memory.c: Include "config.h".
+	Remove trailing blanks.
+
 	Avoid in-function #if directives.
 	* src/parthelper.c [!PED_PARTITION_PROTECTED]: Define to 0.
 	Remove in-function #ifdefs.
diff --git a/src/memory.c b/src/memory.c
index fe41e383f48c40ec8e41fbd9354bb244897ccc5e..1ca67fb7d289d4540b1098847f7c2f88ac164956 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include <config.h>
 #include <stdlib.h>
 
 #include "memory.h"
@@ -72,7 +73,7 @@ int virAlloc(void *ptrptr, size_t size)
  * @size: number of bytes to allocate
  * @count: number of elements to allocate
  *
- * Allocate an array of memory 'count' elements long, 
+ * Allocate an array of memory 'count' elements long,
  * each with 'size' bytes. Return the address of the
  * allocated memory in 'ptrptr'.  The newly allocated
  * memory is filled with zeros.
@@ -101,7 +102,7 @@ int virAllocN(void *ptrptr, size_t size, size_t count)
  * Resize the block of memory in 'ptrptr' to be an array of
  * 'count' elements, each 'size' bytes in length. Update 'ptrptr'
  * with the address of the newly allocated memory. On failure,
- * 'ptrptr' is not changed and still points to the original memory 
+ * 'ptrptr' is not changed and still points to the original memory
  * block. The newly allocated memory is filled with zeros.
  *
  * Returns -1 on failure to allocate, zero on success