diff --git a/scwx-qt/source/scwx/qt/config/radar_site.cpp b/scwx-qt/source/scwx/qt/config/radar_site.cpp
index 782436df..5e49847a 100644
--- a/scwx-qt/source/scwx/qt/config/radar_site.cpp
+++ b/scwx-qt/source/scwx/qt/config/radar_site.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/json.hpp>
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
 #   include <date/date.h>
 #endif
 
@@ -271,7 +271,7 @@ size_t RadarSite::ReadConfig(const std::string& path)
 
             try
             {
-#if (defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono >= 201907L)
                using namespace std::chrono;
 #else
                using namespace date;
diff --git a/scwx-qt/source/scwx/qt/main/main_window.cpp b/scwx-qt/source/scwx/qt/main/main_window.cpp
index 711aed80..6b865703 100644
--- a/scwx-qt/source/scwx/qt/main/main_window.cpp
+++ b/scwx-qt/source/scwx/qt/main/main_window.cpp
@@ -52,7 +52,7 @@
 #include <QTimer>
 #include <QToolButton>
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
 #   include <date/date.h>
 #endif
 
diff --git a/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp b/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp
index 377c7aff..1c093e9b 100644
--- a/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp
+++ b/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp
@@ -413,7 +413,7 @@ const scwx::util::time_zone* RadarProductManager::default_time_zone() const
    }
 
    case types::DefaultTimeZone::Local:
-#if (defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono >= 201907L)
       return std::chrono::current_zone();
 #else
       return date::current_zone();
diff --git a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp
index 0151b6cb..a42bc2b3 100644
--- a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp
+++ b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp
@@ -22,7 +22,7 @@
 #include <QGuiApplication>
 #include <QMouseEvent>
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
 #   include <date/date.h>
 #endif
 
diff --git a/scwx-qt/source/scwx/qt/view/level3_product_view.cpp b/scwx-qt/source/scwx/qt/view/level3_product_view.cpp
index a700b206..df65c693 100644
--- a/scwx-qt/source/scwx/qt/view/level3_product_view.cpp
+++ b/scwx-qt/source/scwx/qt/view/level3_product_view.cpp
@@ -17,7 +17,7 @@
 #include <boost/timer/timer.hpp>
 #include <fmt/format.h>
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
 #   include <date/date.h>
 #endif
 
diff --git a/wxdata/include/scwx/util/time.hpp b/wxdata/include/scwx/util/time.hpp
index 780a31c3..e31e8ca9 100644
--- a/wxdata/include/scwx/util/time.hpp
+++ b/wxdata/include/scwx/util/time.hpp
@@ -6,7 +6,7 @@
 #include <optional>
 #include <string>
 
-#if !defined(_MSC_VER)
+#if (__cpp_lib_chrono < 201907L)
 #   include <date/tz.h>
 #endif
 
