diff --git a/cpp/platform/base/logging.h b/cpp/platform/base/logging.h
index 36a6416c..99b91b14 100644
--- a/cpp/platform/base/logging.h
+++ b/cpp/platform/base/logging.h
@@ -15,6 +15,10 @@
 #ifndef PLATFORM_BASE_LOGGING_H_
 #define PLATFORM_BASE_LOGGING_H_
 
+#if defined NEARBY_WINDOWS_DLL
+#include "base/logging.h"
+#endif
+
 #include "platform/api/log_message.h"
 #include "platform/api/platform.h"
 
diff --git a/cpp/platform/impl/windows/crypto.cc b/cpp/platform/impl/windows/crypto.cc
index 263bec27..0228c653 100644
--- a/cpp/platform/impl/windows/crypto.cc
+++ b/cpp/platform/impl/windows/crypto.cc
@@ -19,7 +19,11 @@
 
 #include "platform/base/byte_array.h"
 #include "absl/strings/string_view.h"
+#if defined NEARBY_WINDOWS_DLL
 #include "openssl/digest.h"
+#else
+#include "openssl/digest.h"
+#endif
 
 // Function implementations for platform/api/crypto.h.
 namespace location {