diff --git a/ntcoreffi/.styleguide b/ntcoreffi/.styleguide
new file mode 100644
index 0000000000..ba1380489a
--- /dev/null
+++ b/ntcoreffi/.styleguide
@@ -0,0 +1,27 @@
+cppHeaderFileInclude {
+  \.h$
+}
+
+cppSrcFileInclude {
+  \.cpp$
+}
+
+modifiableFileExclude {
+  src/main/native/include/DataLogManager\.h$
+}
+
+repoRootNameOverride {
+  ntcoreffi
+}
+
+includeOtherLibs {
+  ^fmt/
+  ^gmock/
+  ^gtest/
+  ^networktables/
+  ^wpi/
+}
+
+includeGuardRoots {
+  ntcoreffi/src/main/native/include/
+}
diff --git a/ntcoreffi/build.gradle b/ntcoreffi/build.gradle
index 3e9b2d6f24..98ffeaa674 100644
--- a/ntcoreffi/build.gradle
+++ b/ntcoreffi/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'c'
+    id 'cpp'
     id 'maven-publish'
 }
 
@@ -49,6 +50,16 @@ model {
                         srcDir generatedHeaders
                     }
                 }
+                cpp {
+                    source {
+                        srcDirs = ['src/main/native/cpp']
+                        includes = ['**/*.cpp']
+                    }
+                    exportedHeaders {
+                        srcDir 'src/main/native/include'
+                        srcDir generatedHeaders
+                    }
+                }
             }
             binaries.all { binary ->
                 if (binary instanceof StaticLibraryBinarySpec) {
diff --git a/ntcoreffi/src/main/native/cpp/DataLogManager.cpp b/ntcoreffi/src/main/native/cpp/DataLogManager.cpp
new file mode 100644
index 0000000000..023facd628
--- /dev/null
+++ b/ntcoreffi/src/main/native/cpp/DataLogManager.cpp
@@ -0,0 +1,526 @@
+// Copyright (c) FIRST and other WPILib contributors.
+// Open Source Software; you can modify and/or share it under the terms of
+// the WPILib BSD license file in the root directory of this project.
+
+#include "DataLogManager.h"
+
+#include <algorithm>
+#include <ctime>
+#include <random>
+
+#include <fmt/chrono.h>
+#include <fmt/format.h>
+#include <networktables/NetworkTableInstance.h>
+#include <wpi/DataLog.h>
+#include <wpi/SafeThread.h>
+#include <wpi/StringExtras.h>
+#include <wpi/fs.h>
+#include <wpi/timestamp.h>
+
+#ifdef __FRC_ROBORIO__
+#include <FRC_NetworkCommunication/FRCComm.h>
+#include <FRC_NetworkCommunication/LoadOut.h>
+#endif
+
+using namespace wpi;
+
+/** Shims to keep the code as similar as possible to wpilibc */
+namespace {
+
+namespace warn {
+static constexpr int Warning = 16;
+}  // namespace warn
+
+namespace frc {
+void ReportErrorV(int32_t status, const char* fileName, int lineNumber,
+                  const char* funcName, fmt::string_view format,
+                  fmt::format_args args) {
+#ifdef __FRC_ROBORIO__
+  if (status == 0) {
+    return;
+  }
+  fmt::memory_buffer out;
+  fmt::format_to(fmt::appender{out}, "Warning: ");
+  fmt::vformat_to(fmt::appender{out}, format, args);
+  out.push_back('\0');
+  FRC_NetworkCommunication_sendError(status < 0, status, 0, out.data(),
+                                     "DataLogManager", "");
+#endif
+}
+
+template <typename... Args>
+inline void ReportError(int32_t status, const char* fileName, int lineNumber,
+                        const char* funcName, fmt::string_view format,
+                        Args&&... args) {
+  ReportErrorV(status, fileName, lineNumber, funcName, format,
+               fmt::make_format_args(args...));
+}
+}  // namespace frc
+
+#define FRC_ReportError(status, format, ...)                             \
+  do {                                                                   \
+    if ((status) != 0) {                                                 \
+      ::frc::ReportError(status, __FILE__, __LINE__, __FUNCTION__,       \
+                         FMT_STRING(format) __VA_OPT__(, ) __VA_ARGS__); \
+    }                                                                    \
+  } while (0)
+
+namespace RobotController {
+inline bool IsSystemTimeValid() {
+#ifdef __FRC_ROBORIO__
+  uint8_t timeWasSet = 0;
+  FRC_NetworkCommunication_getTimeWasSet(&timeWasSet);
+  return timeWasSet != 0;
+#else
+  return true;
+#endif
+}
+}  // namespace RobotController
+
+namespace filesystem {
+inline std::string GetOperatingDirectory() {
+#ifdef __FRC_ROBORIO__
+  return "/home/lvuser";
+#else
+  return fs::current_path().string();
+#endif
+}
+}  // namespace filesystem
+
+namespace DriverStation {
+#ifdef __FRC_ROBORIO__
+using MatchType = MatchType_t;
+constexpr int kNone = kMatchType_none;
+constexpr int kPractice = kMatchType_practice;
+constexpr int kQualification = kMatchType_qualification;
+constexpr int kElimination = kMatchType_elimination;
+char gEventName[128];
+MatchType_t gMatchType;
+uint16_t gMatchNumber;
+uint8_t gReplayNumber;
+uint8_t gGameSpecificMessage[16];
+uint16_t gGameSpecificMessageSize;
+#else
+enum MatchType { kNone, kPractice, kQualification, kElimination };
+#endif
+
+inline void UpdateMatchInfo() {
+#ifdef __FRC_ROBORIO__
+  gGameSpecificMessageSize = sizeof(gGameSpecificMessage);
+  FRC_NetworkCommunication_getMatchInfo(gEventName, &gMatchType, &gMatchNumber,
+                                        &gReplayNumber, gGameSpecificMessage,
+                                        &gGameSpecificMessageSize);
+#endif
+}
+
+inline MatchType GetMatchType() {
+#ifdef __FRC_ROBORIO__
+  return gMatchType;
+#else
+  return kNone;
+#endif
+}
+
+inline std::string_view GetEventName() {
+#ifdef __FRC_ROBORIO__
+  return gEventName;
+#else
+  return "";
+#endif
+}
+
+inline uint16_t GetMatchNumber() {
+#ifdef __FRC_ROBORIO__
+  return gMatchNumber;
+#else
+  return 0;
+#endif
+}
+
+inline bool IsDSAttached() {
+#ifdef __FRC_ROBORIO__
+  struct ControlWord_t cw;
+  FRC_NetworkCommunication_getControlWord(&cw);
+  return cw.dsAttached;
+#else
+  return true;
+#endif
+}
+
+inline bool IsFMSAttached() {
+#ifdef __FRC_ROBORIO__
+  struct ControlWord_t cw;
+  FRC_NetworkCommunication_getControlWord(&cw);
+  return cw.fmsAttached;
+#else
+  return false;
+#endif
+}
+
+WPI_EventHandle gNewDataEvent;
+
+inline void ProvideRefreshedDataEventHandle(WPI_EventHandle event) {
+  gNewDataEvent = event;
+}
+
+inline void RemoveRefreshedDataEventHandle(WPI_EventHandle event) {}
+
+}  // namespace DriverStation
+
+#ifdef __FRC_ROBORIO__
+static constexpr int kRoboRIO = 0;
+namespace RobotBase {
+inline int GetRuntimeType() {
+  nLoadOut::tTargetClass targetClass = nLoadOut::getTargetClass();
+  if (targetClass == nLoadOut::kTargetClass_RoboRIO2) {
+    return 1;
+  } else {
+    return 0;
+  }
+}
+}  // namespace RobotBase
+#endif
+
+struct Thread final : public wpi::SafeThread {
+  Thread(std::string_view dir, std::string_view filename, double period);
+  ~Thread() override;
+
+  void Main() final;
+
+  void StartNTLog();
+  void StopNTLog();
+
+  std::string m_logDir;
+  bool m_filenameOverride;
+  wpi::log::DataLog m_log;
+  bool m_ntLoggerEnabled = false;
+  NT_DataLogger m_ntEntryLogger = 0;
+  NT_ConnectionDataLogger m_ntConnLogger = 0;
+  wpi::log::StringLogEntry m_messageLog;
+};
+
+struct Instance {
+  Instance(std::string_view dir, std::string_view filename, double period);
+  wpi::SafeThreadOwner<Thread> owner;
+};
+
+}  // namespace
+
+// if less than this much free space, delete log files until there is this much
+// free space OR there are this many files remaining.
+static constexpr uintmax_t kFreeSpaceThreshold = 50000000;
+static constexpr int kFileCountThreshold = 10;
+
+static std::string MakeLogDir(std::string_view dir) {
+  if (!dir.empty()) {
+    return std::string{dir};
+  }
+#ifdef __FRC_ROBORIO__
+  // prefer a mounted USB drive if one is accessible
+  constexpr std::string_view usbDir{"/u"};
+  std::error_code ec;
+  auto s = fs::status(usbDir, ec);
+  if (!ec && fs::is_directory(s) &&
+      (s.permissions() & fs::perms::others_write) != fs::perms::none) {
+    return std::string{usbDir};
+  }
+  if (RobotBase::GetRuntimeType() == kRoboRIO) {
+    FRC_ReportError(warn::Warning,
+                    "DataLogManager: Logging to RoboRIO 1 internal storage is "
+                    "not recommended! Plug in a FAT32 formatted flash drive!");
+  }
+#endif
+  return filesystem::GetOperatingDirectory();
+}
+
+static std::string MakeLogFilename(std::string_view filenameOverride) {
+  if (!filenameOverride.empty()) {
+    return std::string{filenameOverride};
+  }
+  static std::random_device dev;
+  static std::mt19937 rng(dev());
+  std::uniform_int_distribution<int> dist(0, 15);
+  const char* v = "0123456789abcdef";
+  std::string filename = "FRC_TBD_";
+  for (int i = 0; i < 16; i++) {
+    filename += v[dist(rng)];
+  }
+  filename += ".wpilog";
+  return filename;
+}
+
+Thread::Thread(std::string_view dir, std::string_view filename, double period)
+    : m_logDir{dir},
+      m_filenameOverride{!filename.empty()},
+      m_log{dir, MakeLogFilename(filename), period},
+      m_messageLog{m_log, "messages"} {
+  StartNTLog();
+}
+
+Thread::~Thread() {
+  StopNTLog();
+}
+
+void Thread::Main() {
+  // based on free disk space, scan for "old" FRC_*.wpilog files and remove
+  {
+    uintmax_t freeSpace = fs::space(m_logDir).free;
+    if (freeSpace < kFreeSpaceThreshold) {
+      // Delete oldest FRC_*.wpilog files (ignore FRC_TBD_*.wpilog as we just
+      // created one)
+      std::vector<fs::directory_entry> entries;
+      std::error_code ec;
+      for (auto&& entry : fs::directory_iterator{m_logDir, ec}) {
+        auto stem = entry.path().stem().string();
+        if (wpi::starts_with(stem, "FRC_") &&
+            entry.path().extension() == ".wpilog" &&
+            !wpi::starts_with(stem, "FRC_TBD_")) {
+          entries.emplace_back(entry);
+        }
+      }
+      std::sort(entries.begin(), entries.end(),
+                [](const auto& a, const auto& b) {
+                  return a.last_write_time() < b.last_write_time();
+                });
+
+      int count = entries.size();
+      for (auto&& entry : entries) {
+        --count;
+        if (count < kFileCountThreshold) {
+          break;
+        }
+        auto size = entry.file_size();
+        if (fs::remove(entry.path(), ec)) {
+          FRC_ReportError(warn::Warning, "DataLogManager: Deleted {}",
+                          entry.path().string());
+          freeSpace += size;
+          if (freeSpace >= kFreeSpaceThreshold) {
+            break;
+          }
+        } else {
+          fmt::print(stderr, "DataLogManager: could not delete {}\n",
+                     entry.path().string());
+        }
+      }
+    } else if (freeSpace < 2 * kFreeSpaceThreshold) {
+      FRC_ReportError(
+          warn::Warning,
+          "DataLogManager: Log storage device has {} MB of free space "
+          "remaining! Logs will get deleted below {} MB of free space. "
+          "Consider deleting logs off the storage device.",
+          freeSpace / 1000000, kFreeSpaceThreshold / 1000000);
+    }
+  }
+
+  int timeoutCount = 0;
+  bool paused = false;
+  int dsAttachCount = 0;
+  int fmsAttachCount = 0;
+  bool dsRenamed = m_filenameOverride;
+  bool fmsRenamed = m_filenameOverride;
+  int sysTimeCount = 0;
+  wpi::log::IntegerLogEntry sysTimeEntry{
+      m_log, "systemTime",
+      "{\"source\":\"DataLogManager\",\"format\":\"time_t_us\"}"};
+
+  wpi::Event newDataEvent;
+  DriverStation::ProvideRefreshedDataEventHandle(newDataEvent.GetHandle());
+
+  for (;;) {
+    bool timedOut = false;
+    bool newData =
+        wpi::WaitForObject(newDataEvent.GetHandle(), 0.25, &timedOut);
+    if (!m_active) {
+      break;
+    }
+    if (!newData) {
+      ++timeoutCount;
+      // pause logging after being disconnected for 10 seconds
+      if (timeoutCount > 40 && !paused) {
+        timeoutCount = 0;
+        paused = true;
+        m_log.Pause();
+      }
+      continue;
+    }
+    // when we connect to the DS, resume logging
+    timeoutCount = 0;
+    if (paused) {
+      paused = false;
+      m_log.Resume();
+    }
+
+    if (!dsRenamed) {
+      // track DS attach
+      if (DriverStation::IsDSAttached()) {
+        ++dsAttachCount;
+      } else {
+        dsAttachCount = 0;
+      }
+      if (dsAttachCount > 50) {  // 1 second
+        if (RobotController::IsSystemTimeValid()) {
+          std::time_t now = std::time(nullptr);
+          auto tm = std::gmtime(&now);
+          m_log.SetFilename(fmt::format("FRC_{:%Y%m%d_%H%M%S}.wpilog", *tm));
+          dsRenamed = true;
+        } else {
+          dsAttachCount = 0;  // wait a bit and try again
+        }
+      }
+    }
+
+    if (!fmsRenamed) {
+      // track FMS attach
+      if (DriverStation::IsFMSAttached()) {
+        ++fmsAttachCount;
+      } else {
+        fmsAttachCount = 0;
+      }
+      if (fmsAttachCount > 250) {  // 5 seconds
+        // match info comes through TCP, so we need to double-check we've
+        // actually received it
+        DriverStation::UpdateMatchInfo();
+        auto matchType = DriverStation::GetMatchType();
+        if (matchType != DriverStation::kNone) {
+          // rename per match info
+          char matchTypeChar;
+          switch (matchType) {
+            case DriverStation::kPractice:
+              matchTypeChar = 'P';
+              break;
+            case DriverStation::kQualification:
+              matchTypeChar = 'Q';
+              break;
+            case DriverStation::kElimination:
+              matchTypeChar = 'E';
+              break;
+            default:
+              matchTypeChar = '_';
+              break;
+          }
+          std::time_t now = std::time(nullptr);
+          m_log.SetFilename(
+              fmt::format("FRC_{:%Y%m%d_%H%M%S}_{}_{}{}.wpilog",
+                          *std::gmtime(&now), DriverStation::GetEventName(),
+                          matchTypeChar, DriverStation::GetMatchNumber()));
+          fmsRenamed = true;
+          dsRenamed = true;  // don't override FMS rename
+        }
+      }
+    }
+
+    // Write system time every ~5 seconds
+    ++sysTimeCount;
+    if (sysTimeCount >= 250) {
+      sysTimeCount = 0;
+      if (RobotController::IsSystemTimeValid()) {
+        sysTimeEntry.Append(wpi::GetSystemTime(), wpi::Now());
+      }
+    }
+  }
+  DriverStation::RemoveRefreshedDataEventHandle(newDataEvent.GetHandle());
+}
+
+void Thread::StartNTLog() {
+  if (!m_ntLoggerEnabled) {
+    m_ntLoggerEnabled = true;
+    auto inst = nt::NetworkTableInstance::GetDefault();
+    m_ntEntryLogger = inst.StartEntryDataLog(m_log, "", "NT:");
+    m_ntConnLogger = inst.StartConnectionDataLog(m_log, "NTConnection");
+  }
+}
+
+void Thread::StopNTLog() {
+  if (m_ntLoggerEnabled) {
+    m_ntLoggerEnabled = false;
+    nt::NetworkTableInstance::StopEntryDataLog(m_ntEntryLogger);
+    nt::NetworkTableInstance::StopConnectionDataLog(m_ntConnLogger);
+  }
+}
+
+Instance::Instance(std::string_view dir, std::string_view filename,
+                   double period) {
+  // Delete all previously existing FRC_TBD_*.wpilog files. These only exist
+  // when the robot never connects to the DS, so they are very unlikely to
+  // have useful data and just clutter the filesystem.
+  auto logDir = MakeLogDir(dir);
+  std::error_code ec;
+  for (auto&& entry : fs::directory_iterator{logDir, ec}) {
+    if (wpi::starts_with(entry.path().stem().string(), "FRC_TBD_") &&
+        entry.path().extension() == ".wpilog") {
+      if (!fs::remove(entry, ec)) {
+        fmt::print(stderr, "DataLogManager: could not delete {}\n",
+                   entry.path().string());
+      }
+    }
+  }
+
+  owner.Start(logDir, filename, period);
+}
+
+static Instance& GetInstance(std::string_view dir = "",
+                             std::string_view filename = "",
+                             double period = 0.25) {
+  static Instance instance(dir, filename, period);
+  return instance;
+}
+
+void DataLogManager::Start(std::string_view dir, std::string_view filename,
+                           double period) {
+  GetInstance(dir, filename, period);
+}
+
+void DataLogManager::Log(std::string_view message) {
+  GetInstance().owner.GetThread()->m_messageLog.Append(message);
+  fmt::print("{}\n", message);
+}
+
+wpi::log::DataLog& DataLogManager::GetLog() {
+  return GetInstance().owner.GetThread()->m_log;
+}
+
+std::string_view DataLogManager::GetLogDir() {
+  return GetInstance().owner.GetThread()->m_logDir;
+}
+
+void DataLogManager::LogNetworkTables(bool enabled) {
+  if (auto thr = GetInstance().owner.GetThread()) {
+    if (enabled) {
+      thr->StartNTLog();
+    } else if (!enabled) {
+      thr->StopNTLog();
+    }
+  }
+}
+
+void DataLogManager::SignalNewDSDataOccur() {
+  wpi::SetSignalObject(DriverStation::gNewDataEvent);
+}
+
+extern "C" {
+
+void DLM_Start(const char* dir, const char* filename, double period) {
+  DataLogManager::Start(dir, filename, period);
+}
+
+void DLM_Log(const char* message) {
+  DataLogManager::Log(message);
+}
+
+WPI_DataLog* DLM_GetLog(void) {
+  return reinterpret_cast<WPI_DataLog*>(&DataLogManager::GetLog());
+}
+
+const char* DLM_GetLogDir(void) {
+  return DataLogManager::GetLogDir().data();
+}
+
+void DLM_LogNetworkTables(int enabled) {
+  DataLogManager::LogNetworkTables(enabled);
+}
+
+void DLM_SignalNewDSDataOccur(void) {
+  DataLogManager::SignalNewDSDataOccur();
+}
+
+}  // extern "C"
diff --git a/ntcoreffi/src/main/native/include/DataLogManager.h b/ntcoreffi/src/main/native/include/DataLogManager.h
new file mode 100644
index 0000000000..8445399dde
--- /dev/null
+++ b/ntcoreffi/src/main/native/include/DataLogManager.h
@@ -0,0 +1,152 @@
+// Copyright (c) FIRST and other WPILib contributors.
+// Open Source Software; you can modify and/or share it under the terms of
+// the WPILib BSD license file in the root directory of this project.
+
+#pragma once
+
+#ifdef __cplusplus
+#include <string>
+#include <string_view>
+#endif  // __cplusplus
+
+#ifdef __cplusplus
+namespace wpi::log {
+class DataLog;
+}  // namespace wpi::log
+
+namespace wpi {
+
+/**
+ * Centralized data log that provides automatic data log file management. It
+ * automatically cleans up old files when disk space is low and renames the file
+ * based either on current date/time or (if available) competition match number.
+ * The deta file will be saved to a USB flash drive if one is attached, or to
+ * /home/lvuser otherwise.
+ *
+ * Log files are initially named "FRC_TBD_{random}.wpilog" until the DS
+ * connects. After the DS connects, the log file is renamed to
+ * "FRC_yyyyMMdd_HHmmss.wpilog" (where the date/time is UTC). If the FMS is
+ * connected and provides a match number, the log file is renamed to
+ * "FRC_yyyyMMdd_HHmmss_{event}_{match}.wpilog".
+ *
+ * On startup, all existing FRC_TBD log files are deleted. If there is less than
+ * 50 MB of free space on the target storage, FRC_ log files are deleted (oldest
+ * to newest) until there is 50 MB free OR there are 10 files remaining.
+ *
+ * By default, all NetworkTables value changes are stored to the data log.
+ */
+class DataLogManager final {
+ public:
+  DataLogManager() = delete;
+
+  /**
+   * Start data log manager. The parameters have no effect if the data log
+   * manager was already started (e.g. by calling another static function).
+   *
+   * @param dir if not empty, directory to use for data log storage
+   * @param filename filename to use; if none provided, the filename is
+   *     automatically generated
+   * @param period time between automatic flushes to disk, in seconds;
+   *               this is a time/storage tradeoff
+   */
+  static void Start(std::string_view dir = "", std::string_view filename = "",
+                    double period = 0.25);
+
+  /**
+   * Log a message to the "messages" entry. The message is also printed to
+   * standard output (followed by a newline).
+   *
+   * @param message message
+   */
+  static void Log(std::string_view message);
+
+  /**
+   * Get the managed data log (for custom logging). Starts the data log manager
+   * if not already started.
+   *
+   * @return data log
+   */
+  static wpi::log::DataLog& GetLog();
+
+  /**
+   * Get the log directory.
+   *
+   * @return log directory
+   */
+  static std::string_view GetLogDir();
+
+  /**
+   * Enable or disable logging of NetworkTables data. Note that unlike the
+   * network interface for NetworkTables, this will capture every value change.
+   * Defaults to enabled.
+   *
+   * @param enabled true to enable, false to disable
+   */
+  static void LogNetworkTables(bool enabled);
+
+  /**
+   * Signal new DS data is available.
+   */
+  static void SignalNewDSDataOccur();
+};
+
+}  // namespace wpi
+
+extern "C" {
+#endif  // __cplusplus
+
+/** C-compatible data log (opaque struct). */
+struct WPI_DataLog;
+
+/**
+ * Start data log manager. The parameters have no effect if the data log
+ * manager was already started (e.g. by calling another static function).
+ *
+ * @param dir if not empty, directory to use for data log storage
+ * @param filename filename to use; if none provided, the filename is
+ *     automatically generated
+ * @param period time between automatic flushes to disk, in seconds;
+ *               this is a time/storage tradeoff
+ */
+void DLM_Start(const char* dir, const char* filename, double period);
+
+/**
+ * Log a message to the "messages" entry. The message is also printed to
+ * standard output (followed by a newline).
+ *
+ * @param message message
+ */
+void DLM_Log(const char* message);
+
+/**
+ * Get the managed data log (for custom logging). Starts the data log manager
+ * if not already started.
+ *
+ * @return data log
+ */
+WPI_DataLog* DLM_GetLog(void);
+
+/**
+ * Get the log directory.
+ *
+ * @return log directory
+ */
+const char* DLM_GetLogDir(void);
+
+/**
+ * Enable or disable logging of NetworkTables data. Note that unlike the
+ * network interface for NetworkTables, this will capture every value change.
+ * Defaults to enabled.
+ *
+ * @param enabled true to enable, false to disable
+ */
+void DLM_LogNetworkTables(int enabled);
+
+/**
+ * Signal new DS data is available.
+ */
+void DLM_SignalNewDSDataOccur(void);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus
diff --git a/ntcoreffi/src/main/native/symbols.txt b/ntcoreffi/src/main/native/symbols.txt
index e2f1766534..f7f299a6cd 100644
--- a/ntcoreffi/src/main/native/symbols.txt
+++ b/ntcoreffi/src/main/native/symbols.txt
@@ -1,3 +1,9 @@
+DLM_GetLog
+DLM_GetLogDir
+DLM_Log
+DLM_LogNetworkTables
+DLM_SignalNewDSDataOccur
+DLM_Start
 NT_AddListener
 NT_AddListenerMultiple
 NT_AddListenerSingle
diff --git a/wpilibc/src/main/native/cpp/DataLogManager.cpp b/wpilibc/src/main/native/cpp/DataLogManager.cpp
index 578cd5e62e..7c55fe7460 100644
--- a/wpilibc/src/main/native/cpp/DataLogManager.cpp
+++ b/wpilibc/src/main/native/cpp/DataLogManager.cpp
@@ -71,13 +71,13 @@ static std::string MakeLogDir(std::string_view dir) {
       (s.permissions() & fs::perms::others_write) != fs::perms::none) {
     return std::string{usbDir};
   }
-  if (frc::RobotBase::GetRuntimeType() == kRoboRIO) {
+  if (RobotBase::GetRuntimeType() == kRoboRIO) {
     FRC_ReportError(warn::Warning,
                     "DataLogManager: Logging to RoboRIO 1 internal storage is "
                     "not recommended! Plug in a FAT32 formatted flash drive!");
   }
 #endif
-  return frc::filesystem::GetOperatingDirectory();
+  return filesystem::GetOperatingDirectory();
 }
 
 static std::string MakeLogFilename(std::string_view filenameOverride) {