8 files changed, 44 insertions, 40 deletions
diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h
index 199d380809..3e9ec14eb3 100644
--- a/indra/llcommon/linden_common.h
+++ b/indra/llcommon/linden_common.h
@@ -27,17 +27,6 @@
 #include <string>
 #include "llfile.h"
 
-#if LL_WINDOWS
-// Limit Windows API to small and manageable set.
-// If you get undefined symbols, find the appropriate
-// Windows header file and include that in your .cpp file.
-// Please don't take this out -- it helps with library
-// compile times. JC
-#define WIN32_LEAN_AND_MEAN
-#include <winsock2.h>
-#include <windows.h>
-#endif	//	LL_WINDOWS
-
 #include "stdtypes.h"
 #include "lldefs.h"
 #include "llerror.h"
@@ -50,4 +39,4 @@
 #pragma warning (3 : 4702) // we like level 3, not 4
 #endif	//	LL_WINDOWS
 
-#endif	//	not LL_LINDEN_COMMON_H
+#endif
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index fda6d89a72..87e7016f39 100644
--- a/indra/llcommon/llapp.cpp
+++ b/indra/llcommon/llapp.cpp
@@ -499,6 +499,7 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *)
 	switch (signum)
 	{
 	case SIGALRM:
+	case SIGPIPE:
 	case SIGUSR2:
 		// We don't care about these signals, ignore them
 		if (LLApp::sLogInSignal)
@@ -548,7 +549,6 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *)
 		
 		// Change the signal that we reraise to SIGABRT, so we generate a core dump.
 		signum = SIGABRT;
-	case SIGPIPE:
 	case SIGBUS:
 	case SIGSEGV:
 	case SIGQUIT:
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h
index 829ae0de21..564c32cb0d 100644
--- a/indra/llcommon/llpreprocessor.h
+++ b/indra/llcommon/llpreprocessor.h
@@ -26,15 +26,12 @@
 
 #if LL_DARWIN
 	#define LL_QUICKTIME_ENABLED	1
-	#define LL_MOZILLA_ENABLED		0
 	#define LL_LIBXUL_ENABLED		1
 #elif LL_WINDOWS
 	#define LL_QUICKTIME_ENABLED	1
-	#define LL_MOZILLA_ENABLED		0
 	#define LL_LIBXUL_ENABLED		1
 #elif LL_LINUX
 	#define LL_QUICKTIME_ENABLED	0
-	#define LL_MOZILLA_ENABLED		0
 	#define LL_LIBXUL_ENABLED		0
 #endif
 
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
index 04e1bc0839..64f4875489 100644
--- a/indra/llcommon/llprocessor.cpp
+++ b/indra/llcommon/llprocessor.cpp
@@ -26,10 +26,17 @@
 
 #include "linden_common.h"
 
+#include "processor.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <memory.h>
-#include "processor.h"
+
+#if LL_WINDOWS
+#	define WIN32_LEAN_AND_MEAN
+#	include <winsock2.h>
+#	include <windows.h>
+#endif
 
 #if !LL_DARWIN
 
diff --git a/indra/llcommon/llprocessor.h b/indra/llcommon/llprocessor.h
index ad44e2ccb3..8453263f9d 100644
--- a/indra/llcommon/llprocessor.h
+++ b/indra/llcommon/llprocessor.h
@@ -11,15 +11,14 @@
 ///////////////////////////////////////////
 
 
-#ifndef PROCESSOR_H
-#define PROCESSOR_H
+#ifndef LLPROCESSOR_H
+#define LLPROCESSOR_H
 
 // Options:
 ///////////
 #if LL_WINDOWS
 #define PROCESSOR_FREQUENCY_MEASURE_AVAILABLE
 #endif
-// Includes <windows.h> --> code gets os-dependend (Win32)
 
 
 typedef struct ProcessorExtensions
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp
index 9305f82e05..8fe43736e4 100644
--- a/indra/llcommon/llsdutil.cpp
+++ b/indra/llcommon/llsdutil.cpp
@@ -8,16 +8,21 @@
  * $License$
  */
 
-#if LL_LINUX
-#include <netinet/in.h>
-#endif
-#if LL_DARWIN
-#include <arpa/inet.h>
-#endif
-
 #include "linden_common.h"
+
 #include "llsdutil.h"
 
+#if LL_WINDOWS
+#	define WIN32_LEAN_AND_MEAN
+#	include <winsock2.h>	// for htonl
+#elif LL_LINUX
+#	include <netinet/in.h>
+#elif LL_DARWIN
+#	include <arpa/inet.h>
+#endif
+
+
+
 // vector3
 LLSD ll_sd_from_vector3(const LLVector3& vec)
 {
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index 9c54ddaac1..b50c0a13ce 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -8,15 +8,21 @@
 
 #include "linden_common.h"
 
+#include "llsys.h"
+
 #include <iostream>
 #include <zlib/zlib.h>
 #include "processor.h"
 
-#if LL_DARWIN
-#include <sys/sysctl.h>
-#include <sys/utsname.h>
+#if LL_WINDOWS
+#	define WIN32_LEAN_AND_MEAN
+#	include <winsock2.h>
+#	include <windows.h>
+#elif LL_DARWIN
+#	include <sys/sysctl.h>
+#	include <sys/utsname.h>
 #elif LL_LINUX
-#include <sys/utsname.h>
+#	include <sys/utsname.h>
 const char MEMINFO_FILE[] = "/proc/meminfo";
 const char CPUINFO_FILE[] = "/proc/cpuinfo";
 #endif
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp
index bd054f02d8..a8118258f9 100644
--- a/indra/llcommon/lltimer.cpp
+++ b/indra/llcommon/lltimer.cpp
@@ -8,15 +8,19 @@
 
 #include "linden_common.h"
 
+#include "lltimer.h"
 
-#if LL_WINDOWS
-#include <time.h>
+#include "u64.h"
 
+#if LL_WINDOWS
+#	define WIN32_LEAN_AND_MEAN
+#	include <winsock2.h>
+#	include <windows.h>
+#	include <time.h>
 #elif LL_LINUX
-#include <time.h>
-#include <sys/time.h>
-#include <sched.h>
-
+#	include <time.h>
+#	include <sys/time.h>
+#	include <sched.h>
 #elif LL_DARWIN
 #	include <time.h>
 #	include <sys/time.h>
@@ -25,9 +29,6 @@
 #endif
 
 
-#include "lltimer.h"
-#include "u64.h"
-
 //
 // Locally used constants
 //