diff --git a/src/Makefile.am b/src/Makefile.am
index 126b51dc..8c7f7648 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -101,6 +101,7 @@ wmaker_SOURCES = 	\
 	window.c \
 	window.h \
 	winmenu.c \
+	winmenu.h \
 	winspector.h \
 	winspector.c \
 	wmspec.h \
diff --git a/src/defaults.c b/src/defaults.c
index d82105c4..50db1d44 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -63,6 +63,7 @@
 #include "properties.h"
 #include "misc.h"
 #include "event.h"
+#include "winmenu.h"
 
 #define MAX_SHORTCUT_LENGTH 32
 
diff --git a/src/event.c b/src/event.c
index d15b2134..9f668f89 100644
--- a/src/event.c
+++ b/src/event.c
@@ -73,6 +73,7 @@
 #include "shutdown.h"
 #include "misc.h"
 #include "event.h"
+#include "winmenu.h"
 
 /******** Global Variables **********/
 extern XContext wWinContext;
diff --git a/src/funcs.h b/src/funcs.h
index a9cb1c8a..82d07340 100644
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -43,13 +43,4 @@ void UpdateSwitchMenu(WScreen *scr, WWindow *wwin, int action);
 void OpenSwitchMenu(WScreen *scr, int x, int y, int keyboard);
 void InitializeSwitchMenu(void);
 
-
-/* ---[ winmenu.c ]------------------------------------------------------- */
-
-void OpenWindowMenu(WWindow *wwin, int x, int y, int keyboard);
-void OpenWindowMenu2(WWindow *wwin, int x, int y, int keyboard);
-void OpenMiniwindowMenu(WWindow *wwin, int x, int y);
-void CloseWindowMenu(WScreen *scr);
-void DestroyWindowMenu(WScreen *scr);
-
 #endif
diff --git a/src/icon.c b/src/icon.c
index b292c885..6a93b7ad 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -46,6 +46,7 @@
 #include "misc.h"
 #include "startup.h"
 #include "event.h"
+#include "winmenu.h"
 
 /**** Global varianebles ****/
 extern WPreferences wPreferences;
diff --git a/src/menu.c b/src/menu.c
index 696daa03..ddf01e64 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -37,7 +37,7 @@
 #include "framewin.h"
 #include "menu.h"
 #include "actions.h"
-#include "funcs.h"
+#include "winmenu.h"
 #include "stacking.h"
 #include "xinerama.h"
 #include "workspace.h"
diff --git a/src/window.c b/src/window.c
index 1dee5875..5b42d0cf 100644
--- a/src/window.c
+++ b/src/window.c
@@ -62,6 +62,7 @@
 #include "placement.h"
 #include "misc.h"
 #include "startup.h"
+#include "winmenu.h"
 
 #ifdef MWM_HINTS
 # include "motif.h"
diff --git a/src/winmenu.c b/src/winmenu.c
index aa2bb248..07735d23 100644
--- a/src/winmenu.c
+++ b/src/winmenu.c
@@ -46,6 +46,7 @@
 #include "stacking.h"
 #include "icon.h"
 #include "xinerama.h"
+#include "winmenu.h"
 
 #define MC_MAXIMIZE	0
 #define MC_MINIATURIZE	1
diff --git a/src/winmenu.h b/src/winmenu.h
new file mode 100644
index 00000000..f8b6e88d
--- /dev/null
+++ b/src/winmenu.h
@@ -0,0 +1,31 @@
+/*
+ *  Window Maker window manager
+ *
+ *  Copyright (c) 1997-2003 Alfredo K. Kojima
+ *  Copyright (c) 2013 Window Maker Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef WMWINMENU_H
+#define WMWINMENU_H
+
+void OpenWindowMenu(WWindow *wwin, int x, int y, int keyboard);
+void OpenWindowMenu2(WWindow *wwin, int x, int y, int keyboard);
+void OpenMiniwindowMenu(WWindow *wwin, int x, int y);
+void CloseWindowMenu(WScreen *scr);
+void DestroyWindowMenu(WScreen *scr);
+
+#endif /* WMWINMENU_H */