diff --git a/libguile/sort.c b/libguile/sort.c
index f5b89f51f..ab6a31f58 100644
--- a/libguile/sort.c
+++ b/libguile/sort.c
@@ -57,6 +57,11 @@
  */
 
 /* We need this to get the definitions for HAVE_ALLOCA_H, etc.  */
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+/* do we still need this here? */
 #include "libguile/scmconfig.h"
 
 /* AIX requires this to be the first thing in the file.  The #pragma
@@ -753,7 +758,7 @@ SCM_DEFINE (scm_sort, "sort", 2, 0, 0,
       items = scm_list_copy (items);
       return scm_merge_list_step (&items, scm_cmp_function (less), less, len);
     }
-#ifdef HAVE_ARRAYS
+#ifdef SCM_HAVE_ARRAYS
   /* support ordinary vectors even if arrays not available?  */
   else if (SCM_VECTORP (items))
     {
@@ -905,7 +910,7 @@ SCM_DEFINE (scm_stable_sort, "stable-sort", 2, 0, 0,
       items = scm_list_copy (items);
       return scm_merge_list_step (&items, scm_cmp_function (less), less, len);
     }
-#ifdef HAVE_ARRAYS
+#ifdef SCM_HAVE_ARRAYS
   /* support ordinary vectors even if arrays not available?  */
   else if (SCM_VECTORP (items))
     {