diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22cadad665b..31fe13c8a17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2585,6 +2585,7 @@ if(WITH_BLENDER)
   # internal and external library information first, for test linking
   add_subdirectory(source)
 elseif(WITH_CYCLES_STANDALONE OR WITH_CYCLES_HYDRA_RENDER_DELEGATE)
+  add_subdirectory(intern/atomic)
   add_subdirectory(intern/guardedalloc)
   add_subdirectory(intern/libc_compat)
   add_subdirectory(intern/sky)
diff --git a/intern/cycles/app/opengl/shader.cpp b/intern/cycles/app/opengl/shader.cpp
index bc1141b9273..51a22305828 100644
--- a/intern/cycles/app/opengl/shader.cpp
+++ b/intern/cycles/app/opengl/shader.cpp
@@ -51,7 +51,7 @@ static void shader_print_errors(const char *task, const char *log, const char *c
   LOG(ERROR) << "Shader: " << task << " error:";
   LOG(ERROR) << "===== shader string ====";
 
-  stringstream stream(code);
+  std::stringstream stream(code);
   string partial;
 
   int line = 1;