diff --git a/indra/llui/llclipboard.h b/indra/llui/llclipboard.h
index 58d80e26876419977f48b4f216dbb780a5a76609..dbebbb2cfa6d085285a58e1a3d4860c2fb45c6c8 100755
--- a/indra/llui/llclipboard.h
+++ b/indra/llui/llclipboard.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLCLIPBOARD_H
 #define LL_LLCLIPBOARD_H
 
-#include <boost/function.hpp>
-
 #include "llstring.h"
 #include "lluuid.h"
 #include "llsingleton.h"
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index a4d425507eb4952dd7d7a7309826ae6eb42c5e13..1acd30fc6f91ed54b85e320ef67d314f6d8b7b0e 100755
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -36,7 +36,6 @@
 #include "llrect.h"
 #include "llscrolllistctrl.h"
 #include "lllineeditor.h"
-#include <boost/function.hpp>
 
 // Classes
 
diff --git a/indra/llui/llflashtimer.h b/indra/llui/llflashtimer.h
index db8d49f0096be7397292c25e7a593573bc7adc48..dc7281b4fa6331cf919b72e36578c93da623a186 100755
--- a/indra/llui/llflashtimer.h
+++ b/indra/llui/llflashtimer.h
@@ -28,7 +28,7 @@
 #define LL_FLASHTIMER_H
 
 #include "lleventtimer.h"
