Index: source/Plugins/Process/Utility/HistoryThread.h
===================================================================
--- source/Plugins/Process/Utility/HistoryThread.h
+++ source/Plugins/Process/Utility/HistoryThread.h
@@ -10,6 +10,10 @@
 #ifndef liblldb_HistoryThread_h_
 #define liblldb_HistoryThread_h_
 
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
 #include "lldb/lldb-private.h"
 #include "lldb/Host/Mutex.h"
 #include "lldb/Core/Broadcaster.h"
@@ -37,52 +41,55 @@
 public:
     HistoryThread (lldb_private::Process &process, lldb::tid_t tid, std::vector<lldb::addr_t> pcs, uint32_t stop_id, bool stop_id_is_valid);
 
-    virtual ~HistoryThread ();
+    ~HistoryThread() override;
 
-    virtual lldb::RegisterContextSP
-    GetRegisterContext ();
+    lldb::RegisterContextSP
+    GetRegisterContext() override;
 
-    virtual lldb::RegisterContextSP
-    CreateRegisterContextForFrame (StackFrame *frame);
+    lldb::RegisterContextSP
+    CreateRegisterContextForFrame(StackFrame *frame) override;
 
-    virtual void
-    RefreshStateAfterStop() { }
+    void
+    RefreshStateAfterStop() override { }
 
     bool
-    CalculateStopInfo () { return false; }
+    CalculateStopInfo() override
+    {
+        return false;
+    }
 
     void 
-    SetExtendedBacktraceToken (uint64_t token)
+    SetExtendedBacktraceToken(uint64_t token) override
     {
         m_extended_unwind_token = token;
     }
 
     uint64_t
-    GetExtendedBacktraceToken ()
+    GetExtendedBacktraceToken() override
     {
         return m_extended_unwind_token;
     }
 
     const char *
-    GetQueueName ()
+    GetQueueName() override
     {
         return m_queue_name.c_str();
     }
 
     void
-    SetQueueName (const char *name)
+    SetQueueName(const char *name) override
     {
         m_queue_name = name;
     }
 
     lldb::queue_id_t
-    GetQueueID ()
+    GetQueueID() override
     {
         return m_queue_id;
     }
 
     void
-    SetQueueID (lldb::queue_id_t queue)
+    SetQueueID(lldb::queue_id_t queue) override
     {
         m_queue_id = queue;
     }
@@ -94,7 +101,7 @@
     }
 
     uint32_t
-    GetExtendedBacktraceOriginatingIndexID ();
+    GetExtendedBacktraceOriginatingIndexID() override;
 
     void
     SetThreadName (const char *name)
@@ -102,14 +109,14 @@
         m_thread_name = name;
     }
     
-    virtual const char *
-    GetName ()
+    const char *
+    GetName() override
     {
         return m_thread_name.c_str();
     }
     
-    virtual void
-    SetName(const char *name)
+    void
+    SetName(const char *name) override
     {
         m_thread_name = name;
     }
@@ -133,4 +140,4 @@
 
 } // namespace lldb_private
 
-#endif  // liblldb_HistoryThread_h_
+#endif // liblldb_HistoryThread_h_
Index: source/Plugins/Process/Utility/HistoryUnwind.h
===================================================================
--- source/Plugins/Process/Utility/HistoryUnwind.h
+++ source/Plugins/Process/Utility/HistoryUnwind.h
@@ -10,8 +10,12 @@
 #ifndef liblldb_HistoryUnwind_h_
 #define liblldb_HistoryUnwind_h_
 
+// C Includes
+// C++ Includes
 #include <vector>
 
+// Other libraries and framework includes
+// Project includes
 #include "lldb/lldb-private.h"
 #include "lldb/Host/Mutex.h"
 #include "lldb/Target/Unwind.h"
@@ -23,21 +27,21 @@
 public:
     HistoryUnwind (Thread &thread, std::vector<lldb::addr_t> pcs, bool stop_id_is_valid);
 
-    virtual ~HistoryUnwind ();
+    ~HistoryUnwind() override;
 
 protected:
     void
-    DoClear();
+    DoClear() override;
 
     lldb::RegisterContextSP
-    DoCreateRegisterContextForFrame (StackFrame *frame);
+    DoCreateRegisterContextForFrame(StackFrame *frame) override;
 
     bool
-    DoGetFrameInfoAtIndex (uint32_t frame_idx,
-                           lldb::addr_t& cfa, 
-                           lldb::addr_t& pc);
+    DoGetFrameInfoAtIndex(uint32_t frame_idx,
+                          lldb::addr_t& cfa, 
+                          lldb::addr_t& pc) override;
     uint32_t
-    DoGetFrameCount ();
+    DoGetFrameCount() override;
 
 private:
 
@@ -47,4 +51,4 @@
 
 } // namespace lldb_private
 
