diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h
index 051b912874..5a163ef532 100755
--- a/indra/llcommon/indra_constants.h
+++ b/indra/llcommon/indra_constants.h
@@ -79,8 +79,8 @@ static const S32		REGION_AGENT_COUNT_MIN = 1;
 static const S32		REGION_AGENT_COUNT_MAX = 200;			// Must fit in U8 for the moment (RegionInfo msg)
 static const S32		REGION_PRIM_COUNT_MIN = 0;
 static const S32		REGION_PRIM_COUNT_MAX = 40000;
-static const F32		REGION_PRIM_BONUS_MIN = 1.0;
-static const F32		REGION_PRIM_BONUS_MAX = 10.0;
+static const F32		REGION_PRIM_BONUS_MIN = 1.0f;
+static const F32		REGION_PRIM_BONUS_MAX = 10.0f;
 
 // Default maximum number of tasks/prims per region.
 const U32 DEFAULT_MAX_REGION_WIDE_PRIM_COUNT = 15000;
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index 97659f99b3..bc68d3a27b 100755
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -54,6 +54,12 @@ LLPumpIO* gServicePump;
 BOOL gBreak = false;
 BOOL gSent = false;
 
+// <FS:CR> Various missing prototypes
+void trimSLLog(std::string& sllog);
+std::string getFormDataField(const std::string& strFieldName, const std::string& strFieldValue, const std::string& strBoundary);
+std::string getStartupStateFromLog(std::string& sllog);
+// </FS:CR>
+
 class LLCrashLoggerResponder : public LLHTTPClient::Responder
 {
 public:
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 90246d23e9..6227d7ec82 100755
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -591,6 +591,8 @@ BOOL LLInventoryItem::unpackMessage(LLMessageSystem* msg, const char* block, S32
 }
 
 // <FS:ND> Helper functions
+void splitCacheDescOrName(char *aBuffer, char *&aJunk, char *&aValue);	/// <FS:CR> Various Missing
+int splitCacheLine(char *aBuffer, char *&aKeyword, char *&aValue);		/// Prototypes
 inline bool isWS( char aVal )
 {
 	return aVal == ' ' || aVal == '\t' || aVal == '\r' || aVal == '\n';
diff --git a/indra/llinventory/lllandmark.cpp b/indra/llinventory/lllandmark.cpp
index 493909cf9c..c1e0c49a40 100755
--- a/indra/llinventory/lllandmark.cpp
+++ b/indra/llinventory/lllandmark.cpp
@@ -55,8 +55,8 @@ bool LLLandmark::getGlobalPos(LLVector3d& pos)
 	}
 	else if(mRegionID.notNull())
 	{
-		F32 g_x = -1.0;
-		F32 g_y = -1.0;
+		F32 g_x = -1.0f;
+		F32 g_y = -1.0f;
 		if(mRegionID == mLocalRegion.first)
 		{
 			from_region_handle(mLocalRegion.second, &g_x, &g_y);
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index f6feb7563f..02c88dfc06 100755
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -959,6 +959,7 @@ BOOL LLParcel::addToBanList(const LLUUID& agent_id, S32 time)
     return TRUE;
 }
 
+BOOL remove_from_access_array(std::map<LLUUID,LLAccessEntry>* list, const LLUUID& agent_id);	// <FS:CR> Various missing prototypes
 BOOL remove_from_access_array(std::map<LLUUID,LLAccessEntry>* list,
                               const LLUUID& agent_id)
 {
@@ -1041,7 +1042,7 @@ BOOL LLParcel::isSaleTimerExpired(const U64& time)
     {
         return FALSE;
     }
-    BOOL expired = mSaleTimerExpires.checkExpirationAndReset(0.0);
+    BOOL expired = mSaleTimerExpires.checkExpirationAndReset(0.0f);
     if (expired)
     {
         mSaleTimerExpires.stop();
@@ -1055,7 +1056,7 @@ BOOL LLParcel::isMediaResetTimerExpired(const U64& time)
     {
         return FALSE;
     }
-    BOOL expired = mMediaResetTimer.checkExpirationAndReset(0.0);
+    BOOL expired = mMediaResetTimer.checkExpirationAndReset(0.0f);
     if (expired)
     {
         mMediaResetTimer.stop();
@@ -1096,7 +1097,7 @@ void LLParcel::expireSale(
 	LLUUID& from_id,
 	LLUUID& to_id)
 {
-    mSaleTimerExpires.setTimerExpirySec(0.0);
+    mSaleTimerExpires.setTimerExpirySec(0.0f);
     mSaleTimerExpires.stop();
     setPreviousOwnerID(LLUUID::null);
     setPreviouslyGroupOwned(FALSE);
@@ -1115,7 +1116,7 @@ void LLParcel::completeSale(
 	U8& flags,
 	LLUUID& to_id)
 {
-	mSaleTimerExpires.setTimerExpirySec(0.0);
+	mSaleTimerExpires.setTimerExpirySec(0.0f);
 	mSaleTimerExpires.stop();
 	mStatus = OS_LEASED;
 	type = TRANS_LAND_SALE;
@@ -1139,7 +1140,7 @@ void LLParcel::completeSale(
 
 void LLParcel::clearSale()
 {
-	mSaleTimerExpires.setTimerExpirySec(0.0);
+	mSaleTimerExpires.setTimerExpirySec(0.0f);
 	mSaleTimerExpires.stop();
 	if(isPublic())
 	{
diff --git a/indra/llinventory/lltransactionflags.cpp b/indra/llinventory/lltransactionflags.cpp
index 6f08ce5d57..3e6a69795a 100755
--- a/indra/llinventory/lltransactionflags.cpp
+++ b/indra/llinventory/lltransactionflags.cpp
@@ -62,6 +62,7 @@ BOOL is_tf_owner_group(TransactionFlags flags)
 	return ((flags & TRANSACTION_FLAG_OWNER_GROUP) == TRANSACTION_FLAG_OWNER_GROUP);
 }
 
+void append_reason(std::ostream& ostr, S32 transaction_type, const std::string& description);	// <FS:CR>
 void append_reason(
 	std::ostream& ostr,
 	S32 transaction_type,
diff --git a/indra/llkdu/llimagej2ckdu.cpp b/indra/llkdu/llimagej2ckdu.cpp
index d3601d527f..4d7678e09c 100755
--- a/indra/llkdu/llimagej2ckdu.cpp
+++ b/indra/llkdu/llimagej2ckdu.cpp
@@ -71,6 +71,12 @@ private:
 // Kakadu specific implementation
 //
 void set_default_colour_weights(kdu_params *siz);
+// <FS:CR> Various missing prototypes
+LLImageJ2CImpl* fallbackCreateLLImageJ2CImpl();
+void fallbackDestroyLLImageJ2CImpl(LLImageJ2CImpl* impl);
+const char* fallbackEngineInfoLLImageJ2CImpl();
+void ll_kdu_error(void);
+// </FS:CR>
 
 const char* engineInfoLLImageJ2CKDU()
 {
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index ca73e8b246..f873e8398d 100755
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -53,6 +53,10 @@ const S32	WHEEL_DELTA = 1;     /* Value for rolling one detent */
 const S32	BITS_PER_PIXEL = 32;
 const S32	MAX_NUM_RESOLUTIONS = 32;
 
+// <FS:CR> Various missing prototypes
+BOOL check_for_card(const char* RENDERER, const char* bad_card);
+const char* cursorIDToName(int id);
+// </FS:CR>
 
 //
 // LLWindowMacOSX