diff --git a/src/ChangeLog b/src/ChangeLog
index 5653ea633..d17dd69e9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+
+2009-01-09 Enrico Weigelt, metux ITS <weigelt@metux.de>
+
+	* main.c, main.h, main-widgets.h, filegui.c, layout.c, screen.c:
+          moved main widget declarations into main-widgets.h and
+	  removed the WANT_WIDGETS symbol
+
 2009-01-05  Slava Zanko   
 	* main.c (main): remove compatibility_move_mc_files stuff.
 
diff --git a/src/filegui.c b/src/filegui.c
index 441adb782..a526d2d63 100644
--- a/src/filegui.c
+++ b/src/filegui.c
@@ -58,7 +58,7 @@
 #include "dialog.h"		/* do_refresh() */
 #include "color.h"		/* dialog_colors */
 #include "widget.h"		/* WLabel */
-#define WANT_WIDGETS
+#include "main-widgets.h"
 #include "main.h"		/* the_hint */
 #include "wtools.h"		/* QuickDialog */
 #include "panel.h"		/* current_panel */
diff --git a/src/layout.c b/src/layout.c
index 9f3616f7a..8bd8e7ec2 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -51,7 +51,7 @@
 #include "command.h"
 #include "profile.h"		/* For sync_profiles() */
 #include "mouse.h"
-#define WANT_WIDGETS
+#include "main-widgets.h"
 #include "main.h"
 #include "subshell.h"	/* For use_subshell and resize_subshell() */
 #include "tree.h"
diff --git a/src/main-widgets.h b/src/main-widgets.h
new file mode 100644
index 000000000..861e1837f
--- /dev/null
+++ b/src/main-widgets.h
@@ -0,0 +1,14 @@
+#ifndef MC_MAIN_WIDGETS_H
+#define MC_MAIN_WIDGETS_H
+
+#include "widget.h"
+#include "dialog.h"
+
+extern WButtonBar *the_bar;
+extern WLabel     *the_prompt;
+extern WLabel     *the_hint;
+extern Dlg_head   *midnight_dlg;
+
+extern struct WMenu *the_menubar;
+
+#endif
diff --git a/src/main.h b/src/main.h
index 3f3c695ee..fb38e7a38 100644
--- a/src/main.h
+++ b/src/main.h
@@ -116,15 +116,6 @@ char *get_mc_lib_dir (void);
 int maybe_cd (int move_up_dir);
 void do_possible_cd (const char *dir);
 
-#ifdef WANT_WIDGETS
-extern WButtonBar *the_bar;
-extern WLabel     *the_prompt;
-extern WLabel     *the_hint;
-extern Dlg_head   *midnight_dlg;
-
-extern struct WMenu *the_menubar;
-#endif /* WANT_WIDGETS */
-
 void done_menu (void);
 void init_menu (void);
 
diff --git a/src/screen.c b/src/screen.c
index 74604f4a2..f35099e77 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -47,7 +47,7 @@
 #include "execute.h"
 #include "widget.h"
 #include "menu.h"		/* menubar_visible */
-#define WANT_WIDGETS
+#include "main-widgets.h"
 #include "main.h"		/* the_menubar */
 #include "unixcompat.h"