-#endif  // liblldb_HistoryUnwind_h_
+#endif // liblldb_HistoryUnwind_h_
Index: source/Plugins/Process/Utility/RegisterContextDarwin_arm.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextDarwin_arm.h
+++ source/Plugins/Process/Utility/RegisterContextDarwin_arm.h
@@ -51,61 +51,59 @@
 class RegisterContextDarwin_arm : public lldb_private::RegisterContext
 {
 public:
-
     RegisterContextDarwin_arm(lldb_private::Thread &thread, uint32_t concrete_frame_idx);
 
-    virtual
-    ~RegisterContextDarwin_arm();
+    ~RegisterContextDarwin_arm() override;
 
-    virtual void
-    InvalidateAllRegisters ();
+    void
+    InvalidateAllRegisters() override;
 
-    virtual size_t
-    GetRegisterCount ();
+    size_t
+    GetRegisterCount() override;
 
-    virtual const lldb_private::RegisterInfo *
-    GetRegisterInfoAtIndex (size_t reg);
+    const lldb_private::RegisterInfo *
+    GetRegisterInfoAtIndex(size_t reg) override;
 
-    virtual size_t
-    GetRegisterSetCount ();
+    size_t
+    GetRegisterSetCount() override;
 
-    virtual const lldb_private::RegisterSet *
-    GetRegisterSet (size_t set);
+    const lldb_private::RegisterSet *
+    GetRegisterSet(size_t set) override;
 
-    virtual bool
-    ReadRegister (const lldb_private::RegisterInfo *reg_info, 
-                  lldb_private::RegisterValue &reg_value);
+    bool
+    ReadRegister(const lldb_private::RegisterInfo *reg_info,
+                 lldb_private::RegisterValue &reg_value) override;
     
-    virtual bool
-    WriteRegister (const lldb_private::RegisterInfo *reg_info,
-                   const lldb_private::RegisterValue &reg_value);
+    bool
+    WriteRegister(const lldb_private::RegisterInfo *reg_info,
+                  const lldb_private::RegisterValue &reg_value) override;
     
-    virtual bool
-    ReadAllRegisterValues (lldb::DataBufferSP &data_sp);
+    bool
+    ReadAllRegisterValues(lldb::DataBufferSP &data_sp) override;
 
-    virtual bool
-    WriteAllRegisterValues (const lldb::DataBufferSP &data_sp);
+    bool
+    WriteAllRegisterValues(const lldb::DataBufferSP &data_sp) override;
 
-    virtual uint32_t
-    ConvertRegisterKindToRegisterNumber (lldb::RegisterKind kind, uint32_t num);
+    uint32_t
+    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num) override;
 
-    virtual uint32_t
-    NumSupportedHardwareBreakpoints ();
+    uint32_t
+    NumSupportedHardwareBreakpoints() override;
 
-    virtual uint32_t
-    SetHardwareBreakpoint (lldb::addr_t addr, size_t size);
+    uint32_t
+    SetHardwareBreakpoint(lldb::addr_t addr, size_t size) override;
 
-    virtual bool
-    ClearHardwareBreakpoint (uint32_t hw_idx);
+    bool
+    ClearHardwareBreakpoint(uint32_t hw_idx) override;
 
-    virtual uint32_t
-    NumSupportedHardwareWatchpoints ();
+    uint32_t
+    NumSupportedHardwareWatchpoints() override;
 
-    virtual uint32_t
-    SetHardwareWatchpoint (lldb::addr_t addr, size_t size, bool read, bool write);
+    uint32_t
+    SetHardwareWatchpoint(lldb::addr_t addr, size_t size, bool read, bool write) override;
 
-    virtual bool
-    ClearHardwareWatchpoint (uint32_t hw_index);
+    bool
+    ClearHardwareWatchpoint(uint32_t hw_index) override;
 
     struct GPR
     {
@@ -113,7 +111,6 @@
         uint32_t    cpsr;   // CPSR
     };
 
-
     struct QReg
     {
         uint8_t bytes[16];
@@ -163,7 +160,6 @@
     LogDBGRegisters (lldb_private::Log *log, const DBG& dbg);
 
 protected:
-
     enum
     {
         GPRRegSet = 1, // ARM_THREAD_STATE
@@ -330,4 +326,4 @@
     GetRegisterInfos ();
 };
 
-#endif  // liblldb_RegisterContextDarwin_arm_h_
+#endif // liblldb_RegisterContextDarwin_arm_h_
Index: source/Plugins/Process/Utility/RegisterContextDarwin_arm64.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextDarwin_arm64.h
+++ source/Plugins/Process/Utility/RegisterContextDarwin_arm64.h
@@ -32,52 +32,50 @@
 class RegisterContextDarwin_arm64 : public lldb_private::RegisterContext
 {
 public:
-
     RegisterContextDarwin_arm64(lldb_private::Thread &thread, uint32_t concrete_frame_idx);
 
-    virtual
-    ~RegisterContextDarwin_arm64();
+    ~RegisterContextDarwin_arm64() override;
 
-    virtual void
-    InvalidateAllRegisters ();
+    void
+    InvalidateAllRegisters() override;
 
-    virtual size_t
-    GetRegisterCount ();
+    size_t
+    GetRegisterCount() override;
 
-    virtual const lldb_private::RegisterInfo *
-    GetRegisterInfoAtIndex (size_t reg);
+    const lldb_private::RegisterInfo *
+    GetRegisterInfoAtIndex(size_t reg) override;
 
-    virtual size_t
-    GetRegisterSetCount ();
+    size_t
+    GetRegisterSetCount() override;
 
-    virtual const lldb_private::RegisterSet *
-    GetRegisterSet (size_t set);
+    const lldb_private::RegisterSet *
+    GetRegisterSet(size_t set) override;
 
-    virtual bool
-    ReadRegister (const lldb_private::RegisterInfo *reg_info, 
-                  lldb_private::RegisterValue &reg_value);
+    bool
+    ReadRegister(const lldb_private::RegisterInfo *reg_info,
+                 lldb_private::RegisterValue &reg_value) override;
     
-    virtual bool
-    WriteRegister (const lldb_private::RegisterInfo *reg_info,
-                   const lldb_private::RegisterValue &reg_value);
+    bool
+    WriteRegister(const lldb_private::RegisterInfo *reg_info,
+                  const lldb_private::RegisterValue &reg_value) override;
     
-    virtual bool
-    ReadAllRegisterValues (lldb::DataBufferSP &data_sp);
+    bool
+    ReadAllRegisterValues(lldb::DataBufferSP &data_sp) override;
 
-    virtual bool
-    WriteAllRegisterValues (const lldb::DataBufferSP &data_sp);
+    bool
+    WriteAllRegisterValues(const lldb::DataBufferSP &data_sp) override;
 
-    virtual uint32_t
-    ConvertRegisterKindToRegisterNumber (lldb::RegisterKind kind, uint32_t num);
+    uint32_t
+    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num) override;
 
-    virtual uint32_t
-    NumSupportedHardwareWatchpoints ();
+    uint32_t
+    NumSupportedHardwareWatchpoints() override;
 
-    virtual uint32_t
-    SetHardwareWatchpoint (lldb::addr_t addr, size_t size, bool read, bool write);
+    uint32_t
+    SetHardwareWatchpoint(lldb::addr_t addr, size_t size, bool read, bool write) override;
 
-    virtual bool
-    ClearHardwareWatchpoint (uint32_t hw_index);
+    bool
+    ClearHardwareWatchpoint(uint32_t hw_index) override;
 
     // mirrors <mach/arm/thread_status.h> arm_thread_state64_t
     struct GPR
@@ -90,7 +88,6 @@
         uint32_t    cpsr;   // cpsr
     };
 