@@ -15,7 +15,7 @@ namespace scwx
 namespace util
 {
 
-#if (defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono >= 201907L)
 typedef std::chrono::time_zone time_zone;
 #else
 typedef date::time_zone time_zone;
diff --git a/wxdata/source/scwx/awips/coded_time_motion_location.cpp b/wxdata/source/scwx/awips/coded_time_motion_location.cpp
index 40358eef..569cc513 100644
--- a/wxdata/source/scwx/awips/coded_time_motion_location.cpp
+++ b/wxdata/source/scwx/awips/coded_time_motion_location.cpp
@@ -13,7 +13,7 @@
 
 #include <sstream>
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
 #   include <date/date.h>
 #endif
 
@@ -107,7 +107,7 @@ bool CodedTimeMotionLocation::Parse(const StringRange& lines,
       {
          using namespace std::chrono;
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
          using namespace date;
 #endif
 
diff --git a/wxdata/source/scwx/awips/pvtec.cpp b/wxdata/source/scwx/awips/pvtec.cpp
index 426a58d3..b93d2be0 100644
--- a/wxdata/source/scwx/awips/pvtec.cpp
+++ b/wxdata/source/scwx/awips/pvtec.cpp
@@ -17,7 +17,7 @@
 #include <boost/bimap.hpp>
 #include <boost/bimap/unordered_set_of.hpp>
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
 #   include <date/date.h>
 #endif
 
@@ -143,7 +143,7 @@ bool PVtec::Parse(const std::string& s)
 {
    using namespace std::chrono;
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
    using namespace date;
 #endif
 
diff --git a/wxdata/source/scwx/gr/placefile.cpp b/wxdata/source/scwx/gr/placefile.cpp
index 70881299..02bb3527 100644
--- a/wxdata/source/scwx/gr/placefile.cpp
+++ b/wxdata/source/scwx/gr/placefile.cpp
@@ -20,7 +20,7 @@
 
 #include <boost/algorithm/string.hpp>
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
 #   include <date/date.h>
 #endif
 
@@ -284,7 +284,7 @@ void Placefile::Impl::ProcessLine(const std::string& line)
       {
          using namespace std::chrono;
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
          using namespace date;
 #endif
 
diff --git a/wxdata/source/scwx/network/dir_list.cpp b/wxdata/source/scwx/network/dir_list.cpp
index e4a2c4c3..f1be20b9 100644
--- a/wxdata/source/scwx/network/dir_list.cpp
+++ b/wxdata/source/scwx/network/dir_list.cpp
@@ -11,7 +11,7 @@
 #include <cpr/cpr.h>
 #include <libxml/HTMLparser.h>
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
 #   include <date/date.h>
 #endif
 
@@ -200,7 +200,7 @@ void DirListSAXHandler::Characters(void* userData, const xmlChar* ch, int len)
    {
       using namespace std::chrono;
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
       using namespace date;
 #endif
 
diff --git a/wxdata/source/scwx/provider/aws_level2_data_provider.cpp b/wxdata/source/scwx/provider/aws_level2_data_provider.cpp
index 87f0d2a2..c2910773 100644
--- a/wxdata/source/scwx/provider/aws_level2_data_provider.cpp
+++ b/wxdata/source/scwx/provider/aws_level2_data_provider.cpp
@@ -5,7 +5,7 @@
 #include <fmt/chrono.h>
 #include <fmt/format.h>
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
 #   include <date/date.h>
 #endif
 
@@ -82,7 +82,7 @@ AwsLevel2DataProvider::GetTimePointFromKey(const std::string& key)
    {
       using namespace std::chrono;
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
       using namespace date;
 #endif
 
diff --git a/wxdata/source/scwx/provider/aws_level3_data_provider.cpp b/wxdata/source/scwx/provider/aws_level3_data_provider.cpp
index e052b907..5bae6843 100644
--- a/wxdata/source/scwx/provider/aws_level3_data_provider.cpp
+++ b/wxdata/source/scwx/provider/aws_level3_data_provider.cpp
@@ -12,7 +12,7 @@
 #include <fmt/chrono.h>
 #include <fmt/format.h>
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
 #   include <date/date.h>
 #endif
 
@@ -110,7 +110,7 @@ AwsLevel3DataProvider::GetTimePointFromKey(const std::string& key)
    {
       using namespace std::chrono;
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
       using namespace date;
 #endif
 
diff --git a/wxdata/source/scwx/provider/warnings_provider.cpp b/wxdata/source/scwx/provider/warnings_provider.cpp
index 443582c7..8cfe9b77 100644
--- a/wxdata/source/scwx/provider/warnings_provider.cpp
+++ b/wxdata/source/scwx/provider/warnings_provider.cpp
@@ -14,7 +14,7 @@
 #include <libxml/HTMLparser.h>
 #include <re2/re2.h>
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
 #   include <date/date.h>
 #endif
 
@@ -71,7 +71,7 @@ WarningsProvider::ListFiles(std::chrono::system_clock::time_point newerThan)
 {
    using namespace std::chrono;
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
    using namespace date;
 #endif
 
diff --git a/wxdata/source/scwx/util/time.cpp b/wxdata/source/scwx/util/time.cpp
index dcf763d2..7a706224 100644
--- a/wxdata/source/scwx/util/time.cpp
+++ b/wxdata/source/scwx/util/time.cpp
@@ -17,7 +17,7 @@
 
 #include <boost/algorithm/string.hpp>
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
 #   include <date/date.h>
 #endif
 
@@ -59,7 +59,7 @@ std::string TimeString(std::chrono::system_clock::time_point time,
 {
    using namespace std::chrono;
 
-#if (defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono >= 201907L)
 #   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;
@@ -128,7 +128,7 @@ TryParseDateTime(const std::string& dateTimeFormat, const std::string& str)
 {
    using namespace std::chrono;
 
-#if !(defined(_MSC_VER) || defined(__clang__))
+#if (__cpp_lib_chrono < 201907L)
    using namespace date;
 #endif