diff --git a/.hgignore b/.hgignore
index 90d48861..a9108cec 100644
--- a/.hgignore
+++ b/.hgignore
@@ -21,6 +21,7 @@ devcpp.*_private\.*
 devcpp.*\.ico
 devcpp.*Makefile\.win
 devcpp.*\.layout
+devcpp/config\.h$
 .*\.pyc
 .*~
 .*\.pcs
@@ -30,3 +31,6 @@ devcpp.*\.layout
 .*-glade\.h
 moomarshals\.[ch]
 tests.*-ui\.h
+moo/mooutils/moofileview/moofileview-ui\.h
+moo/mooutils/moofileview/symlink\.h
+moo/mooutils/stock-moo.h
diff --git a/devcpp/medit-before.mak b/devcpp/medit-before.mak
new file mode 100644
index 00000000..382fa586
--- /dev/null
+++ b/devcpp/medit-before.mak
@@ -0,0 +1,159 @@
+MOO = ../moo
+MOO_W = ..\moo
+XML2H = $(MOO)/mooutils/xml2h.py
+
+mooutils = $(MOO)/mooutils
+mooutils_srcdir = $(MOO)/mooutils
+mooedit = $(MOO)/mooedit
+mooedit_srcdir = $(MOO)/mooedit
+tests = ../tests
+moofileview = $(mooutils)/moofileview
+moofileview_srcdir = $(moofileview)
+
+GENERATED =                                 \
+    config.h                                \
+    $(mooutils)/moomarshals.h               \
+    $(mooutils)/moomarshals.c               \
+    $(tests)/medit-ui.h                     \
+    $(MOO)/mooapp/mooappabout-glade.h       \
+    $(mooutils)/mooaccelbutton-glade.h      \
+    $(mooutils)/mooaccelprefs-glade.h       \
+    $(mooutils)/moologwindow-glade.h        \
+    $(mooedit)/quicksearch-glade.h          \
+    $(mooedit)/statusbar-glade.h            \
+    $(mooedit)/mootextgotoline-glade.h      \
+    $(mooedit)/mootextfind-glade.h          \
+    $(mooedit)/moopluginprefs-glade.h       \
+    $(mooedit)/mooprint-glade.h             \
+    $(mooedit)/mooeditprefs-glade.h         \
+    $(mooedit)/mooeditsavemultiple-glade.h  \
+    $(mooedit)/mooeditcolorsprefs-glade.h   \
+    $(mooutils)/stock-moo.h                 \
+    $(moofileview)/moofileview-ui.h         \
+    $(moofileview)/moofileprops-glade.h     \
+    $(moofileview)/moocreatefolder-glade.h  \
+    $(moofileview)/moofileviewdrop-glade.h  \
+    $(moofileview)/symlink.h                \
+    $(moofileview)/moobookmarkmgr-glade.h
+
+all-before: $(GENERATED)
+
+##############################################################
+# Marshalers
+#
+$(MOO)/mooutils/moomarshals.h: $(MOO)/mooutils/moomarshals.list
+	glib-genmarshal --prefix=_moo_marshal --header $(MOO)/mooutils/moomarshals.list > $(MOO)/mooutils/moomarshals.h
+
+$(MOO)/mooutils/moomarshals.c: $(MOO)/mooutils/moomarshals.list
+	glib-genmarshal --prefix=_moo_marshal --body $(MOO)/mooutils/moomarshals.list > $(MOO)/mooutils/moomarshals.c
+
+
+##############################################################
+# config.h
+#
+config.h: ../config.h.win32
+	copy /Y ..\config.h.win32 config.h
+
+
+##############################################################
+# glade files
+#
+$(mooutils)/mooaccelbutton-glade.h: $(mooutils_srcdir)/glade/shortcutdialog.glade $(XML2H)
+	python $(XML2H) MOO_ACCEL_BUTTON_GLADE_UI \
+	   $(mooutils_srcdir)/glade/shortcutdialog.glade > $(mooutils)/mooaccelbutton-glade.h
+$(mooutils)/mooaccelprefs-glade.h: $(mooutils_srcdir)/glade/shortcutsprefs.glade $(XML2H)
+	python $(XML2H) MOO_SHORTCUTS_PREFS_GLADE_UI \
+	   $(mooutils_srcdir)/glade/shortcutsprefs.glade > $(mooutils)/mooaccelprefs-glade.h
+$(mooutils)/moologwindow-glade.h: $(mooutils_srcdir)/glade/moologwindow.glade $(XML2H)
+	python $(XML2H) MOO_LOG_WINDOW_GLADE_UI \
+	   $(mooutils_srcdir)/glade/moologwindow.glade > $(mooutils)/moologwindow-glade.h
+$(MOO)/mooapp/mooappabout-glade.h: $(MOO)/mooapp/glade/mooappabout.glade $(XML2H)
+	python $(XML2H) MOO_APP_ABOUT_GLADE_UI \
+	   $(MOO)/mooapp/glade/mooappabout.glade > $(MOO)/mooapp/mooappabout-glade.h
+$(mooedit)/mootextgotoline-glade.h: $(mooedit_srcdir)/glade/mootextgotoline.glade $(XML2H)
+	python $(XML2H) MOO_TEXT_GOTO_LINE_GLADE_UI $(mooedit_srcdir)/glade/mootextgotoline.glade \
+		> $(mooedit)/mootextgotoline-glade.h
+$(mooedit)/mootextfind-glade.h: $(mooedit_srcdir)/glade/mootextfind.glade $(XML2H)
+	python $(XML2H) MOO_TEXT_FIND_GLADE_UI $(mooedit_srcdir)/glade/mootextfind.glade \
+		> $(mooedit)/mootextfind-glade.h
+$(mooedit)/mooeditprefs-glade.h: $(mooedit_srcdir)/glade/mooeditprefs.glade $(XML2H)
+	python $(XML2H) MOO_EDIT_PREFS_GLADE_UI $(mooedit_srcdir)/glade/mooeditprefs.glade \
+		> $(mooedit)/mooeditprefs-glade.h
+$(mooedit)/mooeditcolorsprefs-glade.h: $(mooedit_srcdir)/glade/mooeditcolorsprefs.glade $(XML2H)
+	python $(XML2H) MOO_EDIT_COLORS_PREFS_GLADE_UI $(mooedit_srcdir)/glade/mooeditcolorsprefs.glade \
+		> $(mooedit)/mooeditcolorsprefs-glade.h
+$(mooedit)/moopluginprefs-glade.h: $(mooedit_srcdir)/glade/moopluginprefs.glade $(XML2H)
+	python $(XML2H) MOO_PLUGIN_PREFS_GLADE_UI $(mooedit_srcdir)/glade/moopluginprefs.glade \
+		> $(mooedit)/moopluginprefs-glade.h
+$(mooedit)/mooeditsavemultiple-glade.h: $(mooedit_srcdir)/glade/mooeditsavemult.glade $(XML2H)
+	python $(XML2H) MOO_EDIT_SAVE_MULTIPLE_GLADE_UI $(mooedit_srcdir)/glade/mooeditsavemult.glade \
+		> $(mooedit)/mooeditsavemultiple-glade.h
+$(mooedit)/quicksearch-glade.h: $(mooedit_srcdir)/glade/quicksearch.glade $(XML2H)
+	python $(XML2H) QUICK_SEARCH_GLADE_XML $(mooedit_srcdir)/glade/quicksearch.glade \
+		> $(mooedit)/quicksearch-glade.h
+$(mooedit)/statusbar-glade.h: $(mooedit_srcdir)/glade/statusbar.glade $(XML2H)
+	python $(XML2H) STATUSBAR_GLADE_XML $(mooedit_srcdir)/glade/statusbar.glade \
+		> $(mooedit)/statusbar-glade.h
+$(mooedit)/mooprint-glade.h: $(mooedit_srcdir)/glade/mooprint.glade $(XML2H)
+	python $(XML2H) MOO_PRINT_GLADE_XML $(mooedit_srcdir)/glade/mooprint.glade \
+		> $(mooedit)/mooprint-glade.h
+$(moofileview)/moofileview-ui.h: $(moofileview_srcdir)/moofileview-ui.xml $(XML2H)
+	python $(XML2H) MOO_FILE_VIEW_UI                                       \
+	   $(moofileview_srcdir)/moofileview-ui.xml >                      \
+		$(moofileview)/moofileview-ui.h
+$(moofileview)/moofileprops-glade.h: $(moofileview_srcdir)/glade/moofileprops.glade $(XML2H)
+	python $(XML2H) MOO_FILE_PROPS_GLADE_UI                                \
+	   $(moofileview_srcdir)/glade/moofileprops.glade >                \
+		$(moofileview)/moofileprops-glade.h
+$(moofileview)/moocreatefolder-glade.h: $(moofileview_srcdir)/glade/moocreatefolder.glade $(XML2H)
+	python $(XML2H) MOO_CREATE_FOLDER_GLADE_UI                             \
+	   $(moofileview_srcdir)/glade/moocreatefolder.glade >             \
+		$(moofileview)/moocreatefolder-glade.h
+$(moofileview)/moobookmarkmgr-glade.h: $(moofileview_srcdir)/glade/bookmark_editor.glade $(XML2H)
+	python $(XML2H) MOO_BOOKMARK_MGR_GLADE_UI                              \
+	   $(moofileview_srcdir)/glade/bookmark_editor.glade >             \
+		$(moofileview)/moobookmarkmgr-glade.h
+$(moofileview)/moofileviewdrop-glade.h: $(moofileview_srcdir)/glade/drop.glade $(XML2H)
+	python $(XML2H) MOO_FILE_VIEW_DROP_GLADE_UI                            \
+	   $(moofileview_srcdir)/glade/drop.glade >                        \
+		$(moofileview)/moofileviewdrop-glade.h
+
+moofileview_pixmaps =                          \
+    $(moofileview)/symlink.png                 \
+    $(moofileview)/symlink-small.png
+
+$(moofileview)/symlink.h: $(moofileview_pixmaps)
+	gdk-pixbuf-csource --static --build-list                           \
+	SYMLINK_ARROW $(moofileview_srcdir)/symlink.png                    \
+	SYMLINK_ARROW_SMALL $(moofileview_srcdir)/symlink-small.png        \
+	> $(moofileview)/symlink.h
+
+
+mooutils_pixmaps =                             \
+    $(mooutils_srcdir)/pixmaps/gap.png         \
+    $(mooutils_srcdir)/pixmaps/ggap.png        \
+    $(mooutils_srcdir)/pixmaps/medit.png       \
+    $(mooutils_srcdir)/pixmaps/close.png       \
+    $(mooutils_srcdir)/pixmaps/detach.png      \
+    $(mooutils_srcdir)/pixmaps/attach.png      \
+    $(mooutils_srcdir)/pixmaps/keepontop.png   \
+    $(mooutils_srcdir)/pixmaps/sticky.png
+
+$(mooutils)/stock-moo.h: $(mooutils_pixmaps)
+	gdk-pixbuf-csource --static --build-list                               \
+		GAP_ICON  $(mooutils_srcdir)/pixmaps/gap.png                   \
+		GGAP_ICON $(mooutils_srcdir)/pixmaps/ggap.png                  \
+		MEDIT_ICON $(mooutils_srcdir)/pixmaps/medit.png                \
+		MOO_CLOSE_ICON $(mooutils_srcdir)/pixmaps/close.png            \
+		MOO_STICKY_ICON $(mooutils_srcdir)/pixmaps/sticky.png          \
+		MOO_DETACH_ICON $(mooutils_srcdir)/pixmaps/detach.png          \
+		MOO_ATTACH_ICON $(mooutils_srcdir)/pixmaps/attach.png          \
+		MOO_KEEP_ON_TOP_ICON $(mooutils_srcdir)/pixmaps/keepontop.png  \
+			> $(mooutils)/stock-moo.h
+
+
+##############################################################
+# xml
+#
+$(tests)/medit-ui.h: $(tests)/medit-ui.xml $(XML2H)
+	python $(XML2H) MEDIT_UI $(tests)/medit-ui.xml > $(tests)/medit-ui.h
diff --git a/devcpp/medit.dev b/devcpp/medit.dev
new file mode 100644
index 00000000..4a4025b3
--- /dev/null
+++ b/devcpp/medit.dev
@@ -0,0 +1,2369 @@
+[Project]
+FileName=medit.dev
+Name=medit
+UnitCount=230
+Type=0
+Ver=1
+ObjFiles=
+Includes=
+Libs=
+PrivateResource=
+ResourceIncludes=
+MakeIncludes=medit-before.mak
+Compiler=-I../moo -I../moo/mooutils -I. _@@_-D__MOO___@@_-DHAVE_CONFIG_H_@@_
+CppCompiler=
+Linker=-lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -liconv_@@_
+IsCpp=0
+Icon=
+ExeOutput=
+ObjectOutput=
+OverrideOutput=0
+OverrideOutputName=medit.exe
+HostApplication=
+Folders=mooapp,mooedit,mooutils,mooutils/moofileview,mooutils/mooscript,mooutils/pcre
+CommandLine=
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=0000000000000000000000
+
+[Unit1]
+FileName=..\tests\medit-app.c
+CompileCpp=0
+Folder=medit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=
+AutoIncBuildNr=0
+
+[Unit2]
+FileName=..\moo\mooapp\moohtml.h
+CompileCpp=0
+Folder=mooapp
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit3]
+FileName=..\moo\mooapp\mooapp.h
+CompileCpp=0
+Folder=mooapp
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit4]
+FileName=..\moo\mooapp\mooappabout.c
+CompileCpp=0
+Folder=mooapp
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit5]
+FileName=..\moo\mooapp\mooappabout.h
+CompileCpp=0
+Folder=mooapp
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit6]
+FileName=..\moo\mooapp\mooappinput.c
+CompileCpp=0
+Folder=mooapp
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit7]
+FileName=..\moo\mooapp\mooappinput.h
+CompileCpp=0
+Folder=mooapp
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit8]
+FileName=..\moo\mooapp\moohtml.c
+CompileCpp=0
+Folder=mooapp
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit9]
+FileName=..\moo\mooapp\mooapp.c
+CompileCpp=0
+Folder=mooapp
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit10]
+FileName=..\moo\mooedit\mooedit.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit11]
+FileName=..\moo\mooedit\gtksourceiter.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit12]
+FileName=..\moo\mooedit\moocmdview.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit13]
+FileName=..\moo\mooedit\moocmdview.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit14]
+FileName=..\moo\mooedit\moocompletion.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit15]
+FileName=..\moo\mooedit\moocompletion.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit16]
+FileName=..\moo\mooedit\mooedit.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit17]
+FileName=..\moo\mooedit\gtksourceiter.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit18]
+FileName=..\moo\mooedit\mooedit-actions.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit19]
+FileName=..\moo\mooedit\mooedit-actions.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit20]
+FileName=..\moo\mooedit\mooeditconfig.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit21]
+FileName=..\moo\mooedit\mooeditconfig.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit22]
+FileName=..\moo\mooedit\mooeditdialogs.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit23]
+FileName=..\moo\mooedit\mooeditdialogs.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit24]
+FileName=..\moo\mooedit\mooeditfileops.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit25]
+FileName=..\moo\mooedit\mooeditfileops.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit26]
+FileName=..\moo\mooedit\mooeditinput.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit27]
+FileName=..\moo\mooedit\mooeditor.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit28]
+FileName=..\moo\mooedit\mooeditor.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit29]
+FileName=..\moo\mooedit\mooeditprefs.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit30]
+FileName=..\moo\mooedit\mooeditprefs.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit31]
+FileName=..\moo\mooedit\mooeditprefspage.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit32]
+FileName=..\moo\mooedit\mooedit-private.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit33]
+FileName=..\moo\mooedit\mooedit-script.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit34]
+FileName=..\moo\mooedit\mooedit-script.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit35]
+FileName=..\moo\mooedit\mooeditsession.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit36]
+FileName=..\moo\mooedit\mooeditsession.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit37]
+FileName=..\moo\mooedit\mooeditsession-private.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit38]
+FileName=..\moo\mooedit\mooeditwindow.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit39]
+FileName=..\moo\mooedit\mooeditwindow.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit40]
+FileName=..\moo\mooedit\moofold.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit41]
+FileName=..\moo\mooedit\moofold.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit42]
+FileName=..\moo\mooedit\moohighlighter.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit43]
+FileName=..\moo\mooedit\moohighlighter.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit44]
+FileName=..\moo\mooedit\mooindenter.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit45]
+FileName=..\moo\mooedit\mooindenter.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit46]
+FileName=..\moo\mooedit\moolang.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit47]
+FileName=..\moo\mooedit\moolang.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit48]
+FileName=..\moo\mooedit\moolang-aux.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit49]
+FileName=..\moo\mooedit\moolangmgr.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit50]
+FileName=..\moo\mooedit\moolangmgr.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit51]
+FileName=..\moo\mooedit\moolang-parser.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit52]
+FileName=..\moo\mooedit\moolang-parser.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit53]
+FileName=..\moo\mooedit\moolang-private.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit54]
+FileName=..\moo\mooedit\moolang-rules.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit55]
+FileName=..\moo\mooedit\moolang-rules.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit56]
+FileName=..\moo\mooedit\moolang-strings.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit57]
+FileName=..\moo\mooedit\moolinebuffer.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit58]
+FileName=..\moo\mooedit\moolinebuffer.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit59]
+FileName=..\moo\mooedit\moolinemark.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit60]
+FileName=..\moo\mooedit\moolinemark.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit61]
+FileName=..\moo\mooedit\moolineview.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit62]
+FileName=..\moo\mooedit\moolineview.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit63]
+FileName=..\moo\mooedit\mooplugin.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit64]
+FileName=..\moo\mooedit\mooplugin.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit65]
+FileName=..\moo\mooedit\mooplugin-macro.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit66]
+FileName=..\moo\mooedit\mootextbox.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit67]
+FileName=..\moo\mooedit\mootextbox.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit68]
+FileName=..\moo\mooedit\mootextbtree.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit69]
+FileName=..\moo\mooedit\mootextbtree.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit70]
+FileName=..\moo\mooedit\mootextbuffer.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit71]
+FileName=..\moo\mooedit\mootextbuffer.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit72]
+FileName=..\moo\mooedit\mootextfind.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit73]
+FileName=..\moo\mooedit\mootextfind.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit74]
+FileName=..\moo\mooedit\mootextiter.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit75]
+FileName=..\moo\mooedit\mootextpopup.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit76]
+FileName=..\moo\mooedit\mootextpopup.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit78]
+FileName=..\moo\mooedit\mootextsearch.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit79]
+FileName=..\moo\mooedit\mootextsearch.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit80]
+FileName=..\moo\mooedit\mootextstyle.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit81]
+FileName=..\moo\mooedit\mootextstyle.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit82]
+FileName=..\moo\mooedit\mootextstylescheme.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit83]
+FileName=..\moo\mooedit\mootextstylescheme.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit84]
+FileName=..\moo\mooedit\mootextview.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit85]
+FileName=..\moo\mooedit\mootextview.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit86]
+FileName=..\moo\mooedit\mootextview-private.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit87]
+FileName=..\moo\mooedit\moousertools.c
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit88]
+FileName=..\moo\mooedit\moousertools.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit89]
+FileName=..\moo\mooutils\eggregex.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit90]
+FileName=..\moo\mooutils\eggregex.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit91]
+FileName=..\moo\mooutils\mooaccel.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit92]
+FileName=..\moo\mooutils\mooaccel.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit93]
+FileName=..\moo\mooutils\mooaccelbutton.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit94]
+FileName=..\moo\mooutils\mooaccelbutton.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit95]
+FileName=..\moo\mooutils\mooaction.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit96]
+FileName=..\moo\mooutils\mooaction.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit97]
+FileName=..\moo\mooutils\mooactionfactory.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit98]
+FileName=..\moo\mooutils\mooactionfactory.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit99]
+FileName=..\moo\mooutils\moobigpaned.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit100]
+FileName=..\moo\mooutils\moobigpaned.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit101]
+FileName=..\moo\mooutils\mooclosure.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit102]
+FileName=..\moo\mooutils\mooclosure.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit103]
+FileName=..\moo\mooutils\moocmd.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit104]
+FileName=..\moo\mooutils\moocmd.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit105]
+FileName=..\moo\mooutils\moocombo.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit106]
+FileName=..\moo\mooutils\moocombo.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit107]
+FileName=..\moo\mooutils\moocommand.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit108]
+FileName=..\moo\mooutils\moocommand.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit109]
+FileName=..\moo\mooutils\moocompat.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit110]
+FileName=..\moo\mooutils\moocompat.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit111]
+FileName=..\moo\mooutils\mooconfig.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit112]
+FileName=..\moo\mooutils\mooconfig.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit113]
+FileName=..\moo\mooutils\moodialogs.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit114]
+FileName=..\moo\mooutils\moodialogs.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit115]
+FileName=..\moo\mooutils\mooentry.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit116]
+FileName=..\moo\mooutils\mooentry.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit117]
+FileName=..\moo\mooutils\moofiledialog.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit118]
+FileName=..\moo\mooutils\moofiledialog.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit119]
+FileName=..\moo\mooutils\moofilewatch.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit120]
+FileName=..\moo\mooutils\moofilewatch.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit121]
+FileName=..\moo\mooutils\moofiltermgr.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit122]
+FileName=..\moo\mooutils\moofiltermgr.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit123]
+FileName=..\moo\mooutils\mooglade.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit124]
+FileName=..\moo\mooutils\mooglade.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit125]
+FileName=..\moo\mooutils\moohistoryentry.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit126]
+FileName=..\moo\mooutils\moohistoryentry.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit127]
+FileName=..\moo\mooutils\moohistorylist.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit128]
+FileName=..\moo\mooutils\moohistorylist.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit129]
+FileName=..\moo\mooutils\moolinklabel.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit130]
+FileName=..\moo\mooutils\moolinklabel.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit131]
+FileName=..\moo\mooutils\moomarkup.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit132]
+FileName=..\moo\mooutils\moomarkup.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit133]
+FileName=..\moo\mooutils\moomarshals.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit134]
+FileName=..\moo\mooutils\moomarshals.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit135]
+FileName=..\moo\mooutils\moomenuaction.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit136]
+FileName=..\moo\mooutils\moomenuaction.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit137]
+FileName=..\moo\mooutils\moomenumgr.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit138]
+FileName=..\moo\mooutils\moomenumgr.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit139]
+FileName=..\moo\mooutils\moomenutoolbutton.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit140]
+FileName=..\moo\mooutils\moomenutoolbutton.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit141]
+FileName=..\moo\mooutils\moonotebook.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit142]
+FileName=..\moo\mooutils\moonotebook.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit143]
+FileName=..\moo\mooutils\moopaned.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit144]
+FileName=..\moo\mooutils\moopaned.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit145]
+FileName=..\moo\mooutils\mooprefs.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit146]
+FileName=..\moo\mooutils\mooprefs.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit147]
+FileName=..\moo\mooutils\mooprefsdialog.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit148]
+FileName=..\moo\mooutils\mooprefsdialog.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit149]
+FileName=..\moo\mooutils\mooprefsdialogpage.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit150]
+FileName=..\moo\mooutils\mooprefsdialogpage.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit151]
+FileName=..\moo\mooutils\moopython.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit152]
+FileName=..\moo\mooutils\moopython.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit153]
+FileName=..\moo\mooutils\moostock.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit154]
+FileName=..\moo\mooutils\moostock.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit155]
+FileName=..\moo\mooutils\moouixml.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit156]
+FileName=..\moo\mooutils\moouixml.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit157]
+FileName=..\moo\mooutils\mooundo.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit158]
+FileName=..\moo\mooutils\mooundo.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit159]
+FileName=..\moo\mooutils\mooutils-fs.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit160]
+FileName=..\moo\mooutils\mooutils-fs.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit161]
+FileName=..\moo\mooutils\mooutils-gobject.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit162]
+FileName=..\moo\mooutils\mooutils-gobject.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit163]
+FileName=..\moo\mooutils\mooutils-misc.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit164]
+FileName=..\moo\mooutils\mooutils-misc.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit165]
+FileName=..\moo\mooutils\mooutils-treeview.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit166]
+FileName=..\moo\mooutils\mooutils-treeview.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit167]
+FileName=..\moo\mooutils\moowindow.c
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit168]
+FileName=..\moo\mooutils\moowindow.h
+CompileCpp=0
+Folder=mooutils
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit169]
+FileName=..\moo\mooutils\pcre\pcre.h
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit170]
+FileName=..\moo\mooutils\pcre\pcre_chartables.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit171]
+FileName=..\moo\mooutils\pcre\pcre_compile.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit172]
+FileName=..\moo\mooutils\pcre\pcre_config.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit173]
+FileName=..\moo\mooutils\pcre\pcre_exec.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit174]
+FileName=..\moo\mooutils\pcre\pcre_fullinfo.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit175]
+FileName=..\moo\mooutils\pcre\pcre_get.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit176]
+FileName=..\moo\mooutils\pcre\pcre_globals.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit177]
+FileName=..\moo\mooutils\pcre\pcre_info.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit178]
+FileName=..\moo\mooutils\pcre\pcre_internal.h
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit179]
+FileName=..\moo\mooutils\pcre\pcre_maketables.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit180]
+FileName=..\moo\mooutils\pcre\pcre_ord2utf8.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit181]
+FileName=..\moo\mooutils\pcre\pcre_refcount.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit182]
+FileName=..\moo\mooutils\pcre\pcre_study.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit183]
+FileName=..\moo\mooutils\pcre\pcre_tables.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit184]
+FileName=..\moo\mooutils\pcre\pcre_try_flipped.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit185]
+FileName=..\moo\mooutils\pcre\pcre_ucp_findchar.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit186]
+FileName=..\moo\mooutils\pcre\pcre_valid_utf8.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit187]
+FileName=..\moo\mooutils\pcre\pcre_version.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit188]
+FileName=..\moo\mooutils\pcre\pcre_xclass.c
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit189]
+FileName=..\moo\mooutils\pcre\ucp.h
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit190]
+FileName=..\moo\mooutils\pcre\ucpinternal.h
+CompileCpp=0
+Folder=mooutils/pcre
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit191]
+FileName=..\moo\mooutils\moofileview\moobookmarkmgr.c
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit192]
+FileName=..\moo\mooutils\moofileview\moobookmarkmgr.h
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit193]
+FileName=..\moo\mooutils\moofileview\moobookmarkview.c
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit194]
+FileName=..\moo\mooutils\moofileview\moobookmarkview.h
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit195]
+FileName=..\moo\mooutils\moofileview\moofile.c
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit196]
+FileName=..\moo\mooutils\moofileview\moofile.h
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit197]
+FileName=..\moo\mooutils\moofileview\moofileentry.c
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit198]
+FileName=..\moo\mooutils\moofileview\moofileentry.h
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit199]
+FileName=..\moo\mooutils\moofileview\moofilesystem.c
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit200]
+FileName=..\moo\mooutils\moofileview\moofilesystem.h
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit201]
+FileName=..\moo\mooutils\moofileview\moofileview.c
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit202]
+FileName=..\moo\mooutils\moofileview\moofileview.h
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit203]
+FileName=..\moo\mooutils\moofileview\moofileview-dialogs.c
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit204]
+FileName=..\moo\mooutils\moofileview\moofileview-dialogs.h
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit205]
+FileName=..\moo\mooutils\moofileview\moofileview-private.h
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit206]
+FileName=..\moo\mooutils\moofileview\moofileview-tools.c
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit207]
+FileName=..\moo\mooutils\moofileview\moofileview-tools.h
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit208]
+FileName=..\moo\mooutils\moofileview\moofoldermodel.c
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit209]
+FileName=..\moo\mooutils\moofileview\moofoldermodel.h
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit210]
+FileName=..\moo\mooutils\moofileview\moofoldermodel-private.h
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit211]
+FileName=..\moo\mooutils\moofileview\mooiconview.c
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit212]
+FileName=..\moo\mooutils\moofileview\mooiconview.h
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit213]
+FileName=..\moo\mooutils\moofileview\mootreeview.c
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit214]
+FileName=..\moo\mooutils\moofileview\mootreeview.h
+CompileCpp=0
+Folder=mooutils/moofileview
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit215]
+FileName=..\moo\mooutils\mooscript\mooscript-builtin.c
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit216]
+FileName=..\moo\mooutils\mooscript\mooscript-context.c
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit217]
+FileName=..\moo\mooutils\mooscript\mooscript-context.h
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit218]
+FileName=..\moo\mooutils\mooscript\mooscript-func.c
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit219]
+FileName=..\moo\mooutils\mooscript\mooscript-func.h
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit220]
+FileName=..\moo\mooutils\mooscript\mooscript-node.c
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit221]
+FileName=..\moo\mooutils\mooscript\mooscript-node.h
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit222]
+FileName=..\moo\mooutils\mooscript\mooscript-parser.c
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit223]
+FileName=..\moo\mooutils\mooscript\mooscript-parser.h
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit224]
+FileName=..\moo\mooutils\mooscript\mooscript-parser-priv.h
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit225]
+FileName=..\moo\mooutils\mooscript\mooscript-value.c
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit226]
+FileName=..\moo\mooutils\mooscript\mooscript-value.h
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit227]
+FileName=..\moo\mooutils\mooscript\mooscript-yacc.c
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit228]
+FileName=..\moo\mooutils\mooscript\mooscript-yacc.h
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit229]
+FileName=..\moo\mooutils\mooscript\mooscript-zenity.c
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit230]
+FileName=..\moo\mooutils\mooscript\mooscript-zenity.h
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit231]
+FileName=..\moo\mooutils\mooscript\mooscript-zenity.c
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit232]
+FileName=..\moo\mooutils\mooscript\mooscript-zenity.h
+CompileCpp=0
+Folder=mooutils/mooscript
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit77]
+FileName=..\moo\mooedit\mootext-private.h
+CompileCpp=0
+Folder=mooedit
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/devcpp/moo-version.h b/devcpp/moo-version.h
new file mode 100644
index 00000000..5e812ba5
--- /dev/null
+++ b/devcpp/moo-version.h
@@ -0,0 +1,24 @@
+/*
+ *   moo-version.h
+ *
+ *   Copyright (C) 2004-2006 by Yevgen Muntyan <muntyan@math.tamu.edu>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   See COPYING file that comes with this distribution.
+ */
+
+#ifndef __MOO_VERSION_H__
+#define __MOO_VERSION_H__
+
+
+#define MOO_VERSION         "0.6.99"
+#define MOO_VERSION_MAJOR   0
+#define MOO_VERSION_MINOR   6
+#define MOO_VERSION_MICRO   99
+
+
+#endif /* __MOO_VERSION_H__ */
diff --git a/moo.kdevelop b/moo.kdevelop
index 9f4780a4..89f02634 100644
--- a/moo.kdevelop
+++ b/moo.kdevelop
@@ -292,16 +292,16 @@
   </kdevdoctreeview>
   <kdevfilecreate>
     <filetypes>