-
     struct VReg
     {
         uint8_t bytes[16];
@@ -126,7 +123,6 @@
     LogDBGRegisters (lldb_private::Log *log, const DBG& dbg);
 
 protected:
-
     enum
     {
         GPRRegSet = 6,  // ARM_THREAD_STATE64
@@ -293,4 +289,4 @@
     GetRegisterInfos ();
 };
 
-#endif  // liblldb_RegisterContextDarwin_arm64_h_
+#endif // liblldb_RegisterContextDarwin_arm64_h_
Index: source/Plugins/Process/Utility/RegisterContextDarwin_i386.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextDarwin_i386.h
+++ source/Plugins/Process/Utility/RegisterContextDarwin_i386.h
@@ -20,45 +20,45 @@
 class RegisterContextDarwin_i386 : public lldb_private::RegisterContext
 {
 public:
-
     RegisterContextDarwin_i386(lldb_private::Thread &thread,
-                             uint32_t concrete_frame_idx);
+                               uint32_t concrete_frame_idx);
 
-    virtual
-    ~RegisterContextDarwin_i386();
+    ~RegisterContextDarwin_i386() override;
 
-    virtual void
-    InvalidateAllRegisters ();
+    void
+    InvalidateAllRegisters() override;
 
-    virtual size_t
-    GetRegisterCount ();
+    size_t
+    GetRegisterCount() override;
 
-    virtual const lldb_private::RegisterInfo *
-    GetRegisterInfoAtIndex (size_t reg);
+    const lldb_private::RegisterInfo *
+    GetRegisterInfoAtIndex(size_t reg) override;
 
-    virtual size_t
-    GetRegisterSetCount ();
+    size_t
+    GetRegisterSetCount() override;
 
-    virtual const lldb_private::RegisterSet *
-    GetRegisterSet (size_t set);
+    const lldb_private::RegisterSet *
+    GetRegisterSet(size_t set) override;
 
-    virtual bool
-    ReadRegister (const lldb_private::RegisterInfo *reg_info, lldb_private::RegisterValue &value);
+    bool
+    ReadRegister(const lldb_private::RegisterInfo *reg_info,
+                 lldb_private::RegisterValue &value) override;
 
-    virtual bool
-    WriteRegister (const lldb_private::RegisterInfo *reg_info, const lldb_private::RegisterValue &value);
+    bool
+    WriteRegister(const lldb_private::RegisterInfo *reg_info,
+                  const lldb_private::RegisterValue &value) override;
     
-    virtual bool
-    ReadAllRegisterValues (lldb::DataBufferSP &data_sp);
+    bool
+    ReadAllRegisterValues(lldb::DataBufferSP &data_sp) override;
 
-    virtual bool
-    WriteAllRegisterValues (const lldb::DataBufferSP &data_sp);
+    bool
+    WriteAllRegisterValues(const lldb::DataBufferSP &data_sp) override;
 
-    virtual uint32_t
-    ConvertRegisterKindToRegisterNumber (lldb::RegisterKind kind, uint32_t num);
+    uint32_t
+    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num) override;
 
-    virtual bool
-    HardwareSingleStep (bool enable);
+    bool
+    HardwareSingleStep(bool enable) override;
 
     struct GPR
     {
@@ -121,7 +121,6 @@
     };
 
 protected:
-
     enum
     {
         GPRRegSet = 1,
@@ -266,4 +265,4 @@
     GetRegisterInfos ();
 };
 
-#endif  // liblldb_RegisterContextDarwin_i386_h_
+#endif // liblldb_RegisterContextDarwin_i386_h_
Index: source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.h
+++ source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.h
@@ -23,41 +23,42 @@
     RegisterContextDarwin_x86_64 (lldb_private::Thread &thread,
                                   uint32_t concrete_frame_idx);
 
-    virtual
-    ~RegisterContextDarwin_x86_64();
+    ~RegisterContextDarwin_x86_64() override;
 
-    virtual void
-    InvalidateAllRegisters ();
+    void
+    InvalidateAllRegisters() override;
 
-    virtual size_t
-    GetRegisterCount ();
+    size_t
+    GetRegisterCount() override;
 
-    virtual const lldb_private::RegisterInfo *
-    GetRegisterInfoAtIndex (size_t reg);
+    const lldb_private::RegisterInfo *
+    GetRegisterInfoAtIndex(size_t reg) override;
 
-    virtual size_t
-    GetRegisterSetCount ();
+    size_t
+    GetRegisterSetCount() override;
 
-    virtual const lldb_private::RegisterSet *
-    GetRegisterSet (size_t set);
+    const lldb_private::RegisterSet *
+    GetRegisterSet(size_t set) override;
 
-    virtual bool
-    ReadRegister (const lldb_private::RegisterInfo *reg_info, lldb_private::RegisterValue &value);
+    bool
+    ReadRegister(const lldb_private::RegisterInfo *reg_info,
+                 lldb_private::RegisterValue &value) override;
 
-    virtual bool
-    WriteRegister (const lldb_private::RegisterInfo *reg_info, const lldb_private::RegisterValue &value);
+    bool
+    WriteRegister(const lldb_private::RegisterInfo *reg_info,
+                  const lldb_private::RegisterValue &value) override;
     
-    virtual bool
-    ReadAllRegisterValues (lldb::DataBufferSP &data_sp);
+    bool
+    ReadAllRegisterValues(lldb::DataBufferSP &data_sp) override;
 
-    virtual bool
-    WriteAllRegisterValues (const lldb::DataBufferSP &data_sp);
+    bool
+    WriteAllRegisterValues(const lldb::DataBufferSP &data_sp) override;
 
-    virtual uint32_t
-    ConvertRegisterKindToRegisterNumber (lldb::RegisterKind kind, uint32_t num);
+    uint32_t
+    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num) override;
 
