diff --git a/common/include/villas/utils.hpp b/common/include/villas/utils.hpp
index 5318d2efe..112e881a9 100644
--- a/common/include/villas/utils.hpp
+++ b/common/include/villas/utils.hpp
@@ -12,6 +12,7 @@
 #include <list>
 #include <string>
 #include <vector>
+#include <filesystem>
 
 #include <cassert>
 #include <cstdint>
@@ -213,8 +214,7 @@ template <class... Ts> struct overloaded : Ts... {
 template <class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
 
 void write_to_file(std::string data, const std::filesystem::path file);
-std::vector<std::string>
-read_names_in_directory(const std::filesystem::path &directory);
+std::vector<std::string> read_names_in_directory(const std::string &name);
 
 namespace base64 {
 
diff --git a/common/lib/CMakeLists.txt b/common/lib/CMakeLists.txt
index 3aabe90ae..4c43567f0 100644
--- a/common/lib/CMakeLists.txt
+++ b/common/lib/CMakeLists.txt
@@ -43,7 +43,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux)
         kernel/devices/ip_device.cpp
         kernel/devices/pci_device.cpp
         kernel/devices/platform_device.cpp
-        kernel/devices/utils.cpp
         kernel/vfio_device.cpp
         kernel/vfio_group.cpp
         kernel/vfio_container.cpp
diff --git a/common/lib/kernel/devices/generic_driver.cpp b/common/lib/kernel/devices/generic_driver.cpp
index 9e0de6d98..a79ac23b3 100644
--- a/common/lib/kernel/devices/generic_driver.cpp
+++ b/common/lib/kernel/devices/generic_driver.cpp
@@ -9,10 +9,10 @@
 #include <villas/kernel/devices/generic_driver.hpp>
 
 #include <villas/kernel/devices/device.hpp>
-#include <villas/kernel/devices/utils.hpp>
+#include <villas/utils.hpp>
 
 using villas::kernel::devices::Device, villas::kernel::devices::GenericDriver;
-using villas::kernel::devices::utils::write_to_file;
+using villas::utils::write_to_file;
 
 void GenericDriver::attach(const Device &device) const {
   if (device.driver().has_value()) {
diff --git a/common/lib/kernel/devices/platform_device.cpp b/common/lib/kernel/devices/platform_device.cpp
index 276c31eae..02ee71751 100644
--- a/common/lib/kernel/devices/platform_device.cpp
+++ b/common/lib/kernel/devices/platform_device.cpp
@@ -6,12 +6,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <villas/kernel/devices/platform_device.hpp>
 #include <villas/kernel/devices/generic_driver.hpp>
+#include <villas/kernel/devices/platform_device.hpp>
+#include <villas/utils.hpp>
 
 using villas::kernel::devices::Driver, villas::kernel::devices::GenericDriver;
 using villas::kernel::devices::PlatformDevice;
-using villas::kernel::devices::utils::write_to_file;
+using villas::utils::write_to_file;
 
 std::optional<std::unique_ptr<Driver>> PlatformDevice::driver() const {
   std::filesystem::path driver_symlink =
diff --git a/common/lib/kernel/devices/utils.cpp b/common/lib/kernel/devices/utils.cpp
deleted file mode 100644
index 16fb5e387..000000000
--- a/common/lib/kernel/devices/utils.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Utils
- *
- * Author: Pascal Bauer <pascal.bauer@rwth-aachen.de>
- *
- * SPDX-FileCopyrightText: 2023-2024 Pascal Bauer <pascal.bauer@rwth-aachen.de>
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <dirent.h>
-#include <filesystem>
-#include <fstream>
-#include <iostream>
-#include <villas/kernel/devices/utils.hpp>
-#include <villas/log.hpp>
-
-namespace utils = villas::kernel::devices::utils;
-
-void utils::write_to_file(std::string data, const std::filesystem::path file) {
-  villas::Log::get("Filewriter")->debug("{} > {}", data, file.u8string());
-  std::ofstream outputFile(file.u8string());
-
-  if (outputFile.is_open()) {
-    // Write to file
-    outputFile << data;
-    outputFile.close();
-  } else {
-    throw std::filesystem::filesystem_error("Cannot open outputfile",
-                                            std::error_code());
-  }
-}
-
-std::vector<std::string>
-utils::read_names_in_directory(const std::string &name) {
-  DIR *directory = opendir(name.c_str());
-
-  struct dirent *dp;
-  std::vector<std::string> names;
-  dp = readdir(directory);
-  while (dp != NULL) {
-    auto name = std::string(dp->d_name);
-    if (name != "." && name != "..") {
-      names.push_back(name);
-    }
-    dp = readdir(directory);
-  }
-  closedir(directory);
-  return names;
-}
\ No newline at end of file
diff --git a/common/lib/utils.cpp b/common/lib/utils.cpp
index 62ae139e3..4735435f8 100644
--- a/common/lib/utils.cpp
+++ b/common/lib/utils.cpp
@@ -360,6 +360,7 @@ void write_to_file(std::string data, const std::filesystem::path file) {
   std::ofstream outputFile(file.u8string());
 
   if (outputFile.is_open()) {
+    // Write to file
     outputFile << data;
     outputFile.close();
   } else {
@@ -368,12 +369,20 @@ void write_to_file(std::string data, const std::filesystem::path file) {
   }
 }
 
-std::vector<std::string>
-read_names_in_directory(const std::filesystem::path &directory) {
+std::vector<std::string> read_names_in_directory(const std::string &name) {
+  DIR *directory = opendir(name.c_str());
+
+  struct dirent *dp;
   std::vector<std::string> names;
-  for (auto const &dir_entry : std::filesystem::directory_iterator{directory}) {
-    names.push_back(dir_entry.path().filename());
+  dp = readdir(directory);
+  while (dp != NULL) {
+    auto name = std::string(dp->d_name);
+    if (name != "." && name != "..") {
+      names.push_back(name);
+    }
+    dp = readdir(directory);
   }
+  closedir(directory);
   return names;
 }