diff --git a/alberta/src/1d/disc-ortho-poly.c.h b/alberta/src/1d/disc-ortho-poly.c.h
index 5b69939c9280cb8be6a909471c14d9f086f26d57..2205e19b3d9ad2cca6f313dc5dbe0ab4e331f1a7 100644
--- a/alberta/src/1d/disc-ortho-poly.c.h
+++ b/alberta/src/1d/disc-ortho-poly.c.h
@@ -320,7 +320,7 @@ static const EL_BNDRY_VEC *d_ortho_get_bound_1_1d(BNDRY_FLAGS *vec,
 						  const BAS_FCTS *thisptr)
 {
   FUNCNAME("d_get_bound2_1d");
-  DEF_EL_VEC_D_ORTHO_1_1D(BNDRY, rvec_space);
+  static DEF_EL_VEC_D_ORTHO_1_1D(BNDRY, rvec_space);
   BNDRY_FLAGS *rvec = vec ? vec : rvec_space->vec;
   int i;
 
diff --git a/alberta/src/1d/disc_lagrange_0_1d.c b/alberta/src/1d/disc_lagrange_0_1d.c
index 1067241da4f4b854015bbea879b9308f8cdbbc5b..39238b9fb519855b4e17dd394c4247fbaa5f1df3 100644
--- a/alberta/src/1d/disc_lagrange_0_1d.c
+++ b/alberta/src/1d/disc_lagrange_0_1d.c
@@ -119,7 +119,7 @@ static const EL_BNDRY_VEC *
 d_get_bound0_1d(BNDRY_FLAGS *vec,
 		const EL_INFO *el_info, const BAS_FCTS *thisptr)
 {
-  DEF_EL_VEC_D_0_1D(BNDRY, rvec_space);
+  static DEF_EL_VEC_D_0_1D(BNDRY, rvec_space);
   BNDRY_FLAGS *rvec = vec ? vec : rvec_space->vec;
 
   BNDRY_FLAGS_CPY(rvec[0], el_info->edge_bound[0]);
diff --git a/alberta/src/1d/disc_lagrange_1_1d.c b/alberta/src/1d/disc_lagrange_1_1d.c
index ccb8e254035d5d2711112b6d3ce89166102f51b4..a75e2b348eaac54946a4a3411d38fdf73e4a45eb 100644
--- a/alberta/src/1d/disc_lagrange_1_1d.c
+++ b/alberta/src/1d/disc_lagrange_1_1d.c
@@ -141,7 +141,7 @@ static const EL_BNDRY_VEC *d_get_bound1_1d(BNDRY_FLAGS *vec,
 					   const BAS_FCTS *thisptr)
 {
   FUNCNAME("d_get_bound1_1d");
-  DEF_EL_VEC_D_1_1D(BNDRY, rvec_space);
+  static DEF_EL_VEC_D_1_1D(BNDRY, rvec_space);
   BNDRY_FLAGS *rvec = vec ? vec : rvec_space->vec;
   int i;
 
diff --git a/alberta/src/1d/disc_lagrange_2_1d.c b/alberta/src/1d/disc_lagrange_2_1d.c
index 6367cbf4f769fd16a87870147a539890e03a5b83..094a5bc85d76119fc7ba1df534fbc69fe3204656 100644
--- a/alberta/src/1d/disc_lagrange_2_1d.c
+++ b/alberta/src/1d/disc_lagrange_2_1d.c
@@ -171,7 +171,7 @@ static const EL_BNDRY_VEC *d_get_bound2_1d(BNDRY_FLAGS *vec,
 					   const BAS_FCTS *thisptr)
 {
   FUNCNAME("d_get_bound1_1d");
-  DEF_EL_VEC_D_1_1D(BNDRY, rvec_space);
+  static DEF_EL_VEC_D_1_1D(BNDRY, rvec_space);
   BNDRY_FLAGS *rvec = vec ? vec : rvec_space->vec;
   int i;
 
diff --git a/alberta/src/1d/lagrange_2_1d.c b/alberta/src/1d/lagrange_2_1d.c
index a702e42d863513ad341667a8634b0c7b55c132e7..24ca83ad17c54adeea1a4ce5961b4216bed9239a 100644
--- a/alberta/src/1d/lagrange_2_1d.c
+++ b/alberta/src/1d/lagrange_2_1d.c
@@ -204,7 +204,7 @@ static const EL_BNDRY_VEC *get_bound2_1d(BNDRY_FLAGS *vec,
 					 const BAS_FCTS *thisptr)
 {
   FUNCNAME("get_bound2_1d");
-  DEF_EL_VEC_2_1D(BNDRY, rvec_space);
+  static DEF_EL_VEC_2_1D(BNDRY, rvec_space);
   BNDRY_FLAGS *rvec = vec ? vec : rvec_space->vec;
   int i;
 
diff --git a/alberta/src/1d/lagrange_3_1d.c b/alberta/src/1d/lagrange_3_1d.c
index 746bdd177e794cc6d50670bc49c5ec8f77323556..7298ea3cdc3b64993da7e415bcd79d0cf4151cd7 100644
--- a/alberta/src/1d/lagrange_3_1d.c
+++ b/alberta/src/1d/lagrange_3_1d.c
@@ -250,7 +250,7 @@ static const EL_BNDRY_VEC *get_bound3_1d(BNDRY_FLAGS *vec,
 					 const BAS_FCTS *thisptr)
 {
   FUNCNAME("get_bound3_1d");
-  DEF_EL_VEC_3_1D(BNDRY, rvec_space);
+  static DEF_EL_VEC_3_1D(BNDRY, rvec_space);
   BNDRY_FLAGS *rvec = vec ? vec : rvec_space->vec;
   int ibas = 0, i, j;
 
diff --git a/alberta/src/1d/lagrange_4_1d.c b/alberta/src/1d/lagrange_4_1d.c
index 40c68c56b8d926aa06c5009fd26fce9dfc6adf5e..05bfdf8f234f0dadad636c65cc4e2d52c3762d00 100644
--- a/alberta/src/1d/lagrange_4_1d.c
+++ b/alberta/src/1d/lagrange_4_1d.c
@@ -332,7 +332,7 @@ static const EL_BNDRY_VEC *get_bound4_1d(BNDRY_FLAGS *vec,
 					 const BAS_FCTS *thisptr)
 {
   FUNCNAME("get_bound4_1d");
-  DEF_EL_VEC_4_1D(BNDRY, rvec_space);
+  static DEF_EL_VEC_4_1D(BNDRY, rvec_space);
   BNDRY_FLAGS *rvec = vec ? vec : rvec_space->vec;
   int ibas = 0, i, j;
 
diff --git a/alberta/src/2d/disc-ortho-poly.c.h b/alberta/src/2d/disc-ortho-poly.c.h
index cf58a829ba83d4a22292bfae7b6d931a24a951b9..04b81e51fba1323b3e6bde5f54adf02e4bea5540 100644
--- a/alberta/src/2d/disc-ortho-poly.c.h
+++ b/alberta/src/2d/disc-ortho-poly.c.h
@@ -352,7 +352,7 @@ static const EL_BNDRY_VEC *d_ortho_get_bound_1_2d(BNDRY_FLAGS *vec,
 						  const BAS_FCTS *thisptr)
 {
   FUNCNAME("d_get_bound2_2d");
-  DEF_EL_VEC_D_ORTHO_1_2D(BNDRY, rvec_space);
+  static DEF_EL_VEC_D_ORTHO_1_2D(BNDRY, rvec_space);
   BNDRY_FLAGS *rvec = vec ? vec : rvec_space->vec;
   int i;
 
@@ -751,7 +751,7 @@ static const EL_BNDRY_VEC *d_ortho_get_bound_2_2d(BNDRY_FLAGS *vec,
 						  const BAS_FCTS *thisptr)
 {
   FUNCNAME("d_get_bound2_2d");
-  DEF_EL_VEC_D_ORTHO_2_2D(BNDRY, rvec_space);
+  static DEF_EL_VEC_D_ORTHO_2_2D(BNDRY, rvec_space);
   BNDRY_FLAGS *rvec = vec ? vec : rvec_space->vec;
   int i;
 
diff --git a/alberta/src/2d/disc_lagrange_0_2d.c b/alberta/src/2d/disc_lagrange_0_2d.c
index 3efe2f4f4bb1181cbc1c6712095b2d94255de93a..f642c5be2e1e4fdd64b1d3e0c204acc58acd4929 100644
--- a/alberta/src/2d/disc_lagrange_0_2d.c
+++ b/alberta/src/2d/disc_lagrange_0_2d.c
@@ -119,7 +119,7 @@ static const EL_BNDRY_VEC *
 d_get_bound0_2d(BNDRY_FLAGS *vec,
 		const EL_INFO *el_info, const BAS_FCTS *thisptr)
 {
-  DEF_EL_VEC_D_0_2D(BNDRY, rvec_space);
+  static DEF_EL_VEC_D_0_2D(BNDRY, rvec_space);
   BNDRY_FLAGS *rvec = vec ? vec : rvec_space->vec;
 
   BNDRY_FLAGS_INIT(rvec[0]);
diff --git a/alberta/src/2d/disc_lagrange_1_2d.c b/alberta/src/2d/disc_lagrange_1_2d.c
index 8a5688f977a4e8068faefee5c81723c4cee2abfa..7adb424e3d4029aaf7b0ec47dd218f2afe0010ca 100644
--- a/alberta/src/2d/disc_lagrange_1_2d.c
+++ b/alberta/src/2d/disc_lagrange_1_2d.c
@@ -173,7 +173,7 @@ static const EL_BNDRY_VEC *d_get_bound1_2d(BNDRY_FLAGS *vec,
 					   const BAS_FCTS *thisptr)
 {
   FUNCNAME("d_get_bound1_2d");
-  DEF_EL_VEC_D_1_2D(BNDRY, rvec_space);
+  static DEF_EL_VEC_D_1_2D(BNDRY, rvec_space);
   BNDRY_FLAGS *rvec = vec ? vec : rvec_space->vec;
   int i;
 
diff --git a/alberta/src/2d/disc_lagrange_2_2d.c b/alberta/src/2d/disc_lagrange_2_2d.c
index cf84614f21b22b60805c5688fa58e72d4b0f6083..a6684e589422d7a155c570df2ab2314fcfc41f1b 100644
--- a/alberta/src/2d/disc_lagrange_2_2d.c
+++ b/alberta/src/2d/disc_lagrange_2_2d.c
@@ -266,7 +266,7 @@ static const EL_BNDRY_VEC *d_get_bound2_2d(BNDRY_FLAGS *vec,
 					   const BAS_FCTS *thisptr)
 {
   FUNCNAME("d_get_bound2_2d");
-  DEF_EL_VEC_D_2_2D(BNDRY, rvec_space);
+  static DEF_EL_VEC_D_2_2D(BNDRY, rvec_space);
   BNDRY_FLAGS *rvec = vec ? vec : rvec_space->vec;
   int i;
 
diff --git a/alberta/src/3d/disc-ortho-poly.c.h b/alberta/src/3d/disc-ortho-poly.c.h
index 5b5823169067ada2722274dab65b26fad3fc6ced..830bf70a77cfcfa65b10159284ffb48d8c8ae689 100644
--- a/alberta/src/3d/disc-ortho-poly.c.h
+++ b/alberta/src/3d/disc-ortho-poly.c.h
@@ -1218,7 +1218,7 @@ static const EL_BNDRY_VEC *d_ortho_get_bound_1_3d(BNDRY_FLAGS *vec,
 						  const BAS_FCTS *thisptr)
 {
   FUNCNAME("d_get_bound2_3d");
-  DEF_EL_VEC_D_ORTHO_1_3D(BNDRY, rvec_space);
+  static DEF_EL_VEC_D_ORTHO_1_3D(BNDRY, rvec_space);
   BNDRY_FLAGS *rvec = vec ? vec : rvec_space->vec;
   int i;
 
@@ -1646,7 +1646,7 @@ static const EL_BNDRY_VEC *d_ortho_get_bound_2_3d(BNDRY_FLAGS *vec,
 						  const BAS_FCTS *thisptr)
 {
   FUNCNAME("d_get_bound2_3d");
-  DEF_EL_VEC_D_ORTHO_2_3D(BNDRY, rvec_space);
+  static DEF_EL_VEC_D_ORTHO_2_3D(BNDRY, rvec_space);
   BNDRY_FLAGS *rvec = vec ? vec : rvec_space->vec;
   int i;
 
diff --git a/alberta/src/3d/disc_lagrange_0_3d.c b/alberta/src/3d/disc_lagrange_0_3d.c
index e8a5b261e8ce56f92068a6ca33cd7de128de6125..03cd0cff61e5788759389e7a422443bf5837b9a7 100644
--- a/alberta/src/3d/disc_lagrange_0_3d.c
+++ b/alberta/src/3d/disc_lagrange_0_3d.c
@@ -120,7 +120,7 @@ static const EL_BNDRY_VEC *
 d_get_bound0_3d(BNDRY_FLAGS *vec,
 		const EL_INFO *el_info, const BAS_FCTS *thisptr)
 {
-  DEF_EL_VEC_D_0_3D(BNDRY, rvec_space);
+  static DEF_EL_VEC_D_0_3D(BNDRY, rvec_space);
   BNDRY_FLAGS *rvec = vec ? vec : rvec_space->vec;
 
   BNDRY_FLAGS_INIT(rvec[0]);
diff --git a/alberta/src/3d/disc_lagrange_1_3d.c b/alberta/src/3d/disc_lagrange_1_3d.c
index 9b2feab3af7b928c419e18f5c949ed1cf2e39e0d..dc646f5760e20a7aa4d5e60322dbbced7ace6c84 100644
--- a/alberta/src/3d/disc_lagrange_1_3d.c
+++ b/alberta/src/3d/disc_lagrange_1_3d.c
@@ -196,7 +196,7 @@ static const EL_BNDRY_VEC *d_get_bound1_3d(BNDRY_FLAGS *vec,
 					   const BAS_FCTS *thisptr)
 {
   FUNCNAME("d_get_bound1_3d");
-  DEF_EL_VEC_D_1_3D(BNDRY, rvec_space);
+  static DEF_EL_VEC_D_1_3D(BNDRY, rvec_space);
   BNDRY_FLAGS *rvec = vec ? vec : rvec_space->vec;
   int i;
 
diff --git a/alberta/src/3d/disc_lagrange_2_3d.c b/alberta/src/3d/disc_lagrange_2_3d.c
index 12f7003188df408e29f7e43521a7fa6df0aaaa64..219bfa942d501263053e1bdb12d8b5fb52cb4388 100644
--- a/alberta/src/3d/disc_lagrange_2_3d.c
+++ b/alberta/src/3d/disc_lagrange_2_3d.c
@@ -380,7 +380,7 @@ static const EL_BNDRY_VEC *d_get_bound2_3d(BNDRY_FLAGS *vec,
 					   const BAS_FCTS *thisptr)
 {
   FUNCNAME("d_get_bound2_3d");
-  DEF_EL_VEC_D_2_3D(BNDRY, rvec_space);
+  static DEF_EL_VEC_D_2_3D(BNDRY, rvec_space);
   BNDRY_FLAGS *rvec = vec ? vec : rvec_space->vec;
   int i;