diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index 4950aa7fec4a0a66f138b88cf85f5ea1518e2f4b..c618fcbd2a44f3761fa6bfd7c607f1cd35cb08af 100755
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -519,7 +519,6 @@ std::string utf16str_to_utf8str(const llutf16string& utf16str, S32 len)
 	return wstring_to_utf8str(utf16str_to_wstring(utf16str, len), len);
 }
 
-
 std::string utf8str_trim(const std::string& utf8str)
 {
 	LLWString wstr = utf8str_to_wstring(utf8str);
diff --git a/indra/llcommon/lltraceaccumulators.h b/indra/llcommon/lltraceaccumulators.h
index bd1dfb839480d7946897428d32d6feec70cdac7e..6f27b97dff958eac748e38e24da3f05fcb3cacde 100644
--- a/indra/llcommon/lltraceaccumulators.h
+++ b/indra/llcommon/lltraceaccumulators.h
@@ -62,9 +62,8 @@ namespace LLTrace
 		{}
 
 	public:
-
 		AccumulatorBuffer()
-		:	mStorageSize(0),
+			: mStorageSize(0),
 			mStorage(NULL)
 		{
 			const AccumulatorBuffer& other = *getDefaultBuffer();
@@ -75,17 +74,6 @@ namespace LLTrace
 			}
 		}
 
-		AccumulatorBuffer(const AccumulatorBuffer& other)
-		:	mStorageSize(0),
-			mStorage(NULL)
-		{
-			resize(sNextStorageSlot);
-			for (S32 i = 0; i < sNextStorageSlot; i++)
-			{
-				mStorage[i] = other.mStorage[i];
-			}
-		}
-
 		~AccumulatorBuffer()
 		{
 			if (isCurrent())
@@ -105,6 +93,18 @@ namespace LLTrace
 			return mStorage[index]; 
 		}
 
+
+		AccumulatorBuffer(const AccumulatorBuffer& other)
+			: mStorageSize(0),
+			mStorage(NULL)
+		{
+			resize(sNextStorageSlot);
+			for (S32 i = 0; i < sNextStorageSlot; i++)
+			{
+				mStorage[i] = other.mStorage[i];
+			}
+		}
+
 		void addSamples(const AccumulatorBuffer<ACCUMULATOR>& other, EBufferAppendType append_type)
 		{
 			llassert(mStorageSize >= sNextStorageSlot && other.mStorageSize >= sNextStorageSlot);
diff --git a/indra/llcommon/tests/llstring_test.cpp b/indra/llcommon/tests/llstring_test.cpp
index 478c0c891668d1f069052ed73ace99f0e6aa2718..a7aa347222aab47a257655a611b0a1454374ea55 100755
--- a/indra/llcommon/tests/llstring_test.cpp
+++ b/indra/llcommon/tests/llstring_test.cpp
@@ -30,7 +30,7 @@
 
 #include <boost/assign/list_of.hpp>
 #include "../llstring.h"
-#include "StringVec.h"
+#include "StringVec.h"                  // must come BEFORE lltut.h
 #include "../test/lltut.h"
 
 using boost::assign::list_of;