diff --git a/source/components/debugger/dbcmds.c b/source/components/debugger/dbcmds.c
index 3549cdc2d..fb6376356 100644
--- a/source/components/debugger/dbcmds.c
+++ b/source/components/debugger/dbcmds.c
@@ -193,7 +193,7 @@ AcpiDbWalkForReferences (
         AcpiOsPrintf ("Reference at Entry->ChildTable %p [%4.4s]\n", Entry, &Entry->Name);
     }
 
-    return AE_OK;
+    return (AE_OK);
 }
 
 
@@ -709,7 +709,7 @@ AcpiDbWalkForSpecificObjects (
     if (ACPI_FAILURE (Status))
     {
         AcpiOsPrintf ("Could Not get pathname for object %p\n", ObjHandle);
-        return AE_OK;
+        return (AE_OK);
     }
 
     AcpiOsPrintf ("%32s", buffer);
@@ -745,7 +745,7 @@ AcpiDbWalkForSpecificObjects (
     }
 
     AcpiOsPrintf ("\n");
-    return AE_OK;
+    return (AE_OK);
 }
 
 
@@ -775,7 +775,7 @@ AcpiDbDisplayObjects (
     if (Type == ACPI_TYPE_NOT_FOUND)
     {
         AcpiOsPrintf ("Invalid or unsupported argument\n");
-        return AE_OK;
+        return (AE_OK);
     }
 
 
@@ -798,7 +798,7 @@ AcpiDbDisplayObjects (
                         AcpiDbWalkForSpecificObjects, (void *) &Type, NULL);
 
     AcpiDbSetOutputDestination (DB_CONSOLE_OUTPUT);
-    return AE_OK;
+    return (AE_OK);
 }
 
 
@@ -843,7 +843,7 @@ AcpiDbWalkAndMatchName (
         {
             /* No match, just exit */
 
-            return AE_OK;
+            return (AE_OK);
         }
     }
 
@@ -863,7 +863,7 @@ AcpiDbWalkAndMatchName (
         AcpiOsPrintf ("%32s (0x%p) - %s\n", Buffer, ObjHandle, AcpiCmGetTypeName (((ACPI_NAMED_OBJECT*)ObjHandle)->Type));
     }
 
-    return AE_OK;
+    return (AE_OK);
 }
 
 
@@ -894,7 +894,7 @@ AcpiDbFindNameInNamespace (
                         AcpiDbWalkAndMatchName, NameArg, NULL);
 
     AcpiDbSetOutputDestination (DB_CONSOLE_OUTPUT);
-    return AE_OK;
+    return (AE_OK);
 }
 
 
diff --git a/source/components/debugger/dbdisply.c b/source/components/debugger/dbdisply.c
index fd0af01b7..12bd14661 100644
--- a/source/components/debugger/dbdisply.c
+++ b/source/components/debugger/dbdisply.c
@@ -170,7 +170,7 @@ AcpiDbGetPointer (
 
 #endif
 
-    return ObjPtr;
+    return (ObjPtr);
 }
 
 
diff --git a/source/components/debugger/dbexec.c b/source/components/debugger/dbexec.c
index fd8c67089..9cb136cc6 100644
--- a/source/components/debugger/dbexec.c
+++ b/source/components/debugger/dbexec.c
@@ -215,7 +215,7 @@ AcpiDbExecuteMethod (
     AcpiGbl_CmSingleStep = FALSE;
     AcpiGbl_MethodExecuting = FALSE;
 
-    return Status;
+    return (Status);
 }
 
 
diff --git a/source/components/debugger/dbhistry.c b/source/components/debugger/dbhistry.c
index a4c55375d..2e7ea4ee3 100644
--- a/source/components/debugger/dbhistry.c
+++ b/source/components/debugger/dbhistry.c
@@ -278,7 +278,7 @@ AcpiDbGetFromHistory (
     }
 
     AcpiOsPrintf ("Invalid history number: %d\n", HistoryIndex);
-    return NULL;
+    return (NULL);
 }
 
 
diff --git a/source/components/debugger/dbinput.c b/source/components/debugger/dbinput.c
index d7fa6c815..258d5d8a3 100644
--- a/source/components/debugger/dbinput.c
+++ b/source/components/debugger/dbinput.c
@@ -391,7 +391,7 @@ AcpiDbGetNextToken (
 
     if (!String || !(*String))
     {
-        return NULL;
+        return (NULL);
     }
 
 
@@ -406,7 +406,7 @@ AcpiDbGetNextToken (
 
         if (!(*String))
         {
-            return NULL;
+            return (NULL);
         }
     }
 
@@ -431,7 +431,7 @@ AcpiDbGetNextToken (
         *Next = String + 1;
     }
 
-    return Start;
+    return (Start);
 }
 
 
