diff --git a/doc/contributions.txt b/doc/contributions.txt
index 5d9a971b1e..148abe49ed 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -170,6 +170,7 @@ Blakar Ogre
 blino Nakamura
 	VWR-17
 Boroondas Gupte
+	CTS-320
 	SNOW-278
 	SNOW-503
 	SNOW-510
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index 67cc707a01..f3cbfab77a 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -33,7 +33,12 @@
 
 #include <iostream>
 #include "apr_base64.h"
-#include "zlib/zlib.h"  // for davep's dirty little zip functions
+
+#ifdef LL_STANDALONE
+# include <zlib.h>
+#else
+# include "zlib/zlib.h"  // for davep's dirty little zip functions
+#endif
 
 #if !LL_WINDOWS
 #include <netinet/in.h> // htonl & ntohl
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index eacf2377fe..b486e17194 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -34,7 +34,13 @@
 #include "dae/daeErrorHandler.h"
 #include "dom/domConstants.h"
 #include "dom/domMesh.h"
-#include "zlib/zlib.h"
+
+#ifdef LL_STANDALONE
+# include <zlib.h>
+#else
+# include "zlib/zlib.h"
+#endif
+
 
 
 std::string model_names[] =