diff --git a/include/yaml-cpp/ostream_wrapper.h b/include/yaml-cpp/ostream_wrapper.h
index cc2ef56..1f0a080 100644
--- a/include/yaml-cpp/ostream_wrapper.h
+++ b/include/yaml-cpp/ostream_wrapper.h
@@ -10,8 +10,10 @@
 #include <string>
 #include <vector>
 
+#include "yaml-cpp/dll.h"
+
 namespace YAML {
-class ostream_wrapper {
+class YAML_CPP_API ostream_wrapper {
  public:
   ostream_wrapper();
   explicit ostream_wrapper(std::ostream& stream);
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 462110b..7108a65 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -4,6 +4,10 @@ add_subdirectory(gmock-1.7.0)
 include_directories(gmock-1.7.0/gtest/include)
 include_directories(gmock-1.7.0/include)
 
+if(WIN32 AND BUILD_SHARED_LIBS)
+  add_definitions("-DGTEST_LINKED_AS_SHARED_LIBRARY")
+endif()
+
 file(GLOB test_headers [a-z_]*.h)
 file(GLOB test_sources [a-z_]*.cpp integration/[a-z_]*.cpp)
 file(GLOB test_core_sources core/[a-z]*.cpp)