-    virtual bool
-    HardwareSingleStep (bool enable);
+    bool
+    HardwareSingleStep(bool enable) override;
 
     struct GPR
     {
@@ -268,7 +269,6 @@
 
     static const lldb_private::RegisterInfo *
     GetRegisterInfos ();
-
 };
 
-#endif  // liblldb_RegisterContextDarwin_x86_64_h_
+#endif // liblldb_RegisterContextDarwin_x86_64_h_
Index: source/Plugins/Process/Utility/RegisterContextDummy.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextDummy.h
+++ source/Plugins/Process/Utility/RegisterContextDummy.h
@@ -10,8 +10,12 @@
 #ifndef lldb_RegisterContextDummy_h_
 #define lldb_RegisterContextDummy_h_
 
+// C Includes
+// C++ Includes
 #include <vector>
 
+// Other libraries and framework includes
+// Project includes
 #include "lldb/lldb-private.h"
 #include "lldb/Target/RegisterContext.h"
 #include "lldb/Symbol/SymbolContext.h"
@@ -25,42 +29,39 @@
     
     RegisterContextDummy (Thread &thread, uint32_t concrete_frame_idx, uint32_t address_byte_size);
     
-    ///
-    // pure virtual functions from the base class that we must implement
-    ///
+    ~RegisterContextDummy() override;
 
-    virtual
-    ~RegisterContextDummy ();
+    void
+    InvalidateAllRegisters() override;
 
-    virtual void
-    InvalidateAllRegisters ();
+    size_t
+    GetRegisterCount() override;
 
-    virtual size_t
-    GetRegisterCount ();
+    const lldb_private::RegisterInfo *
+    GetRegisterInfoAtIndex(size_t reg) override;
 
-    virtual const lldb_private::RegisterInfo *
-    GetRegisterInfoAtIndex (size_t reg);
+    size_t
+    GetRegisterSetCount() override;
 
-    virtual size_t
-    GetRegisterSetCount ();
+    const lldb_private::RegisterSet *
+    GetRegisterSet(size_t reg_set) override;
 
-    virtual const lldb_private::RegisterSet *
-    GetRegisterSet (size_t reg_set);
+    bool
+    ReadRegister(const lldb_private::RegisterInfo *reg_info,
+                 lldb_private::RegisterValue &value) override;
 
-    virtual bool
-    ReadRegister (const lldb_private::RegisterInfo *reg_info, lldb_private::RegisterValue &value);
+    bool
+    WriteRegister(const lldb_private::RegisterInfo *reg_info,
+                  const lldb_private::RegisterValue &value) override;
 
-    virtual bool
-    WriteRegister (const lldb_private::RegisterInfo *reg_info, const lldb_private::RegisterValue &value);
+    bool
+    ReadAllRegisterValues(lldb::DataBufferSP &data_sp) override;
 
-    virtual bool
-    ReadAllRegisterValues (lldb::DataBufferSP &data_sp);
+    bool
+    WriteAllRegisterValues(const lldb::DataBufferSP &data_sp) override;
 
-    virtual bool
-    WriteAllRegisterValues (const lldb::DataBufferSP &data_sp);
-
-    virtual uint32_t
-    ConvertRegisterKindToRegisterNumber (lldb::RegisterKind kind, uint32_t num);
+    uint32_t
+    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num) override;
     
 private:
     //------------------------------------------------------------------
@@ -72,6 +73,7 @@
     
     DISALLOW_COPY_AND_ASSIGN (RegisterContextDummy);
 };
+
 } // namespace lldb_private
 
-#endif  // lldb_RegisterContextDummy_h_
+#endif // lldb_RegisterContextDummy_h_
Index: source/Plugins/Process/Utility/RegisterContextFreeBSD_powerpc.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextFreeBSD_powerpc.h
+++ source/Plugins/Process/Utility/RegisterContextFreeBSD_powerpc.h
@@ -7,9 +7,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef liblldb_RegisterContextFreeBSD_powerpc_H_
-#define liblldb_RegisterContextFreeBSD_powerpc_H_
+#ifndef liblldb_RegisterContextFreeBSD_powerpc_h_
+#define liblldb_RegisterContextFreeBSD_powerpc_h_
 
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
 #include "RegisterInfoInterface.h"
 
 class RegisterContextFreeBSD_powerpc:
