diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h
index b7b6684ce..d44c31847 100644
--- a/indra/llcommon/linden_common.h
+++ b/indra/llcommon/linden_common.h
@@ -66,5 +66,6 @@
 #include "lldefs.h"
 #include "llerror.h"
 #include "llfile.h"
+#include "llformat.h"
 
 #endif
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index e1eb06f2b..ffb7b4023 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -27,8 +27,6 @@
 #ifndef LL_LLSTRING_H
 #define LL_LLSTRING_H
 
-#include "llwin32headerslean.h"
-
 #include <boost/optional/optional.hpp>
 #include <string>
 #include <cstdio>
@@ -37,9 +35,8 @@
 #include <algorithm>
 #include <vector>
 #include <map>
-#include "llfasttimer.h"
-#include "llformat.h"
-#include "llsd.h"
+#include "stdtypes.h"
+#include "llpreprocessor.h"
 // [RLVa:KB] - Checked: RLVa-2.1.0
 #include <list>
 // [/RLVa:KB]
diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp
index 3952a63eb..5d80c1905 100644
--- a/indra/llcommon/lluuid.cpp
+++ b/indra/llcommon/lluuid.cpp
@@ -28,6 +28,7 @@
 // We can't use WIN32_LEAN_AND_MEAN here, needs lots of includes.
 #if LL_WINDOWS
 #include "llwin32headers.h"
+#include "nb30.h"
 #endif
 
 #include "lldefs.h"