135 files changed, 20 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 679055b4bb..0530656abe 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ LIBS_MPLAYER = libvo/libvo.a \
                input/libinput.a \
 
 LIBS_MPLAYER-$(VIDIX)             += vidix/libvidix.a
-LIBS_MPLAYER-$(GUI)               += Gui/libgui.a
+LIBS_MPLAYER-$(GUI)               += gui/libgui.a
 LIBS_MPLAYER-$(LIBMENU)           += libmenu/libmenu.a
 
 LIBS_MENCODER = libmpcodecs/libmpencoders.a \
@@ -113,7 +113,7 @@ INSTALL_TARGETS-$(GUI)      += install-gui
 INSTALL_TARGETS             += $(INSTALL_TARGETS-yes)
 
 PARTS = dvdread \
-        Gui \
+        gui \
         input \
         liba52 \
         libaf \
@@ -210,8 +210,8 @@ tremor/libvorbisidec.a:
 vidix/libvidix.a:
 	$(MAKE) -C vidix
 
-Gui/libgui.a:
-	$(MAKE) -C Gui
+gui/libgui.a:
+	$(MAKE) -C gui
 
 osdep/libosdep.a:
 	$(MAKE) -C osdep
@@ -401,7 +401,7 @@ libfaad2/libfaad2.a: .norecurse $(wildcard libfaad2/*.[ch] libfaad2/*/*.[ch])
 
 loader/libloader.a: .norecurse $(wildcard loader/*.[chSs])
 vidix/libvidix.a: .norecurse $(wildcard vidix/*.[ch])
-Gui/libgui.a: .norecurse $(wildcard Gui/*.[ch] Gui/*/*.[ch] Gui/*/*/*.[ch])
+gui/libgui.a: .norecurse $(wildcard gui/*.[ch] gui/*/*.[ch] gui/*/*/*.[ch])
 
 libass/libass.a: .norecurse $(wildcard libass/*.[ch])
 
diff --git a/command.c b/command.c
index 5f60d9e94b..ce480d1b34 100644
--- a/command.c
+++ b/command.c
@@ -46,7 +46,7 @@
 #include "libass/ass_mp.h"
 #endif
 #ifdef HAVE_NEW_GUI
-#include "Gui/interface.h"
+#include "gui/interface.h"
 #endif
 
 #include "mp_core.h"
diff --git a/Gui/Makefile b/gui/Makefile
index 8435035c58..8435035c58 100644
--- a/Gui/Makefile
+++ b/gui/Makefile
diff --git a/Gui/app.c b/gui/app.c
index d375296dc4..d375296dc4 100644
--- a/Gui/app.c
+++ b/gui/app.c
diff --git a/Gui/app.h b/gui/app.h
index 293ed7e30e..293ed7e30e 100644
--- a/Gui/app.h
+++ b/gui/app.h
diff --git a/Gui/bitmap.c b/gui/bitmap.c
index 4367d99415..4367d99415 100644
--- a/Gui/bitmap.c
+++ b/gui/bitmap.c
diff --git a/Gui/bitmap.h b/gui/bitmap.h
index 5b4075a7e7..5b4075a7e7 100644
--- a/Gui/bitmap.h
+++ b/gui/bitmap.h
diff --git a/Gui/cfg.c b/gui/cfg.c
index f12ce3a422..f12ce3a422 100644
--- a/Gui/cfg.c
+++ b/gui/cfg.c
diff --git a/Gui/cfg.h b/gui/cfg.h
index f78e983524..f78e983524 100644
--- a/Gui/cfg.h
+++ b/gui/cfg.h
diff --git a/Gui/interface.c b/gui/interface.c
index eb461bc7f7..eb461bc7f7 100644
--- a/Gui/interface.c
+++ b/gui/interface.c
diff --git a/Gui/interface.h b/gui/interface.h
index 2b14ba2362..2b14ba2362 100644
--- a/Gui/interface.h
+++ b/gui/interface.h
diff --git a/Gui/mplayer/common.c b/gui/mplayer/common.c
index 899389bff7..899389bff7 100644
--- a/Gui/mplayer/common.c
+++ b/gui/mplayer/common.c
diff --git a/Gui/mplayer/common.h b/gui/mplayer/common.h
index 4cc6c7e152..4cc6c7e152 100644
--- a/Gui/mplayer/common.h
+++ b/gui/mplayer/common.h
diff --git a/Gui/mplayer/gmplayer.h b/gui/mplayer/gmplayer.h
index d7bd01b1ac..d7bd01b1ac 100644
--- a/Gui/mplayer/gmplayer.h
+++ b/gui/mplayer/gmplayer.h
diff --git a/Gui/mplayer/gtk/about.c b/gui/mplayer/gtk/about.c
index a19bb55065..a19bb55065 100644
--- a/Gui/mplayer/gtk/about.c
+++ b/gui/mplayer/gtk/about.c
diff --git a/Gui/mplayer/gtk/about.h b/gui/mplayer/gtk/about.h
index 66d5f147ae..66d5f147ae 100644
--- a/Gui/mplayer/gtk/about.h
+++ b/gui/mplayer/gtk/about.h
diff --git a/Gui/mplayer/gtk/common.c b/gui/mplayer/gtk/common.c
index 7a21969e2f..7a21969e2f 100644
--- a/Gui/mplayer/gtk/common.c
+++ b/gui/mplayer/gtk/common.c
diff --git a/Gui/mplayer/gtk/common.h b/gui/mplayer/gtk/common.h
index d68a977622..d68a977622 100644
--- a/Gui/mplayer/gtk/common.h
+++ b/gui/mplayer/gtk/common.h
diff --git a/Gui/mplayer/gtk/eq.c b/gui/mplayer/gtk/eq.c
index 640a7502d5..640a7502d5 100644
--- a/Gui/mplayer/gtk/eq.c
+++ b/gui/mplayer/gtk/eq.c
diff --git a/Gui/mplayer/gtk/eq.h b/gui/mplayer/gtk/eq.h
index 99941a0509..99941a0509 100644
--- a/Gui/mplayer/gtk/eq.h
+++ b/gui/mplayer/gtk/eq.h
diff --git a/Gui/mplayer/gtk/fs.c b/gui/mplayer/gtk/fs.c
index 064795ea13..064795ea13 100644
--- a/Gui/mplayer/gtk/fs.c
+++ b/gui/mplayer/gtk/fs.c
diff --git a/Gui/mplayer/gtk/fs.h b/gui/mplayer/gtk/fs.h
index 94e9ff08e8..94e9ff08e8 100644
--- a/Gui/mplayer/gtk/fs.h
+++ b/gui/mplayer/gtk/fs.h
diff --git a/Gui/mplayer/gtk/mb.c b/gui/mplayer/gtk/mb.c
index 5f3873d054..5f3873d054 100644
--- a/Gui/mplayer/gtk/mb.c
+++ b/gui/mplayer/gtk/mb.c
diff --git a/Gui/mplayer/gtk/mb.h b/gui/mplayer/gtk/mb.h
index 9418d26200..9418d26200 100644
--- a/Gui/mplayer/gtk/mb.h
+++ b/gui/mplayer/gtk/mb.h
diff --git a/Gui/mplayer/gtk/menu.c b/gui/mplayer/gtk/menu.c
index 7cca050700..7cca050700 100644
--- a/Gui/mplayer/gtk/menu.c
+++ b/gui/mplayer/gtk/menu.c
diff --git a/Gui/mplayer/gtk/menu.h b/gui/mplayer/gtk/menu.h
index a8bc5bcc5b..a8bc5bcc5b 100644
--- a/Gui/mplayer/gtk/menu.h
+++ b/gui/mplayer/gtk/menu.h
diff --git a/Gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c
index 60e9a1bde8..60e9a1bde8 100644
--- a/Gui/mplayer/gtk/opts.c
+++ b/gui/mplayer/gtk/opts.c
diff --git a/Gui/mplayer/gtk/opts.h b/gui/mplayer/gtk/opts.h
index 8f3c92e1cc..8f3c92e1cc 100644
--- a/Gui/mplayer/gtk/opts.h
+++ b/gui/mplayer/gtk/opts.h
diff --git a/Gui/mplayer/gtk/pl.c b/gui/mplayer/gtk/pl.c
index 8ca2f1e3fa..8ca2f1e3fa 100644
--- a/Gui/mplayer/gtk/pl.c
+++ b/gui/mplayer/gtk/pl.c
diff --git a/Gui/mplayer/gtk/pl.h b/gui/mplayer/gtk/pl.h
index d5e1ebe8b4..d5e1ebe8b4 100644
--- a/Gui/mplayer/gtk/pl.h
+++ b/gui/mplayer/gtk/pl.h
diff --git a/Gui/mplayer/gtk/sb.c b/gui/mplayer/gtk/sb.c
index bae48c523f..bae48c523f 100644
--- a/Gui/mplayer/gtk/sb.c
+++ b/gui/mplayer/gtk/sb.c
diff --git a/Gui/mplayer/gtk/sb.h b/gui/mplayer/gtk/sb.h
index 74a28ab5a8..74a28ab5a8 100644
--- a/Gui/mplayer/gtk/sb.h
+++ b/gui/mplayer/gtk/sb.h
diff --git a/Gui/mplayer/gtk/url.c b/gui/mplayer/gtk/url.c
index 6ad8b61db2..6ad8b61db2 100644
--- a/Gui/mplayer/gtk/url.c
+++ b/gui/mplayer/gtk/url.c
diff --git a/Gui/mplayer/gtk/url.h b/gui/mplayer/gtk/url.h
index ed0a656586..ed0a656586 100644
--- a/Gui/mplayer/gtk/url.h
+++ b/gui/mplayer/gtk/url.h
diff --git a/Gui/mplayer/menu.c b/gui/mplayer/menu.c
index e8ef5cad97..e8ef5cad97 100644
--- a/Gui/mplayer/menu.c
+++ b/gui/mplayer/menu.c
diff --git a/Gui/mplayer/mw.c b/gui/mplayer/mw.c
index 48d9733cec..48d9733cec 100644
--- a/Gui/mplayer/mw.c
+++ b/gui/mplayer/mw.c
diff --git a/Gui/mplayer/pb.c b/gui/mplayer/pb.c
index 14ea8d97cc..14ea8d97cc 100644
--- a/Gui/mplayer/pb.c
+++ b/gui/mplayer/pb.c
diff --git a/Gui/mplayer/pixmaps/MPlayer_mini.xpm b/gui/mplayer/pixmaps/MPlayer_mini.xpm
index c9de6f759f..c9de6f759f 100644
--- a/Gui/mplayer/pixmaps/MPlayer_mini.xpm
+++ b/gui/mplayer/pixmaps/MPlayer_mini.xpm
diff --git a/Gui/mplayer/pixmaps/a11.xpm b/gui/mplayer/pixmaps/a11.xpm
index dfc31ab1b5..dfc31ab1b5 100644
--- a/Gui/mplayer/pixmaps/a11.xpm
+++ b/gui/mplayer/pixmaps/a11.xpm
diff --git a/Gui/mplayer/pixmaps/a169.xpm b/gui/mplayer/pixmaps/a169.xpm
index c59ebb4258..c59ebb4258 100644
--- a/Gui/mplayer/pixmaps/a169.xpm
+++ b/gui/mplayer/pixmaps/a169.xpm
diff --git a/Gui/mplayer/pixmaps/a235.xpm b/gui/mplayer/pixmaps/a235.xpm
index 01b8a23094..01b8a23094 100644
--- a/Gui/mplayer/pixmaps/a235.xpm
+++ b/gui/mplayer/pixmaps/a235.xpm
diff --git a/Gui/mplayer/pixmaps/a43.xpm b/gui/mplayer/pixmaps/a43.xpm
index f634c4af01..f634c4af01 100644
--- a/Gui/mplayer/pixmaps/a43.xpm
+++ b/gui/mplayer/pixmaps/a43.xpm
diff --git a/Gui/mplayer/pixmaps/ab.xpm b/gui/mplayer/pixmaps/ab.xpm
index 4e70ed3257..4e70ed3257 100644
--- a/Gui/mplayer/pixmaps/ab.xpm
+++ b/gui/mplayer/pixmaps/ab.xpm
diff --git a/Gui/mplayer/pixmaps/about.xpm b/gui/mplayer/pixmaps/about.xpm
index 850e879b4d..850e879b4d 100644
--- a/Gui/mplayer/pixmaps/about.xpm
+++ b/gui/mplayer/pixmaps/about.xpm
diff --git a/Gui/mplayer/pixmaps/aspect.xpm b/gui/mplayer/pixmaps/aspect.xpm
index ad07d86e33..ad07d86e33 100644
--- a/Gui/mplayer/pixmaps/aspect.xpm
+++ b/gui/mplayer/pixmaps/aspect.xpm
diff --git a/Gui/mplayer/pixmaps/cancel.xpm b/gui/mplayer/pixmaps/cancel.xpm
index 1dd78b19b1..1dd78b19b1 100644
--- a/Gui/mplayer/pixmaps/cancel.xpm
+++ b/gui/mplayer/pixmaps/cancel.xpm
diff --git a/Gui/mplayer/pixmaps/chapter.xpm b/gui/mplayer/pixmaps/chapter.xpm
index b64294fe8a..b64294fe8a 100644
--- a/Gui/mplayer/pixmaps/chapter.xpm
+++ b/gui/mplayer/pixmaps/chapter.xpm
diff --git a/Gui/mplayer/pixmaps/delsub.xpm b/gui/mplayer/pixmaps/delsub.xpm
index dd29baa406..dd29baa406 100644
--- a/Gui/mplayer/pixmaps/delsub.xpm
+++ b/gui/mplayer/pixmaps/delsub.xpm
diff --git a/Gui/mplayer/pixmaps/dir.xpm b/gui/mplayer/pixmaps/dir.xpm
index 56791df7d1..56791df7d1 100644
--- a/Gui/mplayer/pixmaps/dir.xpm
+++ b/gui/mplayer/pixmaps/dir.xpm
diff --git a/Gui/mplayer/pixmaps/dolby.xpm b/gui/mplayer/pixmaps/dolby.xpm
index baef72e5e3..baef72e5e3 100644
--- a/Gui/mplayer/pixmaps/dolby.xpm
+++ b/gui/mplayer/pixmaps/dolby.xpm
diff --git a/Gui/mplayer/pixmaps/double.xpm b/gui/mplayer/pixmaps/double.xpm
index bb3664de99..bb3664de99 100644
--- a/Gui/mplayer/pixmaps/double.xpm
+++ b/gui/mplayer/pixmaps/double.xpm
diff --git a/Gui/mplayer/pixmaps/dvd.xpm b/gui/mplayer/pixmaps/dvd.xpm
index c95631ac9e..c95631ac9e 100644
--- a/Gui/mplayer/pixmaps/dvd.xpm
+++ b/gui/mplayer/pixmaps/dvd.xpm
diff --git a/Gui/mplayer/pixmaps/empty.xpm b/gui/mplayer/pixmaps/empty.xpm
index 9cff92d2f4..9cff92d2f4 100644
--- a/Gui/mplayer/pixmaps/empty.xpm
+++ b/gui/mplayer/pixmaps/empty.xpm
diff --git a/Gui/mplayer/pixmaps/empty1px.xpm b/gui/mplayer/pixmaps/empty1px.xpm
index 2132efb1f2..2132efb1f2 100644
--- a/Gui/mplayer/pixmaps/empty1px.xpm
+++ b/gui/mplayer/pixmaps/empty1px.xpm
diff --git a/Gui/mplayer/pixmaps/eq.xpm b/gui/mplayer/pixmaps/eq.xpm
index 7c712a9c76..7c712a9c76 100644
--- a/Gui/mplayer/pixmaps/eq.xpm
+++ b/gui/mplayer/pixmaps/eq.xpm
diff --git a/Gui/mplayer/pixmaps/error.xpm b/gui/mplayer/pixmaps/error.xpm
index b892c323ae..b892c323ae 100644
--- a/Gui/mplayer/pixmaps/error.xpm
+++ b/gui/mplayer/pixmaps/error.xpm
diff --git a/Gui/mplayer/pixmaps/exit.xpm b/gui/mplayer/pixmaps/exit.xpm
index 30d8236717..30d8236717 100644
--- a/Gui/mplayer/pixmaps/exit.xpm
+++ b/gui/mplayer/pixmaps/exit.xpm
diff --git a/Gui/mplayer/pixmaps/file.xpm b/gui/mplayer/pixmaps/file.xpm
index 0ed2fb2b67..0ed2fb2b67 100644
--- a/Gui/mplayer/pixmaps/file.xpm
+++ b/gui/mplayer/pixmaps/file.xpm
diff --git a/Gui/mplayer/pixmaps/file2.xpm b/gui/mplayer/pixmaps/file2.xpm
index 8d2e83c733..8d2e83c733 100644
--- a/Gui/mplayer/pixmaps/file2.xpm
+++ b/gui/mplayer/pixmaps/file2.xpm
diff --git a/Gui/mplayer/pixmaps/fs.xpm b/gui/mplayer/pixmaps/fs.xpm
index e0034f95ef..e0034f95ef 100644
--- a/Gui/mplayer/pixmaps/fs.xpm
+++ b/gui/mplayer/pixmaps/fs.xpm
diff --git a/Gui/mplayer/pixmaps/half.xpm b/gui/mplayer/pixmaps/half.xpm
index 65f32310d8..65f32310d8 100644
--- a/Gui/mplayer/pixmaps/half.xpm
+++ b/gui/mplayer/pixmaps/half.xpm
diff --git a/Gui/mplayer/pixmaps/icon.xpm b/gui/mplayer/pixmaps/icon.xpm
index afec9dced4..afec9dced4 100644
--- a/Gui/mplayer/pixmaps/icon.xpm
+++ b/gui/mplayer/pixmaps/icon.xpm
diff --git a/Gui/mplayer/pixmaps/loadeaf.xpm b/gui/mplayer/pixmaps/loadeaf.xpm
index c4a5ca3b79..c4a5ca3b79 100644
--- a/Gui/mplayer/pixmaps/loadeaf.xpm
+++ b/gui/mplayer/pixmaps/loadeaf.xpm
diff --git a/Gui/mplayer/pixmaps/logo.xpm b/gui/mplayer/pixmaps/logo.xpm
index 3483145fe1..3483145fe1 100644
--- a/Gui/mplayer/pixmaps/logo.xpm
+++ b/gui/mplayer/pixmaps/logo.xpm
diff --git a/Gui/mplayer/pixmaps/mplayer-desktop.xpm b/gui/mplayer/pixmaps/mplayer-desktop.xpm
index 64b06e56ec..64b06e56ec 100644
--- a/Gui/mplayer/pixmaps/mplayer-desktop.xpm
+++ b/gui/mplayer/pixmaps/mplayer-desktop.xpm
diff --git a/Gui/mplayer/pixmaps/next.xpm b/gui/mplayer/pixmaps/next.xpm
index 48c7229790..48c7229790 100644
--- a/Gui/mplayer/pixmaps/next.xpm
+++ b/gui/mplayer/pixmaps/next.xpm
diff --git a/Gui/mplayer/pixmaps/normal.xpm b/gui/mplayer/pixmaps/normal.xpm
index af904c0003..af904c0003 100644
--- a/Gui/mplayer/pixmaps/normal.xpm
+++ b/gui/mplayer/pixmaps/normal.xpm
diff --git a/Gui/mplayer/pixmaps/ok.xpm b/gui/mplayer/pixmaps/ok.xpm
index 2ec7a0efdf..2ec7a0efdf 100644
--- a/Gui/mplayer/pixmaps/ok.xpm
+++ b/gui/mplayer/pixmaps/ok.xpm
diff --git a/Gui/mplayer/pixmaps/open.xpm b/gui/mplayer/pixmaps/open.xpm
index 51af00ed88..51af00ed88 100644
--- a/Gui/mplayer/pixmaps/open.xpm
+++ b/gui/mplayer/pixmaps/open.xpm
diff --git a/Gui/mplayer/pixmaps/pause.xpm b/gui/mplayer/pixmaps/pause.xpm
index 37d6560191..37d6560191 100644
--- a/Gui/mplayer/pixmaps/pause.xpm
+++ b/gui/mplayer/pixmaps/pause.xpm
diff --git a/Gui/mplayer/pixmaps/pl.xpm b/gui/mplayer/pixmaps/pl.xpm
index 25cdb4d0fd..25cdb4d0fd 100644
--- a/Gui/mplayer/pixmaps/pl.xpm
+++ b/gui/mplayer/pixmaps/pl.xpm
diff --git a/Gui/mplayer/pixmaps/play.xpm b/gui/mplayer/pixmaps/play.xpm
index aafc0a554e..aafc0a554e 100644
--- a/Gui/mplayer/pixmaps/play.xpm
+++ b/gui/mplayer/pixmaps/play.xpm
diff --git a/Gui/mplayer/pixmaps/playdvd.xpm b/gui/mplayer/pixmaps/playdvd.xpm
index 0d18933d0d..0d18933d0d 100644
--- a/Gui/mplayer/pixmaps/playdvd.xpm
+++ b/gui/mplayer/pixmaps/playdvd.xpm
diff --git a/Gui/mplayer/pixmaps/playvcd.xpm b/gui/mplayer/pixmaps/playvcd.xpm
index 63a993ee4b..63a993ee4b 100644
--- a/Gui/mplayer/pixmaps/playvcd.xpm
+++ b/gui/mplayer/pixmaps/playvcd.xpm
diff --git a/Gui/mplayer/pixmaps/prefs.xpm b/gui/mplayer/pixmaps/prefs.xpm
index 09813c8904..09813c8904 100644
--- a/Gui/mplayer/pixmaps/prefs.xpm
+++ b/gui/mplayer/pixmaps/prefs.xpm
diff --git a/Gui/mplayer/pixmaps/prev.xpm b/gui/mplayer/pixmaps/prev.xpm
index f46a833448..f46a833448 100644
--- a/Gui/mplayer/pixmaps/prev.xpm
+++ b/gui/mplayer/pixmaps/prev.xpm
diff --git a/Gui/mplayer/pixmaps/question.xpm b/gui/mplayer/pixmaps/question.xpm
index 089deb37a1..089deb37a1 100644
--- a/Gui/mplayer/pixmaps/question.xpm
+++ b/gui/mplayer/pixmaps/question.xpm
diff --git a/Gui/mplayer/pixmaps/skin.xpm b/gui/mplayer/pixmaps/skin.xpm
index e71f1cae02..e71f1cae02 100644
--- a/Gui/mplayer/pixmaps/skin.xpm
+++ b/gui/mplayer/pixmaps/skin.xpm
diff --git a/Gui/mplayer/pixmaps/sound.xpm b/gui/mplayer/pixmaps/sound.xpm
index 78cfb3367e..78cfb3367e 100644
--- a/Gui/mplayer/pixmaps/sound.xpm
+++ b/gui/mplayer/pixmaps/sound.xpm
diff --git a/Gui/mplayer/pixmaps/stop.xpm b/gui/mplayer/pixmaps/stop.xpm
index da0dfb459f..da0dfb459f 100644
--- a/Gui/mplayer/pixmaps/stop.xpm
+++ b/gui/mplayer/pixmaps/stop.xpm
diff --git a/Gui/mplayer/pixmaps/stop2.xpm b/gui/mplayer/pixmaps/stop2.xpm
index c41476012b..c41476012b 100644
--- a/Gui/mplayer/pixmaps/stop2.xpm
+++ b/gui/mplayer/pixmaps/stop2.xpm
diff --git a/Gui/mplayer/pixmaps/sub.xpm b/gui/mplayer/pixmaps/sub.xpm
index dedcbe5f79..dedcbe5f79 100644
--- a/Gui/mplayer/pixmaps/sub.xpm
+++ b/gui/mplayer/pixmaps/sub.xpm
diff --git a/Gui/mplayer/pixmaps/title.xpm b/gui/mplayer/pixmaps/title.xpm
index 1923389d59..1923389d59 100644
--- a/Gui/mplayer/pixmaps/title.xpm
+++ b/gui/mplayer/pixmaps/title.xpm
diff --git a/Gui/mplayer/pixmaps/tongue.xpm b/gui/mplayer/pixmaps/tongue.xpm
index 1597855527..1597855527 100644
--- a/Gui/mplayer/pixmaps/tongue.xpm
+++ b/gui/mplayer/pixmaps/tongue.xpm
diff --git a/Gui/mplayer/pixmaps/tonguebla.xpm b/gui/mplayer/pixmaps/tonguebla.xpm
index f70db0b78b..f70db0b78b 100644
--- a/Gui/mplayer/pixmaps/tonguebla.xpm
+++ b/gui/mplayer/pixmaps/tonguebla.xpm
diff --git a/Gui/mplayer/pixmaps/up.xpm b/gui/mplayer/pixmaps/up.xpm
index d9b85b823b..d9b85b823b 100644
--- a/Gui/mplayer/pixmaps/up.xpm
+++ b/gui/mplayer/pixmaps/up.xpm
diff --git a/Gui/mplayer/pixmaps/url.xpm b/gui/mplayer/pixmaps/url.xpm
index fe47d25692..fe47d25692 100644
--- a/Gui/mplayer/pixmaps/url.xpm
+++ b/gui/mplayer/pixmaps/url.xpm
diff --git a/Gui/mplayer/pixmaps/vcd.xpm b/gui/mplayer/pixmaps/vcd.xpm
index c547e5a736..c547e5a736 100644
--- a/Gui/mplayer/pixmaps/vcd.xpm
+++ b/gui/mplayer/pixmaps/vcd.xpm
diff --git a/Gui/mplayer/pixmaps/warning.xpm b/gui/mplayer/pixmaps/warning.xpm
index 4598541c48..4598541c48 100644
--- a/Gui/mplayer/pixmaps/warning.xpm
+++ b/gui/mplayer/pixmaps/warning.xpm
diff --git a/Gui/mplayer/play.c b/gui/mplayer/play.c
index dbec9d0e38..dbec9d0e38 100644
--- a/Gui/mplayer/play.c
+++ b/gui/mplayer/play.c
diff --git a/Gui/mplayer/play.h b/gui/mplayer/play.h
index 15615dd8a2..15615dd8a2 100644
--- a/Gui/mplayer/play.h
+++ b/gui/mplayer/play.h
diff --git a/Gui/mplayer/sw.c b/gui/mplayer/sw.c
index 20b6807cac..20b6807cac 100644
--- a/Gui/mplayer/sw.c
+++ b/gui/mplayer/sw.c
diff --git a/Gui/mplayer/widgets.c b/gui/mplayer/widgets.c
index 1d4ee6123c..1d4ee6123c 100644
--- a/Gui/mplayer/widgets.c
+++ b/gui/mplayer/widgets.c
diff --git a/Gui/mplayer/widgets.h b/gui/mplayer/widgets.h
index 3821a82b9c..3821a82b9c 100644
--- a/Gui/mplayer/widgets.h
+++ b/gui/mplayer/widgets.h
diff --git a/Gui/skin/cut.c b/gui/skin/cut.c
index cdb56c3d3d..cdb56c3d3d 100644
--- a/Gui/skin/cut.c
+++ b/gui/skin/cut.c
diff --git a/Gui/skin/cut.h b/gui/skin/cut.h
index 71862e91f9..71862e91f9 100644
--- a/Gui/skin/cut.h
+++ b/gui/skin/cut.h
diff --git a/Gui/skin/font.c b/gui/skin/font.c
index 3860079a98..3860079a98 100644
--- a/Gui/skin/font.c
+++ b/gui/skin/font.c
diff --git a/Gui/skin/font.h b/gui/skin/font.h
index 94289ded6c..94289ded6c 100644
--- a/Gui/skin/font.h
+++ b/gui/skin/font.h
diff --git a/Gui/skin/skin.c b/gui/skin/skin.c
index b83c0360e4..b83c0360e4 100644
--- a/Gui/skin/skin.c
+++ b/gui/skin/skin.c
diff --git a/Gui/skin/skin.h b/gui/skin/skin.h
index ce9d47b1eb..ce9d47b1eb 100644
--- a/Gui/skin/skin.h
+++ b/gui/skin/skin.h
diff --git a/Gui/win32/Changelog b/gui/win32/Changelog
index 1e831ee65a..1e831ee65a 100644
--- a/Gui/win32/Changelog
+++ b/gui/win32/Changelog
diff --git a/Gui/win32/README b/gui/win32/README
index 7463258d2f..7463258d2f 100644
--- a/Gui/win32/README
+++ b/gui/win32/README
diff --git a/Gui/win32/dialogs.c b/gui/win32/dialogs.c
index 6b38f8635f..6b38f8635f 100644
--- a/Gui/win32/dialogs.c
+++ b/gui/win32/dialogs.c
diff --git a/Gui/win32/dialogs.h b/gui/win32/dialogs.h
index b7b47ae7a6..b7b47ae7a6 100644
--- a/Gui/win32/dialogs.h
+++ b/gui/win32/dialogs.h
diff --git a/Gui/win32/gui.c b/gui/win32/gui.c
index d079c82c5e..d079c82c5e 100644
--- a/Gui/win32/gui.c
+++ b/gui/win32/gui.c
diff --git a/Gui/win32/gui.h b/gui/win32/gui.h
index 2594d4ae01..2594d4ae01 100644
--- a/Gui/win32/gui.h
+++ b/gui/win32/gui.h
diff --git a/Gui/win32/interface.c b/gui/win32/interface.c
index 4c165f037e..4c165f037e 100644
--- a/Gui/win32/interface.c
+++ b/gui/win32/interface.c
diff --git a/Gui/win32/playlist.c b/gui/win32/playlist.c
index 65556e9dee..65556e9dee 100644
--- a/Gui/win32/playlist.c
+++ b/gui/win32/playlist.c
diff --git a/Gui/win32/playlist.h b/gui/win32/playlist.h
index 41766d169d..41766d169d 100644
--- a/Gui/win32/playlist.h
+++ b/gui/win32/playlist.h
diff --git a/Gui/win32/preferences.c b/gui/win32/preferences.c
index 0063a6ac13..0063a6ac13 100644
--- a/Gui/win32/preferences.c
+++ b/gui/win32/preferences.c
diff --git a/Gui/win32/skinload.c b/gui/win32/skinload.c
index 9c56e93348..9c56e93348 100644
--- a/Gui/win32/skinload.c
+++ b/gui/win32/skinload.c
diff --git a/Gui/win32/skinload.h b/gui/win32/skinload.h
index 3103539dc3..3103539dc3 100644
--- a/Gui/win32/skinload.h
+++ b/gui/win32/skinload.h
diff --git a/Gui/win32/widgetrender.c b/gui/win32/widgetrender.c
index ae4f69b54e..ae4f69b54e 100644
--- a/Gui/win32/widgetrender.c
+++ b/gui/win32/widgetrender.c
diff --git a/Gui/win32/wincfg.c b/gui/win32/wincfg.c
index 605867900c..605867900c 100644
--- a/Gui/win32/wincfg.c
+++ b/gui/win32/wincfg.c
diff --git a/Gui/win32/wincfg.h b/gui/win32/wincfg.h
index 9a5543c3a9..9a5543c3a9 100644
--- a/Gui/win32/wincfg.h
+++ b/gui/win32/wincfg.h
diff --git a/Gui/wm/ws.c b/gui/wm/ws.c
index 5e2e010bf3..5e2e010bf3 100644
--- a/Gui/wm/ws.c
+++ b/gui/wm/ws.c
diff --git a/Gui/wm/ws.h b/gui/wm/ws.h
index 17ad5a512a..17ad5a512a 100644
--- a/Gui/wm/ws.h
+++ b/gui/wm/ws.h
diff --git a/Gui/wm/wskeys.h b/gui/wm/wskeys.h
index 830aecbc39..830aecbc39 100644
--- a/Gui/wm/wskeys.h
+++ b/gui/wm/wskeys.h
diff --git a/Gui/wm/wsmkeys.h b/gui/wm/wsmkeys.h
index 6fadb18428..6fadb18428 100644
--- a/Gui/wm/wsmkeys.h
+++ b/gui/wm/wsmkeys.h
diff --git a/Gui/wm/wsxdnd.c b/gui/wm/wsxdnd.c
index 5fa1c91744..5fa1c91744 100644
--- a/Gui/wm/wsxdnd.c
+++ b/gui/wm/wsxdnd.c
diff --git a/Gui/wm/wsxdnd.h b/gui/wm/wsxdnd.h
index 7fe3c3fd77..7fe3c3fd77 100644
--- a/Gui/wm/wsxdnd.h
+++ b/gui/wm/wsxdnd.h
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index 0188c36eb8..b8851d73a7 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -117,7 +117,7 @@ int vo_flags=0;
 int vd_use_slices=1;
 
 /** global variables for gamma, brightness, contrast, saturation and hue 
-    modified by mplayer.c and Gui/mplayer/gtk/eq.c:
+    modified by mplayer.c and gui/mplayer/gtk/eq.c:
     ranges -100 - 100
     1000 if the vo default should be used
 */   
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c
index c57b0efbe1..3521f9dfeb 100644
--- a/libvo/vo_directx.c
+++ b/libvo/vo_directx.c
@@ -37,7 +37,7 @@
 #include "mp_fifo.h"
 
 #ifdef HAVE_NEW_GUI
-#include "Gui/interface.h"
+#include "gui/interface.h"
 #endif
 
 #ifndef WM_XBUTTONDOWN
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c
index f4ac45ac8b..f08a706127 100644
--- a/libvo/vo_dxr3.c
+++ b/libvo/vo_dxr3.c
@@ -143,7 +143,7 @@
 #include "spuenc.h"
 #include "sub.h"
 #ifdef HAVE_NEW_GUI
-#include "Gui/interface.h"
+#include "gui/interface.h"
 #endif
 #ifdef HAVE_X11
 #include "x11_common.h"
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 4daf5d219f..622955a6d3 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -14,7 +14,7 @@
 #include "gl_common.h"
 #include "aspect.h"
 #ifdef HAVE_NEW_GUI
-#include "Gui/interface.h"
+#include "gui/interface.h"
 #endif
 #include "libass/ass.h"
 #include "libass/ass_mp.h"
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c
index 0f68ffecb3..aa8ce5e092 100644
--- a/libvo/vo_gl2.c
+++ b/libvo/vo_gl2.c
@@ -18,7 +18,7 @@
 #include "gl_common.h"
 #include "aspect.h"
 #ifdef HAVE_NEW_GUI
-#include "Gui/interface.h"
+#include "gui/interface.h"
 #endif
 
 #define NDEBUG
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 05b6efc7e6..a89734b005 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -47,7 +47,7 @@ int XShmGetEventBase(Display *);
 #include "help_mp.h"
 
 #ifdef HAVE_NEW_GUI
-#include "Gui/interface.h"
+#include "gui/interface.h"
 #include "mplayer.h"
 #endif
 
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c
index bec59d13a3..cd57f5d12e 100644
--- a/libvo/vo_xmga.c
+++ b/libvo/vo_xmga.c
@@ -44,7 +44,7 @@ static unsigned int timerd = 0;
 #endif
 
 #ifdef HAVE_NEW_GUI
-#include "Gui/interface.h"
+#include "gui/interface.h"
 #endif
 
 static vo_info_t info = {
diff --git a/libvo/vo_xover.c b/libvo/vo_xover.c
index dbf40182c7..fb5a388bb6 100644
--- a/libvo/vo_xover.c
+++ b/libvo/vo_xover.c
@@ -33,7 +33,7 @@
 #include "mp_msg.h"
 
 #ifdef HAVE_NEW_GUI
-#include "Gui/interface.h"
+#include "gui/interface.h"
 #endif
 
 
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index 8a7101d96d..7f68510432 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -40,7 +40,7 @@ Buffer allocation:
 #include "subopt-helper.h"
 
 #ifdef HAVE_NEW_GUI
-#include "Gui/interface.h"
+#include "gui/interface.h"
 #endif
 
 #include "libavutil/common.h"
diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c
index e8360e7266..68565cdbd5 100644
--- a/libvo/vo_xvidix.c
+++ b/libvo/vo_xvidix.c
@@ -34,7 +34,7 @@
 #include "vidix/vidixlib.h"
 
 #ifdef HAVE_NEW_GUI
-#include "Gui/interface.h"
+#include "gui/interface.h"
 #endif
 
 
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c
index 81745fd6b9..96b6c79fcd 100644
--- a/libvo/vo_xvmc.c
+++ b/libvo/vo_xvmc.c
@@ -33,7 +33,7 @@
 #include "subopt-helper.h"
 
 #ifdef HAVE_NEW_GUI
-#include "Gui/interface.h"
+#include "gui/interface.h"
 #endif
 
 #include "libavutil/common.h"
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 29f0e3bf58..bef8f160c7 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -54,7 +54,7 @@
 #include "input/mouse.h"
 
 #ifdef HAVE_NEW_GUI
-#include "Gui/interface.h"
+#include "gui/interface.h"
 #include "mplayer.h"
 #endif
 
diff --git a/mp_msg.c b/mp_msg.c
index 8ec7bdecf8..abd468e881 100644
--- a/mp_msg.c
+++ b/mp_msg.c
@@ -19,7 +19,7 @@ extern char* get_term_charset(void);
 #endif
 
 #ifdef HAVE_NEW_GUI
-#include "Gui/interface.h"
+#include "gui/interface.h"
 extern int use_gui;
 #endif
 #include "mp_msg.h"
diff --git a/mplayer.c b/mplayer.c
index 061a71620d..b3d5b9b04b 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -76,7 +76,7 @@ extern int mp_input_win32_slave_cmd_func(int fd,char* dest,int size);
 #include "cpudetect.h"
 
 #ifdef HAVE_NEW_GUI
-#include "Gui/interface.h"
+#include "gui/interface.h"
 #endif
 
 #include "input/input.h"