@@ -17,7 +21,7 @@
 {
 public:
     RegisterContextFreeBSD_powerpc(const lldb_private::ArchSpec &target_arch);
-    virtual ~RegisterContextFreeBSD_powerpc();
+    ~RegisterContextFreeBSD_powerpc() override;
 
     size_t
     GetGPRSize() const override;
@@ -34,7 +38,7 @@
 {
 public:
     RegisterContextFreeBSD_powerpc32(const lldb_private::ArchSpec &target_arch);
-    virtual ~RegisterContextFreeBSD_powerpc32();
+    ~RegisterContextFreeBSD_powerpc32() override;
 
     size_t
     GetGPRSize() const override;
@@ -51,7 +55,7 @@
 {
 public:
     RegisterContextFreeBSD_powerpc64(const lldb_private::ArchSpec &target_arch);
-    virtual ~RegisterContextFreeBSD_powerpc64();
+    ~RegisterContextFreeBSD_powerpc64() override;
 
     size_t
     GetGPRSize() const override;
@@ -63,4 +67,4 @@
     GetRegisterCount() const override;
 };
 
-#endif
+#endif // liblldb_RegisterContextFreeBSD_powerpc_h_
Index: source/Plugins/Process/Utility/RegisterContextHistory.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextHistory.h
+++ source/Plugins/Process/Utility/RegisterContextHistory.h
@@ -10,8 +10,12 @@
 #ifndef lldb_RegisterContextHistory_h_
 #define lldb_RegisterContextHistory_h_
 
+// C Includes
+// C++ Includes
 #include <vector>
 
+// Other libraries and framework includes
+// Project includes
 #include "lldb/lldb-private.h"
 #include "lldb/Target/RegisterContext.h"
 #include "lldb/Symbol/SymbolContext.h"
@@ -25,42 +29,39 @@
     
     RegisterContextHistory (Thread &thread, uint32_t concrete_frame_idx, uint32_t address_byte_size, lldb::addr_t pc_value);
     
-    ///
-    // pure virtual functions from the base class that we must implement
-    ///
+    ~RegisterContextHistory() override;
 
-    virtual
-    ~RegisterContextHistory ();
+    void
+    InvalidateAllRegisters() override;
 
-    virtual void
-    InvalidateAllRegisters ();
+    size_t
+    GetRegisterCount() override;
 
-    virtual size_t
-    GetRegisterCount ();
+    const lldb_private::RegisterInfo *
+    GetRegisterInfoAtIndex(size_t reg) override;
 
-    virtual const lldb_private::RegisterInfo *
-    GetRegisterInfoAtIndex (size_t reg);
+    size_t
+    GetRegisterSetCount() override;
 
-    virtual size_t
-    GetRegisterSetCount ();
+    const lldb_private::RegisterSet *
+    GetRegisterSet(size_t reg_set) override;
 
-    virtual const lldb_private::RegisterSet *
-    GetRegisterSet (size_t reg_set);
+    bool
+    ReadRegister(const lldb_private::RegisterInfo *reg_info,
+                 lldb_private::RegisterValue &value) override;
 
-    virtual bool
-    ReadRegister (const lldb_private::RegisterInfo *reg_info, lldb_private::RegisterValue &value);
+    bool
+    WriteRegister(const lldb_private::RegisterInfo *reg_info,
+                  const lldb_private::RegisterValue &value) override;
 
-    virtual bool
-    WriteRegister (const lldb_private::RegisterInfo *reg_info, const lldb_private::RegisterValue &value);
+    bool
+    ReadAllRegisterValues(lldb::DataBufferSP &data_sp) override;
 
-    virtual bool
-    ReadAllRegisterValues (lldb::DataBufferSP &data_sp);
+    bool
+    WriteAllRegisterValues(const lldb::DataBufferSP &data_sp) override;
 
-    virtual bool
-    WriteAllRegisterValues (const lldb::DataBufferSP &data_sp);
-
-    virtual uint32_t
-    ConvertRegisterKindToRegisterNumber (lldb::RegisterKind kind, uint32_t num);
+    uint32_t
+    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num) override;
     
 private:
     //------------------------------------------------------------------
@@ -76,4 +77,4 @@
 };
 } // namespace lldb_private
 
-#endif  // lldb_RegisterContextHistory_h_
+#endif // lldb_RegisterContextHistory_h_
Index: source/Plugins/Process/Utility/RegisterContextLLDB.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextLLDB.h
+++ source/Plugins/Process/Utility/RegisterContextLLDB.h
@@ -10,8 +10,12 @@
 #ifndef lldb_RegisterContextLLDB_h_
 #define lldb_RegisterContextLLDB_h_
 
+// C Includes
+// C++ Includes
 #include <vector>
 
+// Other libraries and framework includes
+// Project includes
 #include "lldb/lldb-private.h"
 #include "lldb/Target/RegisterContext.h"
 #include "lldb/Symbol/UnwindPlan.h"
@@ -33,43 +37,40 @@
                          lldb_private::SymbolContext& sym_ctx,
                          uint32_t frame_number, lldb_private::UnwindLLDB& unwind_lldb);
 
-    ///
-    // pure virtual functions from the base class that we must implement
-    ///
+    ~RegisterContextLLDB() override = default;
 
-    virtual
-    ~RegisterContextLLDB () { }
+    void
+    InvalidateAllRegisters() override;
 
-    virtual void
-    InvalidateAllRegisters ();
+    size_t
+    GetRegisterCount() override;
 
-    virtual size_t
-    GetRegisterCount ();
+    const lldb_private::RegisterInfo *
+    GetRegisterInfoAtIndex(size_t reg) override;
 
-    virtual const lldb_private::RegisterInfo *
-    GetRegisterInfoAtIndex (size_t reg);
+    size_t
+    GetRegisterSetCount() override;
 
-    virtual size_t
-    GetRegisterSetCount ();
+    const lldb_private::RegisterSet *
+    GetRegisterSet(size_t reg_set) override;
 
-    virtual const lldb_private::RegisterSet *
-    GetRegisterSet (size_t reg_set);
+    bool
+    ReadRegister(const lldb_private::RegisterInfo *reg_info,
+                 lldb_private::RegisterValue &value) override;
 
-    virtual bool
-    ReadRegister (const lldb_private::RegisterInfo *reg_info, lldb_private::RegisterValue &value);
+    bool
+    WriteRegister(const lldb_private::RegisterInfo *reg_info,
+                  const lldb_private::RegisterValue &value) override;
 
-    virtual bool
-    WriteRegister (const lldb_private::RegisterInfo *reg_info, const lldb_private::RegisterValue &value);
+    bool
+    ReadAllRegisterValues(lldb::DataBufferSP &data_sp) override;
 
-    virtual bool
-    ReadAllRegisterValues (lldb::DataBufferSP &data_sp);
+    bool
+    WriteAllRegisterValues(const lldb::DataBufferSP &data_sp) override;
 
-    virtual bool
-    WriteAllRegisterValues (const lldb::DataBufferSP &data_sp);
+    uint32_t
+    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num) override;
 
-    virtual uint32_t
-    ConvertRegisterKindToRegisterNumber (lldb::RegisterKind kind, uint32_t num);
-
     bool
     IsValid () const;
 
@@ -99,7 +100,6 @@
     // UnwindLLDB needs to pass around references to RegisterLocations
     friend class UnwindLLDB;
 
-
     // Returns true if we have an unwind loop -- the same stack frame unwinding 
     // multiple times.
     bool
@@ -130,7 +130,6 @@
     bool
     IsSkipFrame () const;
 
-
     //------------------------------------------------------------------
     /// Determines if a SymbolContext is a trap handler or not
     ///
@@ -221,7 +220,6 @@
     bool
     IsUnwindPlanValidForCurrentPC(lldb::UnwindPlanSP unwind_plan_sp, int &valid_pc_offset);
 
