Clean up includes

LinusDierheimer · LinusDierheimer · commit fe712917697c · 2022-06-18T14:25:31.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/src/modules/wmtheme.c b/src/modules/wmtheme.c
diff --git a/src/util/FFlist.c b/src/util/FFlist.c
diff --git a/src/util/FFstrbuf.c b/src/util/FFstrbuf.c
diff --git a/src/util/FFvaluestore.c b/src/util/FFvaluestore.c
diff --git a/src/util/FFvaluestore.h b/src/util/FFvaluestore.h

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#include "fastfetch.h"`
`2`	`2`
`3`	`3`	`#include <stdarg.h>`
	`4`	`+#include <dlfcn.h>`
`4`	`5`
`5`	`6`	`static void* libraryLoad(const char* path, int maxVersion)`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`#include "fastfetch.h"`
`2`	`2`
	`3`	`+#include <stdlib.h>`
	`4`	`+`
`3`	`5`	`static bool parsePropLinePointer(const char** line, const char* start, FFstrbuf* buffer)`
`4`	`6`	`{`
`5`	`7`	`if(**line == '\0')`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include "displayServer.h"`
	`2`	`+`
`2`	`3`	`#include <pthread.h>`
`3`	`4`	`#include <dirent.h>`
`4`	`5`