-      <type icon="source" ext="g" create="template" name="GAP source" >
+      <type icon="source" ext="g" name="GAP source" create="template" >
         <descr>A new empty GAP source file</descr>
       </type>
-      <type icon="source_cpp" ext="cpp" create="template" name="C++ Source" >
+      <type icon="source_cpp" ext="cpp" name="C++ Source" create="template" >
         <descr>A new empty C++ file.</descr>
       </type>
-      <type icon="source_h" ext="h" create="template" name="C/C++ Header" >
+      <type icon="source_h" ext="h" name="C/C++ Header" create="template" >
         <descr>A new empty header file for C/C++.</descr>
       </type>
-      <type icon="source_c" ext="c" create="template" name="C Source" >
+      <type icon="source_c" ext="c" name="C Source" create="template" >
         <descr>A new empty C file.</descr>
       </type>
     </filetypes>
diff --git a/moo/mooutils/Makefile.incl b/moo/mooutils/Makefile.incl
index 64a8c746..4d00a5c2 100644
--- a/moo/mooutils/Makefile.incl
+++ b/moo/mooutils/Makefile.incl
@@ -129,17 +129,17 @@ $(mooutils)/moomarshals.h: $(mooutils)/moomarshals.list
 	glib-genmarshal --prefix=_moo_marshal --header \
 	       $(mooutils_srcdir)/moomarshals.list > $(mooutils)/moomarshals.h
 