-
     lldb_private::Thread& m_thread;
 
     ///
@@ -269,4 +267,4 @@
 
 } // namespace lldb_private
 
-#endif  // lldb_RegisterContextLLDB_h_
+#endif // lldb_RegisterContextLLDB_h_
Index: source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.h
+++ source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.h
@@ -22,56 +22,49 @@
 class RegisterContextMacOSXFrameBackchain : public lldb_private::RegisterContext
 {
 public:
-    //------------------------------------------------------------------
-    // Constructors and Destructors
-    //------------------------------------------------------------------
     RegisterContextMacOSXFrameBackchain (lldb_private::Thread &thread,
                                          uint32_t concrete_frame_idx,
                                          const UnwindMacOSXFrameBackchain::Cursor &cursor);
 
-    virtual
-    ~RegisterContextMacOSXFrameBackchain ();
+    ~RegisterContextMacOSXFrameBackchain() override;
 
-    //------------------------------------------------------------------
-    // Subclasses must override these functions
-    //------------------------------------------------------------------
-    virtual void
-    InvalidateAllRegisters ();
+    void
+    InvalidateAllRegisters() override;
 
-    virtual size_t
-    GetRegisterCount ();
+    size_t
+    GetRegisterCount() override;
 
-    virtual const lldb_private::RegisterInfo *
-    GetRegisterInfoAtIndex (size_t reg);
+    const lldb_private::RegisterInfo *
+    GetRegisterInfoAtIndex(size_t reg) override;
 
-    virtual size_t
-    GetRegisterSetCount ();
+    size_t
+    GetRegisterSetCount() override;
 
-    virtual const lldb_private::RegisterSet *
-    GetRegisterSet (size_t reg_set);
+    const lldb_private::RegisterSet *
+    GetRegisterSet(size_t reg_set) override;
 
-    virtual bool
-    ReadRegister (const lldb_private::RegisterInfo *reg_info, lldb_private::RegisterValue &value);
+    bool
+    ReadRegister(const lldb_private::RegisterInfo *reg_info,
+                 lldb_private::RegisterValue &value) override;
 
-    virtual bool
-    WriteRegister (const lldb_private::RegisterInfo *reg_info, const lldb_private::RegisterValue &value);
+    bool
+    WriteRegister(const lldb_private::RegisterInfo *reg_info,
+                  const lldb_private::RegisterValue &value) override;
     
-    virtual bool
-    ReadAllRegisterValues (lldb::DataBufferSP &data_sp);
+    bool
+    ReadAllRegisterValues(lldb::DataBufferSP &data_sp) override;
 
-    virtual bool
-    WriteAllRegisterValues (const lldb::DataBufferSP &data_sp);
+    bool
+    WriteAllRegisterValues(const lldb::DataBufferSP &data_sp) override;
 
-    virtual uint32_t
-    ConvertRegisterKindToRegisterNumber (lldb::RegisterKind kind, uint32_t num);
+    uint32_t
+    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num) override;
     
 private:
     UnwindMacOSXFrameBackchain::Cursor m_cursor;
     bool m_cursor_is_valid;
-    //------------------------------------------------------------------
-    // For RegisterContextMacOSXFrameBackchain only
-    //------------------------------------------------------------------
+
     DISALLOW_COPY_AND_ASSIGN (RegisterContextMacOSXFrameBackchain);
 };
 
-#endif  // lldb_RegisterContextMacOSXFrameBackchain_h_
+#endif // lldb_RegisterContextMacOSXFrameBackchain_h_
Index: source/Plugins/Process/Utility/RegisterContextMemory.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextMemory.h
+++ source/Plugins/Process/Utility/RegisterContextMemory.h
@@ -25,39 +25,31 @@
 class RegisterContextMemory : public lldb_private::RegisterContext
 {
 public:
-    //------------------------------------------------------------------
-    // Constructors and Destructors
-    //------------------------------------------------------------------
     RegisterContextMemory (lldb_private::Thread &thread,
                             uint32_t concrete_frame_idx,
                             DynamicRegisterInfo &reg_info,
                             lldb::addr_t reg_data_addr);
 
-    virtual
-    ~RegisterContextMemory ();
+    ~RegisterContextMemory() override;
 
-    //------------------------------------------------------------------
-    // Subclasses must override these functions
-    //------------------------------------------------------------------
-    virtual void
-    InvalidateAllRegisters ();
+    void
+    InvalidateAllRegisters() override;
 
-    virtual size_t
-    GetRegisterCount ();
+    size_t
+    GetRegisterCount() override;
 
-    virtual const lldb_private::RegisterInfo *
-    GetRegisterInfoAtIndex (size_t reg);
+    const lldb_private::RegisterInfo *
+    GetRegisterInfoAtIndex(size_t reg) override;
 
-    virtual size_t
-    GetRegisterSetCount ();
+    size_t
+    GetRegisterSetCount() override;
 
-    virtual const lldb_private::RegisterSet *
-    GetRegisterSet (size_t reg_set);
+    const lldb_private::RegisterSet *
+    GetRegisterSet(size_t reg_set) override;
 
-    virtual uint32_t
-    ConvertRegisterKindToRegisterNumber (lldb::RegisterKind kind, uint32_t num);
+    uint32_t
+    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num) override;
 
-    
     //------------------------------------------------------------------
     // If all of the thread register are in a contiguous buffer in 
     // memory, then the default ReadRegister/WriteRegister and
@@ -66,24 +58,24 @@
     // class and modify the read/write functions as needed.
     //------------------------------------------------------------------
 
-    virtual bool
-    ReadRegister (const lldb_private::RegisterInfo *reg_info, 
-                  lldb_private::RegisterValue &reg_value);
+    bool
+    ReadRegister(const lldb_private::RegisterInfo *reg_info,
+                 lldb_private::RegisterValue &reg_value) override;
     
-    virtual bool
-    WriteRegister (const lldb_private::RegisterInfo *reg_info, 
-                   const lldb_private::RegisterValue &reg_value);
+    bool
+    WriteRegister(const lldb_private::RegisterInfo *reg_info,
+                  const lldb_private::RegisterValue &reg_value) override;
     
