Chore: merges common/* into util/*

src/modules/battery/battery.c

@@ -1,11 +1,11 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/percent.h"
-#include "common/duration.h"
-#include "common/temps.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/percent.h"
+#include "util/duration.h"
+#include "util/temps.h"
+#include "util/stringUtils.h"
 #include "detection/battery/battery.h"
 #include "modules/battery/battery.h"
-#include "util/stringUtils.h"
 
 static void printBattery(FFBatteryOptions* options, FFBatteryResult* result, uint8_t index)
 {

src/modules/battery/option.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFBatteryOptions
 {

src/modules/bios/bios.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/bios/bios.h"
 #include "modules/bios/bios.h"
-#include "util/stringUtils.h"
 
 bool ffPrintBios(FFBiosOptions* options)
 {

src/modules/bios/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFBiosOptions
 {

src/modules/bluetooth/bluetooth.c

@@ -1,9 +1,9 @@
-#include "common/percent.h"
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/bluetooth/bluetooth.h"
 #include "modules/bluetooth/bluetooth.h"
-#include "util/stringUtils.h"
 
 static void printDevice(FFBluetoothOptions* options, const FFBluetoothResult* device, uint8_t index)
 {

src/modules/bluetooth/option.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFBluetoothOptions
 {

src/modules/bluetoothradio/bluetoothradio.c

@@ -1,9 +1,9 @@
-#include "common/percent.h"
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/bluetoothradio/bluetoothradio.h"
 #include "modules/bluetoothradio/bluetoothradio.h"
-#include "util/stringUtils.h"
 
 #define FF_BLUETOOTHRADIO_DISPLAY_NAME "Bluetooth Radio"
 

src/modules/bluetoothradio/option.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFBluetoothRadioOptions
 {

src/modules/board/board.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/board/board.h"
 #include "modules/board/board.h"
-#include "util/stringUtils.h"
 
 bool ffPrintBoard(FFBoardOptions* options)
 {

src/modules/board/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFBoardOptions
 {

src/modules/bootmgr/bootmgr.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/bootmgr/bootmgr.h"
 #include "modules/bootmgr/bootmgr.h"
-#include "util/stringUtils.h"
 
 bool ffPrintBootmgr(FFBootmgrOptions* options)
 {

src/modules/bootmgr/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFBootmgrOptions
 {

src/modules/break/break.c

@@ -1,4 +1,4 @@
-#include "common/printing.h"
+#include "util/printing.h"
 #include "logo/logo.h"
 #include "modules/break/break.h"
 

src/modules/break/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFBreakOptions
 {

src/modules/brightness/brightness.c

@@ -1,9 +1,9 @@
-#include "common/percent.h"
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/brightness/brightness.h"
 #include "modules/brightness/brightness.h"
-#include "util/stringUtils.h"
 
 bool ffPrintBrightness(FFBrightnessOptions* options)
 {

src/modules/brightness/option.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFBrightnessOptions
 {

src/modules/btrfs/btrfs.c

@@ -1,10 +1,10 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/percent.h"
-#include "common/size.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/percent.h"
+#include "util/size.h"
+#include "util/stringUtils.h"
 #include "detection/btrfs/btrfs.h"
 #include "modules/btrfs/btrfs.h"
-#include "util/stringUtils.h"
 
 static void printBtrfs(FFBtrfsOptions* options, FFBtrfsResult* result, uint8_t index)
 {

src/modules/btrfs/option.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFBtrfsOptions
 {

src/modules/camera/camera.c

@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/libc/libc.h"
 #include "detection/camera/camera.h"
 #include "modules/camera/camera.h"
-#include "util/stringUtils.h"
 
 static void printDevice(FFCameraOptions* options, const FFCameraResult* device, uint8_t index)
 {

src/modules/camera/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFCameraOptions
 {

src/modules/chassis/chassis.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/chassis/chassis.h"
 #include "modules/chassis/chassis.h"
-#include "util/stringUtils.h"
 
 bool ffPrintChassis(FFChassisOptions* options)
 {

src/modules/chassis/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFChassisOptions
 {

src/modules/colors/colors.c

@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "logo/logo.h"
-#include "modules/colors/colors.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
 #include "util/textModifier.h"
 #include "util/stringUtils.h"
+#include "logo/logo.h"
+#include "modules/colors/colors.h"
 
 static inline uint8_t min(uint8_t a, uint8_t b)
 {

src/modules/colors/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef enum __attribute__((__packed__)) FFColorsSymbol
 {

src/modules/command/command.c

@@ -1,5 +1,5 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
 #include "modules/command/command.h"
 #include "detection/command/command.h"
 

src/modules/command/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFCommandOptions
 {

src/modules/cpu/cpu.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/parsing.h"
-#include "common/temps.h"
-#include "common/frequency.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/parsing.h"
+#include "util/temps.h"
+#include "util/frequency.h"
 #include "detection/cpu/cpu.h"
 #include "modules/cpu/cpu.h"
 

src/modules/cpu/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFCPUOptions
 {

src/modules/cpucache/cpucache.c

@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/size.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/size.h"
+#include "util/stringUtils.h"
 #include "detection/cpucache/cpucache.h"
 #include "modules/cpucache/cpucache.h"
-#include "util/stringUtils.h"
 
 #define FF_CPUCACHE_DISPLAY_NAME "CPU Cache"
 

src/modules/cpucache/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFCPUCacheOptions
 {

src/modules/cpuusage/cpuusage.c

@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/percent.h"
+#include "util/stringUtils.h"
 #include "detection/cpuusage/cpuusage.h"
 #include "modules/cpuusage/cpuusage.h"
-#include "util/stringUtils.h"
 
 #define FF_CPUUSAGE_DISPLAY_NAME "CPU Usage"
 

src/modules/cpuusage/option.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFCPUUsageOptions
 {

src/modules/cursor/cursor.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/cursor/cursor.h"
 #include "modules/cursor/cursor.h"
-#include "util/stringUtils.h"
 
 bool ffPrintCursor(FFCursorOptions* options)
 {

src/modules/cursor/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFCursorOptions
 {

src/modules/custom/custom.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "modules/custom/custom.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
 #include "util/textModifier.h"
 #include "util/stringUtils.h"
+#include "modules/custom/custom.h"
 
 bool ffPrintCustom(FFCustomOptions* options)
 {

src/modules/custom/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFCustomOptions
 {

src/modules/datetime/datetime.c

@@ -1,8 +1,8 @@
-#include "common/time.h"
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "modules/datetime/datetime.h"
+#include "util/time.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
 #include "util/stringUtils.h"
+#include "modules/datetime/datetime.h"
 
 #include <time.h>
 

src/modules/datetime/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFDateTimeOptions
 {

src/modules/de/de.c

@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/displayserver/displayserver.h"
 #include "detection/de/de.h"
 #include "modules/de/de.h"
-#include "util/stringUtils.h"
 
 bool ffPrintDE(FFDEOptions* options)
 {

src/modules/de/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFDEOptions
 {

src/modules/disk/disk.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/percent.h"
-#include "common/size.h"
-#include "common/time.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/percent.h"
+#include "util/size.h"
+#include "util/time.h"
 #include "detection/disk/disk.h"
 #include "modules/disk/disk.h"
 

src/modules/disk/option.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef enum __attribute__((__packed__)) FFDiskVolumeType
 {

src/modules/diskio/diskio.c

@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/size.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/size.h"
+#include "util/stringUtils.h"
 #include "detection/diskio/diskio.h"
 #include "modules/diskio/diskio.h"
-#include "util/stringUtils.h"
 
 #define FF_DISKIO_DISPLAY_NAME "Disk IO"
 

src/modules/diskio/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFDiskIOOptions
 {

src/modules/display/display.c

@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/size.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/size.h"
+#include "util/stringUtils.h"
 #include "detection/displayserver/displayserver.h"
 #include "modules/display/display.h"
-#include "util/stringUtils.h"
 
 #include <math.h>
 

src/modules/display/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef enum __attribute__((__packed__)) FFDisplayCompactType
 {

src/modules/dns/dns.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/dns/dns.h"
 #include "modules/dns/dns.h"
-#include "util/stringUtils.h"
 
 bool ffPrintDNS(FFDNSOptions* options)
 {

src/modules/dns/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef enum __attribute__((__packed__)) FFDNSShowType {
     FF_DNS_TYPE_IPV4_BIT = 1,

src/modules/editor/editor.c

@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/libc/libc.h"
 #include "detection/editor/editor.h"
 #include "modules/editor/editor.h"
-#include "util/stringUtils.h"
 
 bool ffPrintEditor(FFEditorOptions* options)
 {

src/modules/editor/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFEditorOptions
 {

src/modules/font/font.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/font/font.h"
 #include "modules/font/font.h"
-#include "util/stringUtils.h"
 
 bool ffPrintFont(FFFontOptions* options)
 {

src/modules/font/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFFontOptions
 {

src/modules/gamepad/gamepad.c

@@ -1,9 +1,9 @@
-#include "common/percent.h"
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/gamepad/gamepad.h"
 #include "modules/gamepad/gamepad.h"
-#include "util/stringUtils.h"
 
 static void printDevice(FFGamepadOptions* options, const FFGamepadDevice* device, uint8_t index)
 {

src/modules/gamepad/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 #include "util/FFlist.h"
 
 typedef struct FFGamepadOptions

src/modules/gpu/gpu.c

@@ -1,13 +1,13 @@
-#include "common/percent.h"
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/temps.h"
-#include "common/size.h"
-#include "common/frequency.h"
+#include "util/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/temps.h"
+#include "util/size.h"
+#include "util/frequency.h"
+#include "util/stringUtils.h"
 #include "detection/host/host.h"
 #include "detection/gpu/gpu.h"
 #include "modules/gpu/gpu.h"
-#include "util/stringUtils.h"
 
 #include <stdlib.h>
 

src/modules/gpu/option.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef enum __attribute__((__packed__)) FFGPUType
 {

src/modules/host/host.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/host/host.h"
 #include "modules/host/host.h"
-#include "util/stringUtils.h"
 
 bool ffPrintHost(FFHostOptions* options)
 {

src/modules/host/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFHostOptions
 {

src/modules/icons/icons.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/icons/icons.h"
 #include "modules/icons/icons.h"
-#include "util/stringUtils.h"
 
 bool ffPrintIcons(FFIconsOptions* options)
 {

src/modules/icons/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFIconsOptions
 {

src/modules/initsystem/initsystem.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/initsystem/initsystem.h"
 #include "modules/initsystem/initsystem.h"
-#include "util/stringUtils.h"
 
 #define FF_INITSYSTEM_DISPLAY_NAME "Init System"
 

src/modules/initsystem/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFInitSystemOptions
 {

src/modules/kernel/kernel.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/size.h"
-#include "modules/kernel/kernel.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/size.h"
 #include "util/stringUtils.h"
+#include "modules/kernel/kernel.h"
 
 bool ffPrintKernel(FFKernelOptions* options)
 {

src/modules/kernel/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFKernelOptions
 {

src/modules/keyboard/keyboard.c

@@ -1,9 +1,9 @@
-#include "common/percent.h"
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/keyboard/keyboard.h"
 #include "modules/keyboard/keyboard.h"
-#include "util/stringUtils.h"
 
 static void printDevice(FFKeyboardOptions* options, const FFKeyboardDevice* device, uint8_t index)
 {

src/modules/keyboard/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 #include "util/FFlist.h"
 
 typedef struct FFKeyboardOptions

src/modules/lm/lm.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/lm/lm.h"
 #include "modules/lm/lm.h"
-#include "util/stringUtils.h"
 
 bool ffPrintLM(FFLMOptions* options)
 {

src/modules/lm/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFLMOptions
 {

src/modules/loadavg/loadavg.c

@@ -1,10 +1,10 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/percent.h"
+#include "util/stringUtils.h"
 #include "detection/loadavg/loadavg.h"
 #include "detection/cpu/cpu.h"
 #include "modules/loadavg/loadavg.h"
-#include "util/stringUtils.h"
 
 bool ffPrintLoadavg(FFLoadavgOptions* options)
 {

src/modules/loadavg/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFLoadavgOptions
 {

src/modules/locale/locale.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/locale/locale.h"
 #include "modules/locale/locale.h"
-#include "util/stringUtils.h"
 
 bool ffPrintLocale(FFLocaleOptions* options)
 {

src/modules/locale/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFLocaleOptions
 {

src/modules/localip/localip.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/localip/localip.h"
 #include "modules/localip/localip.h"
-#include "util/stringUtils.h"
 
 #define FF_LOCALIP_DISPLAY_NAME "Local IP"
 #pragma GCC diagnostic ignored "-Wsign-conversion"

src/modules/localip/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef enum __attribute__((__packed__)) FFLocalIpType
 {

src/modules/media/media.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/media/media.h"
 #include "modules/media/media.h"
-#include "util/stringUtils.h"
 
 #include <ctype.h>
 

src/modules/media/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFMediaOptions
 {

src/modules/memory/memory.c

@@ -1,10 +1,10 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/percent.h"
-#include "common/size.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/percent.h"
+#include "util/size.h"
+#include "util/stringUtils.h"
 #include "detection/memory/memory.h"
 #include "modules/memory/memory.h"
-#include "util/stringUtils.h"
 
 bool ffPrintMemory(FFMemoryOptions* options)
 {

src/modules/memory/option.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFMemoryOptions
 {

src/modules/monitor/monitor.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/displayserver/displayserver.h"
 #include "modules/monitor/monitor.h"
-#include "util/stringUtils.h"
 
 #include <math.h>
 

src/modules/monitor/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFMonitorOptions
 {

src/modules/mouse/mouse.c

@@ -1,9 +1,9 @@
-#include "common/percent.h"
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/mouse/mouse.h"
 #include "modules/mouse/mouse.h"
-#include "util/stringUtils.h"
 
 static void printDevice(FFMouseOptions* options, const FFMouseDevice* device, uint8_t index)
 {

src/modules/mouse/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 #include "util/FFlist.h"
 
 typedef struct FFMouseOptions

src/modules/netio/netio.c

@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/size.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/size.h"
+#include "util/stringUtils.h"
 #include "detection/netio/netio.h"
 #include "modules/netio/netio.h"
-#include "util/stringUtils.h"
 
 #define FF_NETIO_DISPLAY_NAME "Network IO"
 

src/modules/netio/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFNetIOOptions
 {

src/modules/opencl/opencl.c

@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/opencl/opencl.h"
 #include "detection/gpu/gpu.h"
 #include "modules/opencl/opencl.h"
-#include "util/stringUtils.h"
 
 bool ffPrintOpenCL(FFOpenCLOptions* options)
 {

src/modules/opencl/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFOpenCLOptions
 {

src/modules/opengl/opengl.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/opengl/opengl.h"
 #include "modules/opengl/opengl.h"
-#include "util/stringUtils.h"
 
 bool ffPrintOpenGL(FFOpenGLOptions* options)
 {

src/modules/opengl/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef enum __attribute__((__packed__)) FFOpenGLLibrary
 {

src/modules/os/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFOSOptions
 {

src/modules/os/os.c

@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/option.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/option.h"
+#include "util/stringUtils.h"
 #include "detection/os/os.h"
 #include "modules/os/os.h"
-#include "util/stringUtils.h"
 
 #include <ctype.h>
 

src/modules/packages/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef enum __attribute__((__packed__)) FFPackagesFlags
 {

src/modules/packages/packages.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/packages/packages.h"
 #include "modules/packages/packages.h"
-#include "util/stringUtils.h"
 
 bool ffPrintPackages(FFPackagesOptions* options)
 {

src/modules/physicaldisk/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFPhysicalDiskOptions
 {

src/modules/physicaldisk/physicaldisk.c

@@ -1,10 +1,10 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/temps.h"
-#include "common/size.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/temps.h"
+#include "util/size.h"
+#include "util/stringUtils.h"
 #include "detection/physicaldisk/physicaldisk.h"
 #include "modules/physicaldisk/physicaldisk.h"
-#include "util/stringUtils.h"
 
 #define FF_PHYSICALDISK_DISPLAY_NAME "Physical Disk"
 

src/modules/physicalmemory/option.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFPhysicalMemoryOptions
 {

src/modules/physicalmemory/physicalmemory.c

@@ -1,10 +1,10 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/percent.h"
-#include "common/size.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/percent.h"
+#include "util/size.h"
+#include "util/stringUtils.h"
 #include "detection/physicalmemory/physicalmemory.h"
 #include "modules/physicalmemory/physicalmemory.h"
-#include "util/stringUtils.h"
 
 #define FF_PHYSICALMEMORY_DISPLAY_NAME "Physical Memory"
 

src/modules/player/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFPlayerOptions
 {

src/modules/player/player.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/media/media.h"
 #include "modules/player/player.h"
-#include "util/stringUtils.h"
 
 #include <ctype.h>
 

src/modules/poweradapter/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFPowerAdapterOptions
 {

src/modules/poweradapter/poweradapter.c

@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/poweradapter/poweradapter.h"
 #include "modules/poweradapter/poweradapter.h"
-#include "util/stringUtils.h"
 
 #define FF_POWERADAPTER_DISPLAY_NAME "Power Adapter"