-$(mooutils)/mooaccelbutton-glade.h: $(mooutils_srcdir)/glade/shortcutdialog.glade $(mooutils_srcdir)/xml2h.sh
+$(mooutils)/mooaccelbutton-glade.h: $(mooutils_srcdir)/glade/shortcutdialog.glade $(XML2H)
 	mkdir -p $(mooutils)
-	sh $(mooutils_srcdir)/xml2h.sh MOO_ACCEL_BUTTON_GLADE_UI \
+	sh $(XML2H) MOO_ACCEL_BUTTON_GLADE_UI \
 	   $(mooutils_srcdir)/glade/shortcutdialog.glade > $(mooutils)/mooaccelbutton-glade.h
-$(mooutils)/mooaccelprefs-glade.h: $(mooutils_srcdir)/glade/shortcutsprefs.glade $(mooutils_srcdir)/xml2h.sh
+$(mooutils)/mooaccelprefs-glade.h: $(mooutils_srcdir)/glade/shortcutsprefs.glade $(XML2H)
 	mkdir -p $(mooutils)
-	sh $(mooutils_srcdir)/xml2h.sh MOO_SHORTCUTS_PREFS_GLADE_UI \
+	sh $(XML2H) MOO_SHORTCUTS_PREFS_GLADE_UI \
 	   $(mooutils_srcdir)/glade/shortcutsprefs.glade > $(mooutils)/mooaccelprefs-glade.h