-    virtual bool
-    ReadAllRegisterValues (lldb::DataBufferSP &data_sp);
+    bool
+    ReadAllRegisterValues(lldb::DataBufferSP &data_sp) override;
     
-    virtual bool
-    WriteAllRegisterValues (const lldb::DataBufferSP &data_sp);
+    bool
+    WriteAllRegisterValues(const lldb::DataBufferSP &data_sp) override;
 
     void
     SetAllRegisterData  (const lldb::DataBufferSP &data_sp);
+
 protected:
-    
     void
     SetAllRegisterValid (bool b);
 
@@ -93,10 +85,7 @@
     lldb::addr_t m_reg_data_addr; // If this is valid, then we have a register context that is stored in memmory
 
 private:
-    //------------------------------------------------------------------
-    // For RegisterContextMemory only
-    //------------------------------------------------------------------
     DISALLOW_COPY_AND_ASSIGN (RegisterContextMemory);
 };
 
-#endif  // lldb_RegisterContextMemory_h_
+#endif // lldb_RegisterContextMemory_h_
Index: source/Plugins/Process/Utility/RegisterContextPOSIX_arm.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextPOSIX_arm.h
+++ source/Plugins/Process/Utility/RegisterContextPOSIX_arm.h
@@ -1,4 +1,4 @@
-//===-- RegisterContextPOSIX_arm.h ----------------------------*- C++ -*-===//
+//===-- RegisterContextPOSIX_arm.h ------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,9 +7,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef liblldb_RegisterContextPOSIX_arm_H_
-#define liblldb_RegisterContextPOSIX_arm_H_
+#ifndef liblldb_RegisterContextPOSIX_arm_h_
+#define liblldb_RegisterContextPOSIX_arm_h_
 
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
 #include "lldb/Core/Log.h"
 #include "lldb/Target/RegisterContext.h"
 #include "RegisterInfoInterface.h"
@@ -25,16 +29,16 @@
                             uint32_t concrete_frame_idx,
                             lldb_private::RegisterInfoInterface *register_info);
 
-    ~RegisterContextPOSIX_arm();
+    ~RegisterContextPOSIX_arm() override;
 
     void
     Invalidate();
 
     void
-    InvalidateAllRegisters();
+    InvalidateAllRegisters() override;
 
     size_t
-    GetRegisterCount();
+    GetRegisterCount() override;
 
     virtual size_t
     GetGPRSize();
@@ -46,19 +50,19 @@
     GetRegisterOffset(unsigned reg);
 
     const lldb_private::RegisterInfo *
-    GetRegisterInfoAtIndex(size_t reg);
+    GetRegisterInfoAtIndex(size_t reg) override;
 
     size_t
-    GetRegisterSetCount();
+    GetRegisterSetCount() override;
 
     const lldb_private::RegisterSet *
-    GetRegisterSet(size_t set);
+    GetRegisterSet(size_t set) override;
 
     const char *
     GetRegisterName(unsigned reg);
 
     uint32_t
-    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num);
+    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num) override;
 
 protected:
     struct RegInfo
@@ -118,5 +122,4 @@
     virtual bool WriteFPR() = 0;
 };
 
-#endif // #ifndef liblldb_RegisterContextPOSIX_arm_H_
-
+#endif // liblldb_RegisterContextPOSIX_arm_h_
Index: source/Plugins/Process/Utility/RegisterContextPOSIX_arm64.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextPOSIX_arm64.h
+++ source/Plugins/Process/Utility/RegisterContextPOSIX_arm64.h
@@ -7,9 +7,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef liblldb_RegisterContextPOSIX_arm64_H_
-#define liblldb_RegisterContextPOSIX_arm64_H_
+#ifndef liblldb_RegisterContextPOSIX_arm64_h_
+#define liblldb_RegisterContextPOSIX_arm64_h_
 
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
 #include "lldb/Core/Log.h"
 #include "lldb/Target/RegisterContext.h"
 #include "RegisterInfoInterface.h"
@@ -25,16 +29,16 @@
                             uint32_t concrete_frame_idx,
                             lldb_private::RegisterInfoInterface *register_info);
 
-    ~RegisterContextPOSIX_arm64();
+    ~RegisterContextPOSIX_arm64() override;
 
     void
     Invalidate();
 
     void
-    InvalidateAllRegisters();
+    InvalidateAllRegisters() override;
 
     size_t
-    GetRegisterCount();
+    GetRegisterCount() override;
 
     virtual size_t
     GetGPRSize();
@@ -46,19 +50,19 @@
     GetRegisterOffset(unsigned reg);
 
     const lldb_private::RegisterInfo *
-    GetRegisterInfoAtIndex(size_t reg);
+    GetRegisterInfoAtIndex(size_t reg) override;
 
     size_t
-    GetRegisterSetCount();
+    GetRegisterSetCount() override;
 
     const lldb_private::RegisterSet *
-    GetRegisterSet(size_t set);
+    GetRegisterSet(size_t set) override;
 
     const char *
     GetRegisterName(unsigned reg);
 
     uint32_t
-    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num);
+    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num) override;
 
 protected:
     struct RegInfo
@@ -117,4 +121,4 @@
     virtual bool WriteFPR() = 0;
 };
 
-#endif // #ifndef liblldb_RegisterContextPOSIX_arm64_H_
+#endif // liblldb_RegisterContextPOSIX_arm64_h_
Index: source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.h
+++ source/Plugins/Process/Utility/RegisterContextPOSIX_mips64.h
@@ -7,9 +7,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef liblldb_RegisterContextPOSIX_mips64_H_
-#define liblldb_RegisterContextPOSIX_mips64_H_
+#ifndef liblldb_RegisterContextPOSIX_mips64_h_
+#define liblldb_RegisterContextPOSIX_mips64_h_
 
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
 #include "lldb/Core/Log.h"
 #include "lldb/Target/RegisterContext.h"
 #include "RegisterInfoInterface.h"
