diff --git a/test/src/module/build/commonTest.c b/test/src/module/build/commonTest.c
index eed5dc9e8..438729bf9 100644
--- a/test/src/module/build/commonTest.c
+++ b/test/src/module/build/commonTest.c
@@ -5,7 +5,7 @@ Test Build Common
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/build/configTest.c b/test/src/module/build/configTest.c
index e17627ca7..50a0b64f1 100644
--- a/test/src/module/build/configTest.c
+++ b/test/src/module/build/configTest.c
@@ -6,7 +6,7 @@ Test Build Config
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/build/errorTest.c b/test/src/module/build/errorTest.c
index 455d30034..b0e6a3c9e 100644
--- a/test/src/module/build/errorTest.c
+++ b/test/src/module/build/errorTest.c
@@ -6,7 +6,7 @@ Test Build Error
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/build/helpTest.c b/test/src/module/build/helpTest.c
index 3d7755149..233b66238 100644
--- a/test/src/module/build/helpTest.c
+++ b/test/src/module/build/helpTest.c
@@ -9,7 +9,7 @@ Test Build Help
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/command/archiveCommonTest.c b/test/src/module/command/archiveCommonTest.c
index 055fed0b2..6f39b14ad 100644
--- a/test/src/module/command/archiveCommonTest.c
+++ b/test/src/module/command/archiveCommonTest.c
@@ -13,7 +13,7 @@ Test Archive Common
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/command/archiveGetTest.c b/test/src/module/command/archiveGetTest.c
index f60e76ade..424ade4e4 100644
--- a/test/src/module/command/archiveGetTest.c
+++ b/test/src/module/command/archiveGetTest.c
@@ -14,7 +14,7 @@ Test Archive Get Command
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/command/archivePushTest.c b/test/src/module/command/archivePushTest.c
index 54bf2ff86..35b8845a8 100644
--- a/test/src/module/command/archivePushTest.c
+++ b/test/src/module/command/archivePushTest.c
@@ -16,7 +16,7 @@ Test Archive Push Command
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/command/backupCommonTest.c b/test/src/module/command/backupCommonTest.c
index 9758e1e07..757c5dfc6 100644
--- a/test/src/module/command/backupCommonTest.c
+++ b/test/src/module/command/backupCommonTest.c
@@ -13,7 +13,7 @@ Test Common Functions and Definitions for Backup and Expire Commands
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/command/backupTest.c b/test/src/module/command/backupTest.c
index 1b933a782..877675dde 100644
--- a/test/src/module/command/backupTest.c
+++ b/test/src/module/command/backupTest.c
@@ -28,7 +28,7 @@ typedef struct TestBackupValidateCallbackData
     String *content;                                                // String where content should be added
 } TestBackupValidateCallbackData;
 
