4 files changed, 5 insertions, 5 deletions
diff --git a/lldb/source/Commands/CommandObjectArgs.cpp b/lldb/source/Commands/CommandObjectArgs.cpp
index 7f1fd3dda94..5e432d78ca7 100644
--- a/lldb/source/Commands/CommandObjectArgs.cpp
+++ b/lldb/source/Commands/CommandObjectArgs.cpp
@@ -173,7 +173,7 @@ CommandObjectArgs::Execute(Args &command,
         void *type;
         
         char *int_pos;
-        if ((int_pos = strstr (arg_type_cstr, "int")))
+        if ((int_pos = strstr (const_cast<char*>(arg_type_cstr), "int")))
         {
             Encoding encoding = eEncodingSint;
             
diff --git a/lldb/source/Commands/CommandObjectBreakpoint.h b/lldb/source/Commands/CommandObjectBreakpoint.h
index 49007438b28..85a035f1223 100644
--- a/lldb/source/Commands/CommandObjectBreakpoint.h
+++ b/lldb/source/Commands/CommandObjectBreakpoint.h
@@ -57,7 +57,7 @@ public:
         eSetTypeFileAndLine,
         eSetTypeAddress,
         eSetTypeFunctionName,
-        eSetTypeFunctionRegexp,
+        eSetTypeFunctionRegexp
     } BreakpointSetType;
 
     CommandObjectBreakpointSet ();
diff --git a/lldb/source/Commands/CommandObjectQuit.cpp b/lldb/source/Commands/CommandObjectQuit.cpp
index b66f4b108ff..23aee3bb6f3 100644
--- a/lldb/source/Commands/CommandObjectQuit.cpp
+++ b/lldb/source/Commands/CommandObjectQuit.cpp
@@ -13,8 +13,8 @@
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
-#include "CommandInterpreter.h"
-#include "CommandReturnObject.h"
+#include "lldb/Interpreter/CommandInterpreter.h"
+#include "lldb/Interpreter/CommandReturnObject.h"
 
 using namespace lldb;
 using namespace lldb_private;
diff --git a/lldb/source/Commands/CommandObjectTranslate.cpp b/lldb/source/Commands/CommandObjectTranslate.cpp
index 48a10626c8d..88f5327e84b 100644
--- a/lldb/source/Commands/CommandObjectTranslate.cpp
+++ b/lldb/source/Commands/CommandObjectTranslate.cpp
@@ -59,7 +59,7 @@ CommandObjectTranslate::Execute
         }
         else
         {
-            result.AppendErrroWithFormat
+            result.AppendErrorWithFormat
             ("'%s' is not a known command.\nTry 'help' to see a current list of commands.\n",
              command.GetArgumentAtIndex(0));
             result.SetStatus (eReturnStatusFailed);