diff --git a/CommandLineArguments.cxx b/CommandLineArguments.cxx
index d39a2794b9..be312cc6af 100644
--- a/CommandLineArguments.cxx
+++ b/CommandLineArguments.cxx
@@ -513,6 +513,8 @@ void CommandLineArguments::GenerateHelp()
         case CommandLineArguments::EQUAL_ARGUMENT:
           clen += 4;
           break;
+        default:
+          break;
       }
       if (clen > maxlen) {
         maxlen = clen;
@@ -544,6 +546,8 @@ void CommandLineArguments::GenerateHelp()
         case CommandLineArguments::MULTI_ARGUMENT:
           argument += " opt opt ...";
           break;
+        default:
+          break;
       }
       str << "  " << argument.substr(0, maxstrlen) << "  ";
     }
diff --git a/ProcessUNIX.c b/ProcessUNIX.c
index ce6bb7b9cf..a918b8d9a7 100644
--- a/ProcessUNIX.c
+++ b/ProcessUNIX.c
@@ -1179,6 +1179,8 @@ static int kwsysProcessWaitForPipe(kwsysProcess* cp, char** data, int* length,
             case KWSYSPE_PIPE_STDERR:
               wd->PipeId = kwsysProcess_Pipe_STDERR;
               break;
+            default:
+              break;
           }
           return 1;
         }
@@ -2851,6 +2853,8 @@ static void kwsysProcessesSignalHandler(int signum
 
   /* Signal all process objects that a child has terminated.  */
   switch (signum) {
+    default:
+      break;
     case SIGCHLD:
       for (i = 0; i < kwsysProcesses.Count; ++i) {
         /* Set the pipe in a signalled state.  */
diff --git a/Status.cxx b/Status.cxx
index 17cb0ebd7a..1c343bceed 100644
--- a/Status.cxx
+++ b/Status.cxx
@@ -55,6 +55,8 @@ std::string Status::GetString() const
       LocalFree(message);
     } break;
 #endif
+    default:
+      break;
   }
   return err;
 }
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index aca032459e..f277e567d3 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -1804,6 +1804,8 @@ int SystemInformationImplementation::GetProcessorCacheXSize(
       return this->Features.L2CacheSize;
     case SystemInformation::CPU_FEATURE_L3CACHE:
       return this->Features.L3CacheSize;
+    default:
+      break;
   }
   return -1;
 }
@@ -4814,6 +4816,8 @@ std::string SystemInformationImplementation::RunProcess(
       std::cerr << "Unexpected ending state after running " << args[0]
                 << std::endl;
     } break;
+    default:
+      break;
   }
   kwsysProcess_Delete(gp);
   if (result) {
diff --git a/Terminal.c b/Terminal.c
index 2e62779092..50be83c0f6 100644
--- a/Terminal.c
+++ b/Terminal.c
@@ -297,6 +297,8 @@ static void kwsysTerminalSetVT100Color(FILE* stream, int color)
     case kwsysTerminal_Color_ForegroundWhite:
       fprintf(stream, KWSYS_TERMINAL_VT100_FOREGROUND_WHITE);
       break;
+    default:
+      break;
   }
   switch (color & kwsysTerminal_Color_BackgroundMask) {
     case kwsysTerminal_Color_BackgroundBlack:
@@ -323,6 +325,8 @@ static void kwsysTerminalSetVT100Color(FILE* stream, int color)
     case kwsysTerminal_Color_BackgroundWhite:
       fprintf(stream, KWSYS_TERMINAL_VT100_BACKGROUND_WHITE);
       break;
+    default:
+      break;
   }
   if (color & kwsysTerminal_Color_ForegroundBold) {
     fprintf(stream, KWSYS_TERMINAL_VT100_BOLD);
diff --git a/testProcess.c b/testProcess.c
index 137bd4bf06..3c61ada87c 100644
--- a/testProcess.c
+++ b/testProcess.c
@@ -478,6 +478,8 @@ static int runChild2(kwsysProcess* kp, char const* cmd[], int state,
       printf("Error in administrating child process: [%s]\n",
              kwsysProcess_GetErrorString(kp));
       break;
+    default:
+      break;
   }
 
   if (result) {
@@ -629,6 +631,8 @@ int main(int argc, char const* argv[])
         return test9_grandchild(argc, argv);
       case 110:
         return test10_grandchild(argc, argv);
+      default:
+        break;
     }
     fprintf(stderr, "Invalid test number %d.\n", n);
     return 1;