-$(mooutils)/moologwindow-glade.h: $(mooutils_srcdir)/glade/moologwindow.glade $(mooutils_srcdir)/xml2h.sh
+$(mooutils)/moologwindow-glade.h: $(mooutils_srcdir)/glade/moologwindow.glade $(XML2H)
 	mkdir -p $(mooutils)
-	sh $(mooutils_srcdir)/xml2h.sh MOO_LOG_WINDOW_GLADE_UI \
+	sh $(XML2H) MOO_LOG_WINDOW_GLADE_UI \
 	   $(mooutils_srcdir)/glade/moologwindow.glade > $(mooutils)/moologwindow-glade.h
 
 mooutils_pixmaps =                             \
diff --git a/moo/mooutils/eggregex.c b/moo/mooutils/eggregex.c
index 17af6d0d..83eaa8f9 100644
--- a/moo/mooutils/eggregex.c
+++ b/moo/mooutils/eggregex.c
@@ -56,10 +56,10 @@
 #include <string.h>
 #include <glib.h>
 
-#include "moo/mooutils/eggregex.h"
+#include "eggregex.h"
 
 #ifdef MOO_BUILD_PCRE
-#include "moo/mooutils/pcre/pcre.h"
+#include "pcre/pcre.h"
 #else
 #include <pcre.h>
 #endif
