diff --git a/ChangeLog b/ChangeLog
index 6e9d41a936c..d2cfba2125c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 /* ChangeLog,v 1.214 2004/11/12 00:42:21 gsherman Exp */
 ------------------------------------------------------------------------------
 Version 0.8 'Joesephine' .... development version
+2006-01-08 [timlinux] 0.7.9.8
+** moved all sources for gui lib into src/gui
 2006-01-08 [gsherman] 0.7.9.7
 ** Moved providers to the src directory
 2006-01-08 [timlinux] 0.7.9.6
diff --git a/configure.in b/configure.in
index 68a4873d3e9..79ab9c6f7f5 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
 MAJOR_VERSION=0
 MINOR_VERSION=7
 MICRO_VERSION=9
-EXTRA_VERSION=7
+EXTRA_VERSION=8
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
 else
@@ -478,14 +478,11 @@ AC_CONFIG_FILES([
   src/composer/Makefile
   src/core/Makefile
   src/designer/Makefile
+  src/gui/Makefile
   src/legend/Makefile
   src/mac/Contents/Makefile
   src/mac/Contents/Resources/Makefile
   src/mac/Makefile
-  src/raster/Makefile
-  src/ui/Makefile
-  src/widgets/Makefile
-  src/widgets/projectionselector/Makefile
   src/providers/Makefile 
   src/providers/delimitedtext/Makefile
   src/providers/gpx/Makefile
@@ -493,6 +490,10 @@ AC_CONFIG_FILES([
   src/providers/ogr/Makefile
   src/providers/postgres/Makefile
   src/providers/wms/Makefile
+  src/raster/Makefile
+  src/ui/Makefile
+  src/widgets/Makefile
+  src/widgets/projectionselector/Makefile
   tools/Makefile
   tools/mapserver_export/Makefile
   tools/qgis_config/Makefile
diff --git a/plugins/copyright_label/Makefile.am b/plugins/copyright_label/Makefile.am
index 148c4761bf0..53cfdd65837 100644
--- a/plugins/copyright_label/Makefile.am
+++ b/plugins/copyright_label/Makefile.am
@@ -49,9 +49,9 @@ pluginguibase.cpp: pluginguibase.h pluginguibase.ui
 BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
 
 
-copyrightlabelplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
+copyrightlabelplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/gui/libqgis_gui.la ../../src/core/libqgis_core.la
 copyrightlabelplugin_la_LDFLAGS = -avoid-version -module
-copyrightlabelplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui -I../../src/core
+copyrightlabelplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/gui -I../../src/ui -I../../src/core
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/plugins/copyright_label/plugin.h b/plugins/copyright_label/plugin.h
index 875e84d8b54..6c0b7914d8d 100644
--- a/plugins/copyright_label/plugin.h
+++ b/plugins/copyright_label/plugin.h
@@ -20,7 +20,7 @@
 #ifndef QGSCOPYRIGHTLABELPLUGIN
 #define QGSCOPYRIGHTLABELPLUGIN
 #include "../qgisplugin.h"
-#include "../../src/qgisapp.h"
+#include "qgisapp.h"
 #include <qwidget.h>
 #include <qfont.h>
 #include <qcolor.h>
diff --git a/plugins/delimited_text/Makefile.am b/plugins/delimited_text/Makefile.am
index 5153b4d89db..3a5ea047f8d 100644
--- a/plugins/delimited_text/Makefile.am
+++ b/plugins/delimited_text/Makefile.am
@@ -50,9 +50,9 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
 
 
 
-delimitedtextplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
+delimitedtextplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/gui/libqgis_gui.la ../../src/core/libqgis_core.la
 delimitedtextplugin_la_LDFLAGS = -avoid-version -module
-delimitedtextplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/ -I../../src/ui
+delimitedtextplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/gui -I../../src/ui
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/plugins/delimited_text/qgsdelimitedtextplugin.cpp b/plugins/delimited_text/qgsdelimitedtextplugin.cpp
index 9840d0a8127..3ae37f4a5f6 100644
--- a/plugins/delimited_text/qgsdelimitedtextplugin.cpp
+++ b/plugins/delimited_text/qgsdelimitedtextplugin.cpp
@@ -22,8 +22,8 @@ Functions:
 
 // includes
 
-#include "../../src/qgisapp.h"
-#include "../../src/qgsmaplayer.h"
+#include "qgisapp.h"
+#include "qgsmaplayer.h"
 #include "qgsdelimitedtextplugin.h"
 
 
diff --git a/plugins/delimited_text/qgsdelimitedtextplugin.h b/plugins/delimited_text/qgsdelimitedtextplugin.h
index ccafb86a8b6..12e3ee101f4 100644
--- a/plugins/delimited_text/qgsdelimitedtextplugin.h
+++ b/plugins/delimited_text/qgsdelimitedtextplugin.h
@@ -22,7 +22,7 @@
 #include "../qgisplugin.h"
 #include <qwidget.h>
 #include "ui_qgsdelimitedtextpluginguibase.h"
-#include "../../src/qgisapp.h"
+#include "qgisapp.h"
 
 /**
 * \class QgsDelimitedTextPlugin
diff --git a/plugins/delimited_text/qgsdelimitedtextplugingui.cpp b/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
index 94c88cf1e98..e26df450b8e 100644
--- a/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
+++ b/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
@@ -26,7 +26,7 @@
 #include "qgsdelimitedtextplugingui.h"
 //Added by qt3to4:
 #include <QTextStream>
-#include "../../src/qgisiface.h"
+#include "qgisiface.h"
 
 QgsDelimitedTextPluginGui::QgsDelimitedTextPluginGui() : QDialog()
 {
diff --git a/plugins/geoprocessing/Makefile.am b/plugins/geoprocessing/Makefile.am
index 1e9217e3469..91ed369063b 100644
--- a/plugins/geoprocessing/Makefile.am
+++ b/plugins/geoprocessing/Makefile.am
@@ -51,9 +51,9 @@ qgsdlgpgbufferbase.h: qgsdlgpgbufferbase.ui
 BUILT_SOURCES = $(pggeoprocessing_MOC) $(pggeoprocessing_UI)
 
 
-pggeoprocessingplugin_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD) $(PG_LIB) ../../src/core/libqgis_core.la ../../src/libqgis_gui.la
+pggeoprocessingplugin_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD) $(PG_LIB) ../../src/core/libqgis_core.la ../../src/gui/libqgis_gui.la
 pggeoprocessingplugin_la_LDFLAGS = -avoid-version -module
-pggeoprocessingplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/ui -I../../src -I../../src/core
+pggeoprocessingplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/ui -I../../src/gui -I../../src/core
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/plugins/geoprocessing/qgsdlgpgbuffer.cpp b/plugins/geoprocessing/qgsdlgpgbuffer.cpp
index c6bcbe6c8af..1c19594da5c 100644
--- a/plugins/geoprocessing/qgsdlgpgbuffer.cpp
+++ b/plugins/geoprocessing/qgsdlgpgbuffer.cpp
@@ -25,7 +25,7 @@
 #include <qvalidator.h>
 #include "qgsdlgpgbuffer.h"
 #include <qspinbox.h>
-#include "../../src/qgisiface.h"
+#include "qgisiface.h"
 
 QgsDlgPgBuffer::QgsDlgPgBuffer( QgisIface * _qI, QWidget * parent, const char *name)
 :QDialog(parent, name),qI(_qI)
diff --git a/plugins/geoprocessing/qgspggeoprocessing.h b/plugins/geoprocessing/qgspggeoprocessing.h
index f0ab79a5a21..8bac6d49b26 100644
--- a/plugins/geoprocessing/qgspggeoprocessing.h
+++ b/plugins/geoprocessing/qgspggeoprocessing.h
@@ -37,7 +37,7 @@ class Q3PopupMenu;
 class QAction;
 
 //#include "qgsworkerclass.h"
-#include "../../src/qgisapp.h"
+#include "qgisapp.h"
 
 /**
 * \class QgsPgGeoprocessing
diff --git a/plugins/georeferencer/Makefile.am b/plugins/georeferencer/Makefile.am
index 71b2a436fcc..5971ddcf070 100644
--- a/plugins/georeferencer/Makefile.am
+++ b/plugins/georeferencer/Makefile.am
@@ -64,8 +64,8 @@ georefplugin_la_SOURCES = plugin.cpp \
 
 nodist_georefplugin_la_SOURCES = $(plugin_MOC) $(plugin_UIHEADERS) $(plugin_UISOURCES) 
 
-georefplugin_la_CXXFLAGS = -I../ -I../../src/ui -I../../src/raster -I../../src -I../../src/core $(GDAL_CFLAGS) $(GSL_CFLAGS) $(QT_CXXFLAGS) $(GEOS_CFLAGS)
-georefplugin_la_LDFLAGS = -avoid-version -module $(GDAL_LDADD) $(GSL_LIBS) $(QT_LDADD)  ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
+georefplugin_la_CXXFLAGS = -I../ -I../../src/ui -I../../src/raster -I../../src/gui -I../../src/core $(GDAL_CFLAGS) $(GSL_CFLAGS) $(QT_CXXFLAGS) $(GEOS_CFLAGS)
+georefplugin_la_LDFLAGS = -avoid-version -module $(GDAL_LDADD) $(GSL_LIBS) $(QT_LDADD)  ../../src/gui/libqgis_gui.la ../../src/core/libqgis_core.la
 
 BUILT_SOURCES = $(plugin_UIHEADERS) $(plugin_UISOURCES) $(plugin_MOC)
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/plugins/gps_importer/Makefile.am b/plugins/gps_importer/Makefile.am
index d38fc7f06ac..ca153825a0a 100644
--- a/plugins/gps_importer/Makefile.am
+++ b/plugins/gps_importer/Makefile.am
@@ -60,9 +60,9 @@ plugin_QRC = qgsgps_plugin.qrc
 
 BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
 
-gpsimporterplugin_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD)  ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
+gpsimporterplugin_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD)  ../../src/gui/libqgis_gui.la ../../src/core/libqgis_core.la
 gpsimporterplugin_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
-gpsimporterplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/ui -I../../src
+gpsimporterplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/ui -I../../src/gui
 gpsimporterplugin_la_LDFLAGS = -avoid-version -module 
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/plugins/gps_importer/qgsgpsplugingui.h b/plugins/gps_importer/qgsgpsplugingui.h
index 8350d3b3e89..471d3ca4ebc 100644
--- a/plugins/gps_importer/qgsgpsplugingui.h
+++ b/plugins/gps_importer/qgsgpsplugingui.h
@@ -18,7 +18,7 @@
 #ifndef QGSGPSPLUGINGUI_H
 #define QGSGPSPLUGINGUI_H
 
-#include "../../src/qgsvectorlayer.h"
+#include "qgsvectorlayer.h"
 #include "ui_qgsgpspluginguibase.h"
 #include "qgsbabelformat.h"
 #include "qgsgpsdevice.h"
diff --git a/plugins/grass/Makefile.am b/plugins/grass/Makefile.am
index c155415d9c0..d6a1f2355e7 100644
--- a/plugins/grass/Makefile.am
+++ b/plugins/grass/Makefile.am
@@ -12,7 +12,7 @@
 
 SUBDIRS = config modules themes
 
-INCLUDES = -I../../src -I../../src/core
+INCLUDES = -I../../src/gui -I../../src/core
 
 DEFS=-DGRASS_BASE=\"$(GRASS_BASE)\" -DHAVE_OPENPTY=$(HAVE_OPENPTY) 
 if !HAVE_QTMAC
@@ -114,9 +114,9 @@ qgsgrassregionbase.h: qgsgrassregionbase.ui
 BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
 
 
-grassplugin_la_LIBADD = $(QT_LDADD) ../../src/providers/grass/libqgisgrass.la $(GRASS_LIB) $(PG_LIB) $(GDAL_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la ../../src/raster/libqgis_raster.la
+grassplugin_la_LIBADD = $(QT_LDADD) ../../src/providers/grass/libqgisgrass.la $(GRASS_LIB) $(PG_LIB) $(GDAL_LDADD) ../../src/gui/libqgis_gui.la ../../src/core/libqgis_core.la ../../src/raster/libqgis_raster.la
 grassplugin_la_LDFLAGS = -avoid-version -module
-grassplugin_la_CXXFLAGS = $(PREFIX) $(CXXFLAGS) -I$(GRASS_INC) $(DEFS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I$(PG_INC)  $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/legend/ -I../../src/raster -I../../src/ui 
+grassplugin_la_CXXFLAGS = $(PREFIX) $(CXXFLAGS) -I$(GRASS_INC) $(DEFS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I$(PG_INC)  $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/legend/ -I../../src/raster -I../../src/ui -I../../src/widgets/projectionselector
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/plugins/grass/qgsgrassattributes.h b/plugins/grass/qgsgrassattributes.h
index 6cee2face77..4ec2e8b4eb0 100644
--- a/plugins/grass/qgsgrassattributes.h
+++ b/plugins/grass/qgsgrassattributes.h
@@ -18,7 +18,7 @@
 
 /* First attribute in the table is always field, second attribute is category */
 
-#include "../../src/qgsidentifyresults.h"
+#include "qgsidentifyresults.h"
 //Added by qt3to4:
 #include <QEvent>
 
diff --git a/plugins/grass/qgsgrassmapcalc.h b/plugins/grass/qgsgrassmapcalc.h
index df7750361b1..9f1ce03ef76 100644
--- a/plugins/grass/qgsgrassmapcalc.h
+++ b/plugins/grass/qgsgrassmapcalc.h
@@ -39,8 +39,8 @@ class QPixmap;
 #include <q3canvas.h>
 
 // Must be here, so that it is included to moc file
-#include "../../src/qgisapp.h"
-#include "../../src/qgisiface.h"
+#include "qgisapp.h"
+#include "qgisiface.h"
 
 class QgsGrassProvider;
 class QgsGrassTools;
diff --git a/plugins/grass/qgsgrassmodule.h b/plugins/grass/qgsgrassmodule.h
index c4a538aa987..5f34e52de76 100644
--- a/plugins/grass/qgsgrassmodule.h
+++ b/plugins/grass/qgsgrassmodule.h
@@ -38,9 +38,9 @@ class QPixmap;
 #include <q3process.h>
 
 // Must be here, so that it is included to moc file
-#include "../../src/qgisapp.h"
-#include "../../src/qgisiface.h"
-#include "../../src/qgsvectorlayer.h"
+#include "qgisapp.h"
+#include "qgisiface.h"
+#include "qgsvectorlayer.h"
 
 class QgsGrassProvider;
 class QgsGrassTools;
diff --git a/plugins/grass/qgsgrassnewmapset.h b/plugins/grass/qgsgrassnewmapset.h
index 8ecd059a100..b629f82e915 100644
--- a/plugins/grass/qgsgrassnewmapset.h
+++ b/plugins/grass/qgsgrassnewmapset.h
@@ -30,7 +30,7 @@ class QCloseEvent;
 #include "qgisiface.h"
 #include "qgspoint.h"
 #include "qgsspatialrefsys.h"
-#include "widgets/projectionselector/qgsprojectionselector.h"
+#include "qgsprojectionselector.h"
 
 class QgsGrassProvider;
 #include "qgsgrassplugin.h"
diff --git a/plugins/grass/qgsgrassplugin.h b/plugins/grass/qgsgrassplugin.h
index 56ef77b8fc2..ef039dbacb9 100644
--- a/plugins/grass/qgsgrassplugin.h
+++ b/plugins/grass/qgsgrassplugin.h
@@ -20,7 +20,7 @@
 #include <qwidget.h>
 #include <qpen.h>
 
-#include "../../src/qgisapp.h"
+#include "qgisapp.h"
 
 #include <vector>
 
diff --git a/plugins/grass/qgsgrasstools.h b/plugins/grass/qgsgrasstools.h
index 32aedfbb689..3e103df8123 100644
--- a/plugins/grass/qgsgrasstools.h
+++ b/plugins/grass/qgsgrasstools.h
@@ -25,8 +25,8 @@ class QDomNode;
 class QDomElement;
 
 // Must be here, so that it is included to moc file
-#include "../../src/qgisapp.h"
-#include "../../src/qgisiface.h"
+#include "qgisapp.h"
+#include "qgisiface.h"
 
 class QgsGrassProvider;
 #include "ui_qgsgrasstoolsbase.h"
diff --git a/plugins/grid_maker/Makefile.am b/plugins/grid_maker/Makefile.am
index 4560a378331..4465e803d48 100644
--- a/plugins/grid_maker/Makefile.am
+++ b/plugins/grid_maker/Makefile.am
@@ -62,9 +62,9 @@ plugin_QRC = gridmaker_plugin.qrc
 
 BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
 
-gridmakerplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/core/libqgis_core.la ../../src/libqgis_gui.la
+gridmakerplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/core/libqgis_core.la ../../src/gui/libqgis_gui.la
 gridmakerplugin_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
-gridmakerplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/ui -I../../src 
+gridmakerplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/ui -I../../src/gui 
 gridmakerplugin_la_LDFLAGS = -avoid-version -module
 
 ##
@@ -83,7 +83,7 @@ gridmaker_SOURCES = main.cpp \
 
 gridmaker_LDADD = $(QT_LDADD) 
 gridmaker_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
-gridmaker_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PKGDATAPATH) $(DEBUG_QGIS) -I../../src -I../../src/ui -I../../src/core
+gridmaker_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PKGDATAPATH) $(DEBUG_QGIS) -I../../src/gui -I../../src/ui -I../../src/core
 
 standalone_MOC = plugingui.moc.cpp 
 
diff --git a/plugins/grid_maker/plugin.cpp b/plugins/grid_maker/plugin.cpp
index 88c2b25c0cc..9e317f45e97 100644
--- a/plugins/grid_maker/plugin.cpp
+++ b/plugins/grid_maker/plugin.cpp
@@ -22,8 +22,8 @@ email                : tim@linfiniti.com
 
 // includes
 
-#include "../../src/qgisapp.h"
-#include "../../src/qgsmaplayer.h"
+#include "qgisapp.h"
+#include "qgsmaplayer.h"
 #include "plugin.h"
 
 
diff --git a/plugins/north_arrow/Makefile.am b/plugins/north_arrow/Makefile.am
index cba0f348422..38c453f61ab 100644
--- a/plugins/north_arrow/Makefile.am
+++ b/plugins/north_arrow/Makefile.am
@@ -52,7 +52,7 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
 
 northarrowplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/core/libqgis_core.la 
 northarrowplugin_la_LDFLAGS = -avoid-version -module
-northarrowplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) $(PKGDATAPATH) -I../../src -I../../src/ui -I../../src/core
+northarrowplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) $(PKGDATAPATH) -I../../src/gui -I../../src/ui -I../../src/core
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/plugins/north_arrow/plugin.h b/plugins/north_arrow/plugin.h
index df149b61d34..fa0ab8d9b64 100644
--- a/plugins/north_arrow/plugin.h
+++ b/plugins/north_arrow/plugin.h
@@ -21,7 +21,7 @@
 #define QGSNORTHARROWPLUGIN
 
 #include "../qgisplugin.h"
