diff --git a/indra/newview/altoolalign.h b/indra/newview/altoolalign.h
index 1d5fc552d629cae40f743a79140cac2375fb56df..aece53e8c7fbbb36245d3f8685059a8afb59f091 100644
--- a/indra/newview/altoolalign.h
+++ b/indra/newview/altoolalign.h
@@ -17,7 +17,7 @@ class LLToolSelectRect;
 class ALToolAlign final
 :	public LLTool, public LLSingleton<ALToolAlign>
 {
-	LLSINGLETON(ALToolAlign);
+    LLSINGLETON_C11(ALToolAlign);
 	~ALToolAlign() = default;
     
 public:
diff --git a/indra/newview/llsettingsvo.h b/indra/newview/llsettingsvo.h
index e0f3153e27f73d0e1e656b63e87e58d0cee53c02..9a067d9d41ebcb64593ce2512a3d7896bc6d9065 100644
--- a/indra/newview/llsettingsvo.h
+++ b/indra/newview/llsettingsvo.h
@@ -43,7 +43,7 @@ class LLInventoryItem;
 class LLGLSLShader;
 
 //=========================================================================
-class LLSettingsVOBase final : public LLSettingsBase
+class LLSettingsVOBase : public LLSettingsBase
 {
 public:
     typedef std::function<void(LLUUID asset_id, LLSettingsBase::ptr_t settins, S32 status, LLExtStat extstat)>  asset_download_fn;
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h
index 839cc366af5ae6c6a039b2870c175cdb7e67231a..0c645b9e13377f675a5b56ca942555f630f2fc7a 100644
--- a/indra/newview/lltexturefetch.h
+++ b/indra/newview/lltexturefetch.h
@@ -64,7 +64,7 @@ class LLTextureFetch : public LLWorkerThread
 	class TFRequest;
 	
     // Threads:  Tmain
-	/*virtual*/ S32 update(F32 max_time_ms);
+	/*virtual*/ S32 update(F32 max_time_ms) override;
 	
 	// called in the main thread after the TextureCacheThread shuts down.
     // Threads:  Tmain
@@ -246,20 +246,20 @@ class LLTextureFetch : public LLWorkerThread
 	
 	// Overrides from the LLThread tree
 	// Locks:  Ct
-	bool runCondition();
+	bool runCondition() override;
 
 private:
     // Threads:  Tmain
 	void sendRequestListToSimulators();
 	
 	// Threads:  Ttf
-	/*virtual*/ void startThread(void);
+	/*virtual*/ void startThread(void) override;
 	
 	// Threads:  Ttf
-	/*virtual*/ void endThread(void);
+	/*virtual*/ void endThread(void) override;
 	
 	// Threads:  Ttf
-	/*virtual*/ void threadedUpdate(void);
+	/*virtual*/ void threadedUpdate(void) override;
 
 	// Threads:  Ttf
 	void commonUpdate();
diff --git a/indra/newview/rlvmodifiers.h b/indra/newview/rlvmodifiers.h
index b26c1db0ebdc8aa240c4819f3d36640f24d41e18..c690fb328b067b5a1c877bcdf223424521f1c7a7 100644
--- a/indra/newview/rlvmodifiers.h
+++ b/indra/newview/rlvmodifiers.h
@@ -92,7 +92,7 @@ struct RlvBehaviourModifierTween
 
 class RlvBehaviourModifierAnimator final : public LLSingleton<RlvBehaviourModifierAnimator>
 {
-	LLSINGLETON_EMPTY_CTOR(RlvBehaviourModifierAnimator);
+    LLSINGLETON_EMPTY_CTOR_C11(RlvBehaviourModifierAnimator);
 public:
 	~RlvBehaviourModifierAnimator() override;