diff --git a/moo/mooutils/moobigpaned.c b/moo/mooutils/moobigpaned.c
index 49b53787..b0993282 100644
--- a/moo/mooutils/moobigpaned.c
+++ b/moo/mooutils/moobigpaned.c
@@ -11,8 +11,8 @@
  *   See COPYING file that comes with this distribution.
  */
 
-#include "moobigpaned.h"
-#include MOO_MARSHALS_H
+#include "mooutils/moobigpaned.h"
+#include "mooutils/moomarshals.h"
 
 
 static void     moo_big_paned_finalize      (GObject        *object);
diff --git a/moo/mooutils/moocombo.c b/moo/mooutils/moocombo.c
index 22d37eb6..222362c2 100644
--- a/moo/mooutils/moocombo.c
+++ b/moo/mooutils/moocombo.c
@@ -11,14 +11,9 @@
  *   See COPYING file that comes with this distribution.
  */
 
-#include MOO_MARSHALS_H
-#ifndef __MOO__
-#include "moocombo.h"
-#include "mooentry.h"
-#else
+#include "mooutils/moomarshals.h"
 #include "mooutils/moocombo.h"
 #include "mooutils/mooentry.h"
-#endif
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
diff --git a/moo/mooutils/mooentry.c b/moo/mooutils/mooentry.c
index 4537a79f..1631478d 100644
--- a/moo/mooutils/mooentry.c
+++ b/moo/mooutils/mooentry.c
@@ -11,7 +11,7 @@
  *   See COPYING file that comes with this distribution.
  */
 
