diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index 03f1fe39cb19c454c7b4c3a82938c94115641a3a..869d5805f26ffc05548fe9da5cf57604f6b2c28e 100644
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -9,4 +9,3 @@ include(ZLIBNG)
 include(JsonCpp)
 
 include(XmlRpcEpi)
-        ${TRACY_LIBRARY}
diff --git a/indra/cmake/LLMath.cmake b/indra/cmake/LLMath.cmake
index 688e62e24ba154ff8b20bca87b7995b278377126..e841d2ac78e4cb76e529136c66b21b8ce3d50e4f 100644
--- a/indra/cmake/LLMath.cmake
+++ b/indra/cmake/LLMath.cmake
@@ -2,5 +2,4 @@
 
 include(Variables)
 include(Mikktspace)
-include(MESHOPTIMIZER)
 
diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake
deleted file mode 100644
index 2d9d3725ad236b829705d3fd78ebbf6ab20fb171..0000000000000000000000000000000000000000
--- a/indra/cmake/LLRender.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- cmake -*-
-
-include(Variables)
-include(FreeType)
-include(GLH)
-include(GLEXT)
-
-set(LLRENDER_INCLUDE_DIRS
-    ${LIBS_OPEN_DIR}/llrender
-    ${GLH_INCLUDE_DIR}
-    ${GLEXT_INCLUDE_DIR}
-    )
-
-if (BUILD_HEADLESS)
-  set(LLRENDER_HEADLESS_LIBRARIES
-      llrenderheadless
-      )
-endif (BUILD_HEADLESS)
-set(LLRENDER_LIBRARIES
-    llrender
-    )
-
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake
index cf9c866f8ef83da800a127a49ead02adc61937b0..0bf3bd85ff19c61cc4c5b33ea4cbc48b40357075 100644
--- a/indra/cmake/Tracy.cmake
+++ b/indra/cmake/Tracy.cmake
@@ -11,11 +11,8 @@ if (USE_TRACY)
   use_prebuilt_binary(tracy)
 
   target_include_directories( ll::tracy SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/tracy)
-    set(TRACY_LIBRARY "TracyClient")
-    set(TRACY_LIBRARY "TracyClient")
 
-# See: indra/llcommon/llprofiler.h
-  target_compile_definitions(ll::tracy INTERFACE LL_PROFILER_CONFIGURATION=3 )
-    set(TRACY_LIBRARY "TracyClient")
+  # See: indra/llcommon/llprofiler.h
+  add_compile_definitions(LL_PROFILER_CONFIGURATION=3)
 endif (USE_TRACY)
 
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
index f8f55759aea6134df8bfd743d15714c2f062abc2..76d261ab3e4e6a67f6d74454d3088da5619264cf 100644
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -7,11 +7,8 @@ include(LLCommon)
 include(LLCoreHttp)
 include(LLPhysicsExtensions)
 include(LLPrimitive)
-include(LLRender)
 include(GLH)
 include(TinyGLTF)