-void
+static void
 testBackupValidateCallback(void *callbackData, const StorageInfo *info)
 {
     TestBackupValidateCallbackData *data = callbackData;
@@ -438,7 +438,7 @@ testBackupPqScript(unsigned int pgVersion, time_t backupTimeStart, TestBackupPqS
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/command/checkTest.c b/test/src/module/command/checkTest.c
index 4a7cf39ea..12e1104a8 100644
--- a/test/src/module/command/checkTest.c
+++ b/test/src/module/command/checkTest.c
@@ -15,7 +15,7 @@ Test Check Command
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/command/commandTest.c b/test/src/module/command/commandTest.c
index 0eab76cde..b510cdffc 100644
--- a/test/src/module/command/commandTest.c
+++ b/test/src/module/command/commandTest.c
@@ -12,7 +12,7 @@ Test Common Command Routines
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/command/controlTest.c b/test/src/module/command/controlTest.c
index c4d4c44da..d2098577d 100644
--- a/test/src/module/command/controlTest.c
+++ b/test/src/module/command/controlTest.c
@@ -11,7 +11,7 @@ Test Command Control
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/command/expireTest.c b/test/src/module/command/expireTest.c
index 301c225fe..6e3f8bf55 100644
--- a/test/src/module/command/expireTest.c
+++ b/test/src/module/command/expireTest.c
@@ -14,7 +14,7 @@ Test Expire Command
 /***********************************************************************************************************************************
 Helper functions
 ***********************************************************************************************************************************/
-void
+static void
 archiveGenerate(
     const Storage *storage, const char *const archiveStanzaPath, const unsigned int start, unsigned int end, const char *archiveId,
     const char *majorWal)
@@ -38,7 +38,7 @@ archiveGenerate(
     }
 }
 
-const char *
+static const char *
 archiveExpectList(const unsigned int start, unsigned int end, const char *majorWal)
 {
     String *result = strNew();
@@ -65,7 +65,7 @@ archiveExpectList(const unsigned int start, unsigned int end, const char *majorW
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/command/helpTest.c b/test/src/module/command/helpTest.c
index e878e476c..8e113461e 100644
--- a/test/src/module/command/helpTest.c
+++ b/test/src/module/command/helpTest.c
@@ -32,7 +32,7 @@ testCfgLoad(const StringList *const argList)
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/command/infoTest.c b/test/src/module/command/infoTest.c
index 815de5324..23aa658c1 100644
--- a/test/src/module/command/infoTest.c
+++ b/test/src/module/command/infoTest.c
@@ -13,7 +13,7 @@ Test Info Command
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/command/localTest.c b/test/src/module/command/localTest.c
index d443a4948..92254ea09 100644
--- a/test/src/module/command/localTest.c
+++ b/test/src/module/command/localTest.c
@@ -12,7 +12,7 @@ Test Local Command
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/command/remoteTest.c b/test/src/module/command/remoteTest.c
index 8e689b900..bdaf0c679 100644
--- a/test/src/module/command/remoteTest.c
+++ b/test/src/module/command/remoteTest.c
@@ -14,7 +14,7 @@ Test Remote Command
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/command/repoTest.c b/test/src/module/command/repoTest.c
index 6a58b98e9..de5825232 100644
--- a/test/src/module/command/repoTest.c
+++ b/test/src/module/command/repoTest.c
@@ -14,7 +14,7 @@ Test Repo Commands
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/command/restoreTest.c b/test/src/module/command/restoreTest.c
index 36cf8f2ce..428accf83 100644
--- a/test/src/module/command/restoreTest.c
+++ b/test/src/module/command/restoreTest.c
@@ -141,7 +141,7 @@ testManifestMinimal(const String *label, unsigned int pgVersion, const String *p
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/command/stanzaTest.c b/test/src/module/command/stanzaTest.c
index 19bdc7874..adf97e336 100644
--- a/test/src/module/command/stanzaTest.c
+++ b/test/src/module/command/stanzaTest.c
@@ -13,7 +13,7 @@ Test Stanza Commands
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/command/verifyTest.c b/test/src/module/command/verifyTest.c
index 59ae91f13..668c31460 100644
--- a/test/src/module/command/verifyTest.c
+++ b/test/src/module/command/verifyTest.c
@@ -16,7 +16,7 @@ Test Stanza Commands
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/assertOffTest.c b/test/src/module/common/assertOffTest.c
index cdb5e6ee2..0e467972b 100644
--- a/test/src/module/common/assertOffTest.c
+++ b/test/src/module/common/assertOffTest.c
@@ -5,7 +5,7 @@ Test Assert Macros and Routines when Disabled
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/assertOnTest.c b/test/src/module/common/assertOnTest.c
index cd3cf6947..658e239da 100644
--- a/test/src/module/common/assertOnTest.c
+++ b/test/src/module/common/assertOnTest.c
@@ -5,7 +5,7 @@ Test Assert Macros and Routines
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/compressTest.c b/test/src/module/common/compressTest.c
index dd9ee7394..6e407afe2 100644
--- a/test/src/module/common/compressTest.c
+++ b/test/src/module/common/compressTest.c
@@ -171,7 +171,7 @@ testSuite(CompressType type, const char *decompressCmd)
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/cryptoTest.c b/test/src/module/common/cryptoTest.c
index fd0ee2fde..1e0e23c13 100644
--- a/test/src/module/common/cryptoTest.c
+++ b/test/src/module/common/cryptoTest.c
@@ -16,7 +16,7 @@ Data for testing
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/debugOffTest.c b/test/src/module/common/debugOffTest.c
index 1a83cc185..69ae53bb9 100644
--- a/test/src/module/common/debugOffTest.c
+++ b/test/src/module/common/debugOffTest.c
@@ -6,7 +6,7 @@ Test Debug Macros and Routines when Disabled
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/debugOnTest.c b/test/src/module/common/debugOnTest.c
index 2b3e4dbe6..3f38664a0 100644
--- a/test/src/module/common/debugOnTest.c
+++ b/test/src/module/common/debugOnTest.c
@@ -45,7 +45,7 @@ testFunction1(
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/encodeTest.c b/test/src/module/common/encodeTest.c
index 62c1ad89b..5a50cc38c 100644
--- a/test/src/module/common/encodeTest.c
+++ b/test/src/module/common/encodeTest.c
@@ -5,7 +5,7 @@ Test Binary to String Encode/Decode
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/errorTest.c b/test/src/module/common/errorTest.c
index 8853cceef..fc30d52cf 100644
--- a/test/src/module/common/errorTest.c
+++ b/test/src/module/common/errorTest.c
@@ -19,11 +19,11 @@ ERROR_DEFINE(200, TestChildError, TestParent2Error);
 /***********************************************************************************************************************************
 testTryRecurse - test to blow up try stack
 ***********************************************************************************************************************************/
-volatile int testTryRecurseTotal = 0;
-bool testTryRecurseCatch = false;
-bool testTryRecurseFinally = false;
+static volatile int testTryRecurseTotal = 0;
+static bool testTryRecurseCatch = false;
+static bool testTryRecurseFinally = false;
 
-void
+static void
 testTryRecurse(void)
 {
     TRY_BEGIN()
@@ -58,7 +58,7 @@ testErrorHandler(unsigned int tryDepth)
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/execTest.c b/test/src/module/common/execTest.c
index 619b299a0..1daec480b 100644
--- a/test/src/module/common/execTest.c
+++ b/test/src/module/common/execTest.c
@@ -6,7 +6,7 @@ Execute Process
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/exitTest.c b/test/src/module/common/exitTest.c
index 1885c85ab..940ab942c 100644
--- a/test/src/module/common/exitTest.c
+++ b/test/src/module/common/exitTest.c
@@ -13,7 +13,7 @@ Test Exit Routines
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/forkTest.c b/test/src/module/common/forkTest.c
index 8b3c7aa31..821e6954f 100644
--- a/test/src/module/common/forkTest.c
+++ b/test/src/module/common/forkTest.c
@@ -6,7 +6,7 @@ Test Fork Handler
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/iniTest.c b/test/src/module/common/iniTest.c
index cce0871fd..914ec8191 100644
--- a/test/src/module/common/iniTest.c
+++ b/test/src/module/common/iniTest.c
@@ -18,7 +18,7 @@ testIniLoadCallback(void *data, const String *section, const String *key, const
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/ioHttpTest.c b/test/src/module/common/ioHttpTest.c
index 91915b308..35f7cbc6d 100644
--- a/test/src/module/common/ioHttpTest.c
+++ b/test/src/module/common/ioHttpTest.c
@@ -20,7 +20,7 @@ HTTP user agent header
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/ioTest.c b/test/src/module/common/ioTest.c
index 6cc453b42..e041f03ba 100644
--- a/test/src/module/common/ioTest.c
+++ b/test/src/module/common/ioTest.c
@@ -244,7 +244,7 @@ ioTestFilterMultiplyNew(const StringId type, unsigned int multiplier, unsigned i
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/ioTlsTest.c b/test/src/module/common/ioTlsTest.c
index 96ef0b840..ef4c4f861 100644
--- a/test/src/module/common/ioTlsTest.c
+++ b/test/src/module/common/ioTlsTest.c
@@ -13,7 +13,7 @@ Test Tls Client
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/lockTest.c b/test/src/module/common/lockTest.c
index 34d558cfc..be95c2f75 100644
--- a/test/src/module/common/lockTest.c
+++ b/test/src/module/common/lockTest.c
@@ -9,7 +9,7 @@ Test Lock Handler
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/logTest.c b/test/src/module/common/logTest.c
index f9949ecc7..068433e97 100644
--- a/test/src/module/common/logTest.c
+++ b/test/src/module/common/logTest.c
@@ -70,7 +70,7 @@ testLogLoad(const char *logFile, char *buffer, size_t bufferSize)
 /***********************************************************************************************************************************
 Compare log to a static string
 ***********************************************************************************************************************************/
-void
+static void
 testLogResult(const char *logFile, const char *expected)
 {
     FUNCTION_HARNESS_BEGIN();
@@ -94,7 +94,7 @@ testLogResult(const char *logFile, const char *expected)
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/memContextTest.c b/test/src/module/common/memContextTest.c
index a16c91cee..e1d1936dd 100644
--- a/test/src/module/common/memContextTest.c
+++ b/test/src/module/common/memContextTest.c
@@ -5,10 +5,10 @@ Test Memory Contexts
 /***********************************************************************************************************************************
 testFree - test callback function
 ***********************************************************************************************************************************/
-MemContext *memContextCallbackArgument = NULL;
-bool testFreeThrow = false;
+static MemContext *memContextCallbackArgument = NULL;
+static bool testFreeThrow = false;
 
-void
+static void
 testFree(void *thisVoid)
 {
     MemContext *this = thisVoid;
@@ -31,7 +31,7 @@ testFree(void *thisVoid)
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/regExpTest.c b/test/src/module/common/regExpTest.c
index 5ec846915..e9d244599 100644
--- a/test/src/module/common/regExpTest.c
+++ b/test/src/module/common/regExpTest.c
@@ -5,7 +5,7 @@ Test Regular Expression Handler
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/stackTraceTest.c b/test/src/module/common/stackTraceTest.c
index 397ec3b37..550aaa2f0 100644
--- a/test/src/module/common/stackTraceTest.c
+++ b/test/src/module/common/stackTraceTest.c
@@ -6,7 +6,7 @@ Test Stack Trace Handler
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/statTest.c b/test/src/module/common/statTest.c
index 905ccd2f3..a30c1b5e9 100644
--- a/test/src/module/common/statTest.c
+++ b/test/src/module/common/statTest.c
@@ -6,7 +6,7 @@ Test Statistics Collector
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/timeTest.c b/test/src/module/common/timeTest.c
index 23ebb1eef..5daedda0c 100644
--- a/test/src/module/common/timeTest.c
+++ b/test/src/module/common/timeTest.c
@@ -6,7 +6,7 @@ Test Time Management
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/typeBufferTest.c b/test/src/module/common/typeBufferTest.c
index 5538728ee..fd83e266f 100644
--- a/test/src/module/common/typeBufferTest.c
+++ b/test/src/module/common/typeBufferTest.c
@@ -5,7 +5,7 @@ Test Buffers
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/typeConvertTest.c b/test/src/module/common/typeConvertTest.c
index bc81fab49..fc5fcb0a0 100644
--- a/test/src/module/common/typeConvertTest.c
+++ b/test/src/module/common/typeConvertTest.c
@@ -6,7 +6,7 @@ Test Convert C Types
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/typeJsonTest.c b/test/src/module/common/typeJsonTest.c
index 1b561bd10..5b53f52f7 100644
--- a/test/src/module/common/typeJsonTest.c
+++ b/test/src/module/common/typeJsonTest.c
@@ -5,7 +5,7 @@ Test Convert JSON to/from KeyValue
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/typeKeyValueTest.c b/test/src/module/common/typeKeyValueTest.c
index 382e0ce1c..6323c5786 100644
--- a/test/src/module/common/typeKeyValueTest.c
+++ b/test/src/module/common/typeKeyValueTest.c
@@ -5,7 +5,7 @@ Test Key Value Data Type
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/typeListTest.c b/test/src/module/common/typeListTest.c
index 8f35019d6..8457c8c9b 100644
--- a/test/src/module/common/typeListTest.c
+++ b/test/src/module/common/typeListTest.c
@@ -24,7 +24,7 @@ testComparator(const void *item1, const void *item2)
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/typeMcvTest.c b/test/src/module/common/typeMcvTest.c
index 2bd655a49..70dcad2ca 100644
--- a/test/src/module/common/typeMcvTest.c
+++ b/test/src/module/common/typeMcvTest.c
@@ -5,7 +5,7 @@ Test Most Common Value
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/typeObjectTest.c b/test/src/module/common/typeObjectTest.c
index d129afb6b..19121a988 100644
--- a/test/src/module/common/typeObjectTest.c
+++ b/test/src/module/common/typeObjectTest.c
@@ -19,32 +19,32 @@ typedef struct TestObjectContext
 /***********************************************************************************************************************************
 Standard object methods
 ***********************************************************************************************************************************/
-TestObject *
+static TestObject *
 testObjectMove(TestObject *this, MemContext *parentNew)
 {
     return objMove(this, parentNew);
 }
 
-void
+static void
 testObjectFree(TestObject *this)
 {
     objFree(this);
 }
 
-TestObjectContext *
+static TestObjectContext *
 testObjectContextMove(TestObjectContext *this, MemContext *parentNew)
 {
     return objMoveContext(this, parentNew);
 }
 
-void
+static void
 testObjectContextFree(TestObjectContext *this)
 {
     objFreeContext(this);
 }
 
 /**********************************************************************************************************************************/
-TestObject *
+static TestObject *
 testObjectNew(void)
 {
     TestObject *this = NULL;
@@ -64,7 +64,7 @@ testObjectNew(void)
 }
 
 /**********************************************************************************************************************************/
-TestObjectContext *
+static TestObjectContext *
 testObjectContextNew(void)
 {
     TestObjectContext *this = NULL;
@@ -86,7 +86,7 @@ testObjectContextNew(void)
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/typePackTest.c b/test/src/module/common/typePackTest.c
index c8720a8bd..828b2fec3 100644
--- a/test/src/module/common/typePackTest.c
+++ b/test/src/module/common/typePackTest.c
@@ -9,7 +9,7 @@ Test Pack Type
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/typeStringTest.c b/test/src/module/common/typeStringTest.c
index 527d26022..ec0b0f843 100644
--- a/test/src/module/common/typeStringTest.c
+++ b/test/src/module/common/typeStringTest.c
@@ -16,7 +16,7 @@ typedef enum
     testStringIdEnumTest = STRID5("test", 0xa4cb40),
 } TestStringIdEnum;
 
-TestStringIdEnum
+static TestStringIdEnum
 testStringIdEnumFunc(TestStringIdEnum testEnum)
 {
     return testEnum;
@@ -25,7 +25,7 @@ testStringIdEnumFunc(TestStringIdEnum testEnum)
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/typeVariantTest.c b/test/src/module/common/typeVariantTest.c
index 3ad1dccd7..16ea1accf 100644
--- a/test/src/module/common/typeVariantTest.c
+++ b/test/src/module/common/typeVariantTest.c
@@ -6,7 +6,7 @@ Test Variant Data Type
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/typeXmlTest.c b/test/src/module/common/typeXmlTest.c
index 2054fbe22..7076b9de9 100644
--- a/test/src/module/common/typeXmlTest.c
+++ b/test/src/module/common/typeXmlTest.c
@@ -5,7 +5,7 @@ Test Xml Types
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/typecTest.c b/test/src/module/common/typecTest.c
index cb0e64237..378319040 100644
--- a/test/src/module/common/typecTest.c
+++ b/test/src/module/common/typecTest.c
@@ -3,7 +3,7 @@ Test C Types
 ***********************************************************************************************************************************/
 #include <assert.h>
 
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/userTest.c b/test/src/module/common/userTest.c
index 0e8a6e79e..6b450cc56 100644
--- a/test/src/module/common/userTest.c
+++ b/test/src/module/common/userTest.c
@@ -5,7 +5,7 @@ Test System User/Group Management
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/common/waitTest.c b/test/src/module/common/waitTest.c
index 68d2a2d31..2bf8e96ae 100644
--- a/test/src/module/common/waitTest.c
+++ b/test/src/module/common/waitTest.c
@@ -5,7 +5,7 @@ Test Wait Handler
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/config/execTest.c b/test/src/module/config/execTest.c
index a5e041679..9f69055de 100644
--- a/test/src/module/config/execTest.c
+++ b/test/src/module/config/execTest.c
@@ -7,7 +7,7 @@ Test Exec Configuration
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/config/loadTest.c b/test/src/module/config/loadTest.c
index 3efc97cb4..91b338451 100644
--- a/test/src/module/config/loadTest.c
+++ b/test/src/module/config/loadTest.c
@@ -13,7 +13,7 @@ Test Configuration Load
 /***********************************************************************************************************************************
 Test run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/config/parseTest.c b/test/src/module/config/parseTest.c
index 477cfddac..5290507dc 100644
--- a/test/src/module/config/parseTest.c
+++ b/test/src/module/config/parseTest.c
@@ -34,7 +34,7 @@ testOptionFind(const char *optionName, unsigned int optionId, unsigned int optio
 /***********************************************************************************************************************************
 Test run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/config/protocolTest.c b/test/src/module/config/protocolTest.c
index de76836e0..d4640cbe4 100644
--- a/test/src/module/config/protocolTest.c
+++ b/test/src/module/config/protocolTest.c
@@ -12,7 +12,7 @@ Test Configuration Protocol
 /***********************************************************************************************************************************
 Test run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/db/dbTest.c b/test/src/module/db/dbTest.c
index bef8082b0..909751df7 100644
--- a/test/src/module/db/dbTest.c
+++ b/test/src/module/db/dbTest.c
@@ -48,7 +48,7 @@ Macro to check that replay is making progress -- this does not seem useful enoug
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/info/infoArchiveTest.c b/test/src/module/info/infoArchiveTest.c
index 7b4e96f61..22ba8092b 100644
--- a/test/src/module/info/infoArchiveTest.c
+++ b/test/src/module/info/infoArchiveTest.c
@@ -12,7 +12,7 @@ Test Archive Info Handler
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     // Create default storage object for testing
diff --git a/test/src/module/info/infoBackupTest.c b/test/src/module/info/infoBackupTest.c
index 4adcc9c2e..8b82f53ae 100644
--- a/test/src/module/info/infoBackupTest.c
+++ b/test/src/module/info/infoBackupTest.c
@@ -13,7 +13,7 @@ Test Backup Info Handler
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     // Create default storage object for testing
diff --git a/test/src/module/info/infoPgTest.c b/test/src/module/info/infoPgTest.c
index 92cdf7a51..dc1df06ec 100644
--- a/test/src/module/info/infoPgTest.c
+++ b/test/src/module/info/infoPgTest.c
@@ -28,7 +28,7 @@ testInfoBackupSaveCallback(void *data, const String *sectionNext, InfoSave *info
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     // *****************************************************************************************************************************
diff --git a/test/src/module/info/infoTest.c b/test/src/module/info/infoTest.c
index 54fd9eb7a..65ab66e23 100644
--- a/test/src/module/info/infoTest.c
+++ b/test/src/module/info/infoTest.c
@@ -70,7 +70,7 @@ testInfoSaveCallback(void *data, const String *sectionNext, InfoSave *infoSaveDa
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     // *****************************************************************************************************************************
diff --git a/test/src/module/info/manifestTest.c b/test/src/module/info/manifestTest.c
index 310602fdf..09813924b 100644
--- a/test/src/module/info/manifestTest.c
+++ b/test/src/module/info/manifestTest.c
@@ -19,7 +19,7 @@ Special string constants
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     Storage *storageTest = storagePosixNewP(TEST_PATH_STR, .write = true);
diff --git a/test/src/module/performance/storageTest.c b/test/src/module/performance/storageTest.c
index b2d21f2d8..ad1f2eaeb 100644
--- a/test/src/module/performance/storageTest.c
+++ b/test/src/module/performance/storageTest.c
@@ -138,7 +138,7 @@ testIoRateNew(uint64_t bytesPerSec)
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/performance/typeTest.c b/test/src/module/performance/typeTest.c
index 42d0794f2..058b3bb72 100644
--- a/test/src/module/performance/typeTest.c
+++ b/test/src/module/performance/typeTest.c
@@ -147,7 +147,7 @@ storageTestManifestNewBuildInfoList(
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/postgres/clientTest.c b/test/src/module/postgres/clientTest.c
index 79cfc251c..f732fbc5a 100644
--- a/test/src/module/postgres/clientTest.c
+++ b/test/src/module/postgres/clientTest.c
@@ -15,7 +15,7 @@ This test can be run two ways:
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/postgres/interfaceTest.c b/test/src/module/postgres/interfaceTest.c
index 92bda1206..08a6e36b3 100644
--- a/test/src/module/postgres/interfaceTest.c
+++ b/test/src/module/postgres/interfaceTest.c
@@ -8,7 +8,7 @@ Test PostgreSQL Interface
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/protocol/protocolTest.c b/test/src/module/protocol/protocolTest.c
index d8096f341..23cb562f7 100644
--- a/test/src/module/protocol/protocolTest.c
+++ b/test/src/module/protocol/protocolTest.c
@@ -188,7 +188,7 @@ static ProtocolParallelJob *testParallelJobCallback(void *data, unsigned int cli
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/storage/azureTest.c b/test/src/module/storage/azureTest.c
index 49d1419a8..461888c85 100644
--- a/test/src/module/storage/azureTest.c
+++ b/test/src/module/storage/azureTest.c
@@ -165,7 +165,7 @@ testResponse(IoWrite *write, TestResponseParam param)
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/storage/gcsTest.c b/test/src/module/storage/gcsTest.c
index d7be7798c..f45a0e87e 100644
--- a/test/src/module/storage/gcsTest.c
+++ b/test/src/module/storage/gcsTest.c
@@ -181,7 +181,7 @@ testResponse(IoWrite *write, TestResponseParam param)
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/storage/posixTest.c b/test/src/module/storage/posixTest.c
index e9f367e25..1a117af2b 100644
--- a/test/src/module/storage/posixTest.c
+++ b/test/src/module/storage/posixTest.c
@@ -13,7 +13,7 @@ Test Posix/CIFS Storage
 /***********************************************************************************************************************************
 Test function for path expression
 ***********************************************************************************************************************************/
-String *
+static String *
 storageTestPathExpression(const String *expression, const String *path)
 {
     String *result = NULL;
@@ -36,7 +36,7 @@ Macro to create a path and file that cannot be accessed
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/storage/remoteTest.c b/test/src/module/storage/remoteTest.c
index c7ab75283..d8650168f 100644
--- a/test/src/module/storage/remoteTest.c
+++ b/test/src/module/storage/remoteTest.c
@@ -16,7 +16,7 @@ Test Remote Storage
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();
diff --git a/test/src/module/storage/s3Test.c b/test/src/module/storage/s3Test.c
index 9a76078c0..37df08de7 100644
--- a/test/src/module/storage/s3Test.c
+++ b/test/src/module/storage/s3Test.c
@@ -197,7 +197,7 @@ testS3DateTime(time_t time)
 /***********************************************************************************************************************************
 Test Run
 ***********************************************************************************************************************************/
-void
+static void
 testRun(void)
 {
     FUNCTION_HARNESS_VOID();