diff --git a/src/ChangeLog b/src/ChangeLog
index 0c546f983..731c66078 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jan 19 05:28:04 1999  Timur Bakeyev <mc@bat.ru>
+
+	* ext.c, filenot.c, main.c, screen.c, treestore.c: add missed #include's
+	and moved glib.h so, it follows "fs.h", but preceed "util.h" and "mad.h".
+	There were conflicts during compilation with MAD and GLibed vfs. 
+
 Mon Jan 18 21:23:29 1999 Paul Sheer <psheer@obsidian.co.za>
 
 	* cmd.c: update_panels (UP_OPTIMIZE, UP_KEEPSEL); instead
diff --git a/src/ext.c b/src/ext.c
index cd7ebc40a..86faca366 100644
--- a/src/ext.c
+++ b/src/ext.c
@@ -34,11 +34,14 @@
 #include <malloc.h>
 #include <string.h>
 #include <errno.h>
-#include "mad.h"
+
 #include "user.h"
 #include "main.h"
 #include "fs.h"
+
+#include <glib.h>
 #include "util.h"
+#include "mad.h"
 #include "dialog.h"
 #include "global.h"
 #include "ext.h"
@@ -52,7 +55,6 @@
 #ifdef SCO_FLAVOR
 #include <sys/wait.h>
 #endif /* SCO_FLAVOR */
-#include <glib.h>
 
 /* If set, we execute the file command to check the file type */
 int use_file_to_check_type = 1;
diff --git a/src/filenot.c b/src/filenot.c
index 04325cf62..56f5db35e 100644
--- a/src/filenot.c
+++ b/src/filenot.c
@@ -12,6 +12,7 @@
 #include <string.h>
 #include <malloc.h>
 #include "util.h"
+#include "mad.h"
 #include <errno.h>
 #include "../vfs/vfs.h"
 
diff --git a/src/main.c b/src/main.c
index 010955e0d..b91d8d3a6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -84,6 +84,8 @@
 #    include "gcorba.h"
 #endif
 
+#include <glib.h>
+
 /* Program include files */
 #include "x.h"
 #include "mad.h"
@@ -138,7 +140,6 @@
 #include "../vfs/vfs.h"
 #include "../vfs/extfs.h"
 
-#include <glib.h>
 #include "popt.h"
 
 /* "$Id$" */
diff --git a/src/screen.c b/src/screen.c
index 12bb2e61d..67ded5c40 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -31,6 +31,8 @@
 #endif
 /*#include "mc.h"*/
 
+#include <glib.h>
+
 #include "mem.h"
 #include "mad.h"
 #include "global.h"
@@ -54,7 +56,6 @@
 #include "widget.h"
 #include "../vfs/vfs.h"
 #include "../vfs/extfs.h"
-#include <glib.h>
 #ifdef NEEDS_DRIVE_H
 # include "drive.h"
 #endif
diff --git a/src/treestore.c b/src/treestore.c
index ebc2477f2..970b8b3d6 100644
--- a/src/treestore.c
+++ b/src/treestore.c
@@ -47,6 +47,7 @@
 #include "fs.h"
 #include "../vfs/vfs.h"
 #include "util.h"
+#include "mad.h"
 #include "treestore.h"
 #ifdef OS2_NT
 #   include <io.h>