@@ -485,7 +485,7 @@ AcpiDbGetLine (
     if (Count)
         Count--;  /* Number of args only */
 
-    return Count;
+    return (Count);
 }
 
 
@@ -510,20 +510,20 @@ AcpiDbMatchCommand (
 
     if (!UserCommand || UserCommand[0] == 0)
     {
-        return CMD_NULL;
+        return (CMD_NULL);
     }
 
     for (i = CMD_FIRST_VALID; Commands[i].Name; i++)
     {
         if (STRSTR (Commands[i].Name, UserCommand) == Commands[i].Name)
         {
-            return i;
+            return (i);
         }
     }
 
     /* Command not recognized */
 
-    return CMD_NOT_FOUND;
+    return (CMD_NOT_FOUND);
 }
 
 
@@ -618,7 +618,7 @@ AcpiDbCommandDispatch (
         if (ACPI_FAILURE(Status))
         {
             AcpiOsPrintf("AcpiEnable failed (0x%x)\n", Status);
-            return Status;
+            return (Status);
         }
         break;
 
@@ -651,26 +651,26 @@ AcpiDbCommandDispatch (
         CommandLine = AcpiDbGetFromHistory (Args[1]);
         if (!CommandLine)
         {
-            return AE_CTRL_TRUE;
+            return (AE_CTRL_TRUE);
         }
 
         Status = AcpiDbCommandDispatch (CommandLine, WalkState, Op);
         if (ACPI_SUCCESS (Status))
             Status = AE_CTRL_TRUE;
-        return Status;
+        return (Status);
         break;
 
     case CMD_HISTORY_LAST:
         CommandLine = AcpiDbGetFromHistory (NULL);
         if (!CommandLine)
         {
-            return AE_CTRL_TRUE;
+            return (AE_CTRL_TRUE);
         }
 
         Status = AcpiDbCommandDispatch (CommandLine, WalkState, Op);
         if (ACPI_SUCCESS (Status))
             Status = AE_CTRL_TRUE;
-        return Status;
+        return (Status);
 
     case CMD_INFORMATION:
         AcpiDbDisplayMethodInfo (Op);
@@ -681,7 +681,7 @@ AcpiDbCommandDispatch (
         {
             AcpiGbl_CmSingleStep = TRUE;
             AcpiGbl_MethodBreakpoint = 0;
-            return AE_OK;
+            return (AE_OK);
         }
         break;
 
@@ -713,7 +713,7 @@ AcpiDbCommandDispatch (
         Status = AcpiDbLoadAcpiTable (Args[1]);
         if (ACPI_FAILURE (Status))
         {
-            return Status;
+            return (Status);
         }
 
         AcpiDbSetOutputDestination (DB_REDIRECTABLE_OUTPUT);
@@ -722,7 +722,7 @@ AcpiDbCommandDispatch (
 
         if (ACPI_FAILURE (Status))
         {
-            return Status;
+            return (Status);
         }
         break;
 
@@ -834,7 +834,7 @@ AcpiDbCommandDispatch (
     /* Add all commands that come here to the history buffer */
 
     AcpiDbAddToHistory (InputBuffer);
-    return Status;
+    return (Status);
 }
 
 
@@ -970,7 +970,7 @@ AcpiDbUserCommands (
      */
     AcpiTerminate ();
 
-    return Status;
+    return (Status);
 }
 
 
diff --git a/source/components/debugger/dbstats.c b/source/components/debugger/dbstats.c
index 92c170dea..d1e378611 100644
--- a/source/components/debugger/dbstats.c
+++ b/source/components/debugger/dbstats.c
@@ -195,7 +195,7 @@ AcpiDbDisplayStatistics (
     if (!TypeArg)
     {
         AcpiOsPrintf ("Use subcommand OBJECTS, MEMORY, MISC, or TABLES\n");
-        return AE_OK;
+        return (AE_OK);
     }
 
     STRUPR (TypeArg);
@@ -203,7 +203,7 @@ AcpiDbDisplayStatistics (
     if (Type == (UINT32) -1)
     {
         AcpiOsPrintf ("Invalid or unsupported argument\n");
-        return AE_OK;
+        return (AE_OK);
     }
 
 
@@ -300,7 +300,7 @@ AcpiDbDisplayStatistics (
     }
 
     AcpiOsPrintf ("\n");
-    return AE_OK;
+    return (AE_OK);
 }