diff --git a/include/item.h b/include/item.h
index ae228acb..4cf24cb8 100644
--- a/include/item.h
+++ b/include/item.h
@@ -80,7 +80,7 @@ struct ichrstr {
 
 /* variables using this structure */
 
-extern struct ichrstr ichr[];
+extern struct ichrstr ichr[I_MAX + 2];
 
 /* procedures using/returning this struct */
 
diff --git a/include/land.h b/include/land.h
index 343d4636..6bb8da41 100644
--- a/include/land.h
+++ b/include/land.h
@@ -42,6 +42,7 @@
 #include "nsc.h"
 #include "retreat.h"
 
+#define N_MAXLAND	30
 #define LAND_MINEFF	10
 #define LAND_MINFIREEFF 40	/* arty must be this effic to fire */
 #define LND_MINMOBCOST  0.200
@@ -180,7 +181,7 @@ struct lchrstr {
 #define getlandp(n) \
 	(struct lndstr *) ef_ptr(EF_LAND, n)
 
-extern struct lchrstr lchr[];
+extern struct lchrstr lchr[N_MAXLAND + 1];
 extern int lnd_maxno;
 
 struct llist {
diff --git a/include/nuke.h b/include/nuke.h
index 0ac51ea4..d5da11fc 100644
--- a/include/nuke.h
+++ b/include/nuke.h
@@ -34,7 +34,7 @@
 #ifndef _NUKE_H_
 #define _NUKE_H_
 
-#define	N_MAXNUKE	15
+#define	N_MAXNUKE	20
 
 struct nukstr {
     /* initial part must match struct genitem */
@@ -78,7 +78,7 @@ struct nchrstr {
 #define NUK_BLD_WORK(lcm, hcm, oil, rad) \
   (((lcm) + 2 * (hcm) + (oil) + (rad) + 4) / 5)
 
-extern struct nchrstr nchr[];
+extern struct nchrstr nchr[N_MAXNUKE + 1];
 
 extern int nuk_maxno;
 
diff --git a/include/plane.h b/include/plane.h
index eb0f9673..bb32aac2 100644
--- a/include/plane.h
+++ b/include/plane.h
@@ -39,6 +39,7 @@
 #include "queue.h"
 #include "sect.h"
 
+#define N_MAXPLANE	40
 #define	PLANE_MINEFF	10
 
 /*
@@ -142,7 +143,7 @@ struct plist {
 #define getplanep(n) \
 	(struct plnstr *) ef_ptr(EF_PLANE, n)
 
-extern struct plchrstr plchr[];
+extern struct plchrstr plchr[N_MAXPLANE + 1];
 extern int pln_maxno;
 
 struct shiplist {
diff --git a/include/product.h b/include/product.h
index 53302657..1e296731 100644
--- a/include/product.h
+++ b/include/product.h
@@ -75,7 +75,7 @@ struct pchrstr {
 #define P_URAN	15
 #define P_MDUST	16
 
-extern struct pchrstr pchr[];
+extern struct pchrstr pchr[P_MDUST + 2];
 
 extern int prd_maxno;
 
diff --git a/include/sect.h b/include/sect.h
index ca5bd1cf..383e9927 100644
--- a/include/sect.h
+++ b/include/sect.h
@@ -163,7 +163,7 @@ struct dchrstr {
 /* things relating to sectors */
 extern int sctoff(coord x, coord y);
 
-extern struct dchrstr dchr[];
+extern struct dchrstr dchr[SCT_MAXDEF + 2];
 extern struct dchrstr bigcity_dchr;
 
 /* Minimal efficiency of sectors that can be knocked down (bridges) */
@@ -204,6 +204,6 @@ struct sctintrins {
     u_char in_mcost;
 };
 
-extern struct sctintrins intrchr[];
+extern struct sctintrins intrchr[INT_DEF + 2];
 
 #endif /* _SECT_H_ */
diff --git a/include/ship.h b/include/ship.h
index 398ddadc..3891141b 100644
--- a/include/ship.h
+++ b/include/ship.h
@@ -42,6 +42,7 @@
 #include "misc.h"
 #include "retreat.h"
 
+#define N_MAXSHIPS	40
 #define	SHIP_MINEFF	20
 
 /* bit masks for the autonav mode flags */
@@ -184,7 +185,7 @@ struct mchrstr {
 #define getshipp(n) \
 	(struct shpstr *) ef_ptr(EF_SHIP, n)
 
-extern struct mchrstr mchr[];
+extern struct mchrstr mchr[N_MAXSHIPS + 1];
 extern int shp_maxno;
 
 struct mlist {
diff --git a/src/lib/global/nuke.c b/src/lib/global/nuke.c
index fbb779b9..e82575c1 100644
--- a/src/lib/global/nuke.c
+++ b/src/lib/global/nuke.c
@@ -35,7 +35,7 @@
 #include "nuke.h"
 
 
-struct nchrstr nchr[N_MAXNUKE] = {
+struct nchrstr nchr[] = {
     /* name         lcm  hcm  oil  rads blst dam    cost  tech lbs flags */
     {"10kt  fission", 50, 50, 25, 70, 3, 70, 10000, 280, 4, 0},
     {"15kt  fission", 50, 50, 25, 80, 3, 90, 15000, 290, 5, 0},