diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index bfb005808693090b6a45de668f657f39dda8e34a..667b300c9a3b530859e004de63cc49a1c0e379f9 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -1228,9 +1228,6 @@ void RlvObject::setModifierValue(ERlvLocalBhvrModifier eBhvrModifier, const RlvB
 // RlvForceWear
 //
 
-RlvForceWear::RlvForceWear()
-{
-}
 
 // Checked: 2010-04-05 (RLVa-1.2.0d) | Modified: RLVa-1.2.0d
 bool RlvForceWear::isWearingItem(const LLInventoryItem* pItem)
diff --git a/indra/newview/rlvhelper.h b/indra/newview/rlvhelper.h
index a8696bc01abadb4bf5a7cab910df6bba1da5da1b..6aa83af1d8b5307199377cd41b1080ddef7b85a8 100644
--- a/indra/newview/rlvhelper.h
+++ b/indra/newview/rlvhelper.h
@@ -499,7 +499,8 @@ class RlvObject
 
 class RlvForceWear final : public LLSingleton<RlvForceWear>
 {
-	LLSINGLETON(RlvForceWear);
+	LLSINGLETON_EMPTY_CTOR(RlvForceWear);
+
 public:
 	// Folders
 	enum EWearAction { ACTION_WEAR_REPLACE, ACTION_WEAR_ADD, ACTION_REMOVE };
@@ -590,9 +591,6 @@ class RlvForceWear final : public LLSingleton<RlvForceWear>
 
 	typedef std::map<LLUUID, U8> pendingattachments_map_t;
 	pendingattachments_map_t         m_pendingAttachments;
-
-private:
-	friend class LLSingleton<RlvForceWear>;
 };
 
 // ============================================================================
diff --git a/indra/newview/rlvlocks.cpp b/indra/newview/rlvlocks.cpp
index 5b022fe786d61d068b94aee11361e7e15992e039..cbbf4ff08f4f0c918dbaa9cdc3e47150dc99792f 100644
--- a/indra/newview/rlvlocks.cpp
+++ b/indra/newview/rlvlocks.cpp
@@ -432,9 +432,6 @@ bool RlvAttachmentLocks::verifyAttachmentLocks()
 // RlvAttachmentLockWatchdog member functions
 //
 
-RlvAttachmentLockWatchdog::RlvAttachmentLockWatchdog()
-{
-}
 
 // Checked: 2010-09-23 (RLVa-1.2.1d) | Added: RLVa-1.2.1d
 bool RlvAttachmentLockWatchdog::RlvWearInfo::isAddLockedAttachPt(S32 idxAttachPt) const
diff --git a/indra/newview/rlvlocks.h b/indra/newview/rlvlocks.h
index bd605ddde14966fe1f1aee26a8b6bf4d912edfeb..983af119786ff31ceefce45aef963f1f5957710f 100644
--- a/indra/newview/rlvlocks.h
+++ b/indra/newview/rlvlocks.h
@@ -140,7 +140,7 @@ extern RlvAttachmentLocks gRlvAttachmentLocks;
 // TODO-RLVa: [RLVa-1.2.1] This class really looks rather cluttered so look into cleaning it up/simplifying it a bit
 class RlvAttachmentLockWatchdog final : public LLSingleton<RlvAttachmentLockWatchdog>
 {
-	LLSINGLETON(RlvAttachmentLockWatchdog);
+	LLSINGLETON_EMPTY_CTOR(RlvAttachmentLockWatchdog);
 protected:
 	~RlvAttachmentLockWatchdog() { delete m_pTimer; }
 
@@ -379,8 +379,6 @@ class RlvFolderLocks final : public LLSingleton<RlvFolderLocks>
 	mutable uuid_vec_t       m_LockedAttachmentRem;
 	mutable folderlock_map_t m_LockedFolderMap;
 	mutable uuid_vec_t       m_LockedWearableRem;
-private:
-	friend class LLSingleton<RlvFolderLocks>;
 };
 
 // ============================================================================