From b424d0232bd3f8192497e9d707bd7b58895efb52 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Fri, 1 Nov 2013 01:14:30 +0100
Subject: [PATCH] Make #includes in llcommon header files more complete.

These includes are needed. The current code includes them
in .cpp files *before* including these include files, but
that is not very clean, and not useful.

Actually including what a header file needs makes it more
clear what it drags in, it doesn't drag in more then before.
It also allows to include these headers without having to
includes needed for the included header file in a specific
order, in every .cpp file.
---
 indra/llcommon/llfile.h      | 6 +++---
 indra/llcommon/llmd5.h       | 4 ++++
 indra/llcommon/llrefcount.h  | 3 +++
 indra/llcommon/llrun.h       | 2 ++
 indra/llcommon/llsingleton.h | 1 +
 indra/llcommon/lluuid.h      | 1 +
 6 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/indra/llcommon/llfile.h b/indra/llcommon/llfile.h
index 63b9380fb..1f5514f3e 100644
--- a/indra/llcommon/llfile.h
+++ b/indra/llcommon/llfile.h
@@ -30,6 +30,9 @@
 #ifndef LL_LLFILE_H
 #define LL_LLFILE_H
 
+#include <fstream>
+#include <sys/stat.h>
+
 /**
  * This class provides a cross platform interface to the filesystem.
  * Attempts to mostly mirror the POSIX style IO functions.
@@ -37,9 +40,6 @@
 
 typedef FILE LLFILE;
 
-#include <fstream>
-#include <sys/stat.h>
-
 #if LL_WINDOWS
 // windows version of stat function and stat data structure are called _stat
 typedef struct _stat	llstat;
diff --git a/indra/llcommon/llmd5.h b/indra/llcommon/llmd5.h
index 8bf715f14..f03aac83d 100644
--- a/indra/llcommon/llmd5.h
+++ b/indra/llcommon/llmd5.h
@@ -32,6 +32,10 @@
 #ifndef LL_LLMD5_H
 #define LL_LLMD5_H
 
+#include "llpreprocessor.h"
+#include <iosfwd>
+#include <cstring>	// memcmp
+
 // LLMD5.CC - source code for the C++/object oriented translation and 
 //          modification of MD5.
 
diff --git a/indra/llcommon/llrefcount.h b/indra/llcommon/llrefcount.h
index b7831e7fa..4df84028a 100644
--- a/indra/llcommon/llrefcount.h
+++ b/indra/llcommon/llrefcount.h
@@ -27,6 +27,9 @@
 #define LLREFCOUNT_H
 
 #include <boost/noncopyable.hpp>
+#include "llpreprocessor.h"			// LL_COMMON_API
+#include "stdtypes.h"				// S32
+#include "llerror.h"				// llassert
 
 #define LL_REF_COUNT_DEBUG 0
 #if LL_REF_COUNT_DEBUG
diff --git a/indra/llcommon/llrun.h b/indra/llcommon/llrun.h
index 1fc9925df..1701800b1 100644
--- a/indra/llcommon/llrun.h
+++ b/indra/llcommon/llrun.h
@@ -37,6 +37,8 @@
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
+#include "llpreprocessor.h"
+#include "stdtypes.h"
 
 class LLRunnable;
 
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
index 78b8f95be..a780a6a24 100644
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@@ -27,6 +27,7 @@
 
 #include "llerror.h"	// *TODO: eliminate this
 
+#include <map>
 #include <typeinfo>
 #include <boost/noncopyable.hpp>
 
diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h
index e7b1f525e..ef99c13e7 100644
--- a/indra/llcommon/lluuid.h
+++ b/indra/llcommon/lluuid.h
@@ -28,6 +28,7 @@
 
 #include <iostream>
 #include <set>
+#include <vector>
 #include "stdtypes.h"
 #include "llpreprocessor.h"