diff --git a/lldb/include/lldb/Breakpoint/BreakpointResolverFileLine.h b/lldb/include/lldb/Breakpoint/BreakpointResolverFileLine.h
index 68ec0189932174e3feaa70c80854cdb11c32664e..cd62bcd032b07139ecd932ec2c6df9fae411e630 100644
--- a/lldb/include/lldb/Breakpoint/BreakpointResolverFileLine.h
+++ b/lldb/include/lldb/Breakpoint/BreakpointResolverFileLine.h
@@ -37,20 +37,20 @@ public:
     virtual
     ~BreakpointResolverFileLine ();
 
-    virtual Searcher::CallbackReturn
+    Searcher::CallbackReturn
     SearchCallback (SearchFilter &filter,
                     SymbolContext &context,
                     Address *addr,
-                    bool containing);
+                    bool containing) override;
 
-    virtual Searcher::Depth
-    GetDepth ();
+    Searcher::Depth
+    GetDepth () override;
 
-    virtual void
-    GetDescription (Stream *s);
+    void
+    GetDescription (Stream *s) override;
 
-    virtual void
-    Dump (Stream *s) const;
+    void
+    Dump (Stream *s) const override;
 
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     static inline bool classof(const BreakpointResolverFileLine *) { return true; }
diff --git a/lldb/include/lldb/Breakpoint/BreakpointResolverName.h b/lldb/include/lldb/Breakpoint/BreakpointResolverName.h
index c17644784581781b7d3575bb4b1fc53b58c423ea..c2a5b180f289c36161bd80dfb4b1c0d56661cf98 100644
--- a/lldb/include/lldb/Breakpoint/BreakpointResolverName.h
+++ b/lldb/include/lldb/Breakpoint/BreakpointResolverName.h
@@ -64,20 +64,20 @@ public:
     virtual
     ~BreakpointResolverName ();
 
-    virtual Searcher::CallbackReturn
+    Searcher::CallbackReturn
     SearchCallback (SearchFilter &filter,
                     SymbolContext &context,
                     Address *addr,
-                    bool containing);
+                    bool containing) override;
 
-    virtual Searcher::Depth
-    GetDepth ();
+    Searcher::Depth
+    GetDepth () override;
 
-    virtual void
-    GetDescription (Stream *s);
+    void
+    GetDescription (Stream *s) override;
 
-    virtual void
-    Dump (Stream *s) const;
+    void
+    Dump (Stream *s) const override;
 
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     static inline bool classof(const BreakpointResolverName *) { return true; }
diff --git a/lldb/include/lldb/Core/SearchFilter.h b/lldb/include/lldb/Core/SearchFilter.h
index 0dc3f929736a713e8d7346fd92eae5742e187b10..bbb7509cedb222d32529435c0ec2bdd8150741e9 100644
--- a/lldb/include/lldb/Core/SearchFilter.h
+++ b/lldb/include/lldb/Core/SearchFilter.h
@@ -274,11 +274,11 @@ public:
     SearchFilterForUnconstrainedSearches (const lldb::TargetSP &target_sp) : SearchFilter(target_sp) {}
     ~SearchFilterForUnconstrainedSearches () {}
     
-    virtual bool 
-    ModulePasses (const FileSpec &module_spec);
+    bool 
+    ModulePasses (const FileSpec &module_spec) override;
     
-    virtual bool
-    ModulePasses (const lldb::ModuleSP &module_sp);
+    bool
+    ModulePasses (const lldb::ModuleSP &module_sp) override;
 
 protected:
     lldb::SearchFilterSP
@@ -317,32 +317,32 @@ public:
     const SearchFilterByModule&
     operator=(const SearchFilterByModule& rhs);
 
-    virtual bool
-    ModulePasses (const lldb::ModuleSP &module_sp);
+    bool
+    ModulePasses (const lldb::ModuleSP &module_sp) override;
 
-    virtual bool
-    ModulePasses (const FileSpec &spec);
+    bool
+    ModulePasses (const FileSpec &spec) override;
 
-    virtual bool
-    AddressPasses (Address &address);
+    bool
+    AddressPasses (Address &address) override;
 
-    virtual bool
-    CompUnitPasses (FileSpec &fileSpec);
+    bool
+    CompUnitPasses (FileSpec &fileSpec) override;
 
-    virtual bool
-    CompUnitPasses (CompileUnit &compUnit);
+    bool
+    CompUnitPasses (CompileUnit &compUnit) override;
 
-    virtual void
-    GetDescription(Stream *s);
+    void
+    GetDescription(Stream *s) override;
 
-    virtual uint32_t
-    GetFilterRequiredItems ();
+    uint32_t
+    GetFilterRequiredItems () override;
 
-    virtual void
-    Dump (Stream *s) const;
+    void
+    Dump (Stream *s) const override;
 
-    virtual void
-    Search (Searcher &searcher);
+    void
+    Search (Searcher &searcher) override;
 
 protected:
     lldb::SearchFilterSP
@@ -378,32 +378,32 @@ public:
     const SearchFilterByModuleList&
     operator=(const SearchFilterByModuleList& rhs);
 
-    virtual bool
-    ModulePasses (const lldb::ModuleSP &module_sp);
+    bool
+    ModulePasses (const lldb::ModuleSP &module_sp) override;
 
-    virtual bool
-    ModulePasses (const FileSpec &spec);
+    bool
+    ModulePasses (const FileSpec &spec) override;
 
-    virtual bool
-    AddressPasses (Address &address);
+    bool
+    AddressPasses (Address &address) override;
 
-    virtual bool
-    CompUnitPasses (FileSpec &fileSpec);
+    bool
+    CompUnitPasses (FileSpec &fileSpec) override;
 
-    virtual bool
-    CompUnitPasses (CompileUnit &compUnit);
+    bool
+    CompUnitPasses (CompileUnit &compUnit) override;
 
-    virtual void
-    GetDescription(Stream *s);
+    void
+    GetDescription(Stream *s) override;
 
-    virtual uint32_t
-    GetFilterRequiredItems ();
+    uint32_t
+    GetFilterRequiredItems () override;
 
-    virtual void
-    Dump (Stream *s) const;
+    void
+    Dump (Stream *s) const override;
     
-    virtual void
-    Search (Searcher &searcher);
+    void
+    Search (Searcher &searcher) override;
 
 protected:
     lldb::SearchFilterSP
@@ -440,26 +440,26 @@ public:
     const SearchFilterByModuleListAndCU&
     operator=(const SearchFilterByModuleListAndCU& rhs);
 
-    virtual bool
-    AddressPasses (Address &address);
+    bool
+    AddressPasses (Address &address) override;
 
-    virtual bool
-    CompUnitPasses (FileSpec &fileSpec);
+    bool
+    CompUnitPasses (FileSpec &fileSpec) override;
 
-    virtual bool
-    CompUnitPasses (CompileUnit &compUnit);
+    bool
+    CompUnitPasses (CompileUnit &compUnit) override;
 
-    virtual void
-    GetDescription(Stream *s);
+    void
+    GetDescription(Stream *s) override;
 
-    virtual uint32_t
-    GetFilterRequiredItems ();
+    uint32_t
+    GetFilterRequiredItems () override;
 
-    virtual void
-    Dump (Stream *s) const;
+    void
+    Dump (Stream *s) const override;
 
-    virtual void
-    Search (Searcher &searcher);
+    void
+    Search (Searcher &searcher) override;
     
 protected:
     lldb::SearchFilterSP