-#include MOO_MARSHALS_H
+#include "mooutils/moomarshals.h"
 #include "mooutils/mooentry.h"
 #include "mooutils/mooundo.h"
 #include "mooutils/mooutils-gobject.h"
diff --git a/moo/mooutils/moofileview/moofile.c b/moo/mooutils/moofileview/moofile.c
index e286c0cb..84756174 100644
--- a/moo/mooutils/moofileview/moofile.c
+++ b/moo/mooutils/moofileview/moofile.c
@@ -25,7 +25,7 @@
 #include "moofileview/moofilesystem.h"
 #include "moofileview/symlink.h"
 #include "mooutils/mooutils-fs.h"
-#include MOO_MARSHALS_H
+#include "mooutils/moomarshals.h"
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/moo/mooutils/moofileview/moofileentry.c b/moo/mooutils/moofileview/moofileentry.c
index dd14f572..6ca67853 100644
--- a/moo/mooutils/moofileview/moofileentry.c
+++ b/moo/mooutils/moofileview/moofileentry.c
@@ -17,7 +17,7 @@
 #include "moofileentry.h"
 #include "moofilesystem.h"
 #include "moofoldermodel.h"
-#include MOO_MARSHALS_H
+#include "mooutils/moomarshals.h"
 #include "mooutils/mooutils-gobject.h"
 #include "moofileview-private.h"
 #include <gdk/gdkkeysyms.h>
