Util: moves util/io/io.h to util/io.h

CMakeLists.txt

@@ -469,6 +469,7 @@ set(LIBFASTFETCH_SRC
     src/modules/wm/wm.c
     src/modules/wmtheme/wmtheme.c
     src/modules/zpool/zpool.c
+    src/modules/modules.c
     src/options/display.c
     src/options/logo.c
     src/options/general.c
@@ -480,9 +481,8 @@ set(LIBFASTFETCH_SRC
     src/util/init.c
     src/util/jsonconfig.c
     src/util/library.c
-    src/util/modules.c
-    src/util/netif/netif.c
-    src/util/networking/networking_common.c
+    src/util/netif.c
+    src/util/networking_common.c
     src/util/option.c
     src/util/parsing.c
     src/util/percent.c
@@ -498,7 +498,7 @@ set(LIBFASTFETCH_SRC
     src/util/FFstrbuf.c
     src/util/kmod.c
     src/util/path.c
-    src/util/platform/FFPlatform.c
+    src/util/FFPlatform.c
     src/util/smbiosHelper.c
 )
 
@@ -579,11 +579,11 @@ if(LINUX)
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
         src/util/dbus.c
-        src/util/io/io_unix.c
-        src/util/netif/netif_linux.c
-        src/util/networking/networking_linux.c
+        src/util/io_unix.c
+        src/util/netif_linux.c
+        src/util/networking_linux.c
         src/util/processing_linux.c
-        src/util/platform/FFPlatform_unix.c
+        src/util/FFPlatform_unix.c
         src/util/binary_linux.c
     )
 elseif(ANDROID)
@@ -652,11 +652,11 @@ elseif(ANDROID)
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_android.c
         src/util/dbus.c
-        src/util/io/io_unix.c
-        src/util/netif/netif_linux.c
-        src/util/networking/networking_linux.c
+        src/util/io_unix.c
+        src/util/netif_linux.c
+        src/util/networking_linux.c
         src/util/processing_linux.c
-        src/util/platform/FFPlatform_unix.c
+        src/util/FFPlatform_unix.c
         src/util/binary_linux.c
     )
 elseif(FreeBSD)
@@ -733,12 +733,12 @@ elseif(FreeBSD)
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
         src/util/dbus.c
-        src/util/io/io_unix.c
-        src/util/netif/netif_bsd.c
-        src/util/networking/networking_linux.c
+        src/util/io_unix.c
+        src/util/netif_bsd.c
+        src/util/networking_linux.c
         src/util/processing_linux.c
         src/util/sysctl.c
-        src/util/platform/FFPlatform_unix.c
+        src/util/FFPlatform_unix.c
         src/util/binary_linux.c
     )
     if(DragonFly)
@@ -826,12 +826,12 @@ elseif(NetBSD)
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
         src/util/dbus.c
-        src/util/io/io_unix.c
-        src/util/netif/netif_bsd.c
-        src/util/networking/networking_linux.c
+        src/util/io_unix.c
+        src/util/netif_bsd.c
+        src/util/networking_linux.c
         src/util/processing_linux.c
         src/util/sysctl.c
-        src/util/platform/FFPlatform_unix.c
+        src/util/FFPlatform_unix.c
         src/util/binary_linux.c
     )
 elseif(OpenBSD)
@@ -908,12 +908,12 @@ elseif(OpenBSD)
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
         src/util/dbus.c
-        src/util/io/io_unix.c
-        src/util/netif/netif_bsd.c
-        src/util/networking/networking_linux.c
+        src/util/io_unix.c
+        src/util/netif_bsd.c
+        src/util/networking_linux.c
         src/util/processing_linux.c
         src/util/sysctl.c
-        src/util/platform/FFPlatform_unix.c
+        src/util/FFPlatform_unix.c
         src/util/binary_linux.c
         src/util/smbiosHelper.c
     )
