diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp
index ef84db46d8401a5a9ac15a2a6dfecff3bbccedc1..00033ca969bb7deaae687ce541e533bb9e7d19b7 100755
--- a/indra/llui/llstatbar.cpp
+++ b/indra/llui/llstatbar.cpp
@@ -34,7 +34,6 @@
#include "llgl.h"
#include "llfontgl.h"
-#include "lluictrlfactory.h"
#include "lltracerecording.h"
#include "llcriticaldamp.h"
#include "lltooltip.h"
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 54f27d0f641bbe0f830ef39cdc6f90082a8239da..9d1bbd12aa04ec95860bc03d56ec2b9af5e5d03c 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -31,7 +31,6 @@
// Viewer includes
#include "llversioninfo.h"
#include "llfeaturemanager.h"
-#include "lluictrlfactory.h"
#include "lltexteditor.h"
#include "llerrorcontrol.h"
#include "lleventtimer.h"
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
index bf8fd986c9d7995139e4b1a39a69b722021fc560..05d00820742a6dc620726e35b1db57397141edaa 100755
--- a/indra/newview/llavatariconctrl.cpp
+++ b/indra/newview/llavatariconctrl.cpp
@@ -33,7 +33,6 @@
#include "llcallingcard.h" // for LLAvatarTracker
#include "llavataractions.h"
#include "llmenugl.h"
-#include "lluictrlfactory.h"
#include "llagentdata.h"
#include "llfloaterimsession.h"
#include "llviewertexture.h"
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index 4d9617d3952252580ddb32b9a5388b1874caaf6a..5ab2e88df50b4006a787a060ad47b432e5368f67 100755
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -58,7 +58,6 @@
#include "llmultigesture.h"
#include "llui.h"
#include "llviewermenu.h"
-#include "lluictrlfactory.h"
#include "alchatcommand.h"
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 2807d0201dea51517df198873264aa58abbfd111..76d5fc8355dbfc29de96ad93e952595e7ac016ce 100755
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -35,7 +35,6 @@
#include "llimview.h"
#include "llcommandhandler.h"
#include "llpanel.h"
-#include "lluictrlfactory.h"
#include "llscrollcontainer.h"
#include "llavatariconctrl.h"
#include "llcallingcard.h" //for LLAvatarTracker
diff --git a/indra/newview/llconfirmationmanager.cpp b/indra/newview/llconfirmationmanager.cpp
index 8ea59fdd8340e37a2746b3906d97ee3fd39f02e3..74ec430aa77e925debf8b9ad9a2c0dc0c087ad07 100755
--- a/indra/newview/llconfirmationmanager.cpp
+++ b/indra/newview/llconfirmationmanager.cpp
@@ -28,8 +28,6 @@
#include "llconfirmationmanager.h"
-#include "lluictrlfactory.h"
-
// viewer includes
#include "llnotificationsutil.h"
#include "llstring.h"
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index e9631f757b4327cc52b5eaaa17e4d865225acfc7..ffced584c6c3d37f86750ef825eba286172b2829 100644
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -37,7 +37,6 @@
#include "llfloaterimcontainer.h"
#include "llfloaterreg.h"
#include "llgroupiconctrl.h"
-#include "lluictrlfactory.h"
#include "lltoolbarview.h"
//
diff --git a/indra/newview/llcurrencyuimanager.cpp b/indra/newview/llcurrencyuimanager.cpp
index b4a1457f47f9d302982bbfecc489ebb9f8cd0b35..49a86eba0135f4fc027f499d7ee19e5e47fc2ce9 100755
--- a/indra/newview/llcurrencyuimanager.cpp
+++ b/indra/newview/llcurrencyuimanager.cpp
@@ -26,7 +26,6 @@
#include "llviewerprecompiledheaders.h"
-#include "lluictrlfactory.h"
#include "lltextbox.h"
#include "lllineeditor.h"
#include "llresmgr.h" // for LLLocale
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 6d4acdcf612d237ce1155881614457f9ba4dfa29..83e6f05088c71d96bc4c3e3f9cadf1a6ad0725f2 100755
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -33,7 +33,6 @@
#include "lllandmarkactions.h"
#include "lltoolbarview.h"
#include "lltrans.h"
-#include "lluictrlfactory.h"
#include "llmenugl.h"
#include "lltooltip.h"
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index 7f7add3c702978fdb23a986b986dfc9257d69196..dc385b5607df5b8a80f073e2081d7d9d25b72e68 100755
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -38,7 +38,6 @@
#include "llnotificationsutil.h"
#include "llslurl.h"
#include "llvoiceclient.h"
-#include "lluictrlfactory.h"
#include "llupdaterservice.h"
#include "llviewertexteditor.h"
#include "llviewercontrol.h"
diff --git a/indra/newview/llfloaterauction.cpp b/indra/newview/llfloaterauction.cpp
index de79f4913bfee83551246afe4a5d68a34b6481a6..5d0cc5ce0e280ac68dfae0ce5857229eff42c80f 100755
--- a/indra/newview/llfloaterauction.cpp
+++ b/indra/newview/llfloaterauction.cpp
@@ -49,7 +49,6 @@
#include "llviewertexturelist.h"
#include "llviewerparcelmgr.h"
#include "llviewerregion.h"
-#include "lluictrlfactory.h"
#include "llviewerwindow.h"
#include "llviewerdisplay.h"
#include "llviewercontrol.h"
diff --git a/indra/newview/llfloaterautoreplacesettings.cpp b/indra/newview/llfloaterautoreplacesettings.cpp
index 6e56e929df606d194bd889db9b4b91c1422b4ebd..1d7ef76ed00fab0cb1a13e770694c5f9bc2657c7 100755
--- a/indra/newview/llfloaterautoreplacesettings.cpp
+++ b/indra/newview/llfloaterautoreplacesettings.cpp
@@ -29,7 +29,6 @@
#include "llagentdata.h"
#include "llcommandhandler.h"
#include "llfloater.h"
-#include "lluictrlfactory.h"
#include "llagent.h"
#include "llpanel.h"
#include "llbutton.h"
diff --git a/indra/newview/llfloateravatar.cpp b/indra/newview/llfloateravatar.cpp
index 31adf5b61e23c86feef9f534dc203dcf61b46472..b65e91fe92556d65ff49d41eed1a0c1e94bf1d49 100755
--- a/indra/newview/llfloateravatar.cpp
+++ b/indra/newview/llfloateravatar.cpp
@@ -33,7 +33,6 @@
#include "llviewerprecompiledheaders.h"
#include "llfloateravatar.h"
-#include "lluictrlfactory.h"
#include "llmediactrl.h"
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index aab3883c5ac119b2213f80f9197a4530c9305d9d..554f5eabff42371f0ee24a559c4c9d6740f5aa57 100755
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -48,7 +48,6 @@
#include "llscrolllistitem.h"
#include "llscrolllistcell.h"
#include "lltabcontainer.h"
-#include "lluictrlfactory.h"
#include "llfocusmgr.h"
#include "lldraghandle.h"
#include "message.h"
diff --git a/indra/newview/llfloateravatartextures.cpp b/indra/newview/llfloateravatartextures.cpp
index 78807a8e9950fc2a87a019dfce9d6fb005f6ff6b..11352b566ff9152e3666c76ae4bd9783e8c0a9d6 100755
--- a/indra/newview/llfloateravatartextures.cpp
+++ b/indra/newview/llfloateravatartextures.cpp
@@ -34,7 +34,6 @@
#include "llagentwearables.h"
#include "llviewerwearable.h"
#include "lltexturectrl.h"
-#include "lluictrlfactory.h"
#include "llviewerobjectlist.h"
#include "llvoavatarself.h"
#include "lllocaltextureobject.h"
diff --git a/indra/newview/llfloaterbeacons.cpp b/indra/newview/llfloaterbeacons.cpp
index 316294a477408d700e5019d709b79232e7327aa0..cb64d70a1d3690c327f7c3e8a73e2295fe9bfbe5 100755
--- a/indra/newview/llfloaterbeacons.cpp
+++ b/indra/newview/llfloaterbeacons.cpp
@@ -28,7 +28,6 @@
#include "llviewerprecompiledheaders.h"
#include "llfloaterbeacons.h"
#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
#include "llcheckboxctrl.h"
#include "pipeline.h"
diff --git a/indra/newview/llfloaterbuildoptions.cpp b/indra/newview/llfloaterbuildoptions.cpp
index 1b65d8d68384956703570225742e62a38a955437..2c2334ed4e29de527545ab76c08655bfbdb2d32c 100755
--- a/indra/newview/llfloaterbuildoptions.cpp
+++ b/indra/newview/llfloaterbuildoptions.cpp
@@ -32,7 +32,6 @@
#include "llviewerprecompiledheaders.h"
#include "llfloaterbuildoptions.h"
-#include "lluictrlfactory.h"
#include "llcombobox.h"
#include "llselectmgr.h"
diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp
index 8bba98b87fafdbc2a0e70b3c7885cf437f55ba9f..7dd1f80f126d68a40c82ee20dff1018f286639d3 100755
--- a/indra/newview/llfloaterbulkpermission.cpp
+++ b/indra/newview/llfloaterbulkpermission.cpp
@@ -44,7 +44,6 @@
#include "llbutton.h"
#include "lldir.h"
#include "llviewerstats.h"
-#include "lluictrlfactory.h"
#include "llselectmgr.h"
#include "llcheckboxctrl.h"
diff --git a/indra/newview/llfloaterbump.cpp b/indra/newview/llfloaterbump.cpp
index fa49ad9079992ab13dec2a42de406d1e58739a88..ced61d8b9bd5f6fd0f92c03ea0c3073423a7f693 100755
--- a/indra/newview/llfloaterbump.cpp
+++ b/indra/newview/llfloaterbump.cpp
@@ -38,7 +38,6 @@
#include "llpanelblockedlist.h"
#include "llscrolllistctrl.h"
#include "lltrans.h"
-#include "lluictrlfactory.h"
#include "llviewermessage.h"
#include "llviewermenu.h"
#include "llviewerobjectlist.h"
diff --git a/indra/newview/llfloaterbuy.cpp b/indra/newview/llfloaterbuy.cpp
index 5a9cdbba44d6bfe3aee80e43f079528bf4e32147..c90ccc581957fe9f2a5aa3014e764027d30159dc 100755
--- a/indra/newview/llfloaterbuy.cpp
+++ b/indra/newview/llfloaterbuy.cpp
@@ -44,7 +44,6 @@
#include "llselectmgr.h"
#include "llscrolllistctrl.h"
#include "llviewerobject.h"
-#include "lluictrlfactory.h"
#include "llviewerwindow.h"
#include "lltrans.h"
diff --git a/indra/newview/llfloaterbuycontents.cpp b/indra/newview/llfloaterbuycontents.cpp
index b32ac860aaa57299fec019a6e4fde0061e77026c..f4a922a01cedd3800aeba5a7c04d7ad3129c677f 100755
--- a/indra/newview/llfloaterbuycontents.cpp
+++ b/indra/newview/llfloaterbuycontents.cpp
@@ -50,8 +50,6 @@
#include "llscrolllistctrl.h"
#include "llviewerobject.h"
#include "llviewerregion.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
LLFloaterBuyContents::LLFloaterBuyContents(const LLSD& key)
: LLFloater(key)
diff --git a/indra/newview/llfloaterbuycurrency.cpp b/indra/newview/llfloaterbuycurrency.cpp
index e21a8594bc0e4f37c3087a65dab274c874807f2b..7a16e88678608a9b809daf44e2b27ae20ba7beea 100755
--- a/indra/newview/llfloaterbuycurrency.cpp
+++ b/indra/newview/llfloaterbuycurrency.cpp
@@ -36,8 +36,6 @@
#include "llstatusbar.h"
#include "lltextbox.h"
#include "llviewchildren.h"
-#include "llviewerwindow.h"
-#include "lluictrlfactory.h"
#include "llweb.h"
#include "llwindow.h"
#include "llappviewer.h"
diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp
index 26b1f3b55c339cd950baca1b6c2d2c8fa4589c3b..6595b82a2107ada414ba2aacd5a4825775f12c5d 100755
--- a/indra/newview/llfloaterbuyland.cpp
+++ b/indra/newview/llfloaterbuyland.cpp
@@ -51,7 +51,6 @@
#include "lltrans.h"
#include "llviewchildren.h"
#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
#include "llviewerparcelmgr.h"
#include "llviewerregion.h"
#include "llviewertexteditor.h"
diff --git a/indra/newview/llfloaterbvhpreview.cpp b/indra/newview/llfloaterbvhpreview.cpp
index 669ffa7c599814253c6324b38128463aa9a5b55f..043c92f65f96410655e8e7f7abf0b7c5de752d46 100755
--- a/indra/newview/llfloaterbvhpreview.cpp
+++ b/indra/newview/llfloaterbvhpreview.cpp
@@ -62,7 +62,6 @@
#include "llviewermenufile.h" // upload_new_resource()
#include "llvoavatar.h"
#include "pipeline.h"
-#include "lluictrlfactory.h"
#include "lltrans.h"
const S32 PREVIEW_BORDER_WIDTH = 2;
diff --git a/indra/newview/llfloatercolorpicker.cpp b/indra/newview/llfloatercolorpicker.cpp
index 6dd3fdf60ce51bebdabeec809f7ab608ce796037..ab2c1996624ae43b8dad17e9499752b6ad18c1a5 100755
--- a/indra/newview/llfloatercolorpicker.cpp
+++ b/indra/newview/llfloatercolorpicker.cpp
@@ -45,7 +45,6 @@
#include "lllineeditor.h"
#include "v4coloru.h"
#include "llbutton.h"
-#include "lluictrlfactory.h"
#include "llgl.h"
#include "llpointer.h"
#include "llimage.h"
diff --git a/indra/newview/llfloaterfonttest.cpp b/indra/newview/llfloaterfonttest.cpp
index ff27b683b7d4125b0c3fa56e114248e243ff91d2..99cd90c3e1f9c21e6d6325d068ce1a0b43a1d4d1 100755
--- a/indra/newview/llfloaterfonttest.cpp
+++ b/indra/newview/llfloaterfonttest.cpp
@@ -33,7 +33,6 @@
#include "llviewerprecompiledheaders.h"
#include "llfloaterfonttest.h"
-#include "lluictrlfactory.h"
LLFloaterFontTest::LLFloaterFontTest(const LLSD& key)
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp
index 37774fbc5c76a95200675cf6e873a99ed1b7fedb..f68a59f23db7ac6f10ca51b1802b0ae284b5545c 100755
--- a/indra/newview/llfloatergodtools.cpp
+++ b/indra/newview/llfloatergodtools.cpp
@@ -67,7 +67,6 @@
#include "llvlcomposition.h"
#include "llsurface.h"
#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
#include "lltrans.h"
#include "lltransfertargetfile.h"
diff --git a/indra/newview/llfloatergroups.cpp b/indra/newview/llfloatergroups.cpp
index dbe7fee108e92e821f4f83eefe831f81c2b542e9..8eb38d6943daf541fad008770885b034cecb96a1 100755
--- a/indra/newview/llfloatergroups.cpp
+++ b/indra/newview/llfloatergroups.cpp
@@ -43,7 +43,6 @@
#include "llscrolllistctrl.h"
#include "llstartup.h"
#include "lltextbox.h"
-#include "lluictrlfactory.h"
#include "lltrans.h"
using namespace LLOldEvents;
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp
index fb3790f725f64ab4bc9685642fe14983d6f0db13..e5e49c390342bc3988dadb6610b57b7da87774fb 100755
--- a/indra/newview/llfloaterhardwaresettings.cpp
+++ b/indra/newview/llfloaterhardwaresettings.cpp
@@ -42,7 +42,6 @@
// Linden library includes
#include "llradiogroup.h"
-#include "lluictrlfactory.h"
#include "llwindow.h"
#include "llsliderctrl.h"
diff --git a/indra/newview/llfloaterhud.cpp b/indra/newview/llfloaterhud.cpp
index 58c76a0b85efe08995e93a231de8c706bc98f549..41a0fc14dba1d09294c68042a4ec68f3bb562472 100755
--- a/indra/newview/llfloaterhud.cpp
+++ b/indra/newview/llfloaterhud.cpp
@@ -34,7 +34,6 @@
// Linden libs
#include "llnotificationsutil.h"
-#include "lluictrlfactory.h"
///----------------------------------------------------------------------------
diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp
index 52e678ce248e651f40be20242586339f461f37d4..8e534fecc94fbf9a58a92d118a431397d379e1b5 100755
--- a/indra/newview/llfloaterimagepreview.cpp
+++ b/indra/newview/llfloaterimagepreview.cpp
@@ -49,7 +49,6 @@
#include "llviewerobjectlist.h"
#include "llvoavatar.h"
#include "pipeline.h"
-#include "lluictrlfactory.h"
#include "llviewershadermgr.h"
#include "llviewertexturelist.h"
#include "llstring.h"
diff --git a/indra/newview/llfloaterinspect.cpp b/indra/newview/llfloaterinspect.cpp
index 10088d20c2353e12f5c97361fac7f4cab68b032f..319a3123b6b039e7f4035a59b1579ab196491d8b 100755
--- a/indra/newview/llfloaterinspect.cpp
+++ b/indra/newview/llfloaterinspect.cpp
@@ -41,9 +41,6 @@
#include "lltrans.h"
#include "llviewercontrol.h"
#include "llviewerobject.h"
-#include "lluictrlfactory.h"
-
-//LLFloaterInspect* LLFloaterInspect::sInstance = NULL;
LLFloaterInspect::LLFloaterInspect(const LLSD& key)
: LLFloater(key),
diff --git a/indra/newview/llfloaterjoystick.cpp b/indra/newview/llfloaterjoystick.cpp
index bb1a16fb8eef9b7de4ac1fe67e25d1e505898863..46a79a74288ac5099c12e8deeff349cc806c174b 100755
--- a/indra/newview/llfloaterjoystick.cpp
+++ b/indra/newview/llfloaterjoystick.cpp
@@ -36,7 +36,6 @@
#include "lltrace.h"
// project includes
-#include "lluictrlfactory.h"
#include "llviewercontrol.h"
#include "llappviewer.h"
#include "llviewerjoystick.h"
diff --git a/indra/newview/llfloaterlagmeter.cpp b/indra/newview/llfloaterlagmeter.cpp
index f72f2631a1f664e313be8f5fdc31a1c421369217..049de95d8bdebe166536622e53296c29af682b01 100644
--- a/indra/newview/llfloaterlagmeter.cpp
+++ b/indra/newview/llfloaterlagmeter.cpp
@@ -28,7 +28,6 @@
#include "llfloaterlagmeter.h"
-#include "lluictrlfactory.h"
#include "llviewerstats.h"
#include "llviewertexture.h"
#include "llviewercontrol.h"
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 5da75da74976f6622ba0c5f3e91c7dcb8b30678a..c5faca72dd6da25ed4e8fa0bb6eb874de5bf223f 100755
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -63,7 +63,6 @@
#include "lltextbox.h"
#include "lltexturectrl.h"
#include "lluiconstants.h"
-#include "lluictrlfactory.h"
#include "llviewertexturelist.h" // LLUIImageList
#include "llviewermessage.h"
#include "llviewerparcelmgr.h"
diff --git a/indra/newview/llfloaterlandholdings.cpp b/indra/newview/llfloaterlandholdings.cpp
index f34760a6bf7c38c31ad6138c9205031fed3f5fe5..8aee9584520699e4d475e01bedeec1105981d644 100755
--- a/indra/newview/llfloaterlandholdings.cpp
+++ b/indra/newview/llfloaterlandholdings.cpp
@@ -47,7 +47,6 @@
#include "lltrans.h"
#include "lluiconstants.h"
#include "llviewermessage.h"
-#include "lluictrlfactory.h"
#include "llgroupactions.h"
diff --git a/indra/newview/llfloatermediasettings.cpp b/indra/newview/llfloatermediasettings.cpp
index 4fd5c0587afd6f8f70ddaa7af1c2f9756e03a795..8c3ed9f2b0f3240434f9478f40fbe22ebe4be323 100755
--- a/indra/newview/llfloatermediasettings.cpp
+++ b/indra/newview/llfloatermediasettings.cpp
@@ -32,7 +32,6 @@
#include "llpanelmediasettingssecurity.h"
#include "llpanelmediasettingspermissions.h"
#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
#include "llbutton.h"
#include "llselectmgr.h"
#include "llsdutil.h"
diff --git a/indra/newview/llfloatermemleak.cpp b/indra/newview/llfloatermemleak.cpp
index 9edfe1e3546d8b31ec3c559fe07286b572a972a4..24f8ea132de8a87136ae31a8ed5f44c05acda9b9 100755
--- a/indra/newview/llfloatermemleak.cpp
+++ b/indra/newview/llfloatermemleak.cpp
@@ -28,7 +28,6 @@
#include "llfloatermemleak.h"
-#include "lluictrlfactory.h"
#include "llbutton.h"
#include "llspinctrl.h"
#include "llresmgr.h"
diff --git a/indra/newview/llfloatermessagebuilder.cpp b/indra/newview/llfloatermessagebuilder.cpp
index 59a4adc95b6195cfdcdc190f6fcd8ee5fff4fccd..ad0b1997cf29855ed82f90ef2e7c6171f83ce8fa 100644
--- a/indra/newview/llfloatermessagebuilder.cpp
+++ b/indra/newview/llfloatermessagebuilder.cpp
@@ -17,7 +17,6 @@
#include "llviewerprecompiledheaders.h"
#include "llfloatermessagebuilder.h"
-#include "lluictrlfactory.h"
#include "llmessagetemplate.h"
#include "llagent.h"
#include "llviewerregion.h" // getHandle
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 94ec4ec6e682368a6b30d5d2d28dab1f5a86f6cf..2d40493c7912dab773aecb843e87049c952aa1e4 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -63,7 +63,6 @@
#include "llvoavatar.h"
#include "llvoavatarself.h"
#include "pipeline.h"
-#include "lluictrlfactory.h"
#include "llviewercontrol.h"
#include "llviewermenu.h"
#include "llviewermenufile.h"
diff --git a/indra/newview/llfloaternamedesc.cpp b/indra/newview/llfloaternamedesc.cpp
index 0cca715fe25d94ebd2673c37f010d838ffb80df5..63694f27cc855633d34fdce24537e7580679ba71 100755
--- a/indra/newview/llfloaternamedesc.cpp
+++ b/indra/newview/llfloaternamedesc.cpp
@@ -42,8 +42,6 @@
#include "llfloaterperms.h"
#include "llviewercontrol.h"
#include "llviewermenufile.h" // upload_new_resource()
-#include "lluictrlfactory.h"
-#include "llstring.h"
#include "lleconomy.h"
#include "llpermissions.h"
diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp
index ad5a16004e274b6368689adff71d5db53fcf1ac4..88057d3b4e7345572725f150cdf56ee47a76993f 100755
--- a/indra/newview/llfloaternotificationsconsole.cpp
+++ b/indra/newview/llfloaternotificationsconsole.cpp
@@ -27,7 +27,6 @@
#include "llviewerprecompiledheaders.h"
#include "llfloaternotificationsconsole.h"
#include "llnotifications.h"
-#include "lluictrlfactory.h"
#include "llbutton.h"
#include "llscrolllistctrl.h"
#include "llscrolllistitem.h"
diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp
index 321478779c40f2e3d69f3287426808564be60632..46865b151922ef4667f5357f6871a5359783c7ea 100755
--- a/indra/newview/llfloateropenobject.cpp
+++ b/indra/newview/llfloateropenobject.cpp
@@ -47,8 +47,6 @@
#include "llselectmgr.h"
#include "lluiconstants.h"
#include "llviewerobject.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
LLFloaterOpenObject::LLFloaterOpenObject(const LLSD& key)
diff --git a/indra/newview/llfloaterpay.cpp b/indra/newview/llfloaterpay.cpp
index 3a6b9ab9af8e11803fdd72e1ac6038df536801b6..4d90f542766f7d5faad119786d67451d94b3d996 100755
--- a/indra/newview/llfloaterpay.cpp
+++ b/indra/newview/llfloaterpay.cpp
@@ -50,7 +50,6 @@
#include "llbutton.h"
#include "llselectmgr.h"
#include "lltransactiontypes.h"
-#include "lluictrlfactory.h"
///----------------------------------------------------------------------------
/// Local function declarations, constants, enums, and typedefs
diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index f9953002b63a8f9128ca1291d2b7c0d035161fa9..f9329014c87a69890e900bb4161943a8a04dff1f 100755
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -33,7 +33,6 @@
#include "llnotificationsutil.h"
#include "llpermissions.h"
#include "llsdserialize.h"
-#include "lluictrlfactory.h"
#include "llviewercontrol.h"
#include "llviewerregion.h"
#include "llviewerwindow.h"
diff --git a/indra/newview/llfloaterpostprocess.cpp b/indra/newview/llfloaterpostprocess.cpp
index 2d61109e176e889f324c7acd8ec18d9e0759f797..18b17e1c1b3ba4e1481d61866a3fb8f90b6d0966 100755
--- a/indra/newview/llfloaterpostprocess.cpp
+++ b/indra/newview/llfloaterpostprocess.cpp
@@ -31,7 +31,6 @@
#include "llsliderctrl.h"
#include "llcheckboxctrl.h"
#include "llnotificationsutil.h"
-#include "lluictrlfactory.h"
#include "llviewerdisplay.h"
#include "llpostprocess.h"
#include "llcombobox.h"
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 31e735235cba6b5161bd8f513ff1e3f0a13ea35a..76fa3604bc804aade4c04d051615eafdc0e0424c 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -109,7 +109,6 @@
#include "llwindow.h"
#include "llworld.h"
#include "pipeline.h"
-#include "lluictrlfactory.h"
#include "llviewermedia.h"
#include "llpluginclassmedia.h"
#include "llteleporthistorystorage.h"
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp
index 643fe989f6dc078238216ba3087d509e75add53e..02d6740f67b3df7d059bf752773c760cc4a5f985 100755
--- a/indra/newview/llfloaterproperties.cpp
+++ b/indra/newview/llfloaterproperties.cpp
@@ -58,8 +58,6 @@
#include "llviewerwindow.h"
#include "llgroupactions.h"
-#include "lluictrlfactory.h"
-
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLPropertiesObserver
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index ee8c09c4c6bfb7ccf2be6363317bf2589af29c6e..8cc007e0b936a8d3708ec944ed666e4a3f86bf9d 100755
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -78,7 +78,6 @@
#include "lltexturectrl.h"
#include "lltrans.h"
#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
#include "llviewerinventory.h"
#include "llviewertexture.h"
#include "llviewertexturelist.h"
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index 17b5a89d24a0b7ea35658f41f405ecf3882a5926..dc7697bcb909919d6312d86f2565f09bdf5ea624 100755
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -75,7 +75,6 @@
#include "lldir.h"
#include "llselectmgr.h"
#include "llversioninfo.h"
-#include "lluictrlfactory.h"
#include "llviewernetwork.h"
#include "llassetuploadresponders.h"
diff --git a/indra/newview/llfloaterscriptdebug.cpp b/indra/newview/llfloaterscriptdebug.cpp
index eeaf2a314463e9dce517223eb8bb330f988a0184..4c7e7b894f590a44031ed6549958a7b0e0a54bf2 100755
--- a/indra/newview/llfloaterscriptdebug.cpp
+++ b/indra/newview/llfloaterscriptdebug.cpp
@@ -29,7 +29,6 @@
#include "llfloaterscriptdebug.h"
#include "llfloaterreg.h"
-#include "lluictrlfactory.h"
#include "llfontgl.h"
#include "llrect.h"
#include "llerror.h"
diff --git a/indra/newview/llfloaterscriptlimits.cpp b/indra/newview/llfloaterscriptlimits.cpp
index a410a3437adca428babb352eaf65c839e1fc18d1..3b0ce2f7e8074eb500ebdf2cd87a27b81986a821 100755
--- a/indra/newview/llfloaterscriptlimits.cpp
+++ b/indra/newview/llfloaterscriptlimits.cpp
@@ -46,7 +46,6 @@
#include "lltracker.h"
#include "lltrans.h"
#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
#include "llviewerparcelmgr.h"
#include "llviewerregion.h"
#include "llviewerwindow.h"
diff --git a/indra/newview/llfloatersellland.cpp b/indra/newview/llfloatersellland.cpp
index 0cb37dabe7ccb8cd0005198156afc795b1cab3fe..0e0d3d85fcfd6f53991da602ac02f692e3c6f19e 100755
--- a/indra/newview/llfloatersellland.cpp
+++ b/indra/newview/llfloatersellland.cpp
@@ -39,8 +39,6 @@
#include "lltexturectrl.h"
#include "llviewercontrol.h"
#include "llviewerparcelmgr.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
#include "lltrans.h"
class LLAvatarName;
diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp
index e5017c73154944c96ae4f2df4e3f939e6a0830d7..2b62c30a4fe434dc8ef767cceefa0c5fded83f4a 100755
--- a/indra/newview/llfloatersettingsdebug.cpp
+++ b/indra/newview/llfloatersettingsdebug.cpp
@@ -27,7 +27,6 @@
#include "llviewerprecompiledheaders.h"
#include "llfloatersettingsdebug.h"
#include "llfloater.h"
-#include "lluictrlfactory.h"
#include "llcombobox.h"
#include "llspinctrl.h"
#include "llcolorswatch.h"
diff --git a/indra/newview/llfloatertelehub.cpp b/indra/newview/llfloatertelehub.cpp
index b845fd132d8914e4841d9779760151990f3ff0c1..e35aaf79ffac8d9a90aa03bcc7ba19ec641fbc04 100755
--- a/indra/newview/llfloatertelehub.cpp
+++ b/indra/newview/llfloatertelehub.cpp
@@ -41,7 +41,6 @@
#include "lltoolmgr.h"
#include "llviewerobject.h"
#include "llviewerobjectlist.h"
-#include "lluictrlfactory.h"
LLFloaterTelehub::LLFloaterTelehub(const LLSD& key)
: LLFloater(key),
diff --git a/indra/newview/llfloatertexturefetchdebugger.cpp b/indra/newview/llfloatertexturefetchdebugger.cpp
index 9a23d99802e660db68c0d4420da57937f6aa5e9e..5671cff2a7c848320273e09f343606a65fb2ea99 100755
--- a/indra/newview/llfloatertexturefetchdebugger.cpp
+++ b/indra/newview/llfloatertexturefetchdebugger.cpp
@@ -28,10 +28,8 @@
#include "llfloatertexturefetchdebugger.h"
-#include "lluictrlfactory.h"
#include "llbutton.h"
#include "llspinctrl.h"
-#include "llresmgr.h"
#include "llmath.h"
#include "llviewerwindow.h"
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index d405db6466b5600e5810d93ffd836a736c7007ea..4d23e61029f8f39c0e33a150b98ff45a963a4cd4 100755
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -88,7 +88,6 @@
#include "llvograss.h"
#include "llvotree.h"
#include "llvovolume.h"
-#include "lluictrlfactory.h"
#include "llmeshrepository.h"
#include "qtoolalign.h" // <alchemy/>
diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp
index 56076c554bedd8fdb63a098c262894ca8eb15d2b..47e3130a1a41a01e836ee46a0389835c75dfb25d 100755
--- a/indra/newview/llfloatertopobjects.cpp
+++ b/indra/newview/llfloatertopobjects.cpp
@@ -48,8 +48,6 @@
#include "llviewermessage.h"
#include "llviewerparcelmgr.h"
#include "llviewerregion.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
#include "llfloaterregioninfo.h"
//LLFloaterTopObjects* LLFloaterTopObjects::sInstance = NULL;
diff --git a/indra/newview/llfloatertos.cpp b/indra/newview/llfloatertos.cpp
index ae33acb8420449558df400bec79b19ce73632c47..b3e23282b01f545aa70f90881567838e12fd5eee 100755
--- a/indra/newview/llfloatertos.cpp
+++ b/indra/newview/llfloatertos.cpp
@@ -41,7 +41,6 @@
#include "llradiogroup.h"
#include "lltextbox.h"
#include "llui.h"
-#include "lluictrlfactory.h"
#include "llvfile.h"
#include "message.h"
#include "llstartup.h" // login_alert_done
diff --git a/indra/newview/llfloaterurlentry.cpp b/indra/newview/llfloaterurlentry.cpp
index 2b3e5f561bb48bf3def81a6d9f92c99d06917b5b..5baecf21964ec02fb82d55c564b24d4df7b72a44 100755
--- a/indra/newview/llfloaterurlentry.cpp
+++ b/indra/newview/llfloaterurlentry.cpp
@@ -37,7 +37,6 @@
#include "llmimetypes.h"
#include "llnotificationsutil.h"
#include "llurlhistory.h"
-#include "lluictrlfactory.h"
#include "llwindow.h"
#include "llviewerwindow.h"
diff --git a/indra/newview/llfloaterwhitelistentry.cpp b/indra/newview/llfloaterwhitelistentry.cpp
index 2a499f681bcb8563ec9a6e33c95715236dceda80..27080a87ae5cab31df8ae5a964a80ab10f1c29d3 100755
--- a/indra/newview/llfloaterwhitelistentry.cpp
+++ b/indra/newview/llfloaterwhitelistentry.cpp
@@ -30,7 +30,6 @@
#include "llfloatermediasettings.h"
#include "llfloaterwhitelistentry.h"
#include "llpanelmediasettingssecurity.h"
-#include "lluictrlfactory.h"
#include "llwindow.h"
#include "llviewerwindow.h"
#include "lllineeditor.h"
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 910d0924bb839d3b936ffa96a4dcc0f0d8959d22..b248b25356b18b771aa20225596a46b5b582ee0c 100755
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -68,7 +68,6 @@
#include "llworldmap.h"
#include "llworldmapmessage.h"
#include "llworldmapview.h"
-#include "lluictrlfactory.h"
#include "llappviewer.h"
#include "llmapimagetype.h"
#include "llweb.h"
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 1a6e457d579b5a8fcc5c75a541efeadb3a40f1c5..8b63a085f1a84fb870841b8d273c27a37f47b761 100755
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -33,7 +33,6 @@
#include "llgroupmgr.h"
-#include <vector>
#include <algorithm>
#include "llappviewer.h"
@@ -49,9 +48,9 @@
#include "llpanelgroup.h"
#include "llgroupactions.h"
#include "llnotificationsutil.h"
-#include "lluictrlfactory.h"
#include "lltrans.h"
#include "llviewerregion.h"
+
#include <boost/regex.hpp>
#include <boost/format.hpp>
#include <boost/lexical_cast.hpp>
diff --git a/indra/newview/llhudview.cpp b/indra/newview/llhudview.cpp
index eb48c0fc3a8213d553cb8d71bbf22fcaa2a23ebf..4cf2a3e1fff7baf313adccbc14dd751e984976f8 100755
--- a/indra/newview/llhudview.cpp
+++ b/indra/newview/llhudview.cpp
@@ -40,7 +40,6 @@
#include "lltracker.h"
#include "llviewercamera.h"
#include "llui.h"
-#include "lluictrlfactory.h"
LLHUDView *gHUDView = NULL;
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 59d7e2cab24f9e84e69e42a93e354a78bf63f97d..bd1cad9da466ff2e487776e943cd6860fc7c2db1 100755
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -42,7 +42,6 @@
#include "llstring.h"
#include "lltextutil.h"
#include "lltrans.h"
-#include "lluictrlfactory.h"
#include "llfloaterimsessiontab.h"
#include "llagent.h"
#include "llagentui.h"
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 4944afd7a81329c1df19365e09164047d7fe6d3e..cc2b46bc948aabed6a59081d4d8b3688db8dde79 100755
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -78,12 +78,10 @@
#include "lltabcontainer.h"
#include "lltooldraganddrop.h"
#include "lltrans.h"
-#include "lluictrlfactory.h"
#include "llviewermessage.h"
#include "llviewerfoldertype.h"
#include "llviewerobjectlist.h"
#include "llviewerregion.h"
-#include "llviewerwindow.h"
#include "llvoavatarself.h"
#include "llwearablelist.h"
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 1231e72dbf14ba80787bb6e48c4e084d4934184a..e01c67b79e18d54e12428125c69d4656d48403b9 100755
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -36,7 +36,6 @@
#include "llinventoryfilter.h"
#include "llinventorymodel.h"
#include "llscrollcontainer.h"
-#include "lluictrlfactory.h"
#include <set>
class LLInvFVBridge;
diff --git a/indra/newview/llpanelavatartag.cpp b/indra/newview/llpanelavatartag.cpp
index 884680b87dc6344bfa3db0bf9ccf750f764e5637..fb99c98b984622bc87cb00f0fb404fbfd34fc6d0 100755
--- a/indra/newview/llpanelavatartag.cpp
+++ b/indra/newview/llpanelavatartag.cpp
@@ -28,7 +28,6 @@
#include "llpanelavatartag.h"
-#include "lluictrlfactory.h"
#include "llavatariconctrl.h"
#include "lltextbox.h"
diff --git a/indra/newview/llpanelexperiences.cpp b/indra/newview/llpanelexperiences.cpp
index 3ee4b5e968fcdd931ab5289e594c7da0275d98a8..93b3c3277cfc9bb5de8da487ea08bf448e4a19db 100644
--- a/indra/newview/llpanelexperiences.cpp
+++ b/indra/newview/llpanelexperiences.cpp
@@ -29,7 +29,6 @@
#include "llpanelprofile.h"
-#include "lluictrlfactory.h"
#include "llexperiencecache.h"
#include "llagent.h"
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index d72690ba18212380711d66ec08e0fe53c8b4a239..a1c71ac967da1281aff5765c8887b277eb454d7c 100755
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -64,7 +64,6 @@
#include "llviewerregion.h"
#include "llviewerstats.h"
#include "llvovolume.h"
-#include "lluictrlfactory.h"
#include "llpluginclassmedia.h"
#include "llviewertexturelist.h"// Update sel manager as to which channel we're editing so it can reflect the correct overlay UI
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index e775125ed77c8fbc3b5600c24929efc52823ac17..feac7a7211eea515d080562aeb6c56e4e2b0e78f 100755
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -28,13 +28,16 @@
#include "llpanelgroup.h"
// Library includes
+#include "llaccordionctrltab.h"
+#include "llaccordionctrl.h"
#include "llbutton.h"
-#include "llfloatersidepanelcontainer.h"
#include "lltabcontainer.h"
#include "lltextbox.h"
-#include "lluictrlfactory.h"
+#include "lltrans.h"
// Viewer includes
+#include "llagent.h"
+#include "llfloatersidepanelcontainer.h"
#include "llviewermessage.h"
#include "llviewerwindow.h"
#include "llappviewer.h"
@@ -43,18 +46,12 @@
#include "llfloater.h"
#include "llgroupactions.h"
-#include "llagent.h"
-
#include "llsidetraypanelcontainer.h"
#include "llpanelgroupnotices.h"
#include "llpanelgroupgeneral.h"
#include "llpanelgrouproles.h"
-#include "llaccordionctrltab.h"
-#include "llaccordionctrl.h"
-
-#include "lltrans.h"
static LLPanelInjector<LLPanelGroup> t_panel_group("panel_group_info_sidetray");
diff --git a/indra/newview/llpanelgroupbulk.cpp b/indra/newview/llpanelgroupbulk.cpp
index cffda02aa09475fa5c337593097560f4da0a1291..a18e45725e67cdaab76cb505fd6c3ed53b355374 100644
--- a/indra/newview/llpanelgroupbulk.cpp
+++ b/indra/newview/llpanelgroupbulk.cpp
@@ -45,8 +45,6 @@
#include "lltextbox.h"
#include "llviewerobject.h"
#include "llviewerobjectlist.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
//////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llpanelgroupbulkban.cpp b/indra/newview/llpanelgroupbulkban.cpp
index fe0e284f8b7049b40a1e001b6a5a1e303827432f..f34244e27147f547821b4ec6a959bf95de22d109 100644
--- a/indra/newview/llpanelgroupbulkban.cpp
+++ b/indra/newview/llpanelgroupbulkban.cpp
@@ -46,8 +46,6 @@
#include "lltextbox.h"
#include "llviewerobject.h"
#include "llviewerobjectlist.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
LLPanelGroupBulkBan::LLPanelGroupBulkBan(const LLUUID& group_id) : LLPanelGroupBulk(group_id)
{
diff --git a/indra/newview/llpanelgroupexperiences.cpp b/indra/newview/llpanelgroupexperiences.cpp
index 76b68122fbbf16616a4e70947982a0b3da0ca27d..5810b59d59359820a81ad5c1f08dece8987ea1a2 100644
--- a/indra/newview/llpanelgroupexperiences.cpp
+++ b/indra/newview/llpanelgroupexperiences.cpp
@@ -28,7 +28,6 @@
#include "llpanelgroupexperiences.h"
-#include "lluictrlfactory.h"
#include "roles_constants.h"
#include "llhttpclient.h"
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 85539fb0d94881694013715443fc7d2de6f71b6c..24f10be34150b7b6ff1072032688b9ad93cfedef 100755
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -32,7 +32,6 @@
#include "llagent.h"
#include "lleconomy.h"
#include "llsdparam.h"
-#include "lluictrlfactory.h"
#include "roles_constants.h"
// UI elements
diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp
index 5f5bc89f77d05912a39634c82da11cf774a77be1..2c7ef760909abff55fe96f0c1b8da7a54888ec99 100755
--- a/indra/newview/llpanelgroupinvite.cpp
+++ b/indra/newview/llpanelgroupinvite.cpp
@@ -42,8 +42,6 @@
#include "lltextbox.h"
#include "llviewerobject.h"
#include "llviewerobjectlist.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
class LLPanelGroupInvite::impl
{
diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp
index 71b49701bcdd33b31b695b812b0ae0dd3714462d..02576c940adc4ab14697604ff73411ae8b773040 100755
--- a/indra/newview/llpanelgrouplandmoney.cpp
+++ b/indra/newview/llpanelgrouplandmoney.cpp
@@ -50,7 +50,6 @@
#include "lltrans.h"
#include "lltransactiontypes.h"
#include "lltrans.h"
-#include "lluictrlfactory.h"
#include "llstatusbar.h"
#include "llfloaterworldmap.h"
diff --git a/indra/newview/llpanelland.cpp b/indra/newview/llpanelland.cpp
index acdb16f43291807995eaeb9dfb2f99a6082c14f0..2ad00e3a4df30122233e7fed54b1b7f25dfcfe14 100755
--- a/indra/newview/llpanelland.cpp
+++ b/indra/newview/llpanelland.cpp
@@ -42,8 +42,6 @@
#include "llviewerwindow.h"
#include "roles_constants.h"
-#include "lluictrlfactory.h"
-
LLPanelLandSelectObserver* LLPanelLandInfo::sObserver = NULL;
LLPanelLandInfo* LLPanelLandInfo::sInstance = NULL;
diff --git a/indra/newview/llpanellandmedia.cpp b/indra/newview/llpanellandmedia.cpp
index 73cd05309506e7423800444f0cc349935e3fa121..8a30a6cc08289cb844a23a0c98783a45f9cfd191 100755
--- a/indra/newview/llpanellandmedia.cpp
+++ b/indra/newview/llpanellandmedia.cpp
@@ -35,7 +35,6 @@
#include "llviewerregion.h"
#include "llviewermedia.h"
#include "llviewerparcelmedia.h"
-#include "lluictrlfactory.h"
// library includes
#include "llcheckboxctrl.h"
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index cf25012e3b83f8cd5adc3860485b4df0dc4b37fa..54a245a1a2f61b0c258aaeb883f2687501afbba2 100755
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -58,7 +58,6 @@
#include "llviewermenu.h" // for handle_preferences()
#include "llviewernetwork.h"
#include "llviewerwindow.h" // to link into child list
-#include "lluictrlfactory.h"
#include "llhttpclient.h"
#include "llweb.h"
#include "llmediactrl.h"
diff --git a/indra/newview/llpanelmediasettingsgeneral.cpp b/indra/newview/llpanelmediasettingsgeneral.cpp
index d7c43c224c8e002b5e3e24503478ca7bd157545e..e6c0834dac68cdbe001424bc6d5766008b9e7f10 100755
--- a/indra/newview/llpanelmediasettingsgeneral.cpp
+++ b/indra/newview/llpanelmediasettingsgeneral.cpp
@@ -33,11 +33,9 @@
#include "llcheckboxctrl.h"
#include "llnotificationsutil.h"
#include "llspinctrl.h"
-#include "lluictrlfactory.h"
// project includes
#include "llagent.h"
-#include "llviewerwindow.h"
#include "llviewermedia.h"
#include "llsdutil.h"
#include "llselectmgr.h"
diff --git a/indra/newview/llpanelmediasettingspermissions.cpp b/indra/newview/llpanelmediasettingspermissions.cpp
index cb0b7789ff6e193deb31f4b08c3ff7bda70b9923..577f51e8910c0b0b0c94e695fc1665790ba41320 100755
--- a/indra/newview/llpanelmediasettingspermissions.cpp
+++ b/indra/newview/llpanelmediasettingspermissions.cpp
@@ -36,9 +36,6 @@
#include "llcheckboxctrl.h"
#include "llspinctrl.h"
#include "llurlhistory.h"
-#include "lluictrlfactory.h"
-#include "llwindow.h"
-#include "llviewerwindow.h"
#include "llsdutil.h"
#include "llselectmgr.h"
#include "llmediaentry.h"
diff --git a/indra/newview/llpanelmediasettingssecurity.cpp b/indra/newview/llpanelmediasettingssecurity.cpp
index b588e8f9306faf58dfdd5f1951808ba4801398e0..270be79811535aaf33920ec97f0dd0ca8025b31a 100755
--- a/indra/newview/llpanelmediasettingssecurity.cpp
+++ b/indra/newview/llpanelmediasettingssecurity.cpp
@@ -34,7 +34,6 @@
#include "llnotificationsutil.h"
#include "llscrolllistctrl.h"
#include "llscrolllistitem.h"
-#include "lluictrlfactory.h"
#include "llwindow.h"
#include "llviewerwindow.h"
#include "llsdutil.h"
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 64ad481ac073ce676de5046cf5ee80bdc3491218..ff5fd9ef24f54484c483c66a221d5fee2047d852 100755
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -66,7 +66,6 @@
#include "llworld.h"
#include "pipeline.h"
#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
//#include "llfirstuse.h"
#include "lldrawpool.h"
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 1ff9aaf6f705bf290dce76452cbf54bf81389d30..1e743da1d6854d9278f9c0539debb541dd67c5ea 100755
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -64,7 +64,6 @@
#include "lltextbox.h"
#include "lltoggleablemenu.h"
#include "lltrans.h"
-#include "lluictrlfactory.h"
#include "llsdutil.h"
#include "llsidepanelappearance.h"
#include "lltoggleablemenu.h"
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index f95f94a3f75c315a745278e78b26c1b9dc3fd03c..3d71e68a803206321ef177a51d87a2b51a22f528 100755
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -39,7 +39,6 @@
#include "llfiltereditor.h"
#include "lltabcontainer.h"
#include "lltoggleablemenu.h"
-#include "lluictrlfactory.h"
#include "llpanelpeople.h"
diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp
index d6033b7f881a39ce79d43c715e1b128bbb332fd6..6cebb231c11159f965cfa0c9ad5a040ddda20c8c 100755
--- a/indra/newview/llpanelpeoplemenus.cpp
+++ b/indra/newview/llpanelpeoplemenus.cpp
@@ -28,7 +28,6 @@
// libs
#include "llmenugl.h"
-#include "lluictrlfactory.h"
#include "llpanelpeoplemenus.h"
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index 29fc2b2d034388d5dbc7ae0ce2bb88a9b517aeca..313a8f0088eb1d71bf3981b8810f059ed389c3c0 100755
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -59,7 +59,6 @@
#include "llnamebox.h"
#include "llviewercontrol.h"
#include "llviewernetwork.h"
-#include "lluictrlfactory.h"
#include "llspinctrl.h"
#include "roles_constants.h"
#include "llgroupactions.h"
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index a9a0c30e2678bdd7504a36f39a071c22a0a2cdce..edbfeacb93cd8f450eeb69a0e2937ad6fa547b17 100755
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -45,7 +45,6 @@
#include "lltabcontainer.h"
#include "lltexteditor.h"
#include "lltrans.h"
-#include "lluictrlfactory.h"
#include "llwindow.h"
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp
index f42df221e4a41682203e77e49ec60afe4ff551af..cfd27c7b655ae9355f0e5a26e095e5c71534a341 100755
--- a/indra/newview/llpanelprimmediacontrols.cpp
+++ b/indra/newview/llpanelprimmediacontrols.cpp
@@ -34,8 +34,6 @@
#include "llmediaentry.h"
#include "llrender.h"
#include "lldrawable.h"
-#include "llviewerwindow.h"
-#include "lluictrlfactory.h"
#include "llbutton.h"
#include "llface.h"
#include "llcombobox.h"
diff --git a/indra/newview/llpanelteleporthistory.h b/indra/newview/llpanelteleporthistory.h
index b88861c5c632cb3cd50da65a5cb11015b55a0ec5..49a7c57f5952cad01f1b9d9d7da2b0da459416f6 100755
--- a/indra/newview/llpanelteleporthistory.h
+++ b/indra/newview/llpanelteleporthistory.h
@@ -28,8 +28,6 @@
#ifndef LL_LLPANELTELEPORTHISTORY_H
#define LL_LLPANELTELEPORTHISTORY_H
-#include "lluictrlfactory.h"
-
#include "llpanelplacestab.h"
#include "llteleporthistory.h"
#include "llmenugl.h"
diff --git a/indra/newview/llpanelvoicedevicesettings.cpp b/indra/newview/llpanelvoicedevicesettings.cpp
index 3946d6a63b6875899ad29055a71b497b8613bbf9..341c90c4cf5eeaa648866ca605b68ae0dda11b1e 100755
--- a/indra/newview/llpanelvoicedevicesettings.cpp
+++ b/indra/newview/llpanelvoicedevicesettings.cpp
@@ -36,9 +36,6 @@
#include "llvoiceclient.h"
#include "llvoicechannel.h"
-// Library includes (after viewer)
-#include "lluictrlfactory.h"
-
static LLPanelInjector<LLPanelVoiceDeviceSettings> t_panel_group_general("panel_voice_device_settings");
static const std::string DEFAULT_DEVICE("Default");
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index 48fd6247d44f0eddd18ace0748c308977bd68c3f..74ade2a59357e70a3f177b2a17c4f378d91f1af5 100755
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -71,7 +71,6 @@
#include "llnotificationsutil.h"
#include "lldrawpool.h"
-#include "lluictrlfactory.h"
// For mesh physics
#include "llagent.h"
diff --git a/indra/newview/llpreviewanim.cpp b/indra/newview/llpreviewanim.cpp
index 35ac0537a3d01758397f939b3d13eb509d471ad4..3b5ca36cd85ebe3d18bda1b82bddfe3e21eabcbb 100755
--- a/indra/newview/llpreviewanim.cpp
+++ b/indra/newview/llpreviewanim.cpp
@@ -35,8 +35,6 @@
#include "llkeyframemotion.h"
#include "llfilepicker.h"
#include "lllineeditor.h"
-#include "lluictrlfactory.h"
-#include "lluictrlfactory.h"
extern LLAgent gAgent;
diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp
index 1cb54554d5bd8b2c1c8918a061a5be0b4f7a65c0..5c24f344ce4b38447f7a41090ba840189d148911 100755
--- a/indra/newview/llpreviewnotecard.cpp
+++ b/indra/newview/llpreviewnotecard.cpp
@@ -58,7 +58,6 @@
#include "llviewercontrol.h" // gSavedSettings
#include "llappviewer.h" // app_abort_quit()
#include "lllineeditor.h"
-#include "lluictrlfactory.h"
///----------------------------------------------------------------------------
/// Class LLPreviewNotecard
diff --git a/indra/newview/llpreviewsound.cpp b/indra/newview/llpreviewsound.cpp
index 105c5e8cbebf4678f72bb225a390eb32d4b483e7..9e7e9a81037a1045c46a4648e8201779cf956c80 100755
--- a/indra/newview/llpreviewsound.cpp
+++ b/indra/newview/llpreviewsound.cpp
@@ -35,7 +35,6 @@
#include "llresmgr.h"
#include "llviewercontrol.h"
#include "llviewermessage.h" // send_guid_sound_trigger
-#include "lluictrlfactory.h"
extern LLAudioEngine* gAudiop;
extern LLAgent gAgent;
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index 81a1c6f266ba3c6a64893b873f0db10d43dcac7d..544d3c9c5436b78f908f40d4753ceb68ca26d076 100755
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -51,8 +51,6 @@
#include "llviewerinventory.h"
#include "llviewertexture.h"
#include "llviewertexturelist.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
#include "lllineeditor.h"
const S32 CLIENT_RECT_VPAD = 4;
diff --git a/indra/newview/llsearchcombobox.cpp b/indra/newview/llsearchcombobox.cpp
index 2824c70582abeb11fa6fda0f95faf9b6fb7b6d05..dcbd507932bdd5cd893dff0b9c3b2c0e200bbf6c 100755
--- a/indra/newview/llsearchcombobox.cpp
+++ b/indra/newview/llsearchcombobox.cpp
@@ -29,7 +29,6 @@
#include "llkeyboard.h"
#include "lltrans.h" // for LLTrans::getString()
-#include "lluictrlfactory.h"
static LLDefaultChildRegistry::Register<LLSearchComboBox> r1("search_combo_box");
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index ea7cf826746bcef649fe477b5cd5819c109aa896..02c5a5bde7f17aba1ff45da1ed9a349457f9f8cf 100755
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -43,7 +43,6 @@
#include "llpaneleditwearable.h"
#include "llpaneloutfitsinventory.h"
#include "lltextbox.h"
-#include "lluictrlfactory.h"
#include "llviewercontrol.h"
#include "llviewerregion.h"
#include "llvoavatarself.h"
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 6f864fe8e6fba7e8af3f0329199f8524819b724d..86acb98905cf5df82b8be6c53bda9fb722742f7e 100755
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -66,7 +66,6 @@
#include "llviewermenu.h" // for gMenuBarView
#include "llviewerparcelmgr.h"
#include "llviewerthrottle.h"
-#include "lluictrlfactory.h"
#include "lltoolmgr.h"
#include "llfocusmgr.h"
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp
index aa019dfdd80d8536cf0c0d132e145699e70813d8..dfdc9b0c2720de70a1006a0d3d84243ef7c63729 100755
--- a/indra/newview/llviewermediafocus.cpp
+++ b/indra/newview/llviewermediafocus.cpp
@@ -38,7 +38,6 @@
#include "llviewercamera.h"
#include "llviewermedia.h"
#include "llhudview.h"
-#include "lluictrlfactory.h"
#include "lldrawable.h"
#include "llparcel.h"
#include "llviewerparcelmgr.h"
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 8377fc6bf51fa2f245ee8d74203dd0dd42092bc3..b80729e385d3d2caa8ca8a9b4ac9ea98694ec6a8 100755
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -49,7 +49,6 @@
#include "llstatusbar.h"
#include "llviewercontrol.h" // gSavedSettings
#include "llviewertexturelist.h"
-#include "lluictrlfactory.h"
#include "llvfile.h"
#include "llvfs.h"
#include "llviewerinventory.h"
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 6ef35f0b5b8d3c18a968a9b652984e528254db1a..6f204cb3092a31507bddb7bbf7df90ca9c1578b0 100755
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -55,7 +55,6 @@
#include "lltooldraganddrop.h"
#include "lltooltip.h"
#include "lltrans.h"
-#include "lluictrlfactory.h"
#include "llviewerassettype.h"
#include "llviewercontrol.h"
#include "llviewerinventory.h"
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp
index db032822c15949cfa65e234a21df6e9b28c7137b..468508f6b4eac16e372ba637066154c2f0a9959d 100755
--- a/indra/newview/llwaterparammanager.cpp
+++ b/indra/newview/llwaterparammanager.cpp
@@ -38,7 +38,6 @@
#include "llsliderctrl.h"
#include "llspinctrl.h"
#include "llcheckboxctrl.h"
-#include "lluictrlfactory.h"
#include "llviewercontrol.h"
#include "llviewercamera.h"
#include "llcombobox.h"
diff --git a/indra/newview/llwaterparamset.cpp b/indra/newview/llwaterparamset.cpp
index 9cc91d2246ac2f3ee6021e5cb27e3c0840c24ef0..7418a92668d34273fed6d71d861696eefd5f5dc1 100755
--- a/indra/newview/llwaterparamset.cpp
+++ b/indra/newview/llwaterparamset.cpp
@@ -30,7 +30,6 @@
#include "llsd.h"
#include "llwaterparammanager.h"
-#include "lluictrlfactory.h"
#include "llsliderctrl.h"
#include "llviewertexturelist.h"
#include "llviewercontrol.h"
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp
index 040024f86bb00d59ceabce349262cbb582ed6cb9..167cb4e18b849ca699b951c450ea5cd55dda7e47 100755
--- a/indra/newview/llwlparammanager.cpp
+++ b/indra/newview/llwlparammanager.cpp
@@ -36,7 +36,6 @@
#include "llsliderctrl.h"
#include "llspinctrl.h"
#include "llcheckboxctrl.h"
-#include "lluictrlfactory.h"
#include "llviewercamera.h"
#include "llcombobox.h"
#include "lllineeditor.h"
diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp
index 46d3433c9367b224aff414020922a0c6b07792b8..1438aa7eb879944b4f02f59d06e11a46394c72c0 100755
--- a/indra/newview/llwlparamset.cpp
+++ b/indra/newview/llwlparamset.cpp
@@ -31,7 +31,6 @@
#include "llwlparammanager.h"
#include "llglslshader.h"
-#include "lluictrlfactory.h"
#include "llsliderctrl.h"
#include "pipeline.h"