diff --git a/src/ChangeLog b/src/ChangeLog
index 6cbc60afe..68d887c2d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-09-07  Pavel Roskin  <proski@gnu.org>
 
+	* user.h: Remove all dirty tricks with "MIDNIGHT" - they are not
+	needed anymore.
+
 	* global.h: Include io.h, pwd.h, grp.h and utime.h.  Adjust all
 	sources not to include them and to include global.h at the right
 	place.
diff --git a/src/user.h b/src/user.h
index b9013d636..2c2c46752 100644
--- a/src/user.h
+++ b/src/user.h
@@ -1,12 +1,8 @@
 #ifndef __USER_H
 #define __USER_H
 
-#ifndef MIDNIGHT
 #include "panel.h"
-#define MIDNIGHT
-#include "../edit/edit-widget.h"
-#undef MIDNIGHT
-#endif
+#include "edit/edit-widget.h"
 
 void user_menu_cmd (WEdit *edit_widget);
 char *expand_format (WEdit *edit_widget, char c, int quote);