@@ -977,15 +977,15 @@ elseif(APPLE)
         src/detection/de/de_nosupport.c
         src/detection/wmtheme/wmtheme_apple.m
         src/detection/camera/camera_apple.m
-        src/util/io/io_unix.c
-        src/util/netif/netif_apple.c
-        src/util/networking/networking_linux.c
+        src/util/io_unix.c
+        src/util/netif_apple.c
+        src/util/networking_linux.c
         src/util/processing_linux.c
         src/util/sysctl.c
         src/util/apple/cf_helpers.c
         src/util/apple/osascript.m
         src/util/apple/smc_temps.c
-        src/util/platform/FFPlatform_unix.c
+        src/util/FFPlatform_unix.c
         src/util/binary_apple.c
     )
 elseif(WIN32)
@@ -1047,9 +1047,9 @@ elseif(WIN32)
         src/detection/de/de_nosupport.c
         src/detection/wmtheme/wmtheme_windows.c
         src/detection/camera/camera_windows.cpp
-        src/util/io/io_windows.c
-        src/util/netif/netif_windows.c
-        src/util/networking/networking_windows.c
+        src/util/io_windows.c
+        src/util/netif_windows.c
+        src/util/networking_windows.c
         src/util/processing_windows.c
         src/util/windows/getline.c
         src/util/windows/com.cpp
@@ -1057,7 +1057,7 @@ elseif(WIN32)
         src/util/windows/unicode.c
         src/util/windows/wmi.cpp
         src/util/windows/version.c
-        src/util/platform/FFPlatform_windows.c
+        src/util/FFPlatform_windows.c
         src/util/binary_windows.c
         src/util/debug_windows.c
     )
@@ -1135,11 +1135,11 @@ elseif(SunOS)
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_nosupport.c
         src/util/dbus.c
-        src/util/io/io_unix.c
-        src/util/netif/netif_apple.c
-        src/util/networking/networking_linux.c
+        src/util/io_unix.c
+        src/util/netif_apple.c
+        src/util/networking_linux.c
         src/util/processing_linux.c
-        src/util/platform/FFPlatform_unix.c
+        src/util/FFPlatform_unix.c
         src/util/binary_linux.c
     )
 elseif(Haiku)
@@ -1203,11 +1203,11 @@ elseif(Haiku)
         src/detection/wmtheme/wmtheme_nosupport.c
         src/detection/camera/camera_nosupport.c
         src/util/dbus.c
-        src/util/io/io_unix.c
-        src/util/netif/netif_haiku.c
-        src/util/networking/networking_linux.c
+        src/util/io_unix.c
+        src/util/netif_haiku.c
+        src/util/networking_linux.c
         src/util/processing_linux.c
-        src/util/platform/FFPlatform_unix.c
+        src/util/FFPlatform_unix.c
         src/util/binary_linux.c
         src/util/haiku/version.cpp
     )
@@ -1282,11 +1282,11 @@ elseif(GNU)
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_nosupport.c
         src/util/dbus.c
-        src/util/io/io_unix.c
-        src/util/netif/netif_gnu.c
-        src/util/networking/networking_linux.c
+        src/util/io_unix.c
+        src/util/netif_gnu.c
+        src/util/networking_linux.c
         src/util/processing_linux.c
-        src/util/platform/FFPlatform_unix.c
+        src/util/FFPlatform_unix.c
         src/util/binary_linux.c
    )
 endif()

src/detection/battery/battery_bsd.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "util/sysctl.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "battery.h"
 
 #include <dev/acpica/acpiio.h>

src/detection/battery/battery_haiku.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "battery.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <private/device/power_managment.h>
 #include <sys/ioctl.h>

src/detection/battery/battery_linux.c

@@ -1,5 +1,5 @@
 #include "battery.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/stringUtils.h"
 
 #include <dirent.h>

src/detection/battery/battery_nbsd.c

@@ -1,5 +1,5 @@
 #include "battery.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/FFstrbuf.h"
 #include "util/stringUtils.h"
 

