diff --git a/src/ChangeLog b/src/ChangeLog
index b1322ec5c..31581d04b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2003-10-23  Pavel Roskin  <proski@gnu.org>
 
+	* tree.h: Don't include treestore.h.  Fix sources to include
+	treestore.h when needed.
+	* treestore.h: Eliminate useless typedefs.
+
 	* treestore.c (tree_store_start_check_cwd): Eliminate.
 	(tree_store_start_check): Make globally visible.
 	* dir.c (do_load_dir): Use path supplied as argument.  Call
diff --git a/src/dir.c b/src/dir.c
index 9a1942aae..1544ae133 100644
--- a/src/dir.c
+++ b/src/dir.c
@@ -27,7 +27,7 @@
 #include "tty.h"
 #include "dir.h"
 #include "wtools.h"
-#include "tree.h"
+#include "treestore.h"
 
 /* If true show files starting with a dot */
 int show_dot_files = 1;
diff --git a/src/main.c b/src/main.c
index f05782ed5..8f5a6b2ab 100644
--- a/src/main.c
+++ b/src/main.c
@@ -50,6 +50,7 @@
 #include "mouse.h"
 #include "option.h"
 #include "tree.h"
+#include "treestore.h"
 #include "cons.saver.h"
 #include "subshell.h"
 #include "key.h"		/* For init_key() and mi_getch() */
diff --git a/src/tree.c b/src/tree.c
index de3540a14..17500e82d 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -45,6 +45,7 @@
 #include "help.h"
 #include "key.h"	/* For mi_getch() */
 #include "tree.h"
+#include "treestore.h"
 #include "cmd.h"
 
 extern int command_prompt;
@@ -57,7 +58,7 @@ static int tree_navigation_flag;
 
 struct WTree {
     Widget widget;
-    TreeStore *store;
+    struct TreeStore *store;
     tree_entry *selected_ptr;	/* The selected directory */
     char search_buffer[256];	/* Current search string */
     tree_entry **tree_shown;	/* Entries currently on screen */
diff --git a/src/tree.h b/src/tree.h
index d2a0049f5..cae1e2328 100644
--- a/src/tree.h
+++ b/src/tree.h
@@ -1,8 +1,6 @@
 #ifndef __TREE_H
 #define __TREE_H
 
-#include "treestore.h"
-
 #include "dlg.h"
 
 struct WTree;
diff --git a/src/treestore.c b/src/treestore.c
index 78a5c1c65..50ca852cc 100644
--- a/src/treestore.c
+++ b/src/treestore.c
@@ -47,7 +47,7 @@
 
 #define TREE_SIGNATURE "Midnight Commander TreeStore v 2.0"
 
-static TreeStore ts;
+static struct TreeStore ts;
 
 static tree_entry *tree_store_add_entry(char *name);
 
@@ -123,7 +123,7 @@ tree_store_whereis(char *name)
 	return NULL;
 }
 
-TreeStore *
+struct TreeStore *
 tree_store_get(void)
 {
     return &ts;
diff --git a/src/treestore.h b/src/treestore.h
index 794994f77..0f1a037bc 100644
--- a/src/treestore.h
+++ b/src/treestore.h
@@ -17,14 +17,7 @@ typedef struct tree_entry {
     struct tree_entry *prev;	/* Previous item in the list */
 } tree_entry;
 
-typedef struct {
-    struct tree_entry *base;
-    struct tree_entry *current;
-    int base_dir_len;
-    int sublevel;
-} tree_scan;
-
-typedef struct {
+struct TreeStore {
     tree_entry *tree_first;	/* First entry in the list */
     tree_entry *tree_last;	/* Last entry in the list */
     tree_entry *check_start;	/* Start of checked subdirectories */
@@ -32,9 +25,9 @@ typedef struct {
     GList *add_queue;		/* List of strings of added directories */
     unsigned int loaded:1;
     unsigned int dirty:1;
-} TreeStore;
+};
 
-TreeStore *tree_store_get (void);
+struct TreeStore *tree_store_get (void);
 int tree_store_load (void);
 int tree_store_save (void);
 void tree_store_remove_entry (char *name);