diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index a4e26899fb..3fb0f574a5 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -9,6 +9,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../cmake
 include("${MACRO_DIR}/SetupHifiProject.cmake")
 setup_hifi_project(${TARGET_NAME} TRUE)
 
+include(${MACRO_DIR}/IncludeGLM.cmake)
+include_glm(${TARGET_NAME} "${ROOT_DIR}")
+
 # link in the shared libraries
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
@@ -26,13 +29,20 @@ link_hifi_library(script-engine ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(embedded-webserver ${TARGET_NAME} "${ROOT_DIR}")
 
 if (UNIX)
-  target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
+  list(APPEND DEPENDENCY_LIBRARIES ${CMAKE_DL_LIBS})
 endif (UNIX)
 
 IF (WIN32)
-	target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
+  list(APPEND DEPENDENCY_LIBRARIES Winmm Ws2_32)
 ENDIF(WIN32)
 
+find_package(Qt5 COMPONENTS Gui Network Script Widgets)
+
+# set a property indicating the libraries we are dependent on and link them to ourselves
+list(APPEND DEPENDENCY_LIBRARIES Qt5::Gui Qt5::Network Qt5::Script Qt5::Widgets)
+set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_LIBRARIES "${DEPENDENCY_LIBRARIES}")
+target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES})
+
 # add a definition for ssize_t so that windows doesn't bail
 if (WIN32)
   add_definitions(-Dssize_t=long)
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 5c1bec0321..e624388408 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -52,7 +52,7 @@ foreach(SUBDIR avatar devices renderer ui starfield location scripting voxels pa
   set(INTERFACE_SRCS ${INTERFACE_SRCS} "${SUBDIR_SRCS}")
 endforeach(SUBDIR)
 
-find_package(Qt5 COMPONENTS Core Gui Multimedia Network OpenGL Script Svg WebKit WebKitWidgets Xml UiTools)
+# find_package(Qt5 COMPONENTS Core Gui Multimedia Network OpenGL Script Svg WebKit WebKitWidgets Xml UiTools)
 
 # grab the ui files in resources/ui
 file (GLOB_RECURSE QT_UI_FILES ui/*.ui)
@@ -182,8 +182,6 @@ include_directories("${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}/includes"
 target_link_libraries(
   ${TARGET_NAME}
   "${ZLIB_LIBRARIES}"
-  Qt5::Core Qt5::Gui Qt5::Multimedia Qt5::Network Qt5::OpenGL 
-  Qt5::Script Qt5::Svg Qt5::WebKit Qt5::WebKitWidgets Qt5::Xml Qt5::UiTools
 )
 
 # assume we are using a Qt build without bearer management
@@ -191,30 +189,30 @@ add_definitions(-DQT_NO_BEARERMANAGEMENT)
 
 if (APPLE)
     # link in required OS X frameworks and include the right GL headers
-    find_library(AppKit AppKit)
-    find_library(CoreAudio CoreAudio)
-    find_library(CoreServices CoreServices)
-    find_library(Carbon Carbon)
-    find_library(Foundation Foundation)
-    find_library(GLUT GLUT)
-    find_library(OpenGL OpenGL)
-    find_library(IOKit IOKit)
-    find_library(QTKit QTKit)
-    find_library(QuartzCore QuartzCore)    
-
-    target_link_libraries(
-        ${TARGET_NAME}
-        ${AppKit}
-        ${CoreAudio}
-        ${CoreServices}
-        ${Carbon}
-        ${Foundation}
-        ${GLUT}
-        ${OpenGL}
-        ${IOKit}
-        ${QTKit}
-        ${QuartzCore}
-    )
+    # find_library(AppKit AppKit)
+ #    find_library(CoreAudio CoreAudio)
+ #    find_library(CoreServices CoreServices)
+ #    find_library(Carbon Carbon)
+ #    find_library(Foundation Foundation)
+ #    find_library(GLUT GLUT)
+ #    find_library(OpenGL OpenGL)
+ #    find_library(IOKit IOKit)
+ #    find_library(QTKit QTKit)
+ #    find_library(QuartzCore QuartzCore)
+ #
+ #    target_link_libraries(
+ #        ${TARGET_NAME}
+ #        ${AppKit}
+ #        ${CoreAudio}
+ #        ${CoreServices}
+ #        ${Carbon}
+ #        ${Foundation}
+ #        ${GLUT}
+ #        ${OpenGL}
+ #        ${IOKit}
+ #        ${QTKit}
+ #        ${QuartzCore}
+ #    )
     
     # install command for OS X bundle
     INSTALL(TARGETS ${TARGET_NAME}
diff --git a/libraries/animation/CMakeLists.txt b/libraries/animation/CMakeLists.txt
index 1ed0275a72..7891c65dcc 100644
--- a/libraries/animation/CMakeLists.txt
+++ b/libraries/animation/CMakeLists.txt
@@ -13,8 +13,7 @@ include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(fbx ${TARGET_NAME} "${ROOT_DIR}")
 
-find_package(Qt5Script)
-find_package(Qt5Network)
+find_package(Qt5 COMPONENTS Network Script)
 
 # set a property indicating the libraries we are dependent on and link them to ourselves
 set(DEPENDENCY_LIBRARIES Qt5::Script Qt5::Network)
diff --git a/libraries/audio/CMakeLists.txt b/libraries/audio/CMakeLists.txt
index 69cc61ca6d..ace5f9292c 100644
--- a/libraries/audio/CMakeLists.txt
+++ b/libraries/audio/CMakeLists.txt
@@ -20,7 +20,7 @@ include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
-find_package(Qt5Network)
+find_package(Qt5 COMPONENTS Network)
 
 # set a property indicating the libraries we are dependent on and link them to ourselves
 set(DEPENDENCY_LIBRARIES Qt5::Network)
diff --git a/libraries/audio/src/AudioRingBuffer.cpp b/libraries/audio/src/AudioRingBuffer.cpp
index c687ab8648..cae663758d 100644
--- a/libraries/audio/src/AudioRingBuffer.cpp
+++ b/libraries/audio/src/AudioRingBuffer.cpp
@@ -15,9 +15,9 @@
 
 #include <QtCore/QDebug>
 
-#include "PacketHeaders.h"
-#include "AudioRingBuffer.h"
+#include <PacketHeaders.h>
 
+#include "AudioRingBuffer.h"
 
 AudioRingBuffer::AudioRingBuffer(int numFrameSamples, bool randomAccessMode, int numFramesCapacity) :
     _frameCapacity(numFramesCapacity),
diff --git a/libraries/audio/src/AudioRingBuffer.h b/libraries/audio/src/AudioRingBuffer.h
index ed680b18b1..b4b30b1f56 100644
--- a/libraries/audio/src/AudioRingBuffer.h
+++ b/libraries/audio/src/AudioRingBuffer.h
@@ -15,12 +15,10 @@
 #include <limits>
 #include <stdint.h>
 
-#include <glm/glm.hpp>
-
 #include <QtCore/QIODevice>
 
-#include "NodeData.h"
-#include "SharedUtil.h"
+#include <SharedUtil.h>
+#include <NodeData.h>
 
 const int SAMPLE_RATE = 24000;
 
diff --git a/libraries/avatars/CMakeLists.txt b/libraries/avatars/CMakeLists.txt
index 2aae671146..1300a2e733 100644
--- a/libraries/avatars/CMakeLists.txt
+++ b/libraries/avatars/CMakeLists.txt
@@ -19,8 +19,7 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
-find_package(Qt5Network)
-find_package(Qt5Script)
+find_package(Qt5 COMPONENTS Network Script)
 
 # set a property indicating the libraries we are dependent on and link them to ourselves
 set(DEPENDENCY_LIBRARIES Qt5::Network Qt5::Script)
diff --git a/libraries/embedded-webserver/CMakeLists.txt b/libraries/embedded-webserver/CMakeLists.txt
index eb28cae1b3..5b815625ba 100644
--- a/libraries/embedded-webserver/CMakeLists.txt
+++ b/libraries/embedded-webserver/CMakeLists.txt
@@ -9,7 +9,7 @@ set(TARGET_NAME embedded-webserver)
 include(${MACRO_DIR}/SetupHifiLibrary.cmake)
 setup_hifi_library(${TARGET_NAME})
 
-find_package(Qt5Network REQUIRED)
+find_package(Qt5 COMPONENTS Network)
 
 # set a property indicating the libraries we are dependent on and link them to ourselves
 set(DEPENDENCY_LIBRARIES Qt5::Network)
diff --git a/libraries/metavoxels/CMakeLists.txt b/libraries/metavoxels/CMakeLists.txt
index 10feb55199..799a549a3b 100644
--- a/libraries/metavoxels/CMakeLists.txt
+++ b/libraries/metavoxels/CMakeLists.txt
@@ -19,9 +19,7 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 include(${MACRO_DIR}/IncludeGLM.cmake)
 include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
-find_package(Qt5Script)
-find_package(Qt5Widgets)
-find_package(Qt5Network)
+find_package(Qt5 COMPONENTS Network Script Widgets)
 
 # set a property indicating the libraries we are dependent on and link them to ourselves
 set(DEPENDENCY_LIBRARIES Qt5::Script Qt5::Widgets Qt5::Network)
diff --git a/libraries/models/CMakeLists.txt b/libraries/models/CMakeLists.txt
index 0d7b3cf4fc..8128741ef6 100644
--- a/libraries/models/CMakeLists.txt
+++ b/libraries/models/CMakeLists.txt
@@ -24,8 +24,7 @@ link_hifi_library(animation ${TARGET_NAME} "${ROOT_DIR}")
 # for streamable
 link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}")
 
-find_package(Qt5Network)
-find_package(Qt5Script)
+find_package(Qt5 COMPONENTS Network Script)
 
 # set a property indicating the libraries we are dependent on and link them to ourselves
 set(DEPENDENCY_LIBRARIES Qt5::Network Qt5::Script)
diff --git a/libraries/networking/CMakeLists.txt b/libraries/networking/CMakeLists.txt
index 2d47f7df9b..7bd210623b 100644
--- a/libraries/networking/CMakeLists.txt
+++ b/libraries/networking/CMakeLists.txt
@@ -6,7 +6,7 @@ set(TARGET_NAME networking)
 include(${MACRO_DIR}/SetupHifiLibrary.cmake)
 setup_hifi_library(${TARGET_NAME})
 
-find_package(Qt5Network)
+find_package(Qt5 COMPONENTS Network)
 
 # set a property indicating the libraries we are dependent on and link them to ourselves
 set(DEPENDENCY_LIBRARIES Qt5::Network)
diff --git a/libraries/particles/CMakeLists.txt b/libraries/particles/CMakeLists.txt
index ceac4324c0..54398ac252 100644
--- a/libraries/particles/CMakeLists.txt
+++ b/libraries/particles/CMakeLists.txt
@@ -19,11 +19,10 @@ link_hifi_library(fbx ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(animation ${TARGET_NAME} "${ROOT_DIR}")
 
-find_package(Qt5Network)
-find_package(Qt5Script)
+find_package(Qt5 COMPONENTS Gui Network Script)
 
 # set a property indicating the libraries we are dependent on and link them to ourselves
-set(DEPENDENCY_LIBRARIES Qt5::Network Qt5::Script)
+set(DEPENDENCY_LIBRARIES Qt5::Network Qt5::Script Qt5::Gui)
 set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_LIBRARIES "${DEPENDENCY_LIBRARIES}")
 target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES})
 
diff --git a/libraries/script-engine/CMakeLists.txt b/libraries/script-engine/CMakeLists.txt
index 2dd40c7ece..1b0199977f 100644
--- a/libraries/script-engine/CMakeLists.txt
+++ b/libraries/script-engine/CMakeLists.txt
@@ -6,8 +6,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cm
 
 set(TARGET_NAME script-engine)
 
-find_package(Qt5Widgets REQUIRED)
-
 include(${MACRO_DIR}/SetupHifiLibrary.cmake)
 setup_hifi_library(${TARGET_NAME})
 
@@ -23,11 +21,12 @@ link_hifi_library(particles ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(models ${TARGET_NAME} "${ROOT_DIR}")
 link_hifi_library(animation ${TARGET_NAME} "${ROOT_DIR}")
 
-# link ZLIB
-find_package(ZLIB)
+find_package(Qt5 COMPONENTS Gui Network Script Widgets)
 
-include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
-target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
+# set a property indicating the libraries we are dependent on and link them to ourselves
+set(DEPENDENCY_LIBRARIES Qt5::Gui Qt5::Network Qt5::Script Qt5::Widgets)
+set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_LIBRARIES "${DEPENDENCY_LIBRARIES}")
+target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES})
 
 # add a definition for ssize_t so that windows doesn't bail
 if (WIN32)
diff --git a/libraries/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt
index 5faedff6ed..6badb10f8e 100644
--- a/libraries/shared/CMakeLists.txt
+++ b/libraries/shared/CMakeLists.txt
@@ -20,10 +20,9 @@ elseif (UNIX)
   set(DEPENDENCY_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
 endif ()
 
-find_package(Qt5Network)
-find_package(Qt5Widgets)
+find_package(Qt5 COMPONENTS Network Widgets)
 
 # bubble up the libraries we are dependent on and link them to ourselves
 list(APPEND DEPENDENCY_LIBRARIES Qt5::Network Qt5::Widgets)
-set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_LIBRARIES ${DEPENDENCY_LIBRARIES})
+set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_LIBRARIES "${DEPENDENCY_LIBRARIES}")
 target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES})
\ No newline at end of file