diff --git a/apache2/mod_security2.c b/apache2/mod_security2.c
index f58d5c5d..2a9afee7 100644
--- a/apache2/mod_security2.c
+++ b/apache2/mod_security2.c
@@ -25,15 +25,6 @@
 
 msc_engine DSOLOCAL *modsecurity = NULL;
 
-modsec_build_type_rec DSOLOCAL modsec_build_type[] = {
-    { "dev", 1 },     /* Development build */
-    { "rc", 3 },      /* Release Candidate build */
-    { "", 9 },        /* Production build */
-    { "breach", 9 },  /* Breach build */
-    { "trunk", 9 },   /* Trunk build */
-    { NULL, -1 }      /* terminator */
-};
-
 /* Global module variables; these are used for the Apache-specific functionality */
 
 char DSOLOCAL *chroot_dir = NULL;
diff --git a/apache2/modsecurity.c b/apache2/modsecurity.c
index 95f2c7c8..26af512c 100644
--- a/apache2/modsecurity.c
+++ b/apache2/modsecurity.c
@@ -16,6 +16,15 @@
 #include "msc_parsers.h"
 #include "msc_util.h"
 
+modsec_build_type_rec DSOLOCAL modsec_build_type[] = {
+    { "dev", 1 },     /* Development build */
+    { "rc", 3 },      /* Release Candidate build */
+    { "", 9 },        /* Production build */
+    { "breach", 9 },  /* Breach build */
+    { "trunk", 9 },   /* Trunk build */
+    { NULL, -1 }      /* terminator */
+};
+
 /**
  * Log an alert message to the log, adding the rule metadata at the end.
  */
diff --git a/apache2/msc_test.c b/apache2/msc_test.c
index e7f65eed..5bb36cf1 100644
--- a/apache2/msc_test.c
+++ b/apache2/msc_test.c
@@ -19,15 +19,6 @@
 
 #define BUFLEN 8192
 
-modsec_build_type_rec DSOLOCAL modsec_build_type[] = {
-    { "dev", 1 },     /* Development build */
-    { "rc", 3 },      /* Release Candidate build */
-    { "", 9 },        /* Production build */
-    { "breach", 9 },  /* Breach build */
-    { "trunk", 9 },   /* Trunk build */
-    { NULL, -1 }      /* terminator */
-};
-
 #define RESULT_SUCCESS           0
 #define RESULT_ERROR            -1
 #define RESULT_MISMATCHED       -2
diff --git a/apache2/t/run-tests.pl b/apache2/t/run-tests.pl
index bace1e50..77589153 100755
--- a/apache2/t/run-tests.pl
+++ b/apache2/t/run-tests.pl
@@ -3,7 +3,7 @@ use strict;
 use File::Basename qw(basename dirname);
 
 my @TYPES = qw(tfns operators);
-my $TEST = "./msc-test";
+my $TEST = "./msc_test";
 my $SCRIPT = basename($0);
 my $SCRIPTDIR = dirname($0);
 my $PASSED = 0;