diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index 7ce2f671977c22166a9258f324edac9f257f0b62..970a611aea3700570519d97dd507b39784502eef 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -24,7 +24,6 @@
 #include "llviewerparcelmgr.h"
 #include "llviewermenu.h"
 #include "llviewerregion.h"
-#include "llviewerstats.h"
 #include "llworld.h"
 
 #include "rlvactions.h"
diff --git a/indra/newview/rlvextensions.cpp b/indra/newview/rlvextensions.cpp
index b835df30f764c8d6df48a10a85abfe8d7422b1c5..0e4ed9ae51c34cbde160f059eafd9b2d572942df 100644
--- a/indra/newview/rlvextensions.cpp
+++ b/indra/newview/rlvextensions.cpp
@@ -18,7 +18,6 @@
 #include "llagent.h"
 #include "llagentcamera.h"
 #include "lldaycyclemanager.h"
-#include "llviewercontrol.h"
 #include "llvoavatarself.h"
 #include "llwlparammanager.h"
 
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index f6f1735d8f0b0f2a3037a0f7cdc999829005e700..f8241d6a7986ae4c38d457eaca307cc5456c1661 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -27,6 +27,7 @@
 #include "llviewerregion.h"
 
 #include "rlvhandler.h"
+#include "rlvhelper.h"
 #include "rlvinventory.h"
 #include "rlvlocks.h"
 #include "rlvui.h"
diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index 4488ec030a487889dd5424c611537b1f7c9dc972..0bec3ec85bec01cfffa2e5858998fa2b2e5c9192 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -15,15 +15,11 @@
  */
 
 #include "llviewerprecompiledheaders.h"
-#include "llagent.h"
-#include "llagentwearables.h"
 #include "llappearancemgr.h"
 #include "llattachmentsmgr.h"
 #include "llgesturemgr.h"
 #include "llnotificationsutil.h"
-#include "llviewerobject.h"
 #include "llviewerobjectlist.h"
-#include "llwlparammanager.h"
 
 #include "rlvcommon.h"
 #include "rlvhelper.h"
diff --git a/indra/newview/rlvhelper.h b/indra/newview/rlvhelper.h
index 0187ab494e4286c3686079c456ff6ea280bf4493..9cce832af1f02b098bd0f4874edfae42407088ac 100644
--- a/indra/newview/rlvhelper.h
+++ b/indra/newview/rlvhelper.h
@@ -21,7 +21,6 @@
 #include "llinventorymodel.h"
 #include "llviewerinventory.h"
 #include "llwearabletype.h"
-#include "llwlparamset.h"
 
 #include "rlvdefines.h"
 #include "rlvcommon.h"
diff --git a/indra/newview/rlvinventory.cpp b/indra/newview/rlvinventory.cpp
index 62c4d35d89d830d31b6d59debd755d0d973b59d1..d53b50549e8622f27c18bc4f76c9cc841bd10dd9 100644
--- a/indra/newview/rlvinventory.cpp
+++ b/indra/newview/rlvinventory.cpp
@@ -17,17 +17,10 @@
 #include "llviewerprecompiledheaders.h"
 #include "llagent.h"
 #include "llappearancemgr.h"
-#include "llinventoryobserver.h"
 #include "llstartup.h"
 #include "llviewerfoldertype.h"
-#include "llviewerobject.h"
-#include "llvoavatarself.h"
 
-#include "rlvdefines.h"
-#include "rlvcommon.h"
-#include "rlvlocks.h"
 #include "rlvinventory.h"
-#include "rlvhandler.h"
 
 #include "boost/algorithm/string.hpp"
 
diff --git a/indra/newview/rlvinventory.h b/indra/newview/rlvinventory.h
index 3c15cad43c324f714e5d5c1a03a6fc2ca9e7f714..cacc9394c08a4aebacd3a2423d223d1e7955b5b3 100644
--- a/indra/newview/rlvinventory.h
+++ b/indra/newview/rlvinventory.h
@@ -18,12 +18,9 @@
 #define RLV_INVENTORY_H
 
 #include "llinventoryfunctions.h"
-#include "llinventorymodel.h"
 #include "llinventoryobserver.h"
 #include "llsingleton.h"
-#include "llviewerinventory.h"
 
-#include "rlvcommon.h"
 #include "rlvhelper.h"
 #include "rlvlocks.h"
 
diff --git a/indra/newview/rlvlocks.cpp b/indra/newview/rlvlocks.cpp
index 3b3313fc3761ac4dd4b0fabe59abdf38a0390f5e..56dcbb2cdb88a6eb15e473c2f30e200b2f42f7d6 100644
--- a/indra/newview/rlvlocks.cpp
+++ b/indra/newview/rlvlocks.cpp
@@ -18,7 +18,6 @@
 #include "llagent.h"
 #include "llappearancemgr.h"
 #include "llattachmentsmgr.h"
-#include "llinventoryobserver.h"
 #include "lloutfitobserver.h"
 #include "llviewerobjectlist.h"
 #include "pipeline.h"
diff --git a/indra/newview/rlvui.cpp b/indra/newview/rlvui.cpp
index b004b9c52cd584c0e4b18e6ae51d74fb95c10e86..5935eb242954262ee49b7e0bd9b6aeeff543c123 100644
--- a/indra/newview/rlvui.cpp
+++ b/indra/newview/rlvui.cpp
@@ -34,7 +34,6 @@
 #include "llsidepanelappearance.h"
 #include "lltabcontainer.h"
 #include "llteleporthistory.h"
-#include "llteleporthistorystorage.h"
 #include "lltoolmgr.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"