diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index ba5280ee9..1dbc3de7e 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -30,6 +30,7 @@ set(llui_SOURCE_FILES
     llclipboard.cpp
     llcombobox.cpp
     llctrlselectioninterface.cpp
+    lldelayeduidelete.cpp
     lldraghandle.cpp
     lleditmenuhandler.cpp
     llfloater.cpp
@@ -84,6 +85,7 @@ set(llui_HEADER_FILES
     llclipboard.h
     llcombobox.h
     llctrlselectioninterface.h
+    lldelayeduidelete.h
     lldraghandle.h
     lleditmenuhandler.h
     llfloater.h
diff --git a/indra/llui/lldelayeduidelete.cpp b/indra/llui/lldelayeduidelete.cpp
index 04035cd26..4f679c486 100644
--- a/indra/llui/lldelayeduidelete.cpp
+++ b/indra/llui/lldelayeduidelete.cpp
@@ -3,6 +3,9 @@
 #include "lldelayeduidelete.h"
 #define DELETE_DELAY 0.1f
 #define DELETES_PER_DELAY 512
+
+LLDeleteScheduler* gDeleteScheduler;
+
 std::list<LLDeleteJob*> LLDeleteScheduler::sJobs;
 LLDeleteScheduler::LLDeleteScheduler() : LLEventTimer(DELETE_DELAY)
 {
diff --git a/indra/llui/lldelayeduidelete.h b/indra/llui/lldelayeduidelete.h
index e682d8787..2f08ee8fa 100644
--- a/indra/llui/lldelayeduidelete.h
+++ b/indra/llui/lldelayeduidelete.h
@@ -26,6 +26,6 @@ public:
 private:
 	static std::list<LLDeleteJob*> sJobs;
 };
-static LLDeleteScheduler* gDeleteScheduler;
+extern LLDeleteScheduler* gDeleteScheduler;
 #endif
 // </edit>
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index de520b47c..ca88dbcd7 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -64,10 +64,10 @@ include_directories(
     )
 
 set(viewer_SOURCE_FILES
-	dofloaterhex.cpp
-	dohexeditor.cpp
-	doinventorybackup.cpp
-	hgfloatertexteditor.cpp
+    dofloaterhex.cpp
+    dohexeditor.cpp
+    doinventorybackup.cpp
+    hgfloatertexteditor.cpp
     jcfloaterareasearch.cpp
     llagent.cpp
     llagentaccess.cpp
@@ -81,6 +81,7 @@ set(viewer_SOURCE_FILES
     llaudiosourcevo.cpp
     llbbox.cpp
     llbox.cpp
+    llbuildnewviewsscheduler.cpp
     llcallbacklist.cpp
     llcallingcard.cpp
     llcaphttpsender.cpp
@@ -155,6 +156,7 @@ set(viewer_SOURCE_FILES
     llfloatereditui.cpp
     llfloaterenvsettings.cpp
     llfloaterevent.cpp
+    llfloaterexploreanimations.cpp
     llfloaterfriends.cpp
     llfloaterfonttest.cpp
     llfloatergesture.cpp
@@ -490,10 +492,10 @@ set(viewer_HEADER_FILES
     CMakeLists.txt
     ViewerInstall.cmake
 
-	dofloaterhex.h
-	dohexeditor.h
-	doinventorybackup.h
-	hgfloatertexteditor.h
+    dofloaterhex.h
+    dohexeditor.h
+    doinventorybackup.h
+    hgfloatertexteditor.h
     jcfloaterareasearch.h
     llagent.h
     llagentaccess.h
@@ -508,6 +510,7 @@ set(viewer_HEADER_FILES
     llaudiosourcevo.h
     llbbox.h
     llbox.h
+    llbuildnewviewsscheduler.h
     llcallbacklist.h
     llcallingcard.h
     llcaphttpsender.h
@@ -549,6 +552,7 @@ set(viewer_HEADER_FILES
     lleventinfo.h
     lleventnotifier.h
     lleventpoll.h
+    llfloaterexploreanimations.h
     llface.h
     llfasttimerview.h
     llfeaturemanager.h
diff --git a/indra/newview/llbuildnewviewsscheduler.cpp b/indra/newview/llbuildnewviewsscheduler.cpp
index b244b1d3f..d7f1cd871 100644
--- a/indra/newview/llbuildnewviewsscheduler.cpp
+++ b/indra/newview/llbuildnewviewsscheduler.cpp
@@ -4,6 +4,9 @@
 #include "llinventorybridge.h"
 #define BUILD_DELAY 0.1f
 #define BUILD_PER_DELAY 512
+
+LLBuildNewViewsScheduler* gBuildNewViewsScheduler;
+
 std::list<LLBuildNewViewsScheduler::job> LLBuildNewViewsScheduler::sJobs;
 LLBuildNewViewsScheduler::LLBuildNewViewsScheduler() : LLEventTimer(BUILD_DELAY)
 {
diff --git a/indra/newview/llbuildnewviewsscheduler.h b/indra/newview/llbuildnewviewsscheduler.h
index e68e4365b..a3d5af66c 100644
--- a/indra/newview/llbuildnewviewsscheduler.h
+++ b/indra/newview/llbuildnewviewsscheduler.h
@@ -17,5 +17,5 @@ private:
 	static std::list<job> sJobs;
 	void buildNewViews(LLInventoryPanel* panelp, LLInventoryObject* objectp);
 };
-static LLBuildNewViewsScheduler* gBuildNewViewsScheduler;
+extern LLBuildNewViewsScheduler* gBuildNewViewsScheduler;
 // </edit>
diff --git a/indra/newview/llfloaterexploreanimations.cpp b/indra/newview/llfloaterexploreanimations.cpp
index 24fc4da54..c52cf0391 100644
--- a/indra/newview/llfloaterexploreanimations.cpp
+++ b/indra/newview/llfloaterexploreanimations.cpp
@@ -219,8 +219,8 @@ public:
 // static
 void LLFloaterExploreAnimations::handleHistoryChange()
 {
-	std::map<LLUUID, std::list<LLAnimHistoryItem*>>::iterator av_iter = animHistory.begin();
-	std::map<LLUUID, std::list<LLAnimHistoryItem*>>::iterator av_end = animHistory.end();
+	std::map< LLUUID, std::list< LLAnimHistoryItem* > >::iterator av_iter = animHistory.begin();
+	std::map< LLUUID, std::list< LLAnimHistoryItem* > >::iterator av_end = animHistory.end();
 	for( ; av_iter != av_end; ++av_iter)
 	{
 		std::list<LLAnimHistoryItem*> history = (*av_iter).second;