diff --git a/moo/mooutils/moofileview/moofilesystem.c b/moo/mooutils/moofileview/moofilesystem.c
index a5d2aa57..42a25f46 100644
--- a/moo/mooutils/moofileview/moofilesystem.c
+++ b/moo/mooutils/moofileview/moofilesystem.c
@@ -14,7 +14,7 @@
 #define MOO_FILE_SYSTEM_COMPILATION
 #include "moofilesystem.h"
 #include "mooutils/mooutils-fs.h"
-#include MOO_MARSHALS_H
+#include "mooutils/moomarshals.h"
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/moo/mooutils/moofileview/mooiconview.c b/moo/mooutils/moofileview/mooiconview.c
index b12ff0a8..ed628696 100644
--- a/moo/mooutils/moofileview/mooiconview.c
+++ b/moo/mooutils/moofileview/mooiconview.c
@@ -12,7 +12,7 @@
  */
 
 #include "mooiconview.h"
-#include MOO_MARSHALS_H
+#include "mooutils/moomarshals.h"
 #include "mooutils/mooutils-gobject.h"
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff --git a/moo/mooutils/moohistoryentry.c b/moo/mooutils/moohistoryentry.c
index ac0618be..f87b92e6 100644
--- a/moo/mooutils/moohistoryentry.c
+++ b/moo/mooutils/moohistoryentry.c
@@ -11,12 +11,8 @@
  *   See COPYING file that comes with this distribution.
  */
 