@@ -28,16 +32,16 @@
                             uint32_t concrete_frame_idx,
                             lldb_private::RegisterInfoInterface *register_info);
 
-    ~RegisterContextPOSIX_mips64();
+    ~RegisterContextPOSIX_mips64() override;
 
     void
     Invalidate();
 
     void
-    InvalidateAllRegisters();
+    InvalidateAllRegisters() override;
 
     size_t
-    GetRegisterCount();
+    GetRegisterCount() override;
 
     virtual size_t
     GetGPRSize();
@@ -49,19 +53,19 @@
     GetRegisterOffset(unsigned reg);
 
     const lldb_private::RegisterInfo *
-    GetRegisterInfoAtIndex(size_t reg);
+    GetRegisterInfoAtIndex(size_t reg) override;
 
     size_t
-    GetRegisterSetCount();
+    GetRegisterSetCount() override;
 
     const lldb_private::RegisterSet *
-    GetRegisterSet(size_t set);
+    GetRegisterSet(size_t set) override;
 
     const char *
     GetRegisterName(unsigned reg);
 
     uint32_t
-    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num);
+    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num) override;
 
 protected:
     uint64_t m_gpr_mips64[k_num_gpr_registers_mips64];         // general purpose registers.
@@ -88,4 +92,4 @@
     virtual bool WriteFPR() = 0;
 };
 
-#endif // #ifndef liblldb_RegisterContextPOSIX_mips64_H_
+#endif // liblldb_RegisterContextPOSIX_mips64_h_
Index: source/Plugins/Process/Utility/RegisterContextPOSIX_powerpc.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextPOSIX_powerpc.h
+++ source/Plugins/Process/Utility/RegisterContextPOSIX_powerpc.h
@@ -1,4 +1,4 @@
-//===-- RegisterContextPOSIX_powerpc.h ---------------------------*- C++ -*-===//
+//===-- RegisterContextPOSIX_powerpc.h --------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,9 +7,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef liblldb_RegisterContextPOSIX_powerpc_H_
-#define liblldb_RegisterContextPOSIX_powerpc_H_
+#ifndef liblldb_RegisterContextPOSIX_powerpc_h_
+#define liblldb_RegisterContextPOSIX_powerpc_h_
 
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
 #include "lldb/Core/Log.h"
 #include "lldb/Target/RegisterContext.h"
 #include "RegisterInfoInterface.h"
@@ -149,16 +153,16 @@
                             uint32_t concrete_frame_idx,
                             lldb_private::RegisterInfoInterface *register_info);
 
-    ~RegisterContextPOSIX_powerpc();
+    ~RegisterContextPOSIX_powerpc() override;
 
     void
     Invalidate();
 
     void
-    InvalidateAllRegisters();
+    InvalidateAllRegisters() override;
 
     size_t
-    GetRegisterCount();
+    GetRegisterCount() override;
 
     virtual size_t
     GetGPRSize();
@@ -170,19 +174,19 @@
     GetRegisterOffset(unsigned reg);
 
     const lldb_private::RegisterInfo *
-    GetRegisterInfoAtIndex(size_t reg);
+    GetRegisterInfoAtIndex(size_t reg) override;
 
     size_t
-    GetRegisterSetCount();
+    GetRegisterSetCount() override;
 
     const lldb_private::RegisterSet *
-    GetRegisterSet(size_t set);
+    GetRegisterSet(size_t set) override;
 
     const char *
     GetRegisterName(unsigned reg);
 
     uint32_t
-    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num);
+    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num) override;
 
 protected:
     uint64_t m_gpr_powerpc[k_num_gpr_registers_powerpc];         // general purpose registers.
@@ -216,4 +220,4 @@
     virtual bool WriteVMX() = 0;
 };
 
-#endif // #ifndef liblldb_RegisterContextPOSIX_powerpc_H_
+#endif // liblldb_RegisterContextPOSIX_powerpc_h_
Index: source/Plugins/Process/Utility/RegisterContextPOSIX_x86.h
===================================================================
--- source/Plugins/Process/Utility/RegisterContextPOSIX_x86.h
+++ source/Plugins/Process/Utility/RegisterContextPOSIX_x86.h
@@ -7,9 +7,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef liblldb_RegisterContextPOSIX_x86_H_
-#define liblldb_RegisterContextPOSIX_x86_H_
+#ifndef liblldb_RegisterContextPOSIX_x86_h_
+#define liblldb_RegisterContextPOSIX_x86_h_
 
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
 #include "lldb/Core/Log.h"
 #include "lldb/Target/RegisterContext.h"
 #include "RegisterInfoInterface.h"
@@ -26,16 +30,16 @@
                             uint32_t concrete_frame_idx,
                             lldb_private::RegisterInfoInterface *register_info);
 
-    ~RegisterContextPOSIX_x86();
+    ~RegisterContextPOSIX_x86() override;
 
     void
     Invalidate();
 
     void
-    InvalidateAllRegisters();
+    InvalidateAllRegisters() override;
 
     size_t
-    GetRegisterCount();
+    GetRegisterCount() override;
 
     virtual size_t
     GetGPRSize();
@@ -47,19 +51,19 @@
     GetRegisterOffset(unsigned reg);
 
     const lldb_private::RegisterInfo *
-    GetRegisterInfoAtIndex(size_t reg);
+    GetRegisterInfoAtIndex(size_t reg) override;
 
     size_t
-    GetRegisterSetCount();
+    GetRegisterSetCount() override;
 
     const lldb_private::RegisterSet *
-    GetRegisterSet(size_t set);
+    GetRegisterSet(size_t set) override;
 
     const char *
     GetRegisterName(unsigned reg);
 
     uint32_t
-    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num);
+    ConvertRegisterKindToRegisterNumber(lldb::RegisterKind kind, uint32_t num) override;
 
     //---------------------------------------------------------------------------
     // Note: prefer kernel definitions over user-land
@@ -187,4 +191,4 @@
     virtual bool WriteFPR() = 0;
 };
 
-#endif // #ifndef liblldb_RegisterContextPOSIX_x86_H_
+#endif // liblldb_RegisterContextPOSIX_x86_h_