diff --git a/src/event.c b/src/event.c
index a8f71f7b..a05d6486 100644
--- a/src/event.c
+++ b/src/event.c
@@ -55,6 +55,7 @@
 #include "actions.h"
 #include "client.h"
 #include "main.h"
+#include "funcs.h"
 #include "keybind.h"
 #include "application.h"
 #include "stacking.h"
diff --git a/src/funcs.h b/src/funcs.h
index 4503a65b..848fc40c 100644
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -39,6 +39,7 @@ void StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next, Bool class_only)
 
 /* ---[ event.c ]--------------------------------------------------------- */
 
+void EventLoop(void);
 void DispatchEvent(XEvent *event);
 WMagicNumber wAddDeathHandler(pid_t pid, WDeathHandler *callback, void *cdata);
 Bool IsDoubleClick(WScreen *scr, XEvent *event);
@@ -49,6 +50,11 @@ Bool IsDoubleClick(WScreen *scr, XEvent *event);
 int getWVisualID(int screen);
 
 
+/* ---[ monitor.c ]------------------------------------------------------- */
+
+int MonitorLoop(int argc, char **argv);
+
+
 /* ---[ osdep_*.c ]------------------------------------------------------- */
 
 Bool GetCommandForPid(int pid, char ***argv, int *argc);
@@ -56,6 +62,8 @@ Bool GetCommandForPid(int pid, char ***argv, int *argc);
 
 /* ---[ startup.c ]------------------------------------------------------- */
 
+void StartUp(Bool defaultScreenOnly);
+
 void wHackedGrabButton(unsigned int button, unsigned int modifiers,
                        Window grab_window, Bool owner_events,
                        unsigned int event_mask, int pointer_mode,
diff --git a/src/main.c b/src/main.c
index 4559f868..f1a63b34 100644
--- a/src/main.c
+++ b/src/main.c
@@ -169,10 +169,6 @@ static char **Arguments;
 
 static int ArgCount;
 
-extern void EventLoop(void);
-extern void StartUp(Bool defaultScreenOnly);
-extern int MonitorLoop(int argc, char **argv);
-
 static Bool multiHead = True;
 
 static int *wVisualID = NULL;
diff --git a/src/monitor.c b/src/monitor.c
index ecf05b97..9267709b 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -38,6 +38,7 @@
 #include "window.h"
 #include "dialog.h"
 #include "main.h"
+#include "funcs.h"
 
 /****** Global Variables ******/
 extern WPreferences wPreferences;
diff --git a/src/startup.c b/src/startup.c
index 1532626b..94f88aa0 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -56,6 +56,7 @@
 #include "actions.h"
 #include "client.h"
 #include "main.h"
+#include "funcs.h"
 #include "dock.h"
 #include "workspace.h"
 #include "keybind.h"