diff --git a/src/common/init.c b/src/common/init.c
index 1db2aa01d..561e856cf 100644
--- a/src/common/init.c
+++ b/src/common/init.c
@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/init.h"
 #include "common/parsing.h"
 #include "common/thread.h"
 #include "detection/displayserver/displayserver.h"
diff --git a/src/common/init.h b/src/common/init.h
new file mode 100644
index 000000000..c2ea4c06c
--- /dev/null
+++ b/src/common/init.h
@@ -0,0 +1,7 @@
+#pragma once
+
+void ffInitInstance(void);
+void ffStart(void);
+void ffFinish(void);
+void ffDestroyInstance(void);
+void ffListFeatures(void);
diff --git a/src/common/printing.c b/src/common/printing.c
index ac8fd3055..38369d373 100644
--- a/src/common/printing.c
+++ b/src/common/printing.c
@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/printing.h"
+#include "logo/logo.h"
 #include "util/textModifier.h"
 
 void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType)
diff --git a/src/fastfetch.c b/src/fastfetch.c
index ccd4b37bf..9a278619c 100644
--- a/src/fastfetch.c
+++ b/src/fastfetch.c
@@ -1,9 +1,11 @@
 #include "fastfetch.h"
 #include "common/commandoption.h"
+#include "common/init.h"
 #include "common/io/io.h"
 #include "common/jsonconfig.h"
 #include "common/printing.h"
 #include "detection/version/version.h"
+#include "logo/logo.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"
 #include "fastfetch_datatext.h"
diff --git a/src/fastfetch.h b/src/fastfetch.h
index a95ab7501..1c99a8c2a 100644
--- a/src/fastfetch.h
+++ b/src/fastfetch.h
@@ -63,27 +63,3 @@ typedef struct FFinstance
 } FFinstance;
 extern FFinstance instance; // Defined in `common/init.c`
 extern FFModuleBaseInfo** ffModuleInfos[];
-
-//////////////////////
-// Init functions //
-//////////////////////
-
-//common/init.c
-void ffInitInstance();
-void ffStart();
-void ffFinish();
-void ffDestroyInstance();
-
-void ffListFeatures();
-
-////////////////////
-// Logo functions //
-////////////////////
-
-void ffLogoPrint();
-void ffLogoPrintRemaining();
-void ffLogoPrintLine();
-
-void ffLogoBuiltinPrint();
-void ffLogoBuiltinList();
-void ffLogoBuiltinListAutocompletion();
diff --git a/src/flashfetch.c b/src/flashfetch.c
index 6aeb31bfe..371a0ca98 100644
--- a/src/flashfetch.c
+++ b/src/flashfetch.c
@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 
+#include "common/init.h"
 #include "modules/modules.h"
 
 int main(void)
diff --git a/src/logo/logo.h b/src/logo/logo.h
index 92a1683a6..d4f332dad 100644
--- a/src/logo/logo.h
+++ b/src/logo/logo.h
@@ -21,7 +21,13 @@ typedef struct FFlogo
 } FFlogo;
 
 //logo.c
+void ffLogoPrint(void);
 void ffLogoPrintChars(const char* data, bool doColorReplacement);
+void ffLogoPrintLine(void);
+void ffLogoPrintRemaining(void);
+void ffLogoBuiltinPrint(void);
+void ffLogoBuiltinList(void);
+void ffLogoBuiltinListAutocompletion(void);
 
 //builtin.c
 extern const FFlogo* ffLogoBuiltins[];
diff --git a/src/modules/break/break.c b/src/modules/break/break.c
index 89228e4f4..6e3379ee0 100644
--- a/src/modules/break/break.c
+++ b/src/modules/break/break.c
@@ -1,4 +1,5 @@
 #include "common/printing.h"
+#include "logo/logo.h"
 #include "modules/break/break.h"
 
 void ffPrintBreak(FF_MAYBE_UNUSED FFBreakOptions* options)
diff --git a/src/modules/colors/colors.c b/src/modules/colors/colors.c
index 038bb5cc1..63c69b999 100644
--- a/src/modules/colors/colors.c
+++ b/src/modules/colors/colors.c
@@ -1,7 +1,8 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
-#include "util/textModifier.h"
+#include "logo/logo.h"
 #include "modules/colors/colors.h"
+#include "util/textModifier.h"
 #include "util/stringUtils.h"
 
 static inline uint8_t min(uint8_t a, uint8_t b)
diff --git a/src/modules/separator/separator.c b/src/modules/separator/separator.c
index 29dd5db41..4a6118478 100644
--- a/src/modules/separator/separator.c
+++ b/src/modules/separator/separator.c
@@ -1,5 +1,6 @@
 #include "common/printing.h"
 #include "common/jsonconfig.h"
+#include "logo/logo.h"
 #include "modules/separator/separator.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"