-#include "boost/function.hpp"
+#include <boost/function.hpp>
 
 class LLFlashTimer : public LLEventTimer
 {
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index cb02a646d422d4ffde7eb655eb560d9e34397e92..de5842e261169269239e7359175b84135ad9217f 100755
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -36,7 +36,6 @@
 #include "lluuid.h"
 //#include "llnotificationsutil.h"
 #include <set>
-#include <boost/signals2.hpp>
 
 class LLDragHandle;
 class LLResizeHandle;
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index ae9b169691493e280167a0475bbc58fe3d95219d..c2c21196510c1c0b90787d5b00247ded2fd0ae08 100755
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -37,7 +37,6 @@
 #include "llfloater.h"
 #include "lluistring.h"
 #include "llview.h"
-#include <boost/function.hpp>
 
 extern S32 MENU_BAR_HEIGHT;
 extern S32 MENU_BAR_WIDTH;
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 0aacaddb4632e6b64e273bda4ba98561ffac500d..bed1a97e4052ca52328c318397516b3159c00458 100755
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -81,7 +81,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/type_traits.hpp>
-#include <boost/signals2.hpp>
 #include <boost/range.hpp>
 
 #include "llevents.h"
diff --git a/indra/llui/llspellcheck.h b/indra/llui/llspellcheck.h
index 4ab80195ead318f7f586563474d0f9fb5706d10d..962eeed28ee3ca5a03586e42d5e82fe9dcfd395b 100755
--- a/indra/llui/llspellcheck.h
+++ b/indra/llui/llspellcheck.h
@@ -29,7 +29,6 @@
 
 #include "llsingleton.h"
 #include "llui.h"
-#include <boost/signals2.hpp>
 
 class Hunspell;
 
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index e776b1f67a08da3ad89b45091e27b97f700fb88d..ab28f4251c8ee9fc66df196878473a21e512e269 100755
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -37,8 +37,6 @@
 
 #include <set>
 
-#include <boost/signals2.hpp>
-
 class LLScrollContainer;
 class LLContextMenu;
 class LLUrlMatch;
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index c727f75c4fa6a953f8abdc244ef05225f4c764e7..ce12664cd0b867d181ce20b57a387260ab58eed9 100755
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -41,7 +41,6 @@
 #include "lluicolor.h"
 #include "lluicolortable.h"
 #include "lluiimage.h"
-#include <boost/signals2.hpp>
 #include "llframetimer.h"
 #include "v2math.h"
 #include <limits>
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index 99553ee0d26c701fb042895c54c15d6a7d987498..0576055973597ede37605b257e4f06728c278c56 100755
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -31,8 +31,6 @@
 //#include "llboost.h"
 #include "llrect.h"
 #include "llsd.h"
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
 
 #include "llinitparam.h"
 #include "llview.h"
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 5d70fd823ae9f1fc5dbb83a408600d5135ca2643..82368b4a4bf9230e76427000234a36f148e37331 100755
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -35,7 +35,6 @@
 #include "llavatarname.h"
 #include "llhost.h" // for resolving parcel name by parcel id
 
-#include <boost/signals2.hpp>
 #include <boost/regex.hpp>
 
 class LLAvatarName;
diff --git a/indra/llui/llxuiparser.h b/indra/llui/llxuiparser.h
index ad2a39cab7f0082f84520bfc1bd0b8156c9bc1a1..f9503dde3c7c68910527e9152a6b6d817841a8b1 100755
--- a/indra/llui/llxuiparser.h
+++ b/indra/llui/llxuiparser.h
@@ -31,9 +31,7 @@
 #include "llregistry.h"
 #include "llxmlnode.h"
 
-#include <boost/function.hpp>
 #include <iosfwd>
-#include <stack>
 #include <set>
 
 class LLView;
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index c27ed8ea5d6a412e546ca9b37d5360afd4a45cb5..6045758d33e31e9436e561741409d4a13e74b5c5 100755
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -36,9 +36,7 @@
 #include "llpermissionsflags.h"
 #include "v3dmath.h"
 
-#include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
 
 extern const BOOL 	ANIMATE;
 extern const U8 	AGENT_STATE_TYPING;  // Typing indication
diff --git a/indra/newview/llappviewerlistener.h b/indra/newview/llappviewerlistener.h
index 78c8b1909ec79cca4a0c14a9b15502357dd745ea..b74124ba092b726093f9cfd1543db7c305adda56 100755
--- a/indra/newview/llappviewerlistener.h
+++ b/indra/newview/llappviewerlistener.h
@@ -30,7 +30,6 @@
 #define LL_LLAPPVIEWERLISTENER_H
 
 #include "lleventapi.h"
-#include <boost/function.hpp>
 
 class LLAppViewer;
 class LLSD;
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
index 1a51f3cae4517f4ae29ddafa739abb5db78808d4..bf8fd986c9d7995139e4b1a39a69b722021fc560 100755
--- a/indra/newview/llavatariconctrl.cpp
+++ b/indra/newview/llavatariconctrl.cpp
@@ -28,8 +28,6 @@
 
 #include "llavatariconctrl.h"
 
-#include <boost/signals2.hpp>
-
 // viewer includes
 #include "llagent.h"
 #include "llcallingcard.h" // for LLAvatarTracker
diff --git a/indra/newview/llavatariconctrl.h b/indra/newview/llavatariconctrl.h
index d24ed32d477bd052b02d0e92e984292f60687475..942972ab385787bb3959994aab0fa63ad42a93f2 100755
--- a/indra/newview/llavatariconctrl.h
+++ b/indra/newview/llavatariconctrl.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLAVATARICONCTRL_H
 #define LL_LLAVATARICONCTRL_H
 
-#include <boost/signals2.hpp>
-
 #include "lliconctrl.h"
 #include "llavatarpropertiesprocessor.h"
 #include "llviewermenu.h"
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index 1301361156ff6d2e7a4e7886ac0cbe5292a84e20..d1de8dd8610e7dc5aa4901e8223f369253c99bf5 100755
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -27,8 +27,6 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#include <boost/signals2.hpp>
-
 #include "llavataractions.h"
 #include "llavatarlistitem.h"
 
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h
index 3b845ebe6e46ab4472c61475b4ec6ab6fc102198..4cbe04a81ce49c5acd9f7b88964042fcbb1cdb23 100755
--- a/indra/newview/llavatarlistitem.h
+++ b/indra/newview/llavatarlistitem.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLAVATARLISTITEM_H
 #define LL_LLAVATARLISTITEM_H
 
-#include <boost/signals2.hpp>
-
 #include "llpanel.h"
 #include "lloutputmonitorctrl.h"
 #include "llbutton.h"
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 48b59b237eae40690310f171f60c59172dc3123c..c5119b1447afc4c8440b0adffcd777bdc248fe1e 100755
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -28,8 +28,6 @@
 
 #include "llchathistory.h"
 
-#include <boost/signals2.hpp>
-
 #include "llavatarnamecache.h"
 #include "llinstantmessage.h"
 
diff --git a/indra/newview/llcommandlineparser.h b/indra/newview/llcommandlineparser.h
index 71388b8217ec700d3cb711475f96bb2bc0a054ab..2c2bbd9e3a62088a8d9e726388098e0881b453fd 100755
--- a/indra/newview/llcommandlineparser.h
+++ b/indra/newview/llcommandlineparser.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLCOMMANDLINEPARSER_H
 #define LL_LLCOMMANDLINEPARSER_H
 
-#include <boost/function/function1.hpp>
-
 // *NOTE:Mani The following is a forward decl of 
 // boost::program_options::command_line_parser
 // "yay" c++!
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index af7b50802cd34df0b463dd93a797e8eb8488f4e9..4a863064cdb247a69f515c830efbf9c241f1b763 100644
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLCONVERSATIONMODEL_H
 #define LL_LLCONVERSATIONMODEL_H
 
-#include <boost/signals2.hpp>
-
 #include "llavatarname.h"
 #include "../llui/llfolderviewitem.h"
 #include "../llui/llfolderviewmodel.h"
diff --git a/indra/newview/llfloatergroups.h b/indra/newview/llfloatergroups.h
index ab58208985d9f15c92e68d19b7abde2756fedfa3..324149e2ae22052913bdb60f0dcd8a181a019ebf 100755
--- a/indra/newview/llfloatergroups.h
+++ b/indra/newview/llfloatergroups.h
@@ -40,8 +40,6 @@
 
 #include "lluuid.h"
 #include "llfloater.h"
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
 
 class LLUICtrl;
 class LLTextBox;
diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index ccf3e723fd221cb336862701050449d8c4fe64f3..ca2acdda998405f82e3f6086e4a92f53a463a2d1 100755
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -30,10 +30,6 @@
 
 #include "llfloaterpathfindingconsole.h"
 
-#include <vector>
-
-#include <boost/signals2.hpp>
-
 #include "llagent.h"
 #include "llbutton.h"
 #include "llcheckboxctrl.h"
diff --git a/indra/newview/llfloaterpathfindingconsole.h b/indra/newview/llfloaterpathfindingconsole.h
index e999e57741ff4a37bdee43aa429754d0149e1c5c..9b056d76870f5b0527fd2bb5e14f93588a5690e7 100755
--- a/indra/newview/llfloaterpathfindingconsole.h
+++ b/indra/newview/llfloaterpathfindingconsole.h
@@ -27,10 +27,6 @@
 #ifndef LL_LLFLOATERPATHFINDINGCONSOLE_H
 #define LL_LLFLOATERPATHFINDINGCONSOLE_H
 
-#include <vector>
-
-#include <boost/signals2.hpp>
-
 #include "llfloater.h"
 #include "llhandle.h"
 #include "llpathfindingnavmeshzone.h"
diff --git a/indra/newview/llfloaterpathfindingobjects.cpp b/indra/newview/llfloaterpathfindingobjects.cpp
index e76978cad97f32877ba7751cf71b458b119fe010..08c1bab64b52c1134b2802ca97b8e06a6298a2e1 100755
--- a/indra/newview/llfloaterpathfindingobjects.cpp
+++ b/indra/newview/llfloaterpathfindingobjects.cpp
@@ -30,7 +30,6 @@
 #include "llfloaterpathfindingobjects.h"
 
 #include <boost/bind.hpp>
-#include <boost/signals2.hpp>
 
 #include "llagent.h"
 #include "llavatarname.h"
diff --git a/indra/newview/llfloaterpathfindingobjects.h b/indra/newview/llfloaterpathfindingobjects.h
index 8bf42f1ca09f48915e6cb5e9ba527d7c17d94a9d..a015b9bb747343e49842923450a1aa299e7d2ae9 100755
--- a/indra/newview/llfloaterpathfindingobjects.h
+++ b/indra/newview/llfloaterpathfindingobjects.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLFLOATERPATHFINDINGOBJECTS_H
 #define LL_LLFLOATERPATHFINDINGOBJECTS_H
 
-#include <boost/signals2.hpp>
-
 #include "llagent.h"
 #include "llfloater.h"
 #include "llpathfindingmanager.h"
diff --git a/indra/newview/llfloaterregiondebugconsole.h b/indra/newview/llfloaterregiondebugconsole.h
index fd3af4152e94873d083257bf58a31b6de7e1893a..79667c97b6777a78e76fc50a03ac93980ddbed76 100755
--- a/indra/newview/llfloaterregiondebugconsole.h
+++ b/indra/newview/llfloaterregiondebugconsole.h
@@ -28,8 +28,6 @@
 #ifndef LL_LLFLOATERREGIONDEBUGCONSOLE_H
 #define LL_LLFLOATERREGIONDEBUGCONSOLE_H
 
-#include <boost/signals2.hpp>
-
 #include "llfloater.h"
 #include "llhttpclient.h"
 
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index bc253bb2fd292dc71f630808c8f8eed7906bb063..ee8c09c4c6bfb7ccf2be6363317bf2589af29c6e 100755
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -93,7 +93,6 @@
 #include "llmeshrepository.h"
 #include "llfloaterregionrestarting.h"
 #include "llpanelexperiencelisteditor.h"
-#include <boost/function.hpp>
 #include "llpanelexperiencepicker.h"
 #include "llexperiencecache.h"
 #include "llpanelexperiences.h"
diff --git a/indra/newview/llfloatertos.h b/indra/newview/llfloatertos.h
index 47126d06a64859be60c6fdef68c9b60e00493b4b..7b2a6739450bd68868039cdc59a20edbb04b7fd0 100755
--- a/indra/newview/llfloatertos.h
+++ b/indra/newview/llfloatertos.h
@@ -30,7 +30,6 @@
 #include "llmodaldialog.h"
 #include "llassetstorage.h"
 #include "llmediactrl.h"
-#include <boost/function.hpp>
 
 class LLButton;
 class LLRadioGroup;
diff --git a/indra/newview/lllandmarklist.h b/indra/newview/lllandmarklist.h
index cdabfbe0e8a92b5ee35cba22902970006d803396..21acefaa76a886ff617a0bbb481a025cc94eb92a 100755
--- a/indra/newview/lllandmarklist.h
+++ b/indra/newview/lllandmarklist.h
@@ -27,7 +27,6 @@
 #ifndef LL_LLLANDMARKLIST_H
 #define LL_LLLANDMARKLIST_H
 
-#include <boost/function.hpp>
 #include "lllandmark.h"
 #include "lluuid.h"
 #include "llassetstorage.h"
diff --git a/indra/newview/lllocationhistory.h b/indra/newview/lllocationhistory.h
index 31e089f55c686b391b1bb3b0587141be82c931bd..8c400293239e7822895efa5bd09ea52b4220adb6 100755
--- a/indra/newview/lllocationhistory.h
+++ b/indra/newview/lllocationhistory.h
@@ -29,9 +29,6 @@
 
 #include "llsingleton.h" // for LLSingleton
 
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
-
 class LLSD;
 /**
  * This enum is responsible for identifying of history item.
diff --git a/indra/newview/llmarketplacefunctions.h b/indra/newview/llmarketplacefunctions.h
index f8e7ed43647f61b456c456308b36227b18697f92..26ffe2c94ad5e24d438c32ae398fd16b1442fd82 100755
--- a/indra/newview/llmarketplacefunctions.h
+++ b/indra/newview/llmarketplacefunctions.h
@@ -30,8 +30,6 @@
 
 
 #include <llsd.h>
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
 
 #include "llsingleton.h"
 #include "llstring.h"
diff --git a/indra/newview/llmarketplacenotifications.cpp b/indra/newview/llmarketplacenotifications.cpp
index 02bd9e1f342372e480e74b078cf2381ae6545f29..8944d293ff28a1d4c76211d4a0d7a2fcff3b3e26 100755
--- a/indra/newview/llmarketplacenotifications.cpp
+++ b/indra/newview/llmarketplacenotifications.cpp
@@ -33,9 +33,6 @@
 
 #include "llerror.h"
 
-#include <boost/signals2.hpp>
-
-
 namespace LLMarketplaceInventoryNotifications
 {
 	typedef boost::signals2::signal<void (const LLSD& param)>	no_copy_payload_cb_signal_t;
diff --git a/indra/newview/llmarketplacenotifications.h b/indra/newview/llmarketplacenotifications.h
index 83a4e163c7c5d9eb447376b425033c1ff736b46e..3fbc9c42b65d00c2ba9da58ec22db0c4bab1e4ca 100755
--- a/indra/newview/llmarketplacenotifications.h
+++ b/indra/newview/llmarketplacenotifications.h
@@ -30,7 +30,6 @@
 
 
 #include <llsd.h>
-#include <boost/function.hpp>
 
 
 //
diff --git a/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp b/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp
index 8879cfd7fbf8ed593b4ba58df20737bbdf3766c0..5d753bb0727d1f2bc05e98c9ceed5aa6ebd9f4ee 100755
--- a/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp
+++ b/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp
@@ -30,9 +30,6 @@
 
 #include "llmenuoptionpathfindingrebakenavmesh.h"
 
-#include <boost/bind.hpp>
-#include <boost/signals2.hpp>
-
 #include "llagent.h"
 #include "llenvmanager.h"
 #include "llnotificationsutil.h"
diff --git a/indra/newview/llmenuoptionpathfindingrebakenavmesh.h b/indra/newview/llmenuoptionpathfindingrebakenavmesh.h
index 7b1d2873bad0933e54a0823ddbd7da84f11b6f48..cb442494fc904dbf6f40989a37f89a046635436f 100755
--- a/indra/newview/llmenuoptionpathfindingrebakenavmesh.h
+++ b/indra/newview/llmenuoptionpathfindingrebakenavmesh.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLMENUOPTIONPATHFINDINGREBAKENAVMESH_H
 #define LL_LLMENUOPTIONPATHFINDINGREBAKENAVMESH_H
 
-#include <boost/signals2.hpp>
-
 #include "llpathfindingmanager.h"
 #include "llpathfindingnavmesh.h"
 #include "llsingleton.h"
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index 32edfffa9845b565194eea90f6d2ce7b1c3cde06..0cf9ee8bf4fef40e9955d00b052e1ee7fd7c7f4d 100755
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -30,10 +30,7 @@
 
 #include "llpathfindingmanager.h"
 
-#include <boost/bind.hpp>
-#include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
 
 #include "llagent.h"
 #include "llhttpclient.h"
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h
index fb005223c61e6876682f60e55958bf0c814599ca..92b6f4d3d455b1803892e287c680dfbda0d44065 100755
--- a/indra/newview/llpathfindingmanager.h
+++ b/indra/newview/llpathfindingmanager.h
@@ -27,9 +27,6 @@
 #ifndef LL_LLPATHFINDINGMANAGER_H
 #define LL_LLPATHFINDINGMANAGER_H
 
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
-
 #include "llpathfindinglinkset.h"
 #include "llpathfindingobjectlist.h"
 #include "llpathfindingnavmesh.h"
diff --git a/indra/newview/llpathfindingnavmesh.h b/indra/newview/llpathfindingnavmesh.h
index 63b1703d07630e378c175094060fa4b30e2d63e6..7cbaaba75467e6e462759f2fa651660ebd76a17f 100755
--- a/indra/newview/llpathfindingnavmesh.h
+++ b/indra/newview/llpathfindingnavmesh.h
@@ -28,8 +28,6 @@
 #define LL_LLPATHFINDINGNAVMESH_H
 
 #include <boost/shared_ptr.hpp>
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
 
 #include "llpathfindingnavmeshstatus.h"
 #include "llsd.h"
diff --git a/indra/newview/llpathfindingnavmeshzone.cpp b/indra/newview/llpathfindingnavmeshzone.cpp
index e190dbba659e3ae71bd9e4efa6b39d42b7a0b5a5..aecf9ec12972b65801ff7b53e33067b0aa44f5f9 100755
--- a/indra/newview/llpathfindingnavmeshzone.cpp
+++ b/indra/newview/llpathfindingnavmeshzone.cpp
@@ -30,12 +30,7 @@
 
 #include "llpathfindingnavmeshzone.h"
 
-#include <vector>
-
-#include <boost/bind.hpp>
-#include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
 
 #include "llagent.h"
 #include "llpathfindingmanager.h"
diff --git a/indra/newview/llpathfindingnavmeshzone.h b/indra/newview/llpathfindingnavmeshzone.h
index baa1cc59799d4e51e1aac97dd513b55e6a2dc34c..166bb30caf07a649adfd2d1831a37d200c1a1ebc 100755
--- a/indra/newview/llpathfindingnavmeshzone.h
+++ b/indra/newview/llpathfindingnavmeshzone.h
@@ -27,11 +27,7 @@
 #ifndef LL_LLPATHFINDINGNAVMESHZONE_H
 #define LL_LLPATHFINDINGNAVMESHZONE_H
 
-#include <vector>
-
 #include <boost/shared_ptr.hpp>
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
 
 #include "llpathfindingnavmesh.h"
 #include "llpathfindingnavmeshstatus.h"
diff --git a/indra/newview/llpathfindingobject.h b/indra/newview/llpathfindingobject.h
index a30c0a6398a5bd863c72f47ed1cdb4f4e5c53406..5f84142644f4c085129343e00960e08e3f283089 100755
--- a/indra/newview/llpathfindingobject.h
+++ b/indra/newview/llpathfindingobject.h
@@ -28,8 +28,6 @@
 #define LL_LLPATHFINDINGOBJECT_H
 
 #include <boost/shared_ptr.hpp>
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
 
 #include "llavatarname.h"
 #include "llavatarnamecache.h"
diff --git a/indra/newview/llpathfindingpathtool.cpp b/indra/newview/llpathfindingpathtool.cpp
index a0b8d1c7bd8217787fe337902a78f1b878a31638..37e5704de0d443bc96cd47a252661b5fa3847c64 100755
--- a/indra/newview/llpathfindingpathtool.cpp
+++ b/indra/newview/llpathfindingpathtool.cpp
@@ -30,9 +30,6 @@
 
 #include "llpathfindingpathtool.h"
 
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
-
 #include "llagent.h"
 #include "llpathfindingmanager.h"
 #include "llpathinglib.h"
diff --git a/indra/newview/llpathfindingpathtool.h b/indra/newview/llpathfindingpathtool.h
index 02e2e5d14d675a83d175ad760c28b80379b6af79..32b5b0c2940401cfaea576be0b780f30e6093dd2 100755
--- a/indra/newview/llpathfindingpathtool.h
+++ b/indra/newview/llpathfindingpathtool.h
@@ -27,9 +27,6 @@
 #ifndef LL_LLPATHFINDINGPATHTOOL_H
 #define LL_LLPATHFINDINGPATHTOOL_H
 
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
-
 #include "llpathinglib.h"
 #include "llsingleton.h"
 #include "lltool.h"
diff --git a/indra/newview/llrecentpeople.h b/indra/newview/llrecentpeople.h
index 32d6cc1c7a9143439737e379d4e7132ea4f4ee1b..87c31bb001da6b3e4fe0d8206a98530431c8b27d 100755
--- a/indra/newview/llrecentpeople.h
+++ b/indra/newview/llrecentpeople.h
@@ -31,10 +31,6 @@
 #include "llsingleton.h"
 #include "lluuid.h"
 
-#include <vector>
-#include <set>
-#include <boost/signals2.hpp>
-
 class LLDate;
 
 /**
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index 29c111b24f37926da9fdbe862635aadf63833338..76e7cfd8918191dde82f0180116864ce402d134e 100755
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -45,9 +45,7 @@
 #include "llviewerobject.h"	// LLObjectSelection::getSelectedTEValue template
 #include "llmaterial.h"
 
-#include <deque>
 #include <boost/iterator/filter_iterator.hpp>
-#include <boost/signals2.hpp>
 #include <boost/make_shared.hpp>	// boost::make_shared
 
 class LLMessageSystem;
diff --git a/indra/newview/llteleporthistory.h b/indra/newview/llteleporthistory.h
index a613b3309cb37a6c7cef5a1d91d6af9855e09f96..07b742000ee398bb4bcb8cc4319709afefa0e549 100755
--- a/indra/newview/llteleporthistory.h
+++ b/indra/newview/llteleporthistory.h
@@ -29,8 +29,6 @@
 
 #include "llsingleton.h" // for LLSingleton
 
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
 #include "llteleporthistorystorage.h"
 
 
diff --git a/indra/newview/lltoolpipette.h b/indra/newview/lltoolpipette.h
index 8a83bf31af641534257bcc459aeb94940d2d2608..24b590af851fdb9587eecfe6dd90d520a7a21e96 100755
--- a/indra/newview/lltoolpipette.h
+++ b/indra/newview/lltoolpipette.h
@@ -34,8 +34,6 @@
 
 #include "lltool.h"
 #include "lltextureentry.h"
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
 
 class LLViewerObject;
 class LLPickInfo;
diff --git a/indra/newview/llviewerdisplayname.h b/indra/newview/llviewerdisplayname.h
index 4671614b4137e9f1cbb749ec2c4da06285ef4279..c7938cd538f1970171c3efde19c43747d64fc52c 100755
--- a/indra/newview/llviewerdisplayname.h
+++ b/indra/newview/llviewerdisplayname.h
@@ -27,8 +27,6 @@
 #ifndef LLVIEWERDISPLAYNAME_H
 #define LLVIEWERDISPLAYNAME_H
 
-#include <boost/signals2.hpp>
-
 class LLSD;
 class LLUUID;
 
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 4e91e4110af684bbd4a5d13e009daf4a7f228416..14502dc2ec1ce5869aca0de0167e64e7e3581a41 100755
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -32,8 +32,6 @@
 #include "llwearable.h"
 #include "llui.h" //for LLDestroyClass
 
-#include <boost/signals2.hpp>	// boost::signals2::trackable
-
 class LLInventoryPanel;
 class LLFolderView;
 class LLFolderBridge;
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index cccfd8815a2d734c620048d11567b6ff00e28064..85308da1914cf781f7d90e2d40b1072c86091333 100755
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -72,9 +72,6 @@
 
 #include "llfloaterwebcontent.h"	// for handling window close requests and geometry change requests in media browser windows.
 
-#include <boost/bind.hpp>	// for SkinFolder listener
-#include <boost/signals2.hpp>
-
 /*static*/ const char* LLViewerMedia::AUTO_PLAY_MEDIA_SETTING = "ParcelMediaAutoPlayEnable";
 /*static*/ const char* LLViewerMedia::SHOW_MEDIA_ON_OTHERS_SETTING = "MediaShowOnOthers";
 /*static*/ const char* LLViewerMedia::SHOW_MEDIA_WITHIN_PARCEL_SETTING = "MediaShowWithinParcel";
diff --git a/indra/newview/llviewermessage.h b/indra/newview/llviewermessage.h
index d8f5c71f8d3bfff2a6b7c30e43832d939a81215d..6b7f00a235664e51e3a8ee4b1ffd39394e18cc70 100755
--- a/indra/newview/llviewermessage.h
+++ b/indra/newview/llviewermessage.h
@@ -36,9 +36,6 @@
 #include "llnotifications.h"
 #include "llextendedstatus.h"
 
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
-
 //
 // Forward declarations
 //
diff --git a/indra/newview/llviewernetwork.h b/indra/newview/llviewernetwork.h
index 5ee816d6da32249f0a7f677b69bd337206532e95..7428d477c2160ce9c72cb4420a9ffefe9daa4c02 100755
--- a/indra/newview/llviewernetwork.h
+++ b/indra/newview/llviewernetwork.h
@@ -29,7 +29,6 @@
 #define LL_LLVIEWERNETWORK_H
 
 #include "../llxml/llxmlnode.h"
-#include <boost/signals2.hpp>
 
 // @TODO this really should be private, but is used in llslurl
 #define MAINGRID "util.agni.lindenlab.com"
diff --git a/indra/newview/llviewerparcelmgr.h b/indra/newview/llviewerparcelmgr.h
index b8ff1b02c78c4a2691727c14e9df401a46150660..70e4f7173416003de247c27f0541bc76880aadfd 100755
--- a/indra/newview/llviewerparcelmgr.h
+++ b/indra/newview/llviewerparcelmgr.h
@@ -33,9 +33,6 @@
 #include "llparcelselection.h"
 #include "llui.h"
 
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
-
 class LLUUID;
 class LLMessageSystem;
 class LLParcel;
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 13dda69ae0d13afe2e14471176f5e07cef531bde..c11b29d52ac5a032d1bdc76779ce326df80d0d31 100755
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -29,7 +29,6 @@
 
 // A ViewerRegion is a class that contains a bunch of objects and surfaces
 // that are in to a particular region.
-#include <boost/signals2.hpp>
 #include <boost/unordered_map.hpp>
 
 #include "llwind.h"
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 85ae64aefff472159955432a8da77997a3c4cda0..6ef35f0b5b8d3c18a968a9b652984e528254db1a 100755
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -28,6 +28,7 @@
 
 #include "llviewertexteditor.h"
 
+#include <stack>
 #include "llagent.h"
 #include "llaudioengine.h"
 #include "llavataractions.h"
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index dfde4b8ea217ca1b55fea743c53c41fbc33557e4..0ee2ea96ba19f69f9a926c02af988010a0c783dc 100755
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -47,8 +47,6 @@
 #include "llinitparam.h"
 #include "lltrace.h"
 
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
 #include <boost/scoped_ptr.hpp>
 
 class LLView;
diff --git a/indra/newview/llwatchdog.h b/indra/newview/llwatchdog.h
index fee3ec6f2001c05d9127864480daa23ee3d6b1a4..42681a1f3bbdaf64cd408cceace1d3425f640344 100755
--- a/indra/newview/llwatchdog.h
+++ b/indra/newview/llwatchdog.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLTHREADWATCHDOG_H
 #define LL_LLTHREADWATCHDOG_H
 
-#include <boost/function.hpp>
-
 #ifndef LL_TIMER_H					
 	#include "lltimer.h"
 #endif
diff --git a/indra/newview/llworldmap.h b/indra/newview/llworldmap.h
index 8453f3d57327c3caf4e5fb14e1d21f9fc2d60859..4245b427064208c60da261a6524ac0d1437a74ec 100755
--- a/indra/newview/llworldmap.h
+++ b/indra/newview/llworldmap.h
@@ -28,7 +28,6 @@
 #define LL_LLWORLDMAP_H
 
 #include "llworldmipmap.h"
-#include <boost/function.hpp>
 
 #include "v3dmath.h"
 #include "lluuid.h"
diff --git a/indra/newview/llworldmapmessage.h b/indra/newview/llworldmapmessage.h
index ac1ea1607c793d6370d3f3e95cd4f414c9889a26..12b6ef47920d57748f98d72aaa09a0418983dc4c 100755
--- a/indra/newview/llworldmapmessage.h
+++ b/indra/newview/llworldmapmessage.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLWORLDMAPMESSAGE_H
 #define LL_LLWORLDMAPMESSAGE_H
 
-#include "boost/function.hpp"
-
 // Handling of messages (send and process) as well as SLURL callback if necessary
 class LLMessageSystem;