-#include "../../src/qgisapp.h"
+#include "qgisapp.h"
 
 class QToolBar;
 /**
diff --git a/plugins/scale_bar/Makefile.am b/plugins/scale_bar/Makefile.am
index b05e91ad080..6c8e3c05020 100644
--- a/plugins/scale_bar/Makefile.am
+++ b/plugins/scale_bar/Makefile.am
@@ -51,7 +51,7 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
 
 libScaleBarplugin_la_LIBADD = $(QT_LDADD) ../../src/core/libqgis_core.la
 libScaleBarplugin_la_LDFLAGS = -avoid-version -module
-libScaleBarplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui -I../../src/core 
+libScaleBarplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/gui -I../../src/ui -I../../src/core 
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/plugins/scale_bar/plugin.h b/plugins/scale_bar/plugin.h
index 96e351f681d..9460ac7aa4a 100644
--- a/plugins/scale_bar/plugin.h
+++ b/plugins/scale_bar/plugin.h
@@ -27,7 +27,7 @@ email                : sbr00pwb@users.sourceforge.net
 #include <q3pointarray.h>
 
 
-#include "../../src/qgisapp.h"
+#include "qgisapp.h"
 class QToolBar;
 /**
 * \class Plugin
diff --git a/plugins/spit/Makefile.am b/plugins/spit/Makefile.am
index c32af9061bd..e7c437abf73 100644
--- a/plugins/spit/Makefile.am
+++ b/plugins/spit/Makefile.am
@@ -52,7 +52,7 @@ spitplugin_la_SOURCES =  $(common_sources) \
 	qgsspitplugin.cpp \
 	qgsspitplugin.h
 
-spit_SOURCES = ../../src/qgsmessageviewer.cpp ../../src/qgspgutil.cpp $(common_sources) main.cpp $(SPIT_UIC) $(spit_MOC)
+spit_SOURCES = ../../src/gui/qgsmessageviewer.cpp ../../src/gui/qgspgutil.cpp $(common_sources) main.cpp $(SPIT_UIC) $(spit_MOC)
 
 nodist_spitplugin_la_SOURCES = $(spitplugin_la_MOC)
 
@@ -67,12 +67,12 @@ BUILT_SOURCES = $(spit_MOC) $(spit_UI) $(spitplugin_la_MOC)
 
 spitplugin_la_LIBADD = $(QT_LDADD)  $(PG_LIB) $(GDAL_LDADD) ../../src/core/libqgis_core.la
 spitplugin_la_LDFLAGS = -avoid-version -module
-spitplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(GEOS_CFLAGS) -I../../src -I../../src/ui -I../../src/core
+spitplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(GEOS_CFLAGS) -I../../src/gui -I../../src/ui -I../../src/core
 
 
 spit_LDADD = $(QT_LDADD)  $(PG_LIB) $(GDAL_LDADD)
 #spit_LDFLAGS = -avoid-version -module
-spit_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC)  -I../../src -I../../src/ui -I../../src/core
+spit_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC)  -I../../src/gui -I../../src/ui -I../../src/core
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/plugins/spit/qgseditreservedwordsdialog.cpp b/plugins/spit/qgseditreservedwordsdialog.cpp
index a196a0e169b..559015e58a9 100644
--- a/plugins/spit/qgseditreservedwordsdialog.cpp
+++ b/plugins/spit/qgseditreservedwordsdialog.cpp
@@ -2,7 +2,7 @@
 #include <qpixmap.h>
 #include <q3listview.h>
 #include <q3textedit.h>
-#include "../../src/qgspgutil.h"
+#include "qgspgutil.h"
 #include "spit_icons.h"
 
 #include "qgseditreservedwordsdialog.h"
diff --git a/plugins/spit/qgsspit.cpp b/plugins/spit/qgsspit.cpp
index b6c5de29d33..732b92e559a 100644
--- a/plugins/spit/qgsspit.cpp
+++ b/plugins/spit/qgsspit.cpp
@@ -34,7 +34,7 @@
 #include <qsettings.h>
 #include <qpixmap.h>
 #include <iostream>
-#include "../../src/qgspgutil.h"
+#include "qgspgutil.h"
 #include "qgsspit.h"
 #include "qgsconnectiondialog.h"
 #include "qgseditreservedwordsdialog.h"
diff --git a/plugins/spit/qgsspitplugin.cpp b/plugins/spit/qgsspitplugin.cpp
index 5768697c080..de68f9c6e1f 100644
--- a/plugins/spit/qgsspitplugin.cpp
+++ b/plugins/spit/qgsspitplugin.cpp
@@ -21,7 +21,7 @@
 // includes
 #include <iostream>
 #include <vector>
-#include "../../src/qgisapp.h"
+#include "qgisapp.h"
 
 #include <q3toolbar.h>
 #include <qmenubar.h>
diff --git a/plugins/spit/qgsspitplugin.h b/plugins/spit/qgsspitplugin.h
index 10acd1bbd90..46cff44a4a2 100644
--- a/plugins/spit/qgsspitplugin.h
+++ b/plugins/spit/qgsspitplugin.h
@@ -35,7 +35,7 @@ class QMenuBar;
 class Q3PopupMenu;
 
 //#include "qgsworkerclass.h"
-#include "../../src/qgisapp.h"
+#include "qgisapp.h"
 
 /**
 * \class QgsSpitPlugin
diff --git a/src/Makefile.am b/src/Makefile.am
index f93f1a55096..428ce4b3e3d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,297 +8,9 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-##
-## ----------------------------------------------------------------------
-##        Initial setup 
-## ----------------------------------------------------------------------
-##
-if HAVE_QTMAC
-MAC = mac
-endif
 # NOTE - the order of the SUBDIRS is important. Currently the providers
-#        depend on the existence of libqgis_gui. Since the gui classes
-#        have not been moved into their own directory, the current directory
-#        (.) must be specified immediately before the providers
-#        subdirectory. Once the gui subdirectory is implemented, there is
-#        no need for the current directory to be in the SUBDIRS list
-SUBDIRS =  core ui legend raster composer widgets . providers $(MAC) 
-
-if !HAVE_QTMAC
-PREFIX=-DPREFIX=\"$(prefix)\"
-PLUGINPATH=-DPLUGINPATH=\"$(pkglibdir)\"
-PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\"
-endif
-
-%.moc.cpp: %.h
-	$(MOC) -o $@ $<
-
-##
-## ----------------------------------------------------------------------
-##      Define Targets
-## ----------------------------------------------------------------------
-##
-if HAVE_QTMAC
-## Qt/Mac binary must be in MacOS directory within bundle, not in bin subdirectory
-## (configure ensures that prefix ends in qgis.app/Contents/MacOS)
-macbindir = $(exec_prefix)
-macbin_PROGRAMS = qgis
-else
-bin_PROGRAMS = qgis
-endif
-
-lib_LTLIBRARIES = libqgis_gui.la
-
-
-##
-## ----------------------------------------------------------------------
-##         QGIS Desktop Application
-## ----------------------------------------------------------------------
-##
-
-qgis_SOURCES =	main.cpp
-
-qgis_LDADD = raster/libqgis_raster.la legend/libqgis_legend.la composer/libqgis_composer.la $(LDADD) $(QT_LDADD) $(GDAL_LDADD) $(PG_LIB) $(GEOS_LDADD) $(PYTHON_LIB) -lproj -lsqlite3 libqgis_gui.la core/libqgis_core.la
-if HAVE_QTMAC
-qgis_LDFLAGS = -framework ApplicationServices
-else
-qgis_LDFLAGS = -rdynamic
-endif
-qgis_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS)  $(HAVE_PYTHON) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) -I./ui/ -I./widgets/projectionselector/ -I./legend/ -I./raster/ -I./composer/ -I./core/
-
-
-##
-## ----------------------------------------------------------------------
-##         libqgis_gui-gui stuff starts here
-## ----------------------------------------------------------------------
-##
-
-libqgis_guiHEADERS =							\
-		qgisapp.h							\
-		qgisiface.h					\
-		qgisinterface.h \
-		qgsabout.h				\
-		qgsaddattrdialog.h				\
-		qgsadvancedattrsearch.h				\
-		qgsattributeaction.h		\
-		qgsattributeactiondialog.h			\
-		qgsattributedialog.h				\
-		qgsattributetabledisplay.h			\
-		qgsattributetable.h				\
-		qgsbookmarks.h			\
-		qgsclipboard.h				\
-		qgscontcoldialog.h				\
-		qgscontinuouscolrenderer.h			\
-		qgscsexception.h				\
-		qgscoordinatetransform.h	\
-		qgscustomprojectiondialog.h			\
-		qgsdelattrdialog.h				\
-		qgsencodingfiledialog.h				\
-		qgsfeature.h						\
-		qgsfillstylewidget.h				\
-		qgsgeomtypedialog.h				\
-		qgsgraduatedsymrenderer.h			\
-		qgsgrasydialog.h				\
-		qgshelpviewer.h					\
-		qgsidentifyresults.h				\
-		qgslabeldialog.h				\
-		qgslabel.h							\
-		qgslayerprojectionselector.h \
-		qgslinestyledialog.h				\
-		qgsludialog.h					\
-		qgsmapcanvas.h						\
-		qgsmaplayer.h						\
-		qgsmaplayerinterface.h				\
-		qgsmaplayerregistry.h				\
-		qgsmapoverviewcanvas.h				\
-		qgsmapserverexport.h				\
-		qgsmarkerdialog.h				\
-		qgsmeasure.h					\
-		qgsmessageviewer.h					\
-		qgsnewhttpconnection.h				\
-		qgsoptions.h					\
-		qgspastetransformations.h			\
-		qgspatterndialog.h				\
-		qgspluginmanager.h				\
-		qgspluginmetadata.h				\
-		qgspointstylewidget.h				\
-		qgsproject.h					\
-		qgsprojectproperties.h			\
-		qgsrangerenderitem.h				\
-		qgsrasterlayerproperties.h		\
-		qgsrunprocess.h						\
-		qgsserversourceselect.h				\
-		qgssisydialog.h					\
-		qgsspatialrefsys.h					\
-		qgsuniquevalrenderer.h				\
-		qgsuvaldialog.h					\
-		qgsvectorfilewriter.h				\
-		qgsvectorlayerproperties.h			
-
-## files generated from MOC
-libqgis_gui_la_MOC =							\
-		qgisapp.moc.cpp						\
-		qgisinterface.moc.cpp	\
-		qgsabout.moc.cpp		\
-		qgsaddattrdialog.moc.cpp		\
-		qgsadvancedattrsearch.moc.cpp		\
-		qgsattributeactiondialog.moc.cpp	\
-		qgsattributedialog.moc.cpp		\
-		qgsattributetabledisplay.moc.cpp		\
-		qgsattributetable.moc.cpp		\
-		qgsbookmarks.moc.cpp		\
-		qgscontcoldialog.moc.cpp		\
-		qgscoordinatetransform.moc.cpp		\
-		qgscustomprojectiondialog.moc.cpp 	\
-		qgsdelattrdialog.moc.cpp		\
-		qgsencodingfiledialog.moc.cpp		\
-		qgsfillstylewidget.moc.cpp			\
-		qgsgeomtypedialog.moc.cpp		\
-		qgsgrasydialog.moc.cpp			\
-		qgshelpviewer.moc.cpp			\
-		qgsidentifyresults.moc.cpp		\
-		qgslabeldialog.moc.cpp			\
-		qgslayerprojectionselector.moc.cpp \
-		qgslinestyledialog.moc.cpp		\
-		qgslinestylewidget.moc.cpp			\
-		qgsludialog.moc.cpp			\
-		qgsmapcanvas.moc.cpp				\
-		qgsmaplayerinterface.moc.cpp		\
-		qgsmaplayer.moc.cpp					\
-		qgsmaplayerregistry.moc.cpp			\
-		qgsmapoverviewcanvas.moc.cpp		\
-		qgsmapserverexport.moc.cpp		\
-		qgsmarkerdialog.moc.cpp			\
-		qgsmeasure.moc.cpp			\
-		qgsnewhttpconnection.moc.cpp		\
-		qgsoptions.moc.cpp			\
-		qgspastetransformations.moc.cpp		\
-		qgspatterndialog.moc.cpp		\
-		qgspluginmanager.moc.cpp		\
-		qgspointstylewidget.moc.cpp			\
-		qgsprojectproperties.moc.cpp		\
-		qgsrasterlayerproperties.moc.cpp	\
-		qgsrunprocess.moc.cpp				\
-		qgsserversourceselect.moc.cpp		\
-		qgssisydialog.moc.cpp			\
-		qgsuvaldialog.moc.cpp			\
-		qgsvectorlayer.moc.cpp \
-		qgsvectorlayerproperties.moc.cpp	
-
-libqgis_gui_la_SOURCES =						\
-		qgisapp.cpp							\
-		qgisiface.cpp			\
-		qgisinterface.cpp	\
-		qgsabout.cpp		\
-		qgsaddattrdialog.cpp		\
-		qgsadvancedattrsearch.cpp	\
-	   	qgsattributeaction.cpp				\
-		qgsattributeactiondialog.cpp	\
-		qgsattributedialog.cpp		\
-		qgsattributetable.cpp		\
-		qgsattributetabledisplay.cpp	\
-		qgsbookmarks.cpp	\
-		qgsclipboard.cpp		\
-		qgscontcoldialog.cpp		\
-		qgscoordinatetransform.cpp			\
-		qgscontinuouscolrenderer.cpp		\
-		qgscustomprojectiondialog.cpp			\
-		qgsdelattrdialog.cpp		\
-		qgsencodingfiledialog.cpp	\
-		qgsfeature.cpp					\
-		qgsfillstylewidget.cpp				\
-		qgsgeomtypedialog.cpp		\
-		qgsgraduatedsymrenderer.cpp			\
-		qgsgrasydialog.cpp		\
-		qgshelpviewer.cpp		\
-		qgsidentifyresults.cpp		\
-		qgslabel.cpp						\
-		qgslabeldialog.cpp		\
-		qgslayerprojectionselector.cpp \
-		qgslinestyledialog.cpp		\
-		qgslinestylewidget.cpp				\
-		qgsludialog.cpp			\
-		qgsmapcanvas.cpp					\
-		qgsmaplayer.cpp						\
-		qgsmaplayerregistry.cpp				\
-		qgsmapoverviewcanvas.cpp			\
-		qgsmapserverexport.cpp		\
-		qgsmarkerdialog.cpp		\
-		qgsmeasure.cpp			\
-		qgsmessageviewer.cpp				\
-		qgsnewhttpconnection.cpp	\
-		qgsoptions.cpp			\
-		qgspastetransformations.cpp	\
-		qgspatterndialog.cpp		\
-		qgspluginmanager.cpp		\
-		qgspluginmetadata.cpp		\
-		qgspointstylewidget.cpp				\
-		qgsproject.cpp			\
-		qgsprojectproperties.cpp	\
-		qgsrasterlayerproperties.cpp	\
-		qgsrunprocess.cpp					\
-		qgsserversourceselect.cpp	\
-		qgssinglesymrenderer.cpp			\
-		qgssisydialog.cpp		\
-		qgsspatialrefsys.cpp				\
-		qgsuniquevalrenderer.cpp			\
-		qgsuvaldialog.cpp		\
-		qgsvectorfilewriter.cpp				\
-		qgsvectorlayer.cpp \
-		qgsvectorlayerproperties.cpp	
-
-if HAVE_POSTGRESQL
-postgresHEADERS = qgsdbsourceselect.h		\
-		  qgsnewconnection.h		\
-		  qgspgquerybuilder.h
-
-postgresSOURCES = qgsdbsourceselect.cpp		\
-		  qgsnewconnection.cpp		\
-		  qgspgquerybuilder.cpp
-
-postgresMOC = qgsdbsourceselect.moc.cpp		\
-		  qgsnewconnection.moc.cpp		\
-		  qgspgquerybuilder.moc.cpp
-		  
-postgresLIBHEADERS = qgspgutil.h
-postgresLIBSOURCES = qgspgutil.cpp
-
-libqgis_gui_la_SOURCES += $(postgresSOURCES) $(postgresLIBSOURCES) $(postgresMOC)
-endif
-
-AM_YFLAGS       = -d
-
-nodist_libqgis_gui_la_SOURCES = $(libqgis_gui_la_MOC)
-
-BUILT_SOURCES = $(libqgis_gui_la_MOC) $(qgis_YACC)  $(postgresMOC)
-
-
-libqgis_gui_la_LIBADD = core/libqgis_core.la raster/libqgis_raster.la legend/libqgis_legend.la composer/libqgis_composer.la widgets/projectionselector/libqgsprojectionselector.la $(QT_LDADD) $(GEOS_LDADD) $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3
-libqgis_gui_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
-
-libqgis_gui_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) $(HAVE_PYTHON) -I./ui/ -I./widgets/projectionselector/ -I./legend/ -I./raster/ -I./composer/ -I ./core/
-
-##
-## ----------------------------------------------------------------------
-##         additional files that need to be installed go here
-## ----------------------------------------------------------------------
-##
-pkginclude_HEADERS = $(qgisHEADERS) 
-
-pkginclude_dir = $(includedir)/qgis
-
-
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST=
-
-if HAVE_POSTGRESQL
-
-EXTRA_DIST += $(postgresSOURCES) \
-		$(postgresLIBSOURCES) 
-		
-pkginclude_HEADERS += $(postgresHEADERS) \
-		$(postgresLIBHEADERS) \
-		$(libqgisHEADERS) 
-endif
+#        depend on the existence of libqgis_gui. 
+#        gui *must* be specified immediately before the providers
+#        subdirectory. 
+SUBDIRS =  core ui legend raster composer widgets gui providers $(MAC) 
 
diff --git a/src/composer/Makefile.am b/src/composer/Makefile.am
index 0f9cf70b5e8..3d1aa5e91c2 100644
--- a/src/composer/Makefile.am
+++ b/src/composer/Makefile.am
@@ -53,7 +53,7 @@ libqgis_composer_la_SOURCES =  qgscomposer.cpp\
 libqgis_composer_la_LIBFLAGS = $(QT_LDADD)
 
 libqgis_composer_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
-libqgis_composer_la_CXXFLAGS = $(PKGDATAPATH) -I.. -I../ui/ -I../core/ \
+libqgis_composer_la_CXXFLAGS = $(PKGDATAPATH) -I../gui/ -I../ui/ -I../core/ \
 				$(PREFIX) $(CXXFLAGS) $(EXTRA_CXXFLAGS) \
 				$(GDAL_CFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
 
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index e82873d768b..9630f08e4ae 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -164,7 +164,7 @@ BUILT_SOURCES = $(libqgis_core_la_MOC) $(qgis_YACC)  $(postgresMOC)
 libqgis_core_la_LIBADD = $(QT_LDADD) $(GEOS_LDADD) $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3
 libqgis_core_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
 
-libqgis_core_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) $(HAVE_PYTHON) -I../ui/ -I../widgets/projectionselector/ -I../legend/ -I../raster/ -I../composer/ -I../
+libqgis_core_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) $(HAVE_PYTHON) -I../ui/ -I../widgets/projectionselector/ -I../legend/ -I../raster/ -I../composer/ -I../gui/
 
 ##
 ## ----------------------------------------------------------------------
diff --git a/src/designer/Makefile.am b/src/designer/Makefile.am
index 797c7a9da90..856a1fb9487 100644
--- a/src/designer/Makefile.am
+++ b/src/designer/Makefile.am
@@ -25,7 +25,7 @@ qgisdesignerwidgets_la_SOURCES =  qgsdesignerwidgets.cpp \
 
 qgisdesignerwidgets_la_MOC = qgsprojectionselectorplugin.moc.cpp
 
-projectionselector_la_LIBADD =  ../src/libqgis.la $(QT_LDADD)  
+projectionselector_la_LIBADD =  ../src/gui/libqgis_gui.la $(QT_LDADD)  
 #qgisdesignerwidgets_la_LIBADD =  $(QT_LDADD) ../widgets/projectionselector/libqgsprojectionselector.la
 qgisdesignerwidgets_la_LDFLAGS = -avoid-version -module
-qgisdesignerwidgets_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../ -I../legend
+qgisdesignerwidgets_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../gui/ -I../legend
diff --git a/src/main.cpp b/src/gui/main.cpp
similarity index 100%
rename from src/main.cpp
rename to src/gui/main.cpp
diff --git a/src/qgisapp.cpp b/src/gui/qgisapp.cpp
similarity index 99%
rename from src/qgisapp.cpp
rename to src/gui/qgisapp.cpp
index a9de34c7666..c0c958886c0 100644
--- a/src/qgisapp.cpp
+++ b/src/gui/qgisapp.cpp
@@ -94,7 +94,7 @@
 #include "qgshelpviewer.h"
 #include "qgslegend.h"
 #include "qgslegendlayerfile.h"
-#include "legend/qgslegendlayerfile.h"
+#include "qgslegendlayerfile.h"
 #include "qgslegendlayer.h"
 #include "qgsmapcanvas.h"
 #include "qgsmaplayer.h"
@@ -118,8 +118,8 @@
 #include "qgssinglesymrenderer.h"
 #include "qgsvectorfilewriter.h"
 #include "qgsvectorlayer.h"
-#include "../plugins/qgisplugin.h"
-#include "../images/themes/default/qgis.xpm"
+#include "../../plugins/qgisplugin.h"
+#include "../../images/themes/default/qgis.xpm"
 
 //
 // Gdal/Ogr includes
diff --git a/src/qgisapp.h b/src/gui/qgisapp.h
similarity index 100%
rename from src/qgisapp.h
rename to src/gui/qgisapp.h
diff --git a/src/qgisiface.cpp b/src/gui/qgisiface.cpp
similarity index 100%
rename from src/qgisiface.cpp
rename to src/gui/qgisiface.cpp
diff --git a/src/qgisiface.h b/src/gui/qgisiface.h
similarity index 100%
rename from src/qgisiface.h
rename to src/gui/qgisiface.h
diff --git a/src/qgisinterface.cpp b/src/gui/qgisinterface.cpp
similarity index 100%
rename from src/qgisinterface.cpp
rename to src/gui/qgisinterface.cpp
diff --git a/src/qgisinterface.h b/src/gui/qgisinterface.h
similarity index 100%
rename from src/qgisinterface.h
rename to src/gui/qgisinterface.h
diff --git a/src/qgsabout.cpp b/src/gui/qgsabout.cpp
similarity index 100%
rename from src/qgsabout.cpp
rename to src/gui/qgsabout.cpp
diff --git a/src/qgsabout.h b/src/gui/qgsabout.h
similarity index 100%
rename from src/qgsabout.h
rename to src/gui/qgsabout.h
diff --git a/src/qgsaddattrdialog.cpp b/src/gui/qgsaddattrdialog.cpp
similarity index 100%
rename from src/qgsaddattrdialog.cpp
rename to src/gui/qgsaddattrdialog.cpp
diff --git a/src/qgsaddattrdialog.h b/src/gui/qgsaddattrdialog.h
similarity index 100%
rename from src/qgsaddattrdialog.h
rename to src/gui/qgsaddattrdialog.h
diff --git a/src/qgsadvancedattrsearch.cpp b/src/gui/qgsadvancedattrsearch.cpp
similarity index 100%
rename from src/qgsadvancedattrsearch.cpp
rename to src/gui/qgsadvancedattrsearch.cpp
diff --git a/src/qgsadvancedattrsearch.h b/src/gui/qgsadvancedattrsearch.h
similarity index 100%
rename from src/qgsadvancedattrsearch.h
rename to src/gui/qgsadvancedattrsearch.h
diff --git a/src/qgsattributeaction.cpp b/src/gui/qgsattributeaction.cpp
similarity index 100%
rename from src/qgsattributeaction.cpp
rename to src/gui/qgsattributeaction.cpp
diff --git a/src/qgsattributeaction.h b/src/gui/qgsattributeaction.h
similarity index 100%
rename from src/qgsattributeaction.h
rename to src/gui/qgsattributeaction.h
diff --git a/src/qgsattributeactiondialog.cpp b/src/gui/qgsattributeactiondialog.cpp
similarity index 100%
rename from src/qgsattributeactiondialog.cpp
rename to src/gui/qgsattributeactiondialog.cpp
diff --git a/src/qgsattributeactiondialog.h b/src/gui/qgsattributeactiondialog.h
similarity index 100%
rename from src/qgsattributeactiondialog.h
rename to src/gui/qgsattributeactiondialog.h
diff --git a/src/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp
similarity index 100%
rename from src/qgsattributedialog.cpp
rename to src/gui/qgsattributedialog.cpp
diff --git a/src/qgsattributedialog.h b/src/gui/qgsattributedialog.h
similarity index 100%
rename from src/qgsattributedialog.h
rename to src/gui/qgsattributedialog.h
diff --git a/src/qgsattributetable.cpp b/src/gui/qgsattributetable.cpp
similarity index 100%
rename from src/qgsattributetable.cpp
rename to src/gui/qgsattributetable.cpp
diff --git a/src/qgsattributetable.h b/src/gui/qgsattributetable.h
similarity index 100%
rename from src/qgsattributetable.h
rename to src/gui/qgsattributetable.h
diff --git a/src/qgsattributetabledisplay.cpp b/src/gui/qgsattributetabledisplay.cpp
similarity index 100%
rename from src/qgsattributetabledisplay.cpp
rename to src/gui/qgsattributetabledisplay.cpp
diff --git a/src/qgsattributetabledisplay.h b/src/gui/qgsattributetabledisplay.h
similarity index 100%
rename from src/qgsattributetabledisplay.h
rename to src/gui/qgsattributetabledisplay.h
diff --git a/src/qgsbookmarks.cpp b/src/gui/qgsbookmarks.cpp
similarity index 100%
rename from src/qgsbookmarks.cpp
rename to src/gui/qgsbookmarks.cpp
diff --git a/src/qgsbookmarks.h b/src/gui/qgsbookmarks.h
similarity index 100%
rename from src/qgsbookmarks.h
rename to src/gui/qgsbookmarks.h
diff --git a/src/qgsclipboard.cpp b/src/gui/qgsclipboard.cpp
similarity index 100%
rename from src/qgsclipboard.cpp
rename to src/gui/qgsclipboard.cpp
diff --git a/src/qgsclipboard.h b/src/gui/qgsclipboard.h
similarity index 100%
rename from src/qgsclipboard.h
rename to src/gui/qgsclipboard.h
diff --git a/src/qgscontcoldialog.cpp b/src/gui/qgscontcoldialog.cpp
similarity index 100%
rename from src/qgscontcoldialog.cpp
rename to src/gui/qgscontcoldialog.cpp
diff --git a/src/qgscontcoldialog.h b/src/gui/qgscontcoldialog.h
similarity index 100%
rename from src/qgscontcoldialog.h
rename to src/gui/qgscontcoldialog.h
diff --git a/src/qgscontinuouscolrenderer.cpp b/src/gui/qgscontinuouscolrenderer.cpp
similarity index 100%
rename from src/qgscontinuouscolrenderer.cpp
rename to src/gui/qgscontinuouscolrenderer.cpp
diff --git a/src/qgscontinuouscolrenderer.h b/src/gui/qgscontinuouscolrenderer.h
similarity index 100%
rename from src/qgscontinuouscolrenderer.h
rename to src/gui/qgscontinuouscolrenderer.h
diff --git a/src/qgscoordinatetransform.cpp b/src/gui/qgscoordinatetransform.cpp
similarity index 100%
rename from src/qgscoordinatetransform.cpp
rename to src/gui/qgscoordinatetransform.cpp
diff --git a/src/qgscoordinatetransform.h b/src/gui/qgscoordinatetransform.h
similarity index 100%
rename from src/qgscoordinatetransform.h
rename to src/gui/qgscoordinatetransform.h
diff --git a/src/qgscsexception.h b/src/gui/qgscsexception.h
similarity index 100%
rename from src/qgscsexception.h
rename to src/gui/qgscsexception.h
diff --git a/src/qgscursors.h b/src/gui/qgscursors.h
similarity index 100%
rename from src/qgscursors.h
rename to src/gui/qgscursors.h
diff --git a/src/qgscustomprojectiondialog.cpp b/src/gui/qgscustomprojectiondialog.cpp
similarity index 100%
rename from src/qgscustomprojectiondialog.cpp
rename to src/gui/qgscustomprojectiondialog.cpp
diff --git a/src/qgscustomprojectiondialog.h b/src/gui/qgscustomprojectiondialog.h
similarity index 100%
rename from src/qgscustomprojectiondialog.h
rename to src/gui/qgscustomprojectiondialog.h
diff --git a/src/qgsdbsourceselect.cpp b/src/gui/qgsdbsourceselect.cpp
similarity index 100%
rename from src/qgsdbsourceselect.cpp
rename to src/gui/qgsdbsourceselect.cpp
diff --git a/src/qgsdbsourceselect.h b/src/gui/qgsdbsourceselect.h
similarity index 100%
rename from src/qgsdbsourceselect.h
rename to src/gui/qgsdbsourceselect.h
diff --git a/src/qgsdelattrdialog.cpp b/src/gui/qgsdelattrdialog.cpp
similarity index 100%
rename from src/qgsdelattrdialog.cpp
rename to src/gui/qgsdelattrdialog.cpp
diff --git a/src/qgsdelattrdialog.h b/src/gui/qgsdelattrdialog.h
similarity index 100%
rename from src/qgsdelattrdialog.h
rename to src/gui/qgsdelattrdialog.h
diff --git a/src/qgsencodingfiledialog.cpp b/src/gui/qgsencodingfiledialog.cpp
similarity index 100%
rename from src/qgsencodingfiledialog.cpp
rename to src/gui/qgsencodingfiledialog.cpp
diff --git a/src/qgsencodingfiledialog.h b/src/gui/qgsencodingfiledialog.h
similarity index 100%
rename from src/qgsencodingfiledialog.h
rename to src/gui/qgsencodingfiledialog.h
diff --git a/src/qgsfeature.cpp b/src/gui/qgsfeature.cpp
similarity index 100%
rename from src/qgsfeature.cpp
rename to src/gui/qgsfeature.cpp
diff --git a/src/qgsfeature.h b/src/gui/qgsfeature.h
similarity index 100%
rename from src/qgsfeature.h
rename to src/gui/qgsfeature.h
diff --git a/src/qgsfillstylewidget.cpp b/src/gui/qgsfillstylewidget.cpp
similarity index 100%
rename from src/qgsfillstylewidget.cpp
rename to src/gui/qgsfillstylewidget.cpp
diff --git a/src/qgsfillstylewidget.h b/src/gui/qgsfillstylewidget.h
similarity index 100%
rename from src/qgsfillstylewidget.h
rename to src/gui/qgsfillstylewidget.h
diff --git a/src/qgsgeomtypedialog.cpp b/src/gui/qgsgeomtypedialog.cpp
similarity index 100%
rename from src/qgsgeomtypedialog.cpp
rename to src/gui/qgsgeomtypedialog.cpp
diff --git a/src/qgsgeomtypedialog.h b/src/gui/qgsgeomtypedialog.h
similarity index 100%
rename from src/qgsgeomtypedialog.h
rename to src/gui/qgsgeomtypedialog.h
diff --git a/src/qgsgraduatedsymrenderer.cpp b/src/gui/qgsgraduatedsymrenderer.cpp
similarity index 100%
rename from src/qgsgraduatedsymrenderer.cpp
rename to src/gui/qgsgraduatedsymrenderer.cpp
diff --git a/src/qgsgraduatedsymrenderer.h b/src/gui/qgsgraduatedsymrenderer.h
similarity index 100%
rename from src/qgsgraduatedsymrenderer.h
rename to src/gui/qgsgraduatedsymrenderer.h
diff --git a/src/qgsgrasydialog.cpp b/src/gui/qgsgrasydialog.cpp
similarity index 100%
rename from src/qgsgrasydialog.cpp
rename to src/gui/qgsgrasydialog.cpp
diff --git a/src/qgsgrasydialog.h b/src/gui/qgsgrasydialog.h
similarity index 100%
rename from src/qgsgrasydialog.h
rename to src/gui/qgsgrasydialog.h
diff --git a/src/qgshelpviewer.cpp b/src/gui/qgshelpviewer.cpp
similarity index 100%
rename from src/qgshelpviewer.cpp
rename to src/gui/qgshelpviewer.cpp
diff --git a/src/qgshelpviewer.h b/src/gui/qgshelpviewer.h
similarity index 100%
rename from src/qgshelpviewer.h
rename to src/gui/qgshelpviewer.h
diff --git a/src/qgsidentifyresults.cpp b/src/gui/qgsidentifyresults.cpp
similarity index 100%
rename from src/qgsidentifyresults.cpp
rename to src/gui/qgsidentifyresults.cpp
diff --git a/src/qgsidentifyresults.h b/src/gui/qgsidentifyresults.h
similarity index 100%
rename from src/qgsidentifyresults.h
rename to src/gui/qgsidentifyresults.h
diff --git a/src/qgslabel.cpp b/src/gui/qgslabel.cpp
similarity index 100%
rename from src/qgslabel.cpp
rename to src/gui/qgslabel.cpp
diff --git a/src/qgslabel.h b/src/gui/qgslabel.h
similarity index 100%
rename from src/qgslabel.h
rename to src/gui/qgslabel.h
diff --git a/src/qgslabeldialog.cpp b/src/gui/qgslabeldialog.cpp
similarity index 100%
rename from src/qgslabeldialog.cpp
rename to src/gui/qgslabeldialog.cpp
diff --git a/src/qgslabeldialog.h b/src/gui/qgslabeldialog.h
similarity index 100%
rename from src/qgslabeldialog.h
rename to src/gui/qgslabeldialog.h
diff --git a/src/qgslayerprojectionselector.cpp b/src/gui/qgslayerprojectionselector.cpp
similarity index 100%
rename from src/qgslayerprojectionselector.cpp
rename to src/gui/qgslayerprojectionselector.cpp
diff --git a/src/qgslayerprojectionselector.h b/src/gui/qgslayerprojectionselector.h
similarity index 100%
rename from src/qgslayerprojectionselector.h
rename to src/gui/qgslayerprojectionselector.h
diff --git a/src/qgslinestyledialog.cpp b/src/gui/qgslinestyledialog.cpp
similarity index 100%
rename from src/qgslinestyledialog.cpp
rename to src/gui/qgslinestyledialog.cpp
diff --git a/src/qgslinestyledialog.h b/src/gui/qgslinestyledialog.h
similarity index 100%
rename from src/qgslinestyledialog.h
rename to src/gui/qgslinestyledialog.h
diff --git a/src/qgslinestylewidget.cpp b/src/gui/qgslinestylewidget.cpp
similarity index 100%
rename from src/qgslinestylewidget.cpp
rename to src/gui/qgslinestylewidget.cpp
diff --git a/src/qgslinestylewidget.h b/src/gui/qgslinestylewidget.h
similarity index 100%
rename from src/qgslinestylewidget.h
rename to src/gui/qgslinestylewidget.h
diff --git a/src/qgsludialog.cpp b/src/gui/qgsludialog.cpp
similarity index 100%
rename from src/qgsludialog.cpp
rename to src/gui/qgsludialog.cpp
diff --git a/src/qgsludialog.h b/src/gui/qgsludialog.h
similarity index 100%
rename from src/qgsludialog.h
rename to src/gui/qgsludialog.h
diff --git a/src/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
similarity index 100%
rename from src/qgsmapcanvas.cpp
rename to src/gui/qgsmapcanvas.cpp
diff --git a/src/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
similarity index 100%
rename from src/qgsmapcanvas.h
rename to src/gui/qgsmapcanvas.h
diff --git a/src/qgsmapcanvasproperties.h b/src/gui/qgsmapcanvasproperties.h
similarity index 100%
rename from src/qgsmapcanvasproperties.h
rename to src/gui/qgsmapcanvasproperties.h
diff --git a/src/qgsmaplayer.cpp b/src/gui/qgsmaplayer.cpp
similarity index 100%
rename from src/qgsmaplayer.cpp
rename to src/gui/qgsmaplayer.cpp
diff --git a/src/qgsmaplayer.h b/src/gui/qgsmaplayer.h
similarity index 100%
rename from src/qgsmaplayer.h
rename to src/gui/qgsmaplayer.h
diff --git a/src/qgsmaplayerinterface.h b/src/gui/qgsmaplayerinterface.h
similarity index 100%
rename from src/qgsmaplayerinterface.h
rename to src/gui/qgsmaplayerinterface.h
diff --git a/src/qgsmaplayerregistry.cpp b/src/gui/qgsmaplayerregistry.cpp
similarity index 100%
rename from src/qgsmaplayerregistry.cpp
rename to src/gui/qgsmaplayerregistry.cpp
diff --git a/src/qgsmaplayerregistry.h b/src/gui/qgsmaplayerregistry.h
similarity index 100%
rename from src/qgsmaplayerregistry.h
rename to src/gui/qgsmaplayerregistry.h
diff --git a/src/qgsmapoverviewcanvas.cpp b/src/gui/qgsmapoverviewcanvas.cpp
similarity index 100%
rename from src/qgsmapoverviewcanvas.cpp
rename to src/gui/qgsmapoverviewcanvas.cpp
diff --git a/src/qgsmapoverviewcanvas.h b/src/gui/qgsmapoverviewcanvas.h
similarity index 100%
rename from src/qgsmapoverviewcanvas.h
rename to src/gui/qgsmapoverviewcanvas.h
diff --git a/src/qgsmapserverexport.cpp b/src/gui/qgsmapserverexport.cpp
similarity index 100%
rename from src/qgsmapserverexport.cpp
rename to src/gui/qgsmapserverexport.cpp
diff --git a/src/qgsmapserverexport.h b/src/gui/qgsmapserverexport.h
similarity index 100%
rename from src/qgsmapserverexport.h
rename to src/gui/qgsmapserverexport.h
diff --git a/src/qgsmarkerdialog.cpp b/src/gui/qgsmarkerdialog.cpp
similarity index 100%
rename from src/qgsmarkerdialog.cpp
rename to src/gui/qgsmarkerdialog.cpp
diff --git a/src/qgsmarkerdialog.h b/src/gui/qgsmarkerdialog.h
similarity index 100%
rename from src/qgsmarkerdialog.h
rename to src/gui/qgsmarkerdialog.h
diff --git a/src/qgsmeasure.cpp b/src/gui/qgsmeasure.cpp
similarity index 100%
rename from src/qgsmeasure.cpp
rename to src/gui/qgsmeasure.cpp
diff --git a/src/qgsmeasure.h b/src/gui/qgsmeasure.h
similarity index 100%
rename from src/qgsmeasure.h
rename to src/gui/qgsmeasure.h
diff --git a/src/qgsmessageviewer.cpp b/src/gui/qgsmessageviewer.cpp
similarity index 100%
rename from src/qgsmessageviewer.cpp
rename to src/gui/qgsmessageviewer.cpp
diff --git a/src/qgsmessageviewer.h b/src/gui/qgsmessageviewer.h
similarity index 100%
rename from src/qgsmessageviewer.h
rename to src/gui/qgsmessageviewer.h
diff --git a/src/qgsnewconnection.cpp b/src/gui/qgsnewconnection.cpp
similarity index 100%
rename from src/qgsnewconnection.cpp
rename to src/gui/qgsnewconnection.cpp
diff --git a/src/qgsnewconnection.h b/src/gui/qgsnewconnection.h
similarity index 100%
rename from src/qgsnewconnection.h
rename to src/gui/qgsnewconnection.h
diff --git a/src/qgsnewhttpconnection.cpp b/src/gui/qgsnewhttpconnection.cpp
similarity index 100%
rename from src/qgsnewhttpconnection.cpp
rename to src/gui/qgsnewhttpconnection.cpp
diff --git a/src/qgsnewhttpconnection.h b/src/gui/qgsnewhttpconnection.h
similarity index 100%
rename from src/qgsnewhttpconnection.h
rename to src/gui/qgsnewhttpconnection.h
diff --git a/src/qgsoptions.cpp b/src/gui/qgsoptions.cpp
similarity index 100%
rename from src/qgsoptions.cpp
rename to src/gui/qgsoptions.cpp
diff --git a/src/qgsoptions.h b/src/gui/qgsoptions.h
similarity index 100%
rename from src/qgsoptions.h
rename to src/gui/qgsoptions.h
diff --git a/src/qgspastetransformations.cpp b/src/gui/qgspastetransformations.cpp
similarity index 100%
rename from src/qgspastetransformations.cpp
rename to src/gui/qgspastetransformations.cpp
diff --git a/src/qgspastetransformations.h b/src/gui/qgspastetransformations.h
similarity index 100%
rename from src/qgspastetransformations.h
rename to src/gui/qgspastetransformations.h
diff --git a/src/qgspatterndialog.cpp b/src/gui/qgspatterndialog.cpp
similarity index 100%
rename from src/qgspatterndialog.cpp
rename to src/gui/qgspatterndialog.cpp
diff --git a/src/qgspatterndialog.h b/src/gui/qgspatterndialog.h
similarity index 100%
rename from src/qgspatterndialog.h
rename to src/gui/qgspatterndialog.h
diff --git a/src/qgspgquerybuilder.cpp b/src/gui/qgspgquerybuilder.cpp
similarity index 100%
rename from src/qgspgquerybuilder.cpp
rename to src/gui/qgspgquerybuilder.cpp
diff --git a/src/qgspgquerybuilder.h b/src/gui/qgspgquerybuilder.h
similarity index 100%
rename from src/qgspgquerybuilder.h
rename to src/gui/qgspgquerybuilder.h
diff --git a/src/qgspgutil.cpp b/src/gui/qgspgutil.cpp
similarity index 100%
rename from src/qgspgutil.cpp
rename to src/gui/qgspgutil.cpp
diff --git a/src/qgspgutil.h b/src/gui/qgspgutil.h
similarity index 100%
rename from src/qgspgutil.h
rename to src/gui/qgspgutil.h
diff --git a/src/qgspluginmanager.cpp b/src/gui/qgspluginmanager.cpp
similarity index 99%
rename from src/qgspluginmanager.cpp
rename to src/gui/qgspluginmanager.cpp
index 3f143471bc1..5d8de0cfe64 100644
--- a/src/qgspluginmanager.cpp
+++ b/src/gui/qgspluginmanager.cpp
@@ -23,7 +23,7 @@
 #include <qmessagebox.h>
 #include <qlibrary.h>
 #include <qsettings.h>
-#include "../plugins/qgisplugin.h"
+#include "qgisplugin.h"
 #include "qgspluginmanager.h"
 #include "qgspluginitem.h"
 #include "qgsproviderregistry.h"
diff --git a/src/qgspluginmanager.h b/src/gui/qgspluginmanager.h
similarity index 100%
rename from src/qgspluginmanager.h
rename to src/gui/qgspluginmanager.h
diff --git a/src/qgspluginmetadata.cpp b/src/gui/qgspluginmetadata.cpp
similarity index 100%
rename from src/qgspluginmetadata.cpp
rename to src/gui/qgspluginmetadata.cpp
diff --git a/src/qgspluginmetadata.h b/src/gui/qgspluginmetadata.h
similarity index 100%
rename from src/qgspluginmetadata.h
rename to src/gui/qgspluginmetadata.h
diff --git a/src/qgspointstylewidget.cpp b/src/gui/qgspointstylewidget.cpp
similarity index 100%
rename from src/qgspointstylewidget.cpp
rename to src/gui/qgspointstylewidget.cpp
diff --git a/src/qgspointstylewidget.h b/src/gui/qgspointstylewidget.h
similarity index 100%
rename from src/qgspointstylewidget.h
rename to src/gui/qgspointstylewidget.h
diff --git a/src/qgsproject.cpp b/src/gui/qgsproject.cpp
similarity index 100%
rename from src/qgsproject.cpp
rename to src/gui/qgsproject.cpp
diff --git a/src/qgsproject.h b/src/gui/qgsproject.h
similarity index 100%
rename from src/qgsproject.h
rename to src/gui/qgsproject.h
diff --git a/src/qgsprojectproperties.cpp b/src/gui/qgsprojectproperties.cpp
similarity index 100%
rename from src/qgsprojectproperties.cpp
rename to src/gui/qgsprojectproperties.cpp
diff --git a/src/qgsprojectproperties.h b/src/gui/qgsprojectproperties.h
similarity index 100%
rename from src/qgsprojectproperties.h
rename to src/gui/qgsprojectproperties.h
diff --git a/src/qgsrasterlayerproperties.cpp b/src/gui/qgsrasterlayerproperties.cpp
similarity index 100%
rename from src/qgsrasterlayerproperties.cpp
rename to src/gui/qgsrasterlayerproperties.cpp
diff --git a/src/qgsrasterlayerproperties.h b/src/gui/qgsrasterlayerproperties.h
similarity index 100%
rename from src/qgsrasterlayerproperties.h
rename to src/gui/qgsrasterlayerproperties.h
diff --git a/src/qgsrunprocess.cpp b/src/gui/qgsrunprocess.cpp
similarity index 100%
rename from src/qgsrunprocess.cpp
rename to src/gui/qgsrunprocess.cpp
diff --git a/src/qgsrunprocess.h b/src/gui/qgsrunprocess.h
similarity index 100%
rename from src/qgsrunprocess.h
rename to src/gui/qgsrunprocess.h
diff --git a/src/qgsserversourceselect.cpp b/src/gui/qgsserversourceselect.cpp
similarity index 100%
rename from src/qgsserversourceselect.cpp
rename to src/gui/qgsserversourceselect.cpp
diff --git a/src/qgsserversourceselect.h b/src/gui/qgsserversourceselect.h
similarity index 100%
rename from src/qgsserversourceselect.h
rename to src/gui/qgsserversourceselect.h
diff --git a/src/qgssinglesymrenderer.cpp b/src/gui/qgssinglesymrenderer.cpp
similarity index 100%
rename from src/qgssinglesymrenderer.cpp
rename to src/gui/qgssinglesymrenderer.cpp
diff --git a/src/qgssinglesymrenderer.h b/src/gui/qgssinglesymrenderer.h
similarity index 100%
rename from src/qgssinglesymrenderer.h
rename to src/gui/qgssinglesymrenderer.h
diff --git a/src/qgssisydialog.cpp b/src/gui/qgssisydialog.cpp
similarity index 100%
rename from src/qgssisydialog.cpp
rename to src/gui/qgssisydialog.cpp
diff --git a/src/qgssisydialog.h b/src/gui/qgssisydialog.h
similarity index 100%
rename from src/qgssisydialog.h
rename to src/gui/qgssisydialog.h
diff --git a/src/qgsspatialrefsys.cpp b/src/gui/qgsspatialrefsys.cpp
similarity index 100%
rename from src/qgsspatialrefsys.cpp
rename to src/gui/qgsspatialrefsys.cpp
diff --git a/src/qgsspatialrefsys.h b/src/gui/qgsspatialrefsys.h
similarity index 100%
rename from src/qgsspatialrefsys.h
rename to src/gui/qgsspatialrefsys.h
diff --git a/src/qgstable.h b/src/gui/qgstable.h
similarity index 100%
rename from src/qgstable.h
rename to src/gui/qgstable.h
diff --git a/src/qgsuniquevalrenderer.cpp b/src/gui/qgsuniquevalrenderer.cpp
similarity index 100%
rename from src/qgsuniquevalrenderer.cpp
rename to src/gui/qgsuniquevalrenderer.cpp
diff --git a/src/qgsuniquevalrenderer.h b/src/gui/qgsuniquevalrenderer.h
similarity index 100%
rename from src/qgsuniquevalrenderer.h
rename to src/gui/qgsuniquevalrenderer.h
diff --git a/src/qgsuvaldialog.cpp b/src/gui/qgsuvaldialog.cpp
similarity index 100%
rename from src/qgsuvaldialog.cpp
rename to src/gui/qgsuvaldialog.cpp
diff --git a/src/qgsuvaldialog.h b/src/gui/qgsuvaldialog.h
similarity index 100%
rename from src/qgsuvaldialog.h
rename to src/gui/qgsuvaldialog.h
diff --git a/src/qgsvectorfilewriter.cpp b/src/gui/qgsvectorfilewriter.cpp
similarity index 100%
rename from src/qgsvectorfilewriter.cpp
rename to src/gui/qgsvectorfilewriter.cpp
diff --git a/src/qgsvectorfilewriter.h b/src/gui/qgsvectorfilewriter.h
similarity index 100%
rename from src/qgsvectorfilewriter.h
rename to src/gui/qgsvectorfilewriter.h
diff --git a/src/qgsvectorlayer.cpp b/src/gui/qgsvectorlayer.cpp
similarity index 100%
rename from src/qgsvectorlayer.cpp
rename to src/gui/qgsvectorlayer.cpp
diff --git a/src/qgsvectorlayer.h b/src/gui/qgsvectorlayer.h
similarity index 100%
rename from src/qgsvectorlayer.h
rename to src/gui/qgsvectorlayer.h
diff --git a/src/qgsvectorlayerproperties.cpp b/src/gui/qgsvectorlayerproperties.cpp
similarity index 100%
rename from src/qgsvectorlayerproperties.cpp
rename to src/gui/qgsvectorlayerproperties.cpp
diff --git a/src/qgsvectorlayerproperties.h b/src/gui/qgsvectorlayerproperties.h
similarity index 100%
rename from src/qgsvectorlayerproperties.h
rename to src/gui/qgsvectorlayerproperties.h
diff --git a/src/qgsvectorsymbologywidget.cpp b/src/gui/qgsvectorsymbologywidget.cpp
similarity index 100%
rename from src/qgsvectorsymbologywidget.cpp
rename to src/gui/qgsvectorsymbologywidget.cpp
diff --git a/src/qgsvectorsymbologywidget.h b/src/gui/qgsvectorsymbologywidget.h
similarity index 100%
rename from src/qgsvectorsymbologywidget.h
rename to src/gui/qgsvectorsymbologywidget.h
diff --git a/src/legend/Makefile.am b/src/legend/Makefile.am
index db7a18b0004..b53b3794dca 100644
--- a/src/legend/Makefile.am
+++ b/src/legend/Makefile.am
@@ -37,7 +37,7 @@ libqgis_legend_la_SOURCES =	qgslegendgroup.cpp \
 libqgis_legend_la_LIBFLAGS = $(QT_LDADD)
 
 libqgis_legend_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
-libqgis_legend_la_CXXFLAGS = $(PKGDATAPATH) -I.. -I../ui/ -I../core/ \
+libqgis_legend_la_CXXFLAGS = $(PKGDATAPATH) -I../gui/ -I../ui/ -I../core/ \
 				$(CXXFLAGS) $(EXTRA_CXXFLAGS) \
 				$(GDAL_CFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
 
diff --git a/src/providers/delimitedtext/Makefile.am b/src/providers/delimitedtext/Makefile.am
index aabb8693c3a..a80ea32ef64 100644
--- a/src/providers/delimitedtext/Makefile.am
+++ b/src/providers/delimitedtext/Makefile.am
@@ -1,6 +1,6 @@
 ## $Id$
 
-INCLUDES = -I../../core/ -I../../
+INCLUDES = -I../../core/ -I../../gui/
 
 plugindir = ${pkglibdir}
 plugin_LTLIBRARIES = delimitedtextprovider.la 
@@ -8,7 +8,7 @@ plugin_LTLIBRARIES = delimitedtextprovider.la
 delimitedtextprovider_la_SOURCES = qgsdelimitedtextprovider.cpp
 
 
-delimitedtextprovider_la_LIBADD = $(QT_LDADD)  $(GDAL_LIB) $(GEOS_LDADD) ../../libqgis_gui.la ../../core/libqgis_core.la
+delimitedtextprovider_la_LIBADD = $(QT_LDADD)  $(GDAL_LIB) $(GEOS_LDADD) ../../gui/libqgis_gui.la ../../core/libqgis_core.la
 delimitedtextprovider_la_LDFLAGS = -avoid-version -module
 delimitedtextprovider_la_CXXFLAGS = $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
 
diff --git a/src/providers/gpx/Makefile.am b/src/providers/gpx/Makefile.am
index b780cc6636e..1922735bdf4 100644
--- a/src/providers/gpx/Makefile.am
+++ b/src/providers/gpx/Makefile.am
@@ -2,7 +2,7 @@
 
 if HAVE_EXPAT
 
-INCLUDES = -I../../core -I../../
+INCLUDES = -I../../core -I../../gui
 
 plugindir = ${pkglibdir}
 plugin_LTLIBRARIES = gpxprovider.la 
diff --git a/src/providers/grass/Makefile.am b/src/providers/grass/Makefile.am
index 3ac8f277719..36923b8ac5e 100644
--- a/src/providers/grass/Makefile.am
+++ b/src/providers/grass/Makefile.am
@@ -2,7 +2,7 @@
 ## $Id$
 ##
 
-INCLUDES = -I../../core -I../../
+INCLUDES = -I../../core -I../../gui
 
 lib_LTLIBRARIES = libqgisgrass.la
 
@@ -30,7 +30,7 @@ libqgisgrass_la_SOURCES = qgsgrassprovider.cpp \
 			qgsgrass.cpp \
 			qgsgrass.h
 
-libqgisgrass_la_LIBADD = $(QT_LDADD) $(GRASS_LIB) ../../core/libqgis_core.la ../../libqgis_gui.la
+libqgisgrass_la_LIBADD = $(QT_LDADD) $(GRASS_LIB) ../../core/libqgis_core.la ../../gui/libqgis_gui.la
 libqgisgrass_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
 libqgisgrass_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) -I$(GRASS_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS)
 if HAVE_POSTGRESQL
diff --git a/src/providers/ogr/Makefile.am b/src/providers/ogr/Makefile.am
index 7f45fa9ca5b..64d950506fd 100644
--- a/src/providers/ogr/Makefile.am
+++ b/src/providers/ogr/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../../core/ -I../../
+INCLUDES = -I../../core/ -I../../gui
 
 plugindir = ${pkglibdir}
 plugin_LTLIBRARIES = ogrprovider.la 
@@ -6,7 +6,7 @@ plugin_LTLIBRARIES = ogrprovider.la
 ogrprovider_la_SOURCES = qgsogrprovider.cpp			\
 			 qgsogrprovider.h
 
-ogrprovider_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD) $(GEOS_LDADD) ../../core/libqgis_core.la ../../libqgis_gui.la
+ogrprovider_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD) $(GEOS_LDADD) ../../core/libqgis_core.la ../../gui/libqgis_gui.la
 ogrprovider_la_LDFLAGS = -avoid-version -module
 ogrprovider_la_CXXFLAGS := $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
 
diff --git a/src/providers/postgres/Makefile.am b/src/providers/postgres/Makefile.am
index 5bf02c67a2c..c86756f2fbc 100644
--- a/src/providers/postgres/Makefile.am
+++ b/src/providers/postgres/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../../core/ -I../../
+INCLUDES = -I../../core/ -I../../gui/
 
 %.moc.cpp: %.h
 	$(MOC) -o $@ $<
@@ -27,7 +27,7 @@ postgresprovider_la_SOURCES =					\
 
 BUILT_SOURCES = $(postgresprovider_MOC)
                                 
-postgresprovider_la_LIBADD = $(QT_LDADD) $(PG_LIB) $(GEOS_LDADD) ../../core/libqgis_core.la ../../libqgis_gui.la
+postgresprovider_la_LIBADD = $(QT_LDADD) $(PG_LIB) $(GEOS_LDADD) ../../core/libqgis_core.la ../../gui/libqgis_gui.la
 postgresprovider_la_LDFLAGS = -avoid-version -module
 postgresprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS)
 
diff --git a/src/providers/wms/Makefile.am b/src/providers/wms/Makefile.am
index 25be63a08de..0b1350a8608 100644
--- a/src/providers/wms/Makefile.am
+++ b/src/providers/wms/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../../ -I../../raster -I../../core
+INCLUDES = -I../../gui -I../../raster -I../../core
 
 %.moc.cpp: %.h
 	$(MOC) -o $@ $<
diff --git a/src/raster/Makefile.am b/src/raster/Makefile.am
index 5d9d9039e4e..f5837b067d0 100644
--- a/src/raster/Makefile.am
+++ b/src/raster/Makefile.am
@@ -24,7 +24,7 @@ BUILT_SOURCES = $(libqgis_raster_la_MOC) $(libqgis_raster_la_SOURCES)
 ##libqgis_raster_la_LDFLAGS = -no-undefined
 libqgis_raster_la_CPPFLAGS = -I$(OMSRCDIR)
 libqgis_raster_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD)
-libqgis_raster_la_CXXFLAGS = $(PREFIX) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../widgets/projectionselector/ -I../ -I../legend/ -I../ui/ -I../core/
+libqgis_raster_la_CXXFLAGS = $(PREFIX) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../widgets/projectionselector/ -I../gui/ -I../legend/ -I../ui/ -I../core/
 
 EXTRA_DIST = \
 	qgsrasterbandstats.h \