4 files changed, 8 insertions, 2 deletions
diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt
index 508c2b919b..03ac4bc9f2 100644
--- a/indra/llxml/CMakeLists.txt
+++ b/indra/llxml/CMakeLists.txt
@@ -4,6 +4,7 @@ project(llxml)
 
 include(00-Common)
 include(LLCommon)
+include(LLWindow)
 
 set(llxml_SOURCE_FILES
     llcontrol.cpp
@@ -31,9 +32,11 @@ target_link_libraries( llxml
         llmath
         llcommon
         ll::expat
+        ll::SDL
     )
 target_include_directories( llxml  INTERFACE   ${CMAKE_CURRENT_SOURCE_DIR})
 
+include(LibraryInstall)
 
 # tests
 
diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp
index ec616cefbc..8a2c36a307 100644
--- a/indra/llxml/llxmlnode.cpp
+++ b/indra/llxml/llxmlnode.cpp
@@ -29,6 +29,9 @@
 
 #include <iostream>
 #include <map>
+#if LL_SDL
+#include <SDL_rwops.h>
+#endif
 
 #include "llxmlnode.h"
 
diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h
index 09c7c4fdad..769cf97ba2 100644
--- a/indra/llxml/llxmlnode.h
+++ b/indra/llxml/llxmlnode.h
@@ -30,7 +30,7 @@
 #ifndef XML_STATIC
 #define XML_STATIC
 #endif
-#ifdef LL_USESYSTEMLIBS
+#if 1
 #include <expat.h>
 #else
 #include "expat/expat.h"
diff --git a/indra/llxml/llxmlparser.h b/indra/llxml/llxmlparser.h
index 0f64def6df..9c25727e54 100644
--- a/indra/llxml/llxmlparser.h
+++ b/indra/llxml/llxmlparser.h
@@ -30,7 +30,7 @@
 #ifndef XML_STATIC
 #define XML_STATIC
 #endif
-#ifdef LL_USESYSTEMLIBS
+#if 1
 #include <expat.h>
 #else
 #include "expat/expat.h"