diff --git a/src/iocsh/iocsh.cpp b/src/iocsh/iocsh.cpp
index ac74218cf..e2fd115f4 100644
--- a/src/iocsh/iocsh.cpp
+++ b/src/iocsh/iocsh.cpp
@@ -32,6 +32,8 @@
 #define epicsExportSharedSymbols
 #include "iocsh.h"
 
+extern "C" {
+
 /*
  * File-local information
  */
@@ -66,12 +68,10 @@ struct iocshRedirect {
 /*
  * Set up command table mutex
  */
-extern "C" {
 static void iocshTableOnce (void *)
 {
     iocshTableMutex = epicsMutexMustCreate ();
 }
-}
 
 /*
  * Lock the table mutex
@@ -856,8 +856,6 @@ static void iocshCmdCallFunc(const iocshArgBuf *args)
  * so they show up in the help display
  */
 
-extern "C" {
-
 /* comment */
 static const iocshArg commentArg0 = { "newline-terminated comment",iocshArgArgv};
 static const iocshArg *commentArgs[1] = {&commentArg0};