diff --git a/src/common/caching.c b/src/common/caching.c
index 804cac2c0..cc51bd08b 100644
--- a/src/common/caching.c
+++ b/src/common/caching.c
@@ -1,5 +1,7 @@
 #include "fastfetch.h"
 
+#include <stdlib.h>
+
 #define FF_CACHE_VALUE_EXTENSION "ffcv"
 #define FF_CACHE_SPLIT_EXTENSION "ffcs"
 
diff --git a/src/common/init.c b/src/common/init.c
index 27ba23f86..4c4ecc775 100644
--- a/src/common/init.c
+++ b/src/common/init.c
@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 
+#include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <signal.h>
diff --git a/src/common/io.c b/src/common/io.c
index 51d99afff..535479889 100644
--- a/src/common/io.c
+++ b/src/common/io.c
@@ -1,9 +1,8 @@
 #include "fastfetch.h"
 
-#include <stdio.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <stdarg.h>
 #include <termios.h>
 #include <poll.h>
 
diff --git a/src/common/library.c b/src/common/library.c
index 8ba62bda0..7199f524a 100644
--- a/src/common/library.c
+++ b/src/common/library.c
@@ -1,6 +1,7 @@
 #include "fastfetch.h"
 
 #include <stdarg.h>
+#include <dlfcn.h>
 
 static void* libraryLoad(const char* path, int maxVersion)
 {
diff --git a/src/common/networking.c b/src/common/networking.c
index 6a27a6ffe..615c5b163 100644
--- a/src/common/networking.c
+++ b/src/common/networking.c
@@ -1,6 +1,5 @@
 #include "fastfetch.h"
 
-#include <sys/types.h>
 #include <unistd.h>
 #include <sys/socket.h>
 #include <netdb.h>
diff --git a/src/common/processing.c b/src/common/processing.c
index 585ed8862..4a00fd533 100644
--- a/src/common/processing.c
+++ b/src/common/processing.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 
-#include <sys/types.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <sys/wait.h>
 
diff --git a/src/common/properties.c b/src/common/properties.c
index a6b3f2ba5..c8ff1947b 100644
--- a/src/common/properties.c
+++ b/src/common/properties.c
@@ -1,5 +1,7 @@
 #include "fastfetch.h"
 
+#include <stdlib.h>
+
 static bool parsePropLinePointer(const char** line, const char* start, FFstrbuf* buffer)
 {
     if(**line == '\0')
diff --git a/src/common/settings.c b/src/common/settings.c
index 17be91f5c..065db007b 100644
--- a/src/common/settings.c
+++ b/src/common/settings.c
@@ -2,6 +2,7 @@
 
 #include <pthread.h>
 #include <string.h>
+#include <dlfcn.h>
 
 #define FF_LIBRARY_DATA_LOAD_INIT(dataObject, userLibraryName, ...) \
     static dataObject data; \
diff --git a/src/detection/datetime.c b/src/detection/datetime.c
index b4a74b3f8..356633d18 100644
--- a/src/detection/datetime.c
+++ b/src/detection/datetime.c
@@ -1,7 +1,6 @@
 #include "fastfetch.h"
 
 #include <time.h>
-
 #include <pthread.h>
 
 const FFDateTimeResult* ffDetectDateTime(const FFinstance* instance)
diff --git a/src/detection/displayserver/displayServer.c b/src/detection/displayserver/displayServer.c
index af8a331d6..087f0e2e2 100644
--- a/src/detection/displayserver/displayServer.c
+++ b/src/detection/displayserver/displayServer.c
@@ -1,4 +1,5 @@
 #include "displayServer.h"
+
 #include <pthread.h>
 #include <dirent.h>
 
diff --git a/src/detection/displayserver/wayland.c b/src/detection/displayserver/wayland.c
index c6a7fd858..031abb084 100644
--- a/src/detection/displayserver/wayland.c
+++ b/src/detection/displayserver/wayland.c
@@ -1,9 +1,12 @@
 #include "displayServer.h"
+
+#include <stdlib.h>
 #include <string.h>
 
 #ifdef FF_HAVE_WAYLAND
-#include <wayland-client.h>
 #include <pthread.h>
+#include <dlfcn.h>
+#include <wayland-client.h>
 
 typedef struct WaylandData
 {
diff --git a/src/detection/displayserver/wmde.c b/src/detection/displayserver/wmde.c
index ccc231592..1cb4271b2 100644
--- a/src/detection/displayserver/wmde.c
+++ b/src/detection/displayserver/wmde.c
@@ -1,8 +1,10 @@
 #include "displayServer.h"
-#include <dirent.h>
+
+#include <stdlib.h>
+#include <ctype.h>
 #include <string.h>
 #include <unistd.h>
-#include <ctype.h>
+#include <dirent.h>
 
 static const char* parseEnv()
 {
diff --git a/src/detection/displayserver/xcb.c b/src/detection/displayserver/xcb.c
index de798c7bd..43f136bdd 100644
--- a/src/detection/displayserver/xcb.c
+++ b/src/detection/displayserver/xcb.c
@@ -1,8 +1,10 @@
 #include "displayServer.h"
 
 #ifdef FF_HAVE_XCB
-#include <xcb/xcb.h>
+#include <stdlib.h>
 #include <string.h>
+#include <dlfcn.h>
+#include <xcb/xcb.h>
 
 typedef struct XcbPropertyData
 {
diff --git a/src/detection/displayserver/xlib.c b/src/detection/displayserver/xlib.c
index fc2097ce3..a20f16d58 100644
--- a/src/detection/displayserver/xlib.c
+++ b/src/detection/displayserver/xlib.c
@@ -1,6 +1,7 @@
 #include "displayServer.h"
 
 #ifdef FF_HAVE_X11
+#include <dlfcn.h>
 #include <X11/Xlib.h>
 
 typedef struct X11PropertyData
diff --git a/src/detection/media.c b/src/detection/media.c
index e3432acae..f87d08a0c 100644
--- a/src/detection/media.c
+++ b/src/detection/media.c
@@ -7,6 +7,7 @@
 #define FF_DBUS_TIMEOUT_MILLISECONDS 35
 
 #ifdef FF_HAVE_DBUS
+#include <dlfcn.h>
 #include <dbus/dbus.h>
 
 #define FF_DBUS_ITER_CONTINUE(iterator) \
diff --git a/src/detection/os.c b/src/detection/os.c
index abe4eff33..ef975555a 100644
--- a/src/detection/os.c
+++ b/src/detection/os.c
@@ -1,6 +1,7 @@
 #include "fastfetch.h"
 
 #include <string.h>
+#include <stdlib.h>
 #include <pthread.h>
 
 #if !defined(__ANDROID__)
diff --git a/src/detection/plasma.c b/src/detection/plasma.c
index fa5d91c3b..2885209e2 100644
--- a/src/detection/plasma.c
+++ b/src/detection/plasma.c
@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 
+#include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
 
diff --git a/src/detection/temps.c b/src/detection/temps.c
index b086a424c..4a6928768 100644
--- a/src/detection/temps.c
+++ b/src/detection/temps.c
@@ -1,9 +1,8 @@
 #include "fastfetch.h"
 
+#include <string.h>
 #include <pthread.h>
 #include <dirent.h>
-#include <string.h>
-#include <math.h>
 
 static bool isTempFile(const char* name)
 {
diff --git a/src/detection/terminalShell.c b/src/detection/terminalShell.c
index c4cabff20..374cf260e 100644
--- a/src/detection/terminalShell.c
+++ b/src/detection/terminalShell.c
@@ -2,6 +2,7 @@
 
 #include <ctype.h>
 #include <string.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <pthread.h>
 
diff --git a/src/detection/vulkan.c b/src/detection/vulkan.c
index dd2c1ab8c..f9451db63 100644
--- a/src/detection/vulkan.c
+++ b/src/detection/vulkan.c
@@ -3,6 +3,8 @@
 #include <pthread.h>
 
 #ifdef FF_HAVE_VULKAN
+#include <stdlib.h>
+#include <dlfcn.h>
 #include <vulkan/vulkan.h>
 
 static inline void applyVulkanVersion(uint32_t vulkanVersion, FFVersion* ffVersion)
diff --git a/src/fastfetch.c b/src/fastfetch.c
index d646f47d1..ae5591b35 100644
--- a/src/fastfetch.c
+++ b/src/fastfetch.c
@@ -1,11 +1,9 @@
 #include "fastfetch.h"
 
+#include <stdlib.h>
 #include <string.h>
-#include <malloc.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <dirent.h>
+#include <sys/stat.h>
 
 // Things only needed by fastfetch
 typedef struct FFdata
diff --git a/src/fastfetch.h b/src/fastfetch.h
index 535c9cd9e..83c5efae3 100644
--- a/src/fastfetch.h
+++ b/src/fastfetch.h
@@ -3,20 +3,15 @@
 #ifndef FASTFETCH_INCLUDED
 #define FASTFETCH_INCLUDED
 
-#include <stddef.h>
+#include "fastfetch_config.h"
+
 #include <stdint.h>
 #include <stdbool.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
+
 #include <pwd.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
 #include <sys/sysinfo.h>
-#include <sys/stat.h>
-#include <dlfcn.h>
-
-#include "fastfetch_config.h"
 
 #include "util/FFstrbuf.h"
 #include "util/FFlist.h"
diff --git a/src/logo/image/im6.c b/src/logo/image/im6.c
index 2f8421eb0..3ff9dec43 100644
--- a/src/logo/image/im6.c
+++ b/src/logo/image/im6.c
@@ -1,6 +1,8 @@
 #ifdef FF_HAVE_IMAGEMAGICK6
 
 #include "image.h"
+
+#include <dlfcn.h>
 #include <magick/MagickCore.h>
 
 static FF_LIBRARY_SYMBOL(ResizeImage);
diff --git a/src/logo/image/im7.c b/src/logo/image/im7.c
index 7f76cfd59..1ac0e6ebf 100644
--- a/src/logo/image/im7.c
+++ b/src/logo/image/im7.c
@@ -1,6 +1,8 @@
 #ifdef FF_HAVE_IMAGEMAGICK7
 
 #include "image.h"
+
+#include <dlfcn.h>
 #include <MagickCore/MagickCore.h>
 
 static FF_LIBRARY_SYMBOL(ResizeImage);
diff --git a/src/logo/image/image.c b/src/logo/image/image.c
index 307cbd579..9741e5c87 100644
--- a/src/logo/image/image.c
+++ b/src/logo/image/image.c
@@ -17,6 +17,8 @@
 #include <sys/ioctl.h>
 
 #ifdef FF_HAVE_ZLIB
+#include <stdlib.h>
+#include <dlfcn.h>
 #include <zlib.h>
 
 static bool compressBlob(const FFinstance* instance, void** blob, size_t* length)
diff --git a/src/modules/battery.c b/src/modules/battery.c
index b0745c03a..1ef5e131a 100644
--- a/src/modules/battery.c
+++ b/src/modules/battery.c
@@ -1,10 +1,7 @@
 #include "fastfetch.h"
 
-#include <unistd.h>
 #include <dirent.h>
 
-#include <inttypes.h>
-
 #define FF_BATTERY_MODULE_NAME "Battery"
 #define FF_BATTERY_NUM_FORMAT_ARGS 5
 
diff --git a/src/modules/cpu.c b/src/modules/cpu.c
index 93c414531..20625d99a 100644
--- a/src/modules/cpu.c
+++ b/src/modules/cpu.c
@@ -1,7 +1,6 @@
 #include "fastfetch.h"
 
-#include <string.h>
-#include <errno.h>
+#include <stdlib.h>
 
 #define FF_CPU_MODULE_NAME "CPU"
 #define FF_CPU_NUM_FORMAT_ARGS 15
diff --git a/src/modules/cpuUsage.c b/src/modules/cpuUsage.c
index 854abae58..41d23d6c7 100644
--- a/src/modules/cpuUsage.c
+++ b/src/modules/cpuUsage.c
@@ -1,6 +1,5 @@
 #include "fastfetch.h"
 
-#include <stdio.h>
 #include <unistd.h>
 
 #define FF_CPU_USAGE_MODULE_NAME "CPU Usage"
diff --git a/src/modules/cursor.c b/src/modules/cursor.c
index 8d1e191d1..e88a78b5b 100644
--- a/src/modules/cursor.c
+++ b/src/modules/cursor.c
@@ -1,5 +1,7 @@
 #include "fastfetch.h"
 
+#include <stdlib.h>
+
 #define FF_CURSOR_MODULE_NAME "Cursor"
 #define FF_CURSOR_NUM_FORMAT_ARGS 2
 
diff --git a/src/modules/de.c b/src/modules/de.c
index b8f1a4852..fe611c60d 100644
--- a/src/modules/de.c
+++ b/src/modules/de.c
@@ -1,7 +1,5 @@
 #include "fastfetch.h"
 
-#include <string.h>
-
 #define FF_DE_MODULE_NAME "DE"
 #define FF_DE_NUM_FORMAT_ARGS 3
 
diff --git a/src/modules/gpu.c b/src/modules/gpu.c
index ec58421e8..2f1effde8 100644
--- a/src/modules/gpu.c
+++ b/src/modules/gpu.c
@@ -1,7 +1,5 @@
 #include "fastfetch.h"
 
-#include <string.h>
-
 #define FF_GPU_MODULE_NAME "GPU"
 #define FF_GPU_NUM_FORMAT_ARGS 6
 
@@ -61,8 +59,10 @@ static void printGPUList(FFinstance* instance, const FFlist* list)
 }
 
 #ifdef FF_HAVE_LIBPCI
-#include <pci/pci.h>
+#include <string.h>
 #include <unistd.h>
+#include <dlfcn.h>
+#include <pci/pci.h>
 
 //see https://github.com/pciutils/pciutils/blob/5bdf63b6b1bc35b59c4b3f47f7ca83ca1868155b/ls-kernel.c#L220
 static void pciGetDriver(struct pci_dev* dev, FFstrbuf* driver, char*(*ffpci_get_param)(struct pci_access*, char*))
diff --git a/src/modules/host.c b/src/modules/host.c
index 7679dca08..8f3979524 100644
--- a/src/modules/host.c
+++ b/src/modules/host.c
@@ -1,10 +1,14 @@
 #include "fastfetch.h"
 
-#include <ctype.h>
+#include <stdlib.h>
 
 #define FF_HOST_MODULE_NAME "Host"
 #define FF_HOST_NUM_FORMAT_ARGS 15
 
+#ifdef __ANDROID__
+    #include <ctype.h>
+#endif
+
 #ifndef __ANDROID__
 static bool hostValueSet(FFstrbuf* value)
 {
diff --git a/src/modules/locale.c b/src/modules/locale.c
index c226ddd31..ebc775a12 100644
--- a/src/modules/locale.c
+++ b/src/modules/locale.c
@@ -1,5 +1,7 @@
 #include "fastfetch.h"
 
+#include <stdlib.h>
+
 #define FF_LOCALE_MODULE_NAME "Locale"
 #define FF_LOCALE_NUM_FORMAT_ARGS 1
 
diff --git a/src/modules/localip.c b/src/modules/localip.c
index f5590376d..35f9f4324 100644
--- a/src/modules/localip.c
+++ b/src/modules/localip.c
@@ -3,10 +3,9 @@
 #define FF_LOCALIP_MODULE_NAME "Local IP"
 #define FF_LOCALIP_NUM_FORMAT_ARGS 1
 
-#include <sys/types.h>
+#include <string.h>
 #include <ifaddrs.h>
 #include <netinet/in.h>
-#include <string.h>
 #include <arpa/inet.h>
 
 static void printValue(FFinstance* instance, const char* ifaName, const char* addressBuffer)
diff --git a/src/modules/memory.c b/src/modules/memory.c
index dd6ff0771..95b86a9f8 100644
--- a/src/modules/memory.c
+++ b/src/modules/memory.c
@@ -1,5 +1,7 @@
 #include "fastfetch.h"
 
+#include <stdlib.h>
+
 #define FF_MEMORY_MODULE_NAME "Memory"
 #define FF_MEMORY_NUM_FORMAT_ARGS 3
 
diff --git a/src/modules/opencl.c b/src/modules/opencl.c
index a64964a17..1a08a9646 100644
--- a/src/modules/opencl.c
+++ b/src/modules/opencl.c
@@ -4,6 +4,8 @@
 #define FF_OPENCL_NUM_FORMAT_ARGS 3
 
 #ifdef FF_HAVE_OPENCL
+#include <dlfcn.h>
+
 #define CL_TARGET_OPENCL_VERSION 100
 #include <CL/cl.h>
 
diff --git a/src/modules/opengl.c b/src/modules/opengl.c
index 88e2768b2..47fec4685 100644
--- a/src/modules/opengl.c
+++ b/src/modules/opengl.c
@@ -7,6 +7,7 @@
 
 #if defined(FF_HAVE_EGL) || defined(FF_HAVE_GLX) || defined(FF_HAVE_OSMESA)
 #define FF_HAVE_GL 1
+#include <dlfcn.h>
 #include <GL/gl.h>
 
 #define FF_OPENGL_BUFFER_WIDTH 1
diff --git a/src/modules/packages.c b/src/modules/packages.c
index 12c89f6fd..5ff7c2913 100644
--- a/src/modules/packages.c
+++ b/src/modules/packages.c
@@ -1,7 +1,9 @@
 #include "fastfetch.h"
 
+#include <stdlib.h>
 #include <string.h>
 #include <dirent.h>
+#include <sys/stat.h>
 
 #define FF_PACKAGES_MODULE_NAME "Packages"
 #define FF_PACKAGES_NUM_FORMAT_ARGS 11
@@ -128,6 +130,7 @@ static uint32_t getNixPackages(char* path)
 }
 
 #ifdef FF_HAVE_RPM
+#include <dlfcn.h>
 #include <rpm/rpmlib.h>
 #include <rpm/rpmts.h>
 #include <rpm/rpmdb.h>
diff --git a/src/modules/shell.c b/src/modules/shell.c
index 4f7cfe5c4..83d03cea3 100644
--- a/src/modules/shell.c
+++ b/src/modules/shell.c
@@ -1,8 +1,5 @@
 #include "fastfetch.h"
 
-#include <string.h>
-#include <ctype.h>
-
 #define FF_SHELL_MODULE_NAME "Shell"
 #define FF_SHELL_NUM_FORMAT_ARGS 7
 
diff --git a/src/modules/terminal.c b/src/modules/terminal.c
index ceddefe78..1b51e9b5c 100644
--- a/src/modules/terminal.c
+++ b/src/modules/terminal.c
@@ -1,8 +1,6 @@
 #include "fastfetch.h"
 
 #include <string.h>
-#include <unistd.h>
-#include <pthread.h>
 
 #define FF_TERMINAL_MODULE_NAME "Terminal"
 #define FF_TERMINAL_NUM_FORMAT_ARGS 3
diff --git a/src/modules/wmtheme.c b/src/modules/wmtheme.c
index 18a5dd5b0..771b35f36 100644
--- a/src/modules/wmtheme.c
+++ b/src/modules/wmtheme.c
@@ -1,4 +1,6 @@
 #include "fastfetch.h"
+
+#include <stdlib.h>
 #include <string.h>
 
 #define FF_WMTHEME_MODULE_NAME "WM Theme"
diff --git a/src/util/FFlist.c b/src/util/FFlist.c
index 31d7d6500..07cab9cab 100644
--- a/src/util/FFlist.c
+++ b/src/util/FFlist.c
@@ -1,7 +1,6 @@
 #include "FFlist.h"
 
-#include <malloc.h>
-#include <memory.h>
+#include <stdlib.h>
 
 void ffListInit(FFlist* list, uint32_t elementSize)
 {
diff --git a/src/util/FFstrbuf.c b/src/util/FFstrbuf.c
index 354847063..541ab3651 100644
--- a/src/util/FFstrbuf.c
+++ b/src/util/FFstrbuf.c
@@ -1,9 +1,8 @@
 #include "FFstrbuf.h"
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
-#include <stdlib.h>
 
 static char* CHAR_NULL_PTR = "";
 
diff --git a/src/util/FFvaluestore.c b/src/util/FFvaluestore.c
index 1b42b4b67..0fb7a70a6 100644
--- a/src/util/FFvaluestore.c
+++ b/src/util/FFvaluestore.c
@@ -1,9 +1,8 @@
-#include <stdint.h>
-#include <malloc.h>
-#include <string.h>
-
 #include "FFvaluestore.h"
 
+#include <string.h>
+#include <stdlib.h>
+
 void ffValuestoreInit(FFvaluestore* vs)
 {
     vs->capacity = 32;
diff --git a/src/util/FFvaluestore.h b/src/util/FFvaluestore.h
index 4fcf2eb60..963eb8819 100644
--- a/src/util/FFvaluestore.h
+++ b/src/util/FFvaluestore.h
@@ -4,6 +4,7 @@
 #define FASTFETCH_INCLUDED_FFVALUESTORE
 
 #include <stdbool.h>
+#include <stdint.h>
 
 typedef struct FFvaluestorePair
 {