diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt
index 85327c595..d02af5713 100644
--- a/sdk/core/azure-core/CMakeLists.txt
+++ b/sdk/core/azure-core/CMakeLists.txt
@@ -118,15 +118,16 @@ set(
     src/io/random_access_file_body_stream.cpp
     src/private/environment_log_level_listener.hpp
     src/private/package_version.hpp
-    src/uuid.cpp
     src/base64.cpp
     src/context.cpp
     src/datetime.cpp
     src/environment_log_level_listener.cpp
+    src/etag.cpp
     src/exception.cpp
     src/logger.cpp
     src/operation_status.cpp
     src/strings.cpp
+    src/uuid.cpp
 )
 
 add_library(azure-core ${AZURE_CORE_HEADER} ${AZURE_CORE_SOURCE})
diff --git a/sdk/core/azure-core/inc/azure/core/etag.hpp b/sdk/core/azure-core/inc/azure/core/etag.hpp
index fdc78aa32..e3aabf1df 100644
--- a/sdk/core/azure-core/inc/azure/core/etag.hpp
+++ b/sdk/core/azure-core/inc/azure/core/etag.hpp
@@ -183,10 +183,6 @@ public:
    * @brief #Azure::Core::ETag representing everything.
    * @note The any #Azure::Core::ETag is *, (unquoted).  It is NOT the same as "*".
    */
-  static const ETag& Any()
-  {
-    static ETag any = ETag("*");
-    return any;
-  }
+  static const ETag& Any();
 };
 } // namespace Azure
diff --git a/sdk/core/azure-core/inc/azure/core/internal/io/null_body_stream.hpp b/sdk/core/azure-core/inc/azure/core/internal/io/null_body_stream.hpp
index 3b8ce86ef..03c82eb03 100644
--- a/sdk/core/azure-core/inc/azure/core/internal/io/null_body_stream.hpp
+++ b/sdk/core/azure-core/inc/azure/core/internal/io/null_body_stream.hpp
@@ -38,11 +38,7 @@ namespace Azure { namespace Core { namespace IO { namespace _internal {
      * @brief Gets a singleton instance of a #Azure::Core::IO::_internal::NullBodyStream.
      *
      */
-    static NullBodyStream* GetNullBodyStream()
-    {
-      static NullBodyStream nullBodyStream;
-      return &nullBodyStream;
-    }
+    static NullBodyStream* GetNullBodyStream();
   };
 
 }}}} // namespace Azure::Core::IO::_internal
diff --git a/sdk/core/azure-core/src/etag.cpp b/sdk/core/azure-core/src/etag.cpp
new file mode 100644
index 000000000..42ac1ef53
--- /dev/null
+++ b/sdk/core/azure-core/src/etag.cpp
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+#include "azure/core/etag.hpp"
+
+using Azure::ETag;
+
+const ETag& ETag::Any()
+{
+  static ETag any = ETag("*");
+  return any;
+}
diff --git a/sdk/core/azure-core/src/io/body_stream.cpp b/sdk/core/azure-core/src/io/body_stream.cpp
index 2fc536cde..2c2e03667 100644
--- a/sdk/core/azure-core/src/io/body_stream.cpp
+++ b/sdk/core/azure-core/src/io/body_stream.cpp
@@ -19,6 +19,7 @@
 #endif
 
 #include "azure/core/context.hpp"
+#include "azure/core/internal/io/null_body_stream.hpp"
 #include "azure/core/io/body_stream.hpp"
 
 #include <algorithm>
@@ -218,3 +219,11 @@ size_t ProgressBodyStream::OnRead(
 }
 
 int64_t ProgressBodyStream::Length() const { return m_bodyStream->Length(); }
+
+using Azure::Core::IO::_internal::NullBodyStream;
+
+NullBodyStream* NullBodyStream::GetNullBodyStream()
+{
+  static NullBodyStream nullBodyStream;
+  return &nullBodyStream;
+}