diff --git a/source/sw/src/grpscan.cpp b/source/sw/src/grpscan.cpp
index a1eb4bfe5..ddba9158c 100644
--- a/source/sw/src/grpscan.cpp
+++ b/source/sw/src/grpscan.cpp
@@ -30,13 +30,13 @@
 
 #include "grpscan.h"
 
-struct grpfile grpfiles[numgrpfiles] =
+grpfile grpfiles[numgrpfiles] =
 {
     { "Registered Version",     0x7545319F, 47536148, NULL },
     { "Shareware Version",      0x08A7FA1F, 26056769, NULL },
     { "Wanton Destruction (Addon)", 0xA9AAA7B7, 48698128, NULL },
 };
-struct grpfile *foundgrps = NULL;
+grpfile *foundgrps = NULL;
 
 #define GRPCACHEFILE "grpfiles.cache"
 static struct grpcache
diff --git a/source/sw/src/grpscan.h b/source/sw/src/grpscan.h
index 9407ab6f8..b50ae9934 100644
--- a/source/sw/src/grpscan.h
+++ b/source/sw/src/grpscan.h
@@ -32,7 +32,9 @@ struct grpfile
     int crcval;
     int size;
     struct grpfile *next;
-} grpfiles[numgrpfiles], *foundgrps;
+};
+
+extern grpfile grpfiles[numgrpfiles], *foundgrps;
 
 int ScanGroups(void);
 void FreeGroups(void);