diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc5225f25e..101e3e7603 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
 project(hifi)
 
 IF (WIN32)
-add_definitions( -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS )
+	add_definitions( -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS )
 ENDIF(WIN32)
 
 set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT_CMAKE_PREFIX_PATH})
diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index 32d069ca23..ef786a58c8 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -41,3 +41,7 @@ include_directories(${ROOT_DIR}/externals/civetweb/include)
 if (UNIX)
   target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
 endif (UNIX)
+
+IF (WIN32)
+	target_link_libraries(${TARGET_NAME} Winmm)
+ENDIF(WIN32)
diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index 4817da3b36..e56d31bf5a 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -37,4 +37,8 @@ link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
 # link dl library on UNIX for civetweb
 if (UNIX AND NOT APPLE)
   target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
-endif (UNIX AND NOT APPLE)
\ No newline at end of file
+endif (UNIX AND NOT APPLE)
+
+IF (WIN32)
+	target_link_libraries(${TARGET_NAME} Winmm)
+ENDIF(WIN32)
diff --git a/voxel-edit/CMakeLists.txt b/voxel-edit/CMakeLists.txt
index d41d929085..38e1dd6efc 100644
--- a/voxel-edit/CMakeLists.txt
+++ b/voxel-edit/CMakeLists.txt
@@ -26,4 +26,6 @@ link_hifi_library(octree ${TARGET_NAME} ${ROOT_DIR})
 # link in the hifi voxels library
 link_hifi_library(voxels ${TARGET_NAME} ${ROOT_DIR})
 
-
+IF (WIN32)
+	target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
+ENDIF(WIN32)