-    ${LLRENDER_INCLUDE_DIRS}
-    ${TINYGLTF_INCLUDE_DIR}
 
 set(llprimitive_SOURCE_FILES
     lldaeloader.cpp
@@ -68,6 +65,7 @@ target_link_libraries(llprimitive
         llcorehttp
         llxml
         llcharacter
+        llrender
         llphysicsextensions_impl
         ll::colladadom
         ll::pcre
@@ -82,6 +80,7 @@ if (LL_TESTS)
       llprimitive.cpp
       llgltfmaterial.cpp
       )
-    
+
+    set_property(SOURCE llprimitive.cpp PROPERTY LL_TEST_ADDITIONAL_LIBRARIES llmessage)
     LL_ADD_PROJECT_UNIT_TESTS(llprimitive "${llprimitive_TEST_SOURCE_FILES}")
 endif (LL_TESTS)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 12d452011d12ba761837919d699cde4393783e6e..b19718200929e2c921224c3c6df7e860d60b488b 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2229,8 +2229,8 @@ if (LL_TESTS)
   set_source_files_properties(
     llvocache.cpp
     PROPERTIES
-    LL_TEST_ADDITIONAL_SOURCE_FILES 
-    ../llmessage/lldatapacker.cpp
+    LL_TEST_ADDITIONAL_SOURCE_FILES ../llmessage/lldatapacker.cpp
+    LL_TEST_ADDITIONAL_PROJECTS "llprimitive"
   )
 
   set(test_libs
@@ -2251,7 +2251,6 @@ if (LL_TESTS)
     LL_TEST_ADDITIONAL_LIBRARIES "${test_libs}"
   )
 
-
   set_source_files_properties(
     llworldmap.cpp
     llworldmipmap.cpp
@@ -2271,6 +2270,7 @@ if (LL_TESTS)
     PROPERTIES
     LL_TEST_ADDITIONAL_SOURCE_FILES llversioninfo.cpp
   )
+
   set_property( SOURCE
           ${viewer_TEST_SOURCE_FILES}
           PROPERTY
diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp
index 9c78e48cab66808487e43d61248f8ec95a4073d0..57a67f52f6238c2488e643a7dd6d2a570d37bb1e 100644
--- a/indra/newview/llgltfmateriallist.cpp
+++ b/indra/newview/llgltfmateriallist.cpp
@@ -554,8 +554,6 @@ void LLGLTFMaterialList::onAssetLoadComplete(const LLUUID& id, LLAssetType::ETyp
         LL::WorkQueue::ptr_t main_queue = LL::WorkQueue::getInstance("mainloop");
         LL::WorkQueue::ptr_t general_queue = LL::WorkQueue::getInstance("General");
 
-        typedef std::pair<U32, tinygltf::Model> return_data_t;
-
         main_queue->postTo(
             general_queue,
             [id, asset_type, asset_data]() // Work done on general queue
diff --git a/indra/newview/tests/llviewercontrollistener_test.cpp b/indra/newview/tests/llviewercontrollistener_test.cpp
index 6d100ef984b51aab980cff5e58043c51d04afc02..8aed2a80431f090de35097a4b19f770405787b35 100644
--- a/indra/newview/tests/llviewercontrollistener_test.cpp
+++ b/indra/newview/tests/llviewercontrollistener_test.cpp
@@ -10,9 +10,9 @@
  */
 
 // Precompiled header
-#include "llviewerprecompiledheaders.h"
+#include "../llviewerprecompiledheaders.h"
 // associated header
-#include "llviewercontrollistener.h"
+#include "../llviewercontrollistener.h"
 // STL headers
 // std headers
 // external library headers
@@ -21,7 +21,6 @@
 #include "../test/catch_and_store_what_in.h" // catch_what()
 #include "commoncontrol.h"
 #include "llcontrol.h"              // LLControlGroup
-#include "llviewercontrollistener.h"
 
 /*****************************************************************************
 *   TUT
diff --git a/indra/newview/tests/llvocache_test.cpp b/indra/newview/tests/llvocache_test.cpp
index ea6abe254ee19c27fb51346658295905ec22ddf0..c27730eb584b3fc4b76224466a5dc1773ac63964 100644
--- a/indra/newview/tests/llvocache_test.cpp
+++ b/indra/newview/tests/llvocache_test.cpp
@@ -28,15 +28,16 @@
 #include "../llviewerprecompiledheaders.h"
 #include "../test/lltut.h"
 
-#include "llvocache.h"
+#include "../llvocache.h"
 
 #include "lldir.h"
-#include "llhudobject.h"
+#include "../llhudobject.h"
 #include "llregionhandle.h"
 #include "llsdutil.h"
 #include "llsdserialize.h"
-#include "llviewerobjectlist.h"
-#include "llviewerregion.h"
+
+#include "../llviewerobjectlist.h"
+#include "../llviewerregion.h"
 
 #include "lldir_stub.cpp"
 #include "llvieweroctree_stub.cpp"