src/detection/battery/battery_obsd.c

@@ -1,5 +1,5 @@
 #include "battery.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <machine/apmvar.h>
 #include <sys/ioctl.h>

src/detection/battery/battery_windows.c

@@ -1,6 +1,6 @@
 #include "battery.h"
 
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/windows/nt.h"
 #include "util/windows/unicode.h"
 #include "util/mallocHelper.h"

src/detection/bios/bios_bsd.c

@@ -2,7 +2,7 @@
 
 #include "util/settings.h"
 #include "util/sysctl.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/smbiosHelper.h"
 
 const char* ffDetectBios(FFBiosResult* result)

src/detection/bios/bios_linux.c

@@ -1,5 +1,5 @@
 #include "bios.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/smbiosHelper.h"
 
 #include <stdlib.h>

src/detection/bios/bios_windows.c

@@ -28,7 +28,7 @@ typedef struct _SYSTEM_BOOT_ENVIRONMENT_INFORMATION
     };
 } SYSTEM_BOOT_ENVIRONMENT_INFORMATION;
 #elif __OpenBSD__
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <fcntl.h>
 #include <unistd.h>

src/detection/bluetooth/bluetooth_haiku.cpp

@@ -1,6 +1,6 @@
 extern "C" {
 #include "bluetooth.h"
-#include "util/io/io.h"
+#include "util/io.h"
 }
 
 #include <bluetooth/LocalDevice.h>

src/detection/bluetooth/bluetooth_linux.c

