diff --git a/src/common/caching.c b/src/common/caching.c
index 7aaef69f9..c2a029868 100644
--- a/src/common/caching.c
+++ b/src/common/caching.c
@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/io.h"
 
 #include <stdlib.h>
 
diff --git a/src/common/io.c b/src/common/io.c
index 8cf2de0c6..53c78c22a 100644
--- a/src/common/io.c
+++ b/src/common/io.c
@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/io.h"
 
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/common/io.h b/src/common/io.h
new file mode 100644
index 000000000..b4640bedb
--- /dev/null
+++ b/src/common/io.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#ifndef FF_INCLUDED_common_io
+#define FF_INCLUDED_common_io
+
+#include <sys/types.h> //mode_t
+
+bool ffWriteFDBuffer(int fd, const FFstrbuf* content);
+bool ffWriteFileData(const char* fileName, size_t dataSize, const void* data);
+bool ffWriteFileBuffer(const char* fileName, const FFstrbuf* buffer);
+
+bool ffAppendFDBuffer(int fd, FFstrbuf* buffer);
+ssize_t ffReadFileData(const char* fileName, size_t dataSize, void* data);
+bool ffAppendFileBuffer(const char* fileName, FFstrbuf* buffer);
+bool ffReadFileBuffer(const char* fileName, FFstrbuf* buffer);
+
+bool ffFileExists(const char* fileName, mode_t mode);
+
+// Not thread safe!
+void ffSuppressIO(bool suppress);
+
+void ffGetTerminalResponse(const char* request, const char* format, ...);
+
+#endif
diff --git a/src/common/processing.c b/src/common/processing.c
index 95c3dcb6d..e1f7b0b72 100644
--- a/src/common/processing.c
+++ b/src/common/processing.c
@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/io.h"
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/common/settings.c b/src/common/settings.c
index 0beb97bca..c2b631a02 100644
--- a/src/common/settings.c
+++ b/src/common/settings.c
@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/library.h"
+#include "common/io.h"
 
 #include <pthread.h>
 #include <string.h>
diff --git a/src/detection/displayserver/wayland.c b/src/detection/displayserver/wayland.c
index 92c53f7e9..65c0c8027 100644
--- a/src/detection/displayserver/wayland.c
+++ b/src/detection/displayserver/wayland.c
@@ -7,6 +7,7 @@
 
 #ifdef FF_HAVE_WAYLAND
 #include "common/library.h"
+#include "common/io.h"
 #include <pthread.h>
 #include <wayland-client.h>
 #include <sys/socket.h>
diff --git a/src/detection/displayserver/wmde.c b/src/detection/displayserver/wmde.c
index 1f4abcd48..896202b14 100644
--- a/src/detection/displayserver/wmde.c
+++ b/src/detection/displayserver/wmde.c
@@ -1,4 +1,5 @@
 #include "displayServer.h"
+#include "common/io.h"
 
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/src/detection/temps.c b/src/detection/temps.c
index 1661865a5..9fb9b639a 100644
--- a/src/detection/temps.c
+++ b/src/detection/temps.c
@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/io.h"
 
 #include <string.h>
 #include <pthread.h>
diff --git a/src/detection/terminalShell.c b/src/detection/terminalShell.c
index d53e1ce18..60cf473b8 100644
--- a/src/detection/terminalShell.c
+++ b/src/detection/terminalShell.c
@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/io.h"
 
 #include <ctype.h>
 #include <string.h>
diff --git a/src/detection/vulkan.c b/src/detection/vulkan.c
index 97cf6ac24..f5a3083c1 100644
--- a/src/detection/vulkan.c
+++ b/src/detection/vulkan.c
@@ -4,6 +4,7 @@
 
 #ifdef FF_HAVE_VULKAN
 #include "common/library.h"
+#include "common/io.h"
 #include <stdlib.h>
 #include <vulkan/vulkan.h>
 
diff --git a/src/fastfetch.h b/src/fastfetch.h
index 2606d337e..23b79e391 100644
--- a/src/fastfetch.h
+++ b/src/fastfetch.h
@@ -9,7 +9,6 @@
 #include <stdbool.h>
 
 #include <pwd.h>
-#include <sys/types.h>
 #include <sys/utsname.h>
 #include <sys/sysinfo.h>
 
@@ -392,21 +391,6 @@ void ffListFeatures();
 //common/threading.c
 void ffStartDetectionThreads(FFinstance* instance);
 
-//common/io.c
-bool ffWriteFDBuffer(int fd, const FFstrbuf* content);
-bool ffWriteFileData(const char* fileName, size_t dataSize, const void* data);
-bool ffWriteFileBuffer(const char* fileName, const FFstrbuf* buffer);
-
-bool ffAppendFDBuffer(int fd, FFstrbuf* buffer);
-ssize_t ffReadFileData(const char* fileName, size_t dataSize, void* data);
-bool ffAppendFileBuffer(const char* fileName, FFstrbuf* buffer);
-bool ffReadFileBuffer(const char* fileName, FFstrbuf* buffer);
-
-bool ffFileExists(const char* fileName, mode_t mode);
-void ffSuppressIO(bool suppress); // Not thread safe!
-
-void ffGetTerminalResponse(const char* request, const char* format, ...);
-
 //common/printing.c
 void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat);
 void ffPrintFormatString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* format, uint32_t numArgs, const FFformatarg* arguments);
diff --git a/src/logo/image/image.c b/src/logo/image/image.c
index b6e416350..233409db3 100644
--- a/src/logo/image/image.c
+++ b/src/logo/image/image.c
@@ -1,4 +1,5 @@
 #include "image.h"
+#include "common/io.h"
 
 #if defined(FF_HAVE_IMAGEMAGICK7) || defined(FF_HAVE_IMAGEMAGICK6)
 
diff --git a/src/logo/logo.c b/src/logo/logo.c
index db1e540ae..aeb807de7 100644
--- a/src/logo/logo.c
+++ b/src/logo/logo.c
@@ -1,4 +1,5 @@
 #include "logo.h"
+#include "common/io.h"
 
 #include <ctype.h>
 #include <string.h>
diff --git a/src/modules/battery.c b/src/modules/battery.c
index 8c7489282..3bf1ad0e8 100644
--- a/src/modules/battery.c
+++ b/src/modules/battery.c
@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/io.h"
 
 #include <dirent.h>
 
diff --git a/src/modules/cpu.c b/src/modules/cpu.c
index c5022391c..802e72dab 100644
--- a/src/modules/cpu.c
+++ b/src/modules/cpu.c
@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/io.h"
 
 #include <stdlib.h>
 
diff --git a/src/modules/host.c b/src/modules/host.c
index 87254559b..a8c3e6ae3 100644
--- a/src/modules/host.c
+++ b/src/modules/host.c
@@ -5,7 +5,9 @@
 #define FF_HOST_MODULE_NAME "Host"
 #define FF_HOST_NUM_FORMAT_ARGS 15
 
-#ifdef __ANDROID__
+#ifndef __ANDROID__
+    #include "common/io.h"
+#elif
     #include <ctype.h>
 #endif
 
diff --git a/src/modules/packages.c b/src/modules/packages.c
index e1104a3bc..f2d74fda6 100644
--- a/src/modules/packages.c
+++ b/src/modules/packages.c
@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/io.h"
 
 #include <stdlib.h>
 #include <string.h>