diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt
index d47129a67b38ba5c8835606f54348dc22896fa9d..fc38f56957ea77cc547009113da7e0629dc10ce9 100644
--- a/indra/llrender/CMakeLists.txt
+++ b/indra/llrender/CMakeLists.txt
@@ -105,13 +105,13 @@ add_library (llrender ${llrender_SOURCE_FILES})
 # Libraries on which this library depends, needed for Linux builds
 # Sort by high-level to low-level
 target_link_libraries(llrender 
-    ${LLCOMMON_INCLUDE_DIRS}
-    ${LLIMAGE_INCLUDE_DIRS}
-    ${LLMATH_INCLUDE_DIRS}
-    ${LLRENDER_INCLUDE_DIRS}
-    ${LLVFS_INCLUDE_DIRS}
-    ${LLXML_INCLUDE_DIRS}
-    ${LLVFS_INCLUDE_DIRS}
+    ${LLCOMMON_LIBRARIES}
+    ${LLIMAGE_LIBRARIES}
+    ${LLMATH_LIBRARIES}
+    ${LLRENDER_LIBRARIES}
+    ${LLVFS_LIBRARIES}
+    ${LLXML_LIBRARIES}
+    ${LLVFS_LIBRARIES}
     ${LLWINDOW_LIBRARIES}
     ${FREETYPE_LIBRARIES}
     ${OPENGL_LIBRARIES})
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index bec67c169552280f4fd12a8bb4dd5ac52b0695f9..1b185ed508bb4136ce4d73ef5b0a1bfea07902e4 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -6853,7 +6853,7 @@ void LLVOAvatar::dumpArchetypeXML(const std::string& prefix, bool group_by_weara
 
 			for (U8 te = 0; te < TEX_NUM_INDICES; te++)
 			{
-				if (LLVOAvatarDictionary::getTEWearableType((ETextureIndex)te) == type)
+				if (LLAvatarAppearanceDictionary::getTEWearableType((ETextureIndex)te) == type)
 				{
 					// MULTIPLE_WEARABLES: extend to multiple wearables?
 					LLViewerTexture* te_image = getImage((ETextureIndex)te, 0);