diff --git a/src/log.h b/src/log.h
index 5cf3d6b329..e90006c7ef 100644
--- a/src/log.h
+++ b/src/log.h
@@ -7,6 +7,7 @@
 
 namespace librealsense
 {
+#if BUILD_EASYLOGGINGPP
     template<char const * NAME>
     class logger_type
     {
@@ -135,4 +136,5 @@ namespace librealsense
             open();
         }
     };
+#endif //BUILD_EASYLOGGINGPP
 }
diff --git a/src/tm2/tm-device.cpp b/src/tm2/tm-device.cpp
index 1f2404aeea..6edbc5c8e2 100644
--- a/src/tm2/tm-device.cpp
+++ b/src/tm2/tm-device.cpp
@@ -1,6 +1,10 @@
 // License: Apache 2.0. See LICENSE file in root directory.
 // Copyright(c) 2017 Intel Corporation. All Rights Reserved.
 
+#ifndef NOMINMAX
+    #define NOMINMAX
+#endif
+
 #include <memory>
 #include <thread>
 #include "tm-device.h"