@@ -3,7 +3,7 @@
 
 #ifdef FF_HAVE_DBUS
 #include "util/dbus.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 /* Example dbus reply, striped to only the relevant parts:
 array [                                                     //root

src/detection/bluetoothradio/bluetoothradio_linux.c

@@ -3,7 +3,7 @@
 
 #ifdef FF_HAVE_DBUS
 #include "util/dbus.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 /* Example dbus reply:
 array [

src/detection/bluetoothradio/bluetoothradio_windows.c

@@ -1,6 +1,6 @@
 #include "bluetoothradio.h"
 #include "util/library.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/windows/unicode.h"
 
 #include <windows.h>

src/detection/board/board_linux.c

@@ -1,5 +1,5 @@
 #include "board.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/smbiosHelper.h"
 
 #include <stdlib.h>

src/detection/bootmgr/bootmgr_apple.c

@@ -1,5 +1,5 @@
 #include "bootmgr.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/apple/cf_helpers.h"
 
 #include <IOKit/IOKitLib.h>

src/detection/bootmgr/bootmgr_bsd.c

@@ -1,6 +1,6 @@
 #include "bootmgr.h"
 #include "efi_helper.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #ifdef __OpenBSD__
     #include <dev/efi/efiio.h>

src/detection/bootmgr/bootmgr_linux.c

@@ -1,5 +1,5 @@
 #include "bootmgr.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "efi_helper.h"
 
 #define FF_EFIVARS_PATH_PREFIX "/sys/firmware/efi/efivars/"

src/detection/bootmgr/bootmgr_windows.c

@@ -1,6 +1,6 @@
 #include "bootmgr.h"
 #include "efi_helper.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <windows.h>
 

src/detection/brightness/brightness_bsd.c

@@ -2,7 +2,7 @@
 
 #if __has_include(<sys/backlight.h>)
 
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <sys/backlight.h>
 #include <sys/ioctl.h>

src/detection/brightness/brightness_linux.c

@@ -1,5 +1,5 @@
 #include "brightness.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/edidHelper.h"
 #include "util/stringUtils.h"
 

src/detection/brightness/brightness_obsd.c

@@ -1,5 +1,5 @@
 #include "brightness.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <dev/wscons/wsconsio.h>
 #include <sys/ioctl.h>

src/detection/btrfs/btrfs_linux.c

@@ -1,6 +1,6 @@
 #include "btrfs.h"
 
-#include "util/io/io.h"
+#include "util/io.h"
 #include <fcntl.h>
 
 enum { uuidLen = (uint32_t) __builtin_strlen("00000000-0000-0000-0000-000000000000") };

src/detection/camera/camera_apple.m

@@ -1,5 +1,5 @@
 #include "camera.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #import <AVFoundation/AVCaptureDevice.h>
 

src/detection/camera/camera_linux.c

@@ -1,5 +1,5 @@
 #include "camera.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <unistd.h>
 #include <fcntl.h>

src/detection/chassis/chassis_linux.c

@@ -1,5 +1,5 @@
 #include "chassis.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/smbiosHelper.h"
 
 #include <stdlib.h>

src/detection/cpu/cpu.c

@@ -130,7 +130,7 @@ void ffCPUDetectByCpuid(FFCPUResult* cpu)
 // Worth noting: Apple M1 is marked as ARMv8.5-A on Wikipedia, but it lacks BTI (mandatory in v8.5)
 
 #ifdef __linux__
-#include "util/io/io.h"
+#include "util/io.h"
 #include <elf.h>
 // #include <asm/hwcap.h>
 

src/detection/cpu/cpu_linux.c

@@ -1,5 +1,5 @@
 #include "cpu.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/processing.h"
 #include "util/properties.h"
 #include "util/mallocHelper.h"

src/detection/cpu/cpu_nbsd.c

@@ -1,6 +1,6 @@
 #include "cpu.h"
 #include "util/sysctl.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <sys/envsys.h>
 #include <prop/proplib.h>

src/detection/cpucache/cpucache_linux.c

@@ -1,5 +1,5 @@
 #include "cpucache.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/stringUtils.h"
 
 static const char* parseCpuCacheIndex(FFstrbuf* path, FFCPUCacheResult* result, FFstrbuf* buffer, FFstrbuf* added)

src/detection/cpuusage/cpuusage_linux.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "detection/cpuusage/cpuusage.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <stdio.h>
 #include <inttypes.h>

src/detection/de/de_linux.c

@@ -1,7 +1,7 @@
 #include "de.h"
 
 #include "util/dbus.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/library.h"
 #include "util/parsing.h"
 #include "util/properties.h"

src/detection/disk/disk_linux.c

@@ -1,6 +1,6 @@
 #include "disk.h"
 
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/stringUtils.h"
 
 #include <limits.h>

src/detection/disk/disk_sunos.c

@@ -1,5 +1,5 @@
 #include "disk.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/stringUtils.h"
 
 #include <sys/mntent.h>

src/detection/disk/disk_windows.c

@@ -1,5 +1,5 @@
 #include "disk.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/thread.h"
 #include "util/windows/unicode.h"
 

src/detection/diskio/diskio_linux.c

@@ -1,5 +1,5 @@
 #include "diskio.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/properties.h"
 #include "util/stringUtils.h"
 

src/detection/diskio/diskio_windows.c

@@ -1,5 +1,5 @@
 #include "diskio.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/windows/unicode.h"
 
 #include <windows.h>

src/detection/displayserver/linux/displayserver_linux.c

@@ -1,5 +1,5 @@
 #include "displayserver_linux.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/stringUtils.h"
 
 #ifdef __FreeBSD__

src/detection/displayserver/linux/drm.c

@@ -1,5 +1,5 @@
 #include "displayserver_linux.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/edidHelper.h"
 #include "util/stringUtils.h"
 

src/detection/displayserver/linux/wayland/wayland.c

@@ -1,5 +1,5 @@
 #include "../displayserver_linux.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/edidHelper.h"
 #include "util/stringUtils.h"
 

src/detection/displayserver/linux/wmde.c

@@ -1,5 +1,5 @@
 #include "displayserver_linux.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/properties.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"

src/detection/dns/dns_apple.c

@@ -1,6 +1,6 @@
 #include "detection/dns/dns.h"
 
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"
 #include "util/apple/cf_helpers.h"

src/detection/dns/dns_linux.c

@@ -1,6 +1,6 @@
 #include "detection/dns/dns.h"
 
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"
 #include "util/debug.h"

src/detection/dns/dns_windows.c

@@ -1,5 +1,5 @@
 #include "detection/dns/dns.h"
-#include "util/netif/netif.h"
+#include "util/netif.h"
 #include "util/mallocHelper.h"
 
 #include <ws2tcpip.h>

src/detection/font/font_apple.m

@@ -1,5 +1,5 @@
 #include "util/font.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "font.h"
 
 #import <AppKit/NSFont.h>

src/detection/gamepad/gamepad_bsd.c

@@ -1,5 +1,5 @@
 #include "gamepad.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <stdio.h>
 #include <fcntl.h>

src/detection/gamepad/gamepad_linux.c

@@ -1,5 +1,5 @@
 #include "gamepad.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/stringUtils.h"
 
 static void detectGamepad(FFlist* devices, FFstrbuf* name, FFstrbuf* path)

src/detection/gamepad/gamepad_windows.c

@@ -1,5 +1,5 @@
 #include "gamepad.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/mallocHelper.h"
 #include "util/windows/unicode.h"
 

src/detection/gpu/gpu_android.c

@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/stringUtils.h"
 
 #include <fcntl.h>

src/detection/gpu/gpu_bsd.c

@@ -1,6 +1,6 @@
 #include "gpu_driver_specific.h"
 
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/mallocHelper.h"
 
 #include <sys/pciio.h>

src/detection/gpu/gpu_drm.c

@@ -5,7 +5,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/library.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"

src/detection/gpu/gpu_general.c

@@ -2,7 +2,7 @@
 
 #ifdef FF_HAVE_PCIACCESS
 
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/library.h"
 
 #include <pciaccess.h>

src/detection/gpu/gpu_haiku.c

@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <private/drivers/poke.h>
 

src/detection/gpu/gpu_linux.c

@@ -2,7 +2,7 @@
 #include "detection/vulkan/vulkan.h"
 #include "detection/cpu/cpu.h"
 #include "detection/gpu/gpu_driver_specific.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/library.h"
 #include "util/FFstrbuf.h"
 #include "util/stringUtils.h"

src/detection/gpu/gpu_nbsd.c

@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <sys/param.h>
 #include <sys/ioctl.h>

src/detection/gpu/gpu_obsd.c

@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <sys/param.h>
 #include <sys/ioctl.h>

src/detection/gpu/gpu_pci.c

@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/properties.h"
 
 #include <stdlib.h>

src/detection/host/host_linux.c

@@ -1,5 +1,5 @@
 #include "host.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/processing.h"
 #include "util/smbiosHelper.h"
 

src/detection/initsystem/initsystem_haiku.c

@@ -1,7 +1,7 @@
 #include "initsystem.h"
 #include "util/stringUtils.h"
 #include "util/haiku/version.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <OS.h>
 #include <unistd.h>

src/detection/keyboard/keyboard_bsd.c

@@ -1,5 +1,5 @@
 #include "keyboard.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <stdio.h>
 #include <fcntl.h>

src/detection/keyboard/keyboard_linux.c

@@ -1,5 +1,5 @@
 #include "keyboard.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/stringUtils.h"
 
 const char* ffDetectKeyboard(FFlist* devices /* List of FFKeyboardDevice */)

src/detection/keyboard/keyboard_windows.c

@@ -1,7 +1,7 @@
 #define INITGUID
 
 #include "keyboard.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/mallocHelper.h"
 #include "util/windows/unicode.h"
 

src/detection/loadavg/loadavg_linux.c

@@ -1,5 +1,5 @@
 #include "detection/loadavg/loadavg.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <sys/sysinfo.h>
 

src/detection/localip/localip_linux.c

@@ -1,6 +1,6 @@
 #include "localip.h"
-#include "util/io/io.h"
-#include "util/netif/netif.h"
+#include "util/io.h"
+#include "util/netif.h"
 #include "util/stringUtils.h"
 #include "util/debug.h"
 

src/detection/localip/localip_windows.c

@@ -1,7 +1,7 @@
 #include <ws2tcpip.h>
 #include <iphlpapi.h>
 
-#include "util/netif/netif.h"
+#include "util/netif.h"
 #include "util/mallocHelper.h"
 #include "util/windows/unicode.h"
 #include "util/debug.h"

src/detection/media/media.c

@@ -1,5 +1,5 @@
 #include "media.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 void ffDetectMediaImpl(FFMediaResult* media, bool saveCover);
 

src/detection/media/media_linux.c

@@ -1,5 +1,5 @@
 #include "fastfetch.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/stringUtils.h"
 #include "detection/media/media.h"
 

src/detection/memory/memory_linux.c

@@ -1,5 +1,5 @@
 #include "memory.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/mallocHelper.h"
 
 #include <inttypes.h>

src/detection/mouse/mouse_bsd.c

@@ -1,5 +1,5 @@
 #include "mouse.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <stdio.h>
 #include <fcntl.h>

src/detection/mouse/mouse_linux.c

@@ -1,5 +1,5 @@
 #include "mouse.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/stringUtils.h"
 
 const char* ffDetectMouse(FFlist* devices /* List of FFMouseDevice */)

src/detection/mouse/mouse_windows.c

@@ -1,7 +1,7 @@
 #define INITGUID
 
 #include "mouse.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/mallocHelper.h"
 #include "util/windows/unicode.h"
 

src/detection/netio/netio_apple.c

@@ -1,6 +1,6 @@
 #include "netio.h"
 
-#include "util/netif/netif.h"
+#include "util/netif.h"
 #include "util/mallocHelper.h"
 
 #include <net/if.h>

src/detection/netio/netio_bsd.c

@@ -1,6 +1,6 @@
 #include "netio.h"
 
-#include "util/netif/netif.h"
+#include "util/netif.h"
 #include "util/mallocHelper.h"
 
 #include <net/if.h>

src/detection/netio/netio_haiku.cpp

@@ -1,6 +1,6 @@
 extern "C" {
 #include "netio.h"
-#include "util/netif/netif.h"
+#include "util/netif.h"
 }
 
 #include <NetworkInterface.h>

src/detection/netio/netio_linux.c

@@ -1,7 +1,7 @@
 #include "netio.h"
 
-#include "util/io/io.h"
-#include "util/netif/netif.h"
+#include "util/io.h"
+#include "util/netif.h"
 #include "util/stringUtils.h"
 
 #include <fcntl.h>

src/detection/netio/netio_sunos.c

@@ -1,5 +1,5 @@
 #include "netio.h"
-#include "util/netif/netif.h"
+#include "util/netif.h"
 #include "util/stringUtils.h"
 
 #include <kstat.h>

src/detection/netio/netio_windows.c

@@ -1,6 +1,6 @@
 #include "netio.h"
 
-#include "util/netif/netif.h"
+#include "util/netif.h"
 #include "util/mallocHelper.h"
 #include "util/windows/unicode.h"
 

src/detection/opengl/opengl_haiku.cpp

@@ -2,7 +2,7 @@
 
 extern "C" {
 #include "opengl.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #if FF_HAVE_EGL
 const char* ffOpenGLDetectByEGL(FFOpenGLResult* result);
 #endif

src/detection/opengl/opengl_linux.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "opengl.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <string.h>
 

src/detection/opengl/opengl_shared.c

@@ -25,7 +25,7 @@ void ffOpenGLHandleResult(FFOpenGLResult* result, __typeof__(&glGetString) ffglG
 }
 
 #if defined(FF_HAVE_EGL) || __has_include(<EGL/egl.h>)
-#include "util/io/io.h"
+#include "util/io.h"
 
 #define EGL_EGL_PROTOTYPES 1
 #define EGL_EGLEXT_PROTOTYPES 1

src/detection/os/os_apple.m

@@ -1,5 +1,5 @@
 #include "os.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/sysctl.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"

src/detection/os/os_linux.c

@@ -1,7 +1,7 @@
 #include "os.h"
 #include "util/properties.h"
 #include "util/parsing.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/processing.h"
 #include "util/stringUtils.h"
 

src/detection/os/os_sunos.c

@@ -1,5 +1,5 @@
 #include "os.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 void ffDetectOSImpl(FFOSResult* os)
 {

src/detection/packages/packages.c

@@ -1,5 +1,5 @@
 #include "packages.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <inttypes.h>
 #include <stddef.h>

src/detection/packages/packages_apple.c

@@ -1,5 +1,5 @@
 #include "packages.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/parsing.h"
 #include "util/processing.h"
 #include "util/stringUtils.h"

src/detection/packages/packages_haiku.c

@@ -1,6 +1,6 @@
 #include "packages.h"
 
-#include "util/io/io.h"
+#include "util/io.h"
 
 void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options)
 {

src/detection/packages/packages_linux.c

@@ -1,5 +1,5 @@
 #include "packages.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/parsing.h"
 #include "util/properties.h"
 #include "util/settings.h"

src/detection/packages/packages_nbsd.c

@@ -1,6 +1,6 @@
 #include "packages.h"
 
-#include "util/io/io.h"
+#include "util/io.h"
 
 void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options)
 {

src/detection/packages/packages_nix.c

@@ -1,5 +1,5 @@
 #include "packages.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/processing.h"
 #include "util/stringUtils.h"
 

src/detection/packages/packages_obsd.c

@@ -1,6 +1,6 @@
 #include "packages.h"
 
-#include "util/io/io.h"
+#include "util/io.h"
 
 void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options)
 {

src/detection/packages/packages_windows.c

@@ -4,7 +4,7 @@
 #include "util/path.h"
 #include "util/windows/unicode.h"
 #include "util/mallocHelper.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <windows.h>
 #include "util/windows/nt.h"

src/detection/physicaldisk/physicaldisk_haiku.c

@@ -1,6 +1,6 @@
 #include "physicaldisk.h"
 
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/stringUtils.h"
 
 #include <OS.h>

src/detection/physicaldisk/physicaldisk_linux.c

@@ -1,5 +1,5 @@
 #include "physicaldisk.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/properties.h"
 #include "util/stringUtils.h"
 

src/detection/physicaldisk/physicaldisk_windows.c

@@ -1,5 +1,5 @@
 #include "physicaldisk.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/windows/unicode.h"
 
 #include <windows.h>

src/detection/poweradapter/poweradapter_linux.c

@@ -1,5 +1,5 @@
 #include "poweradapter.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/stringUtils.h"
 
 #include <dirent.h>

src/detection/processes/processes_linux.c

@@ -1,6 +1,6 @@
 #include "processes.h"
 
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/stringUtils.h"
 
 const char* ffDetectProcesses(uint32_t* result)

src/detection/publicip/publicip.c

@@ -1,5 +1,5 @@
 #include "publicip.h"
-#include "util/networking/networking.h"
+#include "util/networking.h"
 
 #define FF_UNITIALIZED ((const char*)(uintptr_t) -1)
 static FFNetworkingState states[2];

src/detection/sound/sound_bsd.c

@@ -1,5 +1,5 @@
 #include "sound.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/sysctl.h"
 
 #include <fcntl.h>

src/detection/sound/sound_nbsd.c

@@ -1,5 +1,5 @@
 #include "sound.h"
-#include "util/io/io.h"
+#include "util/io.h"
 
 #include <fcntl.h>
 #include <stdint.h>

src/detection/sound/sound_sunos.c

@@ -1,5 +1,5 @@
 #include "sound.h"
-#include "util/io/io.h"
+#include "util/io.h"
 #include "util/stringUtils.h"
 
 #include <fcntl.h>