diff --git a/wxdata/include/scwx/common/vcp.hpp b/wxdata/include/scwx/common/vcp.hpp
index 9d95c7aa..d93a056a 100644
--- a/wxdata/include/scwx/common/vcp.hpp
+++ b/wxdata/include/scwx/common/vcp.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <string>
 
 namespace scwx
@@ -7,7 +8,7 @@ namespace scwx
 namespace common
 {
 
-std::string GetVcpDescription(uint16_t vcp);
+std::string GetVcpDescription(std::uint16_t vcp);
 
 } // namespace common
 } // namespace scwx
diff --git a/wxdata/include/scwx/util/digest.hpp b/wxdata/include/scwx/util/digest.hpp
index e0bbc3c9..e00727ca 100644
--- a/wxdata/include/scwx/util/digest.hpp
+++ b/wxdata/include/scwx/util/digest.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <istream>
 #include <vector>
 
diff --git a/wxdata/include/scwx/util/strings.hpp b/wxdata/include/scwx/util/strings.hpp
index e2821331..ea22d117 100644
--- a/wxdata/include/scwx/util/strings.hpp
+++ b/wxdata/include/scwx/util/strings.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <optional>
 #include <string>
 #include <vector>
diff --git a/wxdata/source/scwx/util/time.cpp b/wxdata/source/scwx/util/time.cpp
index 5f04c8f5..5cf091fe 100644
--- a/wxdata/source/scwx/util/time.cpp
+++ b/wxdata/source/scwx/util/time.cpp
@@ -62,10 +62,13 @@ std::string TimeString(std::chrono::system_clock::time_point time,
 #if defined(_MSC_VER)
 #   define FORMAT_STRING_24_HOUR "{:%Y-%m-%d %H:%M:%S %Z}"
 #   define FORMAT_STRING_12_HOUR "{:%Y-%m-%d %I:%M:%S %p %Z}"
+   namespace date = std::chrono;
+   namespace df   = std;
 #else
 #   define FORMAT_STRING_24_HOUR "%Y-%m-%d %H:%M:%S %Z"
 #   define FORMAT_STRING_12_HOUR "%Y-%m-%d %I:%M:%S %p %Z"
    using namespace date;
+   namespace df = date;
 #endif
 
    auto               timeInSeconds = time_point_cast<seconds>(time);
@@ -77,15 +80,15 @@ std::string TimeString(std::chrono::system_clock::time_point time,
       {
          try
          {
-            zoned_time zt = {timeZone, timeInSeconds};
+            date::zoned_time zt = {timeZone, timeInSeconds};
 
             if (clockFormat == ClockFormat::_24Hour)
             {
-               os << format(FORMAT_STRING_24_HOUR, zt);
+               os << df::format(FORMAT_STRING_24_HOUR, zt);
             }
             else
             {
-               os << format(FORMAT_STRING_12_HOUR, zt);
+               os << df::format(FORMAT_STRING_12_HOUR, zt);
             }
          }
          catch (const std::exception& ex)
@@ -107,11 +110,11 @@ std::string TimeString(std::chrono::system_clock::time_point time,
       {
          if (clockFormat == ClockFormat::_24Hour)
          {
-            os << format(FORMAT_STRING_24_HOUR, timeInSeconds);
+            os << df::format(FORMAT_STRING_24_HOUR, timeInSeconds);
          }
          else
          {
-            os << format(FORMAT_STRING_12_HOUR, timeInSeconds);
+            os << df::format(FORMAT_STRING_12_HOUR, timeInSeconds);
          }
       }
    }