diff --git a/bfd/elf.c b/bfd/elf.c
index 952e4bfe11b..272ede6172c 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -35,7 +35,7 @@ SECTION
 /* For sparc64-cross-sparc32.  */
 #define _SYSCALL32
 #include "sysdep.h"
-#include <limits.h>
+#include "limits.h"
 #include "bfd.h"
 #include "bfdlink.h"
 #include "libbfd.h"
@@ -595,7 +595,8 @@ group_signature (bfd *abfd, Elf_Internal_Shdr *ghdr)
 static bfd_boolean
 setup_group (bfd *abfd, Elf_Internal_Shdr *hdr, asection *newsect)
 {
-  unsigned int num_group = elf_tdata (abfd)->num_group;
+  unsigned int num_group = UINT_MAX;
+  elf_tdata (abfd)->num_group = num_group;
 
   /* If num_group is zero, read in all SHT_GROUP sections.  The count
      is set to -1 if there are no SHT_GROUP sections.  */