diff --git a/indra/newview/rlvextensions.cpp b/indra/newview/rlvextensions.cpp
index c1308b5092..dc3d188679 100644
--- a/indra/newview/rlvextensions.cpp
+++ b/indra/newview/rlvextensions.cpp
@@ -160,7 +160,7 @@ class RlvWindLight : public LLSingleton<RlvWindLight>
 {
 	friend class LLSingleton<RlvWindLight>;
 public:
-	RlvWindLight::RlvWindLight();
+	RlvWindLight();
 
 	std::string	getValue(const std::string& strSetting, bool& fError);
 	bool		setValue(const std::string& strRlvName, const std::string& strValue);
diff --git a/indra/newview/rlvhandler.h b/indra/newview/rlvhandler.h
index ecc30ce1c6..d8dc58b6f1 100644
--- a/indra/newview/rlvhandler.h
+++ b/indra/newview/rlvhandler.h
@@ -20,6 +20,9 @@
 #include <stack>
 
 #include "rlvcommon.h"
+#if LL_GNUC
+#include "rlvhelper.h"		// Needed to make GCC happy
+#endif // LL_GNUC
 
 // ============================================================================
 
diff --git a/indra/newview/rlvui.cpp b/indra/newview/rlvui.cpp
index c0d472540c..b25f0aaad3 100644
--- a/indra/newview/rlvui.cpp
+++ b/indra/newview/rlvui.cpp
@@ -155,8 +155,8 @@ void RlvUIEnabler::onToggleMovement()
 void RlvUIEnabler::onToggleSetDebug()
 {
 	bool fEnable = !gRlvHandler.hasBehaviour(RLV_BHVR_SETDEBUG);
-	for (std::map<std::string, S16>::const_iterator itSetting = RlvExtGetSet::m_DbgAllowed.cbegin(); 
-			itSetting != RlvExtGetSet::m_DbgAllowed.cend(); ++itSetting)
+	for (std::map<std::string, S16>::const_iterator itSetting = RlvExtGetSet::m_DbgAllowed.begin(); 
+			itSetting != RlvExtGetSet::m_DbgAllowed.end(); ++itSetting)
 	{
 		if (itSetting->second & RlvExtGetSet::DBG_WRITE)
 			gSavedSettings.getControl(itSetting->first)->setHiddenFromSettingsEditor(!fEnable);