-#include MOO_MARSHALS_H
-#ifndef __MOO__
-#include "moohistoryentry.h"
-#else
+#include "mooutils/moomarshals.h"
 #include "mooutils/moohistoryentry.h"
-#endif
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
diff --git a/moo/mooutils/moohistorylist.c b/moo/mooutils/moohistorylist.c
index ba8b7ba2..f29e18e2 100644
--- a/moo/mooutils/moohistorylist.c
+++ b/moo/mooutils/moohistorylist.c
@@ -11,7 +11,7 @@
  *   See COPYING file that comes with this distribution.
  */
 
-#include MOO_MARSHALS_H
+#include "mooutils/moomarshals.h"
 #include "mooutils/moohistorylist.h"
 #include "mooutils/mooprefs.h"
 #include "mooutils/moocompat.h"
diff --git a/moo/mooutils/moonotebook.c b/moo/mooutils/moonotebook.c
index eed554c9..3d513ba9 100644
--- a/moo/mooutils/moonotebook.c
+++ b/moo/mooutils/moonotebook.c
@@ -11,7 +11,7 @@
  *   See COPYING file that comes with this distribution.
  */
 
-#include MOO_MARSHALS_H
+#include "mooutils/moomarshals.h"
 #include "mooutils/moonotebook.h"
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff --git a/moo/mooutils/moopaned.c b/moo/mooutils/moopaned.c
index 76825f54..751de5ba 100644
--- a/moo/mooutils/moopaned.c
+++ b/moo/mooutils/moopaned.c
@@ -11,7 +11,7 @@
  *   See COPYING file that comes with this distribution.
  */
 
-#include MOO_MARSHALS_H
+#include "mooutils/moomarshals.h"
 #include "mooutils/moopaned.h"
 #include "mooutils/moostock.h"
 #include "mooutils/mooutils-misc.h"