diff --git a/indra/llmessage/llextendedstatus.h b/indra/llmessage/llextendedstatus.h
index 8ce173d1ffd63ae0a80b2b7ace1515d83ea71061..6169ad4c30c84748ad49763b11e957faa08b6e3d 100644
--- a/indra/llmessage/llextendedstatus.h
+++ b/indra/llmessage/llextendedstatus.h
@@ -29,7 +29,7 @@
 #define LL_LLEXTENDEDSTATUS_H
 
 
-typedef S32 LLExtStat;
+typedef long LLExtStat;
 
 
 // Status provider groups - Top bits indicate which status type it is
diff --git a/indra/newview/llparcelselection.cpp b/indra/newview/llparcelselection.cpp
index 3e9abdb0b6f60a29aedb406df1f629247ff4433e..42c08841b74e24367181e218821687df4df0b159 100644
--- a/indra/newview/llparcelselection.cpp
+++ b/indra/newview/llparcelselection.cpp
@@ -36,10 +36,6 @@
 // static
 LLPointer<LLParcelSelection> LLParcelSelection::sNullSelection;
 
-template<>
-	const LLSafeHandle<LLParcelSelection>::NullFunc
-		LLSafeHandle<LLParcelSelection>::sNullFunc = LLParcelSelection::getNullParcelSelection;
-
 //
 // LLParcelSelection
 //
diff --git a/indra/newview/llparcelselection.h b/indra/newview/llparcelselection.h
index 1cbdfc6f74bd5eeeedfccdeb5845b240c6ab9a19..59d1dfc7856e029dda5379157972b40bdc907721 100644
--- a/indra/newview/llparcelselection.h
+++ b/indra/newview/llparcelselection.h
@@ -79,4 +79,8 @@ private:
 
 typedef LLSafeHandle<LLParcelSelection> LLParcelSelectionHandle;
 
+template<>
+    const LLSafeHandle<LLParcelSelection>::NullFunc
+          LLSafeHandle<LLParcelSelection>::sNullFunc = LLParcelSelection::getNullParcelSelection;
+
 #endif
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 8a9e6c82764786f1a4a895df3a45bc10303d4d8d..783e56e590dcb52bb19ef19915ed08b368b1e081 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -137,11 +137,6 @@ LLColor4 LLSelectMgr::sHighlightParentColor;
 LLColor4 LLSelectMgr::sHighlightChildColor;
 LLColor4 LLSelectMgr::sContextSilhouetteColor;
 
-static LLObjectSelection *get_null_object_selection();
-template<> 
-	const LLSafeHandle<LLObjectSelection>::NullFunc 
-		LLSafeHandle<LLObjectSelection>::sNullFunc = get_null_object_selection;
-
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // struct LLDeRezInfo
 //
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index 7bfc7dd9ac40b6db3baba1d6dd45963e90da5b5f..c707ff85060b135c98e13151b3852d81c6c7c10a 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -954,5 +954,10 @@ template <typename T> bool LLObjectSelection::isMultipleTEValue(LLSelectedTEGetF
 	return !unique;
 }
 
+extern LLObjectSelection *get_null_object_selection();
+
+template<>
+    const LLSafeHandle<LLObjectSelection>::NullFunc
+          LLSafeHandle<LLObjectSelection>::sNullFunc = get_null_object_selection;
 
 #endif