diff -r 2a9a5d7f1a16 -r 6b2b718420eb main_win.cc
--- a/main_win.cc	Wed Feb 28 15:19:20 2007 +0000
+++ b/main_win.cc	Wed Feb 28 18:20:28 2007 +0000
@@ -20,9 +20,15 @@
 #include <config.h>
 #endif
 
-#include "main_win.h"
-#include "guipixbufs.h"
-#include "background_chooser_dialog.h"
+#include <main_win.h>
+#include <guipixbufs.h>
+#include <background_chooser_dialog.h>
+
+#include <mapstorage.h>
+#include <graph_displayer_canvas.h>
+#include <algowin.h>
+#include <new_map_win.h>
+#include <nbtab.h>
 
 #include "i18n.h"
 
@@ -364,7 +370,7 @@
 {
   if(active_tab!=-1)
     {
-      if (tabs[active_tab]->mapstorage.modified)
+      if (tabs[active_tab]->mapstorage->modified)
 	{
 	  Gtk::MessageDialog mdialog(_("<b>Save changes before closing?</b>"), true, 
 				     Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE);
@@ -553,7 +559,7 @@
   for(;(i<(int)tabnames.size())&&(tabnames[i]!=tabname);i++)
     {
     }
-  awp->update_maplist(&(tabs[i]->mapstorage));
+  awp->update_maplist(tabs[i]->mapstorage);
 }
 
 void MainWin::deRegisterAlgoWin(AlgoWin * awp)
@@ -632,6 +638,6 @@
 
 void MainWin::createBackgroundChooser()
 {
-  BackgroundChooserDialog dialog(&(tabs[active_tab]->mapstorage));
+  BackgroundChooserDialog dialog(tabs[active_tab]->mapstorage);
   dialog.run();
 }