Switch includes to use embedded guichan.

159 files changed, 238 insertions, 238 deletions

diff --git a/src/being.h b/src/being.h
index 1f0d318f3..d2711c567 100644
--- a/src/being.h
+++ b/src/being.h
@@ -37,7 +37,7 @@
 #include "position.h"
 #include "vector.h"
 
-#include <guichan/color.hpp>
+#include "guichan/color.hpp"
 
 #include <SDL_types.h>
 
diff --git a/src/client.h b/src/client.h
index f03a213db..093fb764d 100644
--- a/src/client.h
+++ b/src/client.h
@@ -27,7 +27,7 @@
 
 #include "net/serverinfo.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 #include <SDL.h>
 #include <SDL_framerate.h>
diff --git a/src/game.cpp b/src/game.cpp
index 850d335e4..d95e2ef8c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -101,8 +101,8 @@
 #include "utils/gettext.h"
 #include "utils/mkdir.h"
 
-#include <guichan/exception.hpp>
-#include <guichan/focushandler.hpp>
+#include "guichan/exception.hpp"
+#include "guichan/focushandler.hpp"
 
 #include <physfs.h>
 
diff --git a/src/graphics.h b/src/graphics.h
index 423279fb0..2a915c60d 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -23,7 +23,7 @@
 #ifndef GRAPHICS_H
 #define GRAPHICS_H
 
-#include <guichan/sdl/sdlgraphics.hpp>
+#include "guichan/sdl/sdlgraphics.hpp"
 
 //include "graphicsvertexes.h"
 
diff --git a/src/graphicsvertexes.h b/src/graphicsvertexes.h
index d3905ba56..1290849fb 100644
--- a/src/graphicsvertexes.h
+++ b/src/graphicsvertexes.h
@@ -36,7 +36,7 @@
 #include <list>
 #include <vector>
 
-//include <guichan/sdl/sdlgraphics.hpp>
+//include "guichan/sdl/sdlgraphics.hpp"
 
 
 struct DoubleRect
diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp
index 20d2c5c1e..85cfeb236 100644
--- a/src/gui/beingpopup.cpp
+++ b/src/gui/beingpopup.cpp
@@ -33,7 +33,7 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/botcheckerwindow.h b/src/gui/botcheckerwindow.h
index cb225d3e7..2f399bd6a 100644
--- a/src/gui/botcheckerwindow.h
+++ b/src/gui/botcheckerwindow.h
@@ -27,7 +27,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 #include <vector>
 
diff --git a/src/gui/buydialog.h b/src/gui/buydialog.h
index eabf26ef8..55434c69d 100644
--- a/src/gui/buydialog.h
+++ b/src/gui/buydialog.h
@@ -27,8 +27,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/selectionlistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/buyselldialog.h b/src/gui/buyselldialog.h
index 2c7e5c101..f2749a3fe 100644
--- a/src/gui/buyselldialog.h
+++ b/src/gui/buyselldialog.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 /**
  * A dialog to choose between buying or selling at a shop.
diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h
index e130a9074..b9f5648b2 100644
--- a/src/gui/changeemaildialog.h
+++ b/src/gui/changeemaildialog.h
@@ -27,7 +27,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 class LoginData;
 class OkDialog;
diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h
index 3b0626922..382fe5a2d 100644
--- a/src/gui/changepassworddialog.h
+++ b/src/gui/changepassworddialog.h
@@ -27,7 +27,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 class LoginData;
 class OkDialog;
diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp
index 91c284985..d7333dc15 100644
--- a/src/gui/charcreatedialog.cpp
+++ b/src/gui/charcreatedialog.cpp
@@ -50,7 +50,7 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h
index 2f0f83513..f39a95ce0 100644
--- a/src/gui/charcreatedialog.h
+++ b/src/gui/charcreatedialog.h
@@ -30,7 +30,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 #include <string>
 #include <vector>
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 264df06e3..55cadde64 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -57,7 +57,7 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #include <string>
 #include <cassert>
diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h
index bcbbb7679..03d49b9fa 100644
--- a/src/gui/charselectdialog.h
+++ b/src/gui/charselectdialog.h
@@ -31,8 +31,8 @@
 
 #include "net/charhandler.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/keylistener.hpp"
 
 class CharacterDisplay;
 class LocalPlayer;
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 1712a3f16..e5e86eabc 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -58,8 +58,8 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <guichan/focushandler.hpp>
-#include <guichan/focuslistener.hpp>
+#include "guichan/focushandler.hpp"
+#include "guichan/focuslistener.hpp"
 
 #include <sstream>
 
diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h
index d68fa7671..c485a46fd 100644
--- a/src/gui/chatwindow.h
+++ b/src/gui/chatwindow.h
@@ -27,10 +27,10 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/keylistener.hpp"
+#include "guichan/widget.hpp"
+#include "guichan/widgetlistener.hpp"
 
 #include <list>
 #include <string>
diff --git a/src/gui/confirmdialog.cpp b/src/gui/confirmdialog.cpp
index 661168dd9..b6522a131 100644
--- a/src/gui/confirmdialog.cpp
+++ b/src/gui/confirmdialog.cpp
@@ -31,7 +31,7 @@
 
 #include "utils/gettext.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/confirmdialog.h b/src/gui/confirmdialog.h
index 214aaba60..b68ddb1f9 100644
--- a/src/gui/confirmdialog.h
+++ b/src/gui/confirmdialog.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 class TextBox;
 
diff --git a/src/gui/connectiondialog.h b/src/gui/connectiondialog.h
index 7c0b59faf..f5f0a67ca 100644
--- a/src/gui/connectiondialog.h
+++ b/src/gui/connectiondialog.h
@@ -27,7 +27,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 /**
  * The connection dialog.
diff --git a/src/gui/editdialog.cpp b/src/gui/editdialog.cpp
index bb80f07ed..6ff954060 100644
--- a/src/gui/editdialog.cpp
+++ b/src/gui/editdialog.cpp
@@ -29,7 +29,7 @@
 
 #include "utils/gettext.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/editdialog.h b/src/gui/editdialog.h
index 55947b23d..09f6fa2f2 100644
--- a/src/gui/editdialog.h
+++ b/src/gui/editdialog.h
@@ -26,7 +26,7 @@
 #include "gui/widgets/window.h"
 #include "gui/widgets/textfield.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 #define ACTION_EDIT_OK "edit ok"
 
diff --git a/src/gui/emotepopup.cpp b/src/gui/emotepopup.cpp
index d23443a2f..3a0b1ee0c 100644
--- a/src/gui/emotepopup.cpp
+++ b/src/gui/emotepopup.cpp
@@ -38,8 +38,8 @@
 
 #include "utils/dtor.h"
 
-#include <guichan/mouseinput.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "guichan/mouseinput.hpp"
+#include "guichan/selectionlistener.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/emotepopup.h b/src/gui/emotepopup.h
index a80562fea..2e2475934 100644
--- a/src/gui/emotepopup.h
+++ b/src/gui/emotepopup.h
@@ -26,7 +26,7 @@
 
 #include "gui/widgets/popup.h"
 
-#include <guichan/mouselistener.hpp>
+#include "guichan/mouselistener.hpp"
 
 #include <list>
 #include <vector>
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index edad33623..88cde205d 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -48,7 +48,7 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 75118707d..5b01b31d5 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -28,7 +28,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h
index 9d814bb69..66cb7c566 100644
--- a/src/gui/focushandler.h
+++ b/src/gui/focushandler.h
@@ -23,7 +23,7 @@
 #ifndef FOCUSHANDLER_H
 #define FOCUSHANDLER_H
 
-#include <guichan/focushandler.hpp>
+#include "guichan/focushandler.hpp"
 
 #include <list>
 
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index a23da8157..e5d4d0964 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -42,8 +42,8 @@
 #include "resources/imageloader.h"
 #include "resources/resourcemanager.h"
 
-#include <guichan/exception.hpp>
-#include <guichan/image.hpp>
+#include "guichan/exception.hpp"
+#include "guichan/image.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 13df02822..507b001d0 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -25,7 +25,7 @@
 
 #include "guichanfwd.h"
 
-#include <guichan/gui.hpp>
+#include "guichan/gui.hpp"
 
 class Graphics;
 class GuiConfigListener;
diff --git a/src/gui/helpwindow.h b/src/gui/helpwindow.h
index df7a867d2..b3c2ecca5 100644
--- a/src/gui/helpwindow.h
+++ b/src/gui/helpwindow.h
@@ -26,7 +26,7 @@
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 056afee92..474bd454f 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -54,8 +54,8 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <guichan/font.hpp>
-#include <guichan/mouseinput.hpp>
+#include "guichan/font.hpp"
+#include "guichan/mouseinput.hpp"
 
 #include <string>
 
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 9ca45aaea..608f70c12 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -31,9 +31,9 @@
 #include "net/inventoryhandler.h"
 #include "net/net.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/keylistener.hpp"
+#include "guichan/selectionlistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/itemamountwindow.h b/src/gui/itemamountwindow.h
index f51c074f7..da7a0a30a 100644
--- a/src/gui/itemamountwindow.h
+++ b/src/gui/itemamountwindow.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/keylistener.hpp>
-#include <guichan/actionlistener.hpp>
+#include "guichan/keylistener.hpp"
+#include "guichan/actionlistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index e7def2234..f3750a2fa 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -40,10 +40,10 @@
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
-#include <guichan/widgets/label.hpp>
-#include <guichan/widgets/container.hpp>
+#include "guichan/widgets/label.hpp"
+#include "guichan/widgets/container.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index 66d7e91a2..8cdf6a185 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -28,7 +28,7 @@
 
 #include "resources/iteminfo.h"
 
-#include <guichan/mouselistener.hpp>
+#include "guichan/mouselistener.hpp"
 
 class Icon;
 class TextBox;
diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp
index 610e76208..869d91b8d 100644
--- a/src/gui/killstats.cpp
+++ b/src/gui/killstats.cpp
@@ -23,7 +23,7 @@
 #include "gui/killstats.h"
 
 #include <math.h>
-#include <guichan/widgets/label.hpp>
+#include "guichan/widgets/label.hpp"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/killstats.h b/src/gui/killstats.h
index 59b1ff653..ca9837b53 100644
--- a/src/gui/killstats.h
+++ b/src/gui/killstats.h
@@ -23,7 +23,7 @@
 #ifndef KILLSTATS_H
 #define KILLSTATS_H
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 #include "listener.h"
 
diff --git a/src/gui/logindialog.h b/src/gui/logindialog.h
index ade45c211..c91c5fb67 100644
--- a/src/gui/logindialog.h
+++ b/src/gui/logindialog.h
@@ -25,9 +25,9 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
-#include <guichan/listmodel.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/keylistener.hpp"
+#include "guichan/listmodel.hpp"
 
 #include <string>
 #include <vector>
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index b85826679..2eb424e09 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -39,7 +39,7 @@
 
 #include "utils/gettext.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index d8dc68fd1..a0309eb6b 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -44,7 +44,7 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h
index 2f5a90b5f..2f587988e 100644
--- a/src/gui/npcdialog.h
+++ b/src/gui/npcdialog.h
@@ -27,8 +27,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/listmodel.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/listmodel.hpp"
 
 #include <list>
 #include <string>
diff --git a/src/gui/npcpostdialog.h b/src/gui/npcpostdialog.h
index bc329096b..9c0d5d8ba 100644
--- a/src/gui/npcpostdialog.h
+++ b/src/gui/npcpostdialog.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 class TextBox;
 class TextField;
diff --git a/src/gui/okdialog.cpp b/src/gui/okdialog.cpp
index 122d7176f..883096620 100644
--- a/src/gui/okdialog.cpp
+++ b/src/gui/okdialog.cpp
@@ -29,7 +29,7 @@
 
 #include "utils/gettext.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/okdialog.h b/src/gui/okdialog.h
index 2ee8653ec..8590db1c7 100644
--- a/src/gui/okdialog.h
+++ b/src/gui/okdialog.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 class TextBox;
 
diff --git a/src/gui/outfitwindow.h b/src/gui/outfitwindow.h
index 8c73b13e0..cff5bad59 100644
--- a/src/gui/outfitwindow.h
+++ b/src/gui/outfitwindow.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/mouselistener.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/mouselistener.hpp"
 
 #define OUTFITS_COUNT 100
 #define OUTFIT_ITEM_COUNT 12
diff --git a/src/gui/palette.h b/src/gui/palette.h
index 4a48bd32d..5fbdf127c 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -27,7 +27,7 @@
 #include "log.h"
 #include "utils/stringutils.h"
 
-#include <guichan/color.hpp>
+#include "guichan/color.hpp"
 
 #include <cstdlib>
 #include <string>
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index e16a9fb4f..69f362530 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -26,7 +26,7 @@
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/popup.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h
index d68910596..6311c8049 100644
--- a/src/gui/quitdialog.h
+++ b/src/gui/quitdialog.h
@@ -27,8 +27,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/keylistener.hpp"
 
 #include <vector>
 
diff --git a/src/gui/register.h b/src/gui/register.h
index a44e51b2a..096ad5a29 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/keylistener.hpp"
 
 #include <string>
 
diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp
index 9cbee4e89..4bcf18a2a 100644
--- a/src/gui/sdlfont.cpp
+++ b/src/gui/sdlfont.cpp
@@ -33,7 +33,7 @@
 
 #include "utils/stringutils.h"
 
-#include <guichan/exception.hpp>
+#include "guichan/exception.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/sdlfont.h b/src/gui/sdlfont.h
index 86ef2f1e9..f8a5a5051 100644
--- a/src/gui/sdlfont.h
+++ b/src/gui/sdlfont.h
@@ -24,7 +24,7 @@
 #ifndef SDLFONT_H
 #define SDLFONT_H
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #ifdef __APPLE__
 #include <SDL_ttf/SDL_ttf.h>
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index a48f35be8..34f323d62 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -57,7 +57,7 @@
 
 #include "sdlinput.h"
 
-#include <guichan/exception.hpp>
+#include "guichan/exception.hpp"
 
 SDLInput::SDLInput()
 {
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index b441380a4..9b279e6bb 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -62,10 +62,10 @@
 
 #include <SDL/SDL.h>
 
-#include <guichan/input.hpp>
-#include <guichan/keyinput.hpp>
-#include <guichan/mouseinput.hpp>
-#include <guichan/platform.hpp>
+#include "guichan/input.hpp"
+#include "guichan/keyinput.hpp"
+#include "guichan/mouseinput.hpp"
+#include "guichan/platform.hpp"
 
 namespace Key
 {
diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h
index e40dd50c2..1075fefbd 100644
--- a/src/gui/selldialog.h
+++ b/src/gui/selldialog.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/selectionlistener.hpp"
 
 #include <SDL_types.h>
 
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 0dc817646..37232aa05 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -49,7 +49,7 @@
 #include "utils/xml.h"
 #include "widgets/dropdown.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #include <cstdlib>
 #include <iostream>
diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index a5f5f3ee0..a1ec053ae 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.h
@@ -31,11 +31,11 @@
 
 #include "utils/mutex.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
-#include <guichan/listmodel.hpp>
-#include <guichan/mouselistener.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/keylistener.hpp"
+#include "guichan/listmodel.hpp"
+#include "guichan/mouselistener.hpp"
+#include "guichan/selectionlistener.hpp"
 
 #include <string>
 #include <vector>
diff --git a/src/gui/setup.h b/src/gui/setup.h
index ad5ba53d9..aafdd6b88 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -29,7 +29,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 #include <list>
 
diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h
index 70264f876..4cbdd2d6a 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.h
@@ -27,7 +27,7 @@
 
 #include "gui/widgets/setuptab.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 class Setup_Audio : public SetupTab, public gcn::ActionListener
 {
diff --git a/src/gui/setup_chat.h b/src/gui/setup_chat.h
index 2a6e5b183..50161ff4e 100644
--- a/src/gui/setup_chat.h
+++ b/src/gui/setup_chat.h
@@ -27,7 +27,7 @@
 
 #include "gui/widgets/setuptab.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 class IntTextField;
 class EditDialog;
diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h
index 6ff7e1bb7..b1db80723 100644
--- a/src/gui/setup_colors.h
+++ b/src/gui/setup_colors.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/setuptab.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/selectionlistener.hpp"
 
 #include <string>
 
diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h
index 0771d3478..49d829e86 100644
--- a/src/gui/setup_joystick.h
+++ b/src/gui/setup_joystick.h
@@ -27,7 +27,7 @@
 
 #include "gui/widgets/setuptab.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 class Setup_Joystick : public SetupTab, public gcn::ActionListener
 {
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 5125541cf..cb2d9021d 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -35,7 +35,7 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <guichan/listmodel.hpp>
+#include "guichan/listmodel.hpp"
 
 #include <SDL_keyboard.h>
 
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
index 9b0c12307..42955bc9b 100644
--- a/src/gui/setup_keyboard.h
+++ b/src/gui/setup_keyboard.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/setuptab.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 #include <string>
 
diff --git a/src/gui/setup_other.h b/src/gui/setup_other.h
index 8bf4fe659..6b81544ef 100644
--- a/src/gui/setup_other.h
+++ b/src/gui/setup_other.h
@@ -27,7 +27,7 @@
 
 #include "gui/widgets/setuptab.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 class EditDialog;
 
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index 64561ed91..e9b855301 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -28,7 +28,7 @@
 
 #include "gui/widgets/setuptab.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/setup_theme.h b/src/gui/setup_theme.h
index 6b2c99999..3a2bf5392 100644
--- a/src/gui/setup_theme.h
+++ b/src/gui/setup_theme.h
@@ -27,7 +27,7 @@
 
 #include "gui/widgets/setuptab.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 class FontsModel;
 class EditDialog;
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 59f3ccf34..3b4ca844d 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -48,8 +48,8 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <guichan/key.hpp>
-#include <guichan/listmodel.hpp>
+#include "guichan/key.hpp"
+#include "guichan/listmodel.hpp"
 
 #include <SDL.h>
 
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 1eba02b4f..0703ab594 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -28,8 +28,8 @@
 
 #include "gui/widgets/setuptab.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/keylistener.hpp"
 
 class FontSizeChoiceListModel;
 class ModeListModel;
diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h
index 0f122a876..01aeb2b29 100644
--- a/src/gui/shopwindow.h
+++ b/src/gui/shopwindow.h
@@ -27,8 +27,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/selectionlistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index a164d59d7..8adffab91 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -51,7 +51,7 @@
 #include "utils/stringutils.h"
 #include "utils/xml.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #include <set>
 #include <string>
diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h
index 6897c35ac..6ab84a4d9 100644
--- a/src/gui/skilldialog.h
+++ b/src/gui/skilldialog.h
@@ -30,7 +30,7 @@
 //include "resources/image.h"
 //include "resources/resourcemanager.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 #include <map>
 
diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h
index c9cd296dc..3f437e66d 100644
--- a/src/gui/socialwindow.h
+++ b/src/gui/socialwindow.h
@@ -24,8 +24,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionevent.hpp>
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionevent.hpp"
+#include "guichan/actionlistener.hpp"
 
 #include <string>
 #include <map>
diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h
index 2c7434f40..6fb5e805f 100644
--- a/src/gui/specialswindow.h
+++ b/src/gui/specialswindow.h
@@ -30,7 +30,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 #include <map>
 
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 7356cc633..bb297dc5a 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -30,9 +30,9 @@
 
 #include "gui/widgets/textbox.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
-#include <guichan/widgets/label.hpp>
+#include "guichan/widgets/label.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/spellpopup.cpp b/src/gui/spellpopup.cpp
index 3c6d17599..8acb3f03a 100644
--- a/src/gui/spellpopup.cpp
+++ b/src/gui/spellpopup.cpp
@@ -34,8 +34,8 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <guichan/font.hpp>
-#include <guichan/widgets/label.hpp>
+#include "guichan/font.hpp"
+#include "guichan/widgets/label.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/spellpopup.h b/src/gui/spellpopup.h
index 1b14e0e4c..c08620f2b 100644
--- a/src/gui/spellpopup.h
+++ b/src/gui/spellpopup.h
@@ -28,7 +28,7 @@
 
 #include "textcommand.h"
 
-#include <guichan/mouselistener.hpp>
+#include "guichan/mouselistener.hpp"
 
 class TextBox;
 
diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp
index 9ac2cfad0..bd324215c 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/statuspopup.cpp
@@ -38,8 +38,8 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <guichan/font.hpp>
-#include <guichan/widgets/label.hpp>
+#include "guichan/font.hpp"
+#include "guichan/widgets/label.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/statuspopup.h b/src/gui/statuspopup.h
index d633fb1f6..f1affd175 100644
--- a/src/gui/statuspopup.h
+++ b/src/gui/statuspopup.h
@@ -28,7 +28,7 @@
 
 #include "resources/iteminfo.h"
 
-#include <guichan/mouselistener.hpp>
+#include "guichan/mouselistener.hpp"
 
 class TextBox;
 
diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h
index 79126a095..8bb3690be 100644
--- a/src/gui/statuswindow.h
+++ b/src/gui/statuswindow.h
@@ -28,7 +28,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 #include <map>
 
diff --git a/src/gui/textcommandeditor.h b/src/gui/textcommandeditor.h
index cb88b8160..fbbd94ffc 100644
--- a/src/gui/textcommandeditor.h
+++ b/src/gui/textcommandeditor.h
@@ -27,7 +27,7 @@
 
 #include "textcommand.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 class Button;
 class DropDown;
diff --git a/src/gui/textdialog.cpp b/src/gui/textdialog.cpp
index a80e25260..bc0a4eee3 100644
--- a/src/gui/textdialog.cpp
+++ b/src/gui/textdialog.cpp
@@ -31,7 +31,7 @@
 
 #include "utils/gettext.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/textdialog.h b/src/gui/textdialog.h
index aed26c1e9..98de88d78 100644
--- a/src/gui/textdialog.h
+++ b/src/gui/textdialog.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 class PasswordField;
 class TextField;
diff --git a/src/gui/textpopup.cpp b/src/gui/textpopup.cpp
index 049f86d76..acbd4a186 100644
--- a/src/gui/textpopup.cpp
+++ b/src/gui/textpopup.cpp
@@ -33,8 +33,8 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <guichan/font.hpp>
-#include <guichan/widgets/label.hpp>
+#include "guichan/font.hpp"
+#include "guichan/widgets/label.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/textpopup.h b/src/gui/textpopup.h
index 898b53555..1c7956588 100644
--- a/src/gui/textpopup.h
+++ b/src/gui/textpopup.h
@@ -27,7 +27,7 @@
 
 #include "gui/widgets/popup.h"
 
-#include <guichan/mouselistener.hpp>
+#include "guichan/mouselistener.hpp"
 
 class TextBox;
 
diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp
index 6ed09669a..a742b0e37 100644
--- a/src/gui/tradewindow.cpp
+++ b/src/gui/tradewindow.cpp
@@ -49,7 +49,7 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #include <sstream>
 
diff --git a/src/gui/tradewindow.h b/src/gui/tradewindow.h
index 3c5ed56b0..11b07f625 100644
--- a/src/gui/tradewindow.h
+++ b/src/gui/tradewindow.h
@@ -27,8 +27,8 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/selectionlistener.hpp"
 
 #include <memory>
 
diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h
index e68741e22..402e9a2ac 100644
--- a/src/gui/unregisterdialog.h
+++ b/src/gui/unregisterdialog.h
@@ -27,7 +27,7 @@
 
 #include "gui/widgets/window.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 class LoginData;
 class OkDialog;
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index 03fd57d1c..c1969a40b 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -29,8 +29,8 @@
 
 #include "utils/mutex.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/keylistener.hpp"
 
 #include <string>
 #include <vector>
diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h
index 3bf9c782a..3143a8ea5 100644
--- a/src/gui/userpalette.h
+++ b/src/gui/userpalette.h
@@ -26,7 +26,7 @@
 
 #include "gui/palette.h"
 
-#include <guichan/listmodel.hpp>
+#include "guichan/listmodel.hpp"
 
 /**
  * Class controlling the game's color palette.
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 7cd12365b..436742da9 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -29,7 +29,7 @@
 
 #include "gui/widgets/windowcontainer.h"
 
-#include <guichan/mouselistener.hpp>
+#include "guichan/mouselistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/whoisonline.h b/src/gui/whoisonline.h
index d6ac177d6..1adfea9cf 100644
--- a/src/gui/whoisonline.h
+++ b/src/gui/whoisonline.h
@@ -33,7 +33,7 @@
 
 #include "../utils/mutex.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 class BrowserBox;
 class ScrollArea;
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index c4737160b..f9a334bbd 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -38,7 +38,7 @@
 
 #include "utils/stringutils.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index f3ee7270b..2cc118a99 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -38,9 +38,9 @@
 #include "resources/resource.h"
 #include "resources/resourcemanager.h"
 
-#include <guichan/graphics.hpp>
-#include <guichan/font.hpp>
-#include <guichan/cliprectangle.hpp>
+#include "guichan/graphics.hpp"
+#include "guichan/font.hpp"
+#include "guichan/cliprectangle.hpp"
 
 #include <algorithm>
 
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 258e0bd09..ae9e6aec9 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -24,8 +24,8 @@
 #ifndef BROWSERBOX_H
 #define BROWSERBOX_H
 
-#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
+#include "guichan/mouselistener.hpp"
+#include "guichan/widget.hpp"
 
 #include <list>
 #include <vector>
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index ba3ac5f36..ba272f032 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -35,8 +35,8 @@
 
 #include "utils/dtor.h"
 
-#include <guichan/exception.hpp>
-#include <guichan/font.hpp>
+#include "guichan/exception.hpp"
+#include "guichan/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 8c43b6ddd..a0c920bef 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -23,9 +23,9 @@
 #ifndef BUTTON_H
 #define BUTTON_H
 
-#include <guichan/widgets/button.hpp>
-#include <guichan/mouseevent.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "guichan/widgets/button.hpp"
+#include "guichan/mouseevent.hpp"
+#include "guichan/widgetlistener.hpp"
 
 class GraphicsVertexes;
 class ImageRect;
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 76f74dec8..76ae40ac0 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -44,7 +44,7 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include <guichan/widgets/tabbedarea.hpp>
+#include "guichan/widgets/tabbedarea.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 0422345f7..f1057f0b6 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -31,7 +31,7 @@
 
 #include "resources/image.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index a8324e2fa..93ec3cda8 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -23,7 +23,7 @@
 #ifndef CHECKBOX_H
 #define CHECKBOX_H
 
-#include <guichan/widgets/checkbox.hpp>
+#include "guichan/widgets/checkbox.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h
index 1d8872477..4fa808b9b 100644
--- a/src/gui/widgets/container.h
+++ b/src/gui/widgets/container.h
@@ -23,8 +23,8 @@
 #ifndef GUI_CONTAINER_H
 #define GUI_CONTAINER_H
 
-#include <guichan/widget.hpp>
-#include <guichan/widgets/container.hpp>
+#include "guichan/widget.hpp"
+#include "guichan/widgets/container.hpp"
 
 /**
  * A widget container.
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index 7666b9e22..400d550f1 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "guichan/widgetlistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index d85c3166c..177b629e0 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -23,7 +23,7 @@
 #ifndef DROPDOWN_H
 #define DROPDOWN_H
 
-#include <guichan/widgets/dropdown.hpp>
+#include "guichan/widgets/dropdown.hpp"
 
 class Image;
 class ImageRect;
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index c072f0613..395cb4b9b 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -23,7 +23,7 @@
 #ifndef DROPSHORTCUTCONTAINER_H
 #define DROPSHORTCUTCONTAINER_H
 
-#include <guichan/mouselistener.hpp>
+#include "guichan/mouselistener.hpp"
 
 #include "gui/widgets/shortcutcontainer.h"
 
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index 6d2a716ef..5098df296 100644
--- a/src/gui/widgets/flowcontainer.h
+++ b/src/gui/widgets/flowcontainer.h
@@ -24,7 +24,7 @@
 
 #include "container.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "guichan/widgetlistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index 99d05b11c..c07c9a128 100644
--- a/src/gui/widgets/horizontcontainer.h
+++ b/src/gui/widgets/horizontcontainer.h
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "guichan/widgetlistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h
index 4b0d12342..4aea36825 100644
--- a/src/gui/widgets/icon.h
+++ b/src/gui/widgets/icon.h
@@ -23,7 +23,7 @@
 #ifndef ICON_H
 #define ICON_H
 
-#include <guichan/widget.hpp>
+#include "guichan/widget.hpp"
 
 class Image;
 
diff --git a/src/gui/widgets/inventoryfilter.h b/src/gui/widgets/inventoryfilter.h
index ed49ba39b..0ca18af97 100644
--- a/src/gui/widgets/inventoryfilter.h
+++ b/src/gui/widgets/inventoryfilter.h
@@ -22,8 +22,8 @@
 #ifndef GUI_INVENTORYFILTER_H
 #define GUI_INVENTORYFILTER_H
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/widgetlistener.hpp"
 
 #include "gui/widgets/horizontcontainer.h"
 
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index d4cecced2..d3d2a9ba9 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -47,8 +47,8 @@
 
 #include "utils/stringutils.h"
 
-#include <guichan/mouseinput.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "guichan/mouseinput.hpp"
+#include "guichan/selectionlistener.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 05988b742..9bd138291 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -23,10 +23,10 @@
 #ifndef ITEMCONTAINER_H
 #define ITEMCONTAINER_H
 
-#include <guichan/keylistener.hpp>
-#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "guichan/keylistener.hpp"
+#include "guichan/mouselistener.hpp"
+#include "guichan/widget.hpp"
+#include "guichan/widgetlistener.hpp"
 
 #include <list>
 #include <algorithm>
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index bd3df56e5..fc7194b4e 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -27,7 +27,7 @@
 
 #include "gui/widgets/shortcutcontainer.h"
 
-#include <guichan/mouselistener.hpp>
+#include "guichan/mouselistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index 775eda18c..0b9a194b6 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -21,7 +21,7 @@
 #ifndef LABEL_H
 #define LABEL_H
 
-#include <guichan/widgets/label.hpp>
+#include "guichan/widgets/label.hpp"
 
 /**
  * Label widget. Same as the Guichan label but modified to use the palette
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index f5e1f1749..313a940ac 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -23,7 +23,7 @@
 #ifndef WIDGET_LAYOUT_H
 #define WIDGET_LAYOUT_H
 
-#include <guichan/widgets/container.hpp>
+#include "guichan/widgets/container.hpp"
 
 #include <vector>
 
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index f4f0d25c9..533b9d14d 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/layout.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "guichan/widgetlistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/widgets/linkhandler.h b/src/gui/widgets/linkhandler.h
index f8f195f2d..ce5d73a87 100644
--- a/src/gui/widgets/linkhandler.h
+++ b/src/gui/widgets/linkhandler.h
@@ -25,7 +25,7 @@
 
 #include <string>
 
-#include <guichan/mouselistener.hpp>
+#include "guichan/mouselistener.hpp"
 
 /**
  * A simple interface to windows that need to handle links from BrowserBox
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index ae75d469e..e2479ea1d 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -29,10 +29,10 @@
 #include "gui/sdlinput.h"
 #include "gui/theme.h"
 
-#include <guichan/font.hpp>
-#include <guichan/graphics.hpp>
-#include <guichan/key.hpp>
-#include <guichan/listmodel.hpp>
+#include "guichan/font.hpp"
+#include "guichan/graphics.hpp"
+#include "guichan/key.hpp"
+#include "guichan/listmodel.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index 7a372e7e2..8ffba15d9 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -23,7 +23,7 @@
 #ifndef LISTBOX_H
 #define LISTBOX_H
 
-#include <guichan/widgets/listbox.hpp>
+#include "guichan/widgets/listbox.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/widgets/mouseevent.h b/src/gui/widgets/mouseevent.h
index 5e9a46cfd..b5bf53188 100644
--- a/src/gui/widgets/mouseevent.h
+++ b/src/gui/widgets/mouseevent.h
@@ -22,8 +22,8 @@
 #ifndef GUI_MOUSEEVENT_H
 #define GUI_MOUSEEVENT_H
 
-#include <guichan/mouseevent.hpp>
-#include <guichan/widget.hpp>
+#include "guichan/mouseevent.hpp"
+#include "guichan/widget.hpp"
 
 class MouseEvent : public gcn::MouseEvent
 {
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index 1b1a237d8..6e1b8d07e 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -23,7 +23,7 @@
 #ifndef PLAYERBOX_H
 #define PLAYERBOX_H
 
-#include <guichan/widgets/scrollarea.hpp>
+#include "guichan/widgets/scrollarea.hpp"
 
 class Being;
 class ImageRect;
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 444d147ff..6b6f7023b 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -36,7 +36,7 @@
 
 #include "resources/image.h"
 
-#include <guichan/exception.hpp>
+#include "guichan/exception.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index 963477fbb..81a111a6a 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -29,8 +29,8 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/mouselistener.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "guichan/mouselistener.hpp"
+#include "guichan/widgetlistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 363bab319..065e8fb88 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -36,7 +36,7 @@
 
 #include "utils/dtor.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index 52a26ddac..2f5816dce 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -23,11 +23,11 @@
 #ifndef PROGRESSBAR_H
 #define PROGRESSBAR_H
 
-#include <guichan/widget.hpp>
+#include "guichan/widget.hpp"
 
 #include <string>
 
-#include <guichan/widgetlistener.hpp>
+#include "guichan/widgetlistener.hpp"
 
 class Graphics;
 class GraphicsVertexes;
diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp
index e885aa0ec..46cfb4cc3 100644
--- a/src/gui/widgets/progressindicator.cpp
+++ b/src/gui/widgets/progressindicator.cpp
@@ -30,7 +30,7 @@
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
 
-#include <guichan/widgets/label.hpp>
+#include "guichan/widgets/label.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h
index e5fcaefda..46dd2bcc2 100644
--- a/src/gui/widgets/progressindicator.h
+++ b/src/gui/widgets/progressindicator.h
@@ -22,7 +22,7 @@
 #ifndef PROGRESSINDICATOR_H
 #define PROGRESSINDICATOR_H
 
-#include <guichan/widget.hpp>
+#include "guichan/widget.hpp"
 
 class SimpleAnimation;
 
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index 32a06c97d..eeb5546f7 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -23,7 +23,7 @@
 #ifndef RADIOBUTTON_H
 #define RADIOBUTTON_H
 
-#include <guichan/widgets/radiobutton.hpp>
+#include "guichan/widgets/radiobutton.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
index cf017b9ec..60f001ce9 100644
--- a/src/gui/widgets/resizegrip.cpp
+++ b/src/gui/widgets/resizegrip.cpp
@@ -30,7 +30,7 @@
 
 #include "resources/image.h"
 
-#include <guichan/graphics.hpp>
+#include "guichan/graphics.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h
index 873d74058..b64378052 100644
--- a/src/gui/widgets/resizegrip.h
+++ b/src/gui/widgets/resizegrip.h
@@ -23,7 +23,7 @@
 #ifndef RESIZEGRIP_H
 #define RESIZEGRIP_H
 
-#include <guichan/widget.hpp>
+#include "guichan/widget.hpp"
 
 class Image;
 
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 0e5a8f850..40ee4c5e4 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -23,8 +23,8 @@
 #ifndef SCROLLAREA_H
 #define SCROLLAREA_H
 
-#include <guichan/widgets/scrollarea.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "guichan/widgets/scrollarea.hpp"
+#include "guichan/widgetlistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h
index cc444fe85..89297976b 100644
--- a/src/gui/widgets/shopitems.h
+++ b/src/gui/widgets/shopitems.h
@@ -23,7 +23,7 @@
 #ifndef SHOPITEMS_H
 #define SHOPITEMS_H
 
-#include <guichan/listmodel.hpp>
+#include "guichan/listmodel.hpp"
 
 #include <string>
 #include <vector>
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index 81a3b7b58..5f11fb210 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -35,8 +35,8 @@
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
-#include <guichan/listmodel.hpp>
+#include "guichan/font.hpp"
+#include "guichan/listmodel.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index 42454fe2b..1e7684159 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -23,9 +23,9 @@
 #ifndef SHORTCUTCONTAINER_H
 #define SHORTCUTCONTAINER_H
 
-#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "guichan/mouselistener.hpp"
+#include "guichan/widget.hpp"
+#include "guichan/widgetlistener.hpp"
 
 #include "gui/widgets/tab.h"
 
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index bcc5de3c7..a5d739924 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -23,7 +23,7 @@
 #ifndef SLIDER_H
 #define SLIDER_H
 
-#include <guichan/widgets/slider.hpp>
+#include "guichan/widgets/slider.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index a4ad1576a..1056e26bf 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -23,7 +23,7 @@
 #ifndef SPELLSHORTCUTCONTAINER_H
 #define SPELLSHORTCUTCONTAINER_H
 
-#include <guichan/mouselistener.hpp>
+#include "guichan/mouselistener.hpp"
 
 #include "gui/widgets/shortcutcontainer.h"
 //#include "textcommand.h"
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 7287d6a8e..d1c62753a 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -37,7 +37,7 @@
 
 #include "utils/dtor.h"
 
-#include <guichan/widgets/label.hpp>
+#include "guichan/widgets/label.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index f9f1fa4da..9da954a81 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -23,8 +23,8 @@
 #ifndef TAB_H
 #define TAB_H
 
-#include <guichan/widgets/tab.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "guichan/widgets/tab.hpp"
+#include "guichan/widgetlistener.hpp"
 
 class GraphicsVertexes;
 class ImageRect;
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index b20237c1b..214674605 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -27,7 +27,7 @@
 
 #include "log.h"
 
-#include <guichan/widgets/container.hpp>
+#include "guichan/widgets/container.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index d6f0783df..5ea72feda 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -23,10 +23,10 @@
 #ifndef TABBEDAREA_H
 #define TABBEDAREA_H
 
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
-#include <guichan/widgets/container.hpp>
-#include <guichan/widgets/tabbedarea.hpp>
+#include "guichan/widget.hpp"
+#include "guichan/widgetlistener.hpp"
+#include "guichan/widgets/container.hpp"
+#include "guichan/widgets/tabbedarea.hpp"
 
 #include "gui/widgets/button.h"
 
diff --git a/src/gui/widgets/table.cpp b/src/gui/widgets/table.cpp
index d5325679f..3b8a425bb 100644
--- a/src/gui/widgets/table.cpp
+++ b/src/gui/widgets/table.cpp
@@ -30,9 +30,9 @@
 
 #include "utils/dtor.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/graphics.hpp>
-#include <guichan/key.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/graphics.hpp"
+#include "guichan/key.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/table.h b/src/gui/widgets/table.h
index 48075d53a..c26ed6f06 100644
--- a/src/gui/widgets/table.h
+++ b/src/gui/widgets/table.h
@@ -25,9 +25,9 @@
 
 #include "gui/widgets/tablemodel.h"
 
-#include <guichan/keylistener.hpp>
-#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
+#include "guichan/keylistener.hpp"
+#include "guichan/mouselistener.hpp"
+#include "guichan/widget.hpp"
 
 #include <vector>
 
diff --git a/src/gui/widgets/tablemodel.cpp b/src/gui/widgets/tablemodel.cpp
index 6c932a411..d4393f4a7 100644
--- a/src/gui/widgets/tablemodel.cpp
+++ b/src/gui/widgets/tablemodel.cpp
@@ -24,7 +24,7 @@
 
 #include "utils/dtor.h"
 
-#include <guichan/widget.hpp>
+#include "guichan/widget.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h
index 810b2f4ac..a6829addc 100644
--- a/src/gui/widgets/tablemodel.h
+++ b/src/gui/widgets/tablemodel.h
@@ -23,7 +23,7 @@
 #ifndef TABLE_MODEL_H
 #define TABLE_MODEL_H
 
-#include <guichanfwd.h>
+#include "guichanfwd.h"
 
 #include <set>
 #include <vector>
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index f31c8d129..44ac62be6 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -24,7 +24,7 @@
 
 #include "gui/theme.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #include <sstream>
 
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index 27525fc85..02f27e23b 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -23,7 +23,7 @@
 #ifndef TEXTBOX_H
 #define TEXTBOX_H
 
-#include <guichan/widgets/textbox.hpp>
+#include "guichan/widgets/textbox.hpp"
 
 /**
  * A text box, meant to be used inside a scroll area. Same as the Guichan text
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index fd50ee4d5..f02a4e3a8 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -36,7 +36,7 @@
 #include "utils/copynpaste.h"
 #include "utils/dtor.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #undef DELETE //Win32 compatibility hack
 
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index 79197bb7a..4f4c13443 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -23,7 +23,7 @@
 #ifndef TEXTFIELD_H
 #define TEXTFIELD_H
 
-#include <guichan/widgets/textfield.hpp>
+#include "guichan/widgets/textfield.hpp"
 
 class ImageRect;
 class TextField;
diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h
index a3f623177..a17c8e15d 100644
--- a/src/gui/widgets/textpreview.h
+++ b/src/gui/widgets/textpreview.h
@@ -23,9 +23,9 @@
 #ifndef TEXTPREVIEW_H
 #define TEXTPREVIEW_H
 
-#include <guichan/color.hpp>
-#include <guichan/font.hpp>
-#include <guichan/widget.hpp>
+#include "guichan/color.hpp"
+#include "guichan/font.hpp"
+#include "guichan/widget.hpp"
 
 /**
  * Preview widget for particle colors, etc.
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index e96bd5561..3e6a6b751 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "guichan/widgetlistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 2b6c4ef58..fccab9e99 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -38,8 +38,8 @@
 
 #include "resources/image.h"
 
-#include <guichan/exception.hpp>
-#include <guichan/focushandler.hpp>
+#include "guichan/exception.hpp"
+#include "guichan/focushandler.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index f455f1238..ad82c5772 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -26,9 +26,9 @@
 #include "graphics.h"
 #include "guichanfwd.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "guichan/widgetlistener.hpp"
 
-#include <guichan/widgets/window.hpp>
+#include "guichan/widgets/window.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h
index cebae7c11..9626caff2 100644
--- a/src/gui/windowmenu.h
+++ b/src/gui/windowmenu.h
@@ -26,8 +26,8 @@
 #include "gui/widgets/container.h"
 #include "gui/widgets/button.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/selectionlistener.hpp"
 
 #include <map>
 
diff --git a/src/gui/worldselectdialog.h b/src/gui/worldselectdialog.h
index 61bcc4b51..309f99b65 100644
--- a/src/gui/worldselectdialog.h
+++ b/src/gui/worldselectdialog.h
@@ -27,9 +27,9 @@
 
 #include "net/worldinfo.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
-#include <guichan/listmodel.hpp>
+#include "guichan/actionlistener.hpp"
+#include "guichan/keylistener.hpp"
+#include "guichan/listmodel.hpp"
 
 #include <vector>
 
diff --git a/src/localplayer.h b/src/localplayer.h
index a5d5563cf..29e5a0282 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -31,7 +31,7 @@
 
 #include "gui/userpalette.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 #include <memory>
 #include <vector>
diff --git a/src/net/manaserv/playerhandler.h b/src/net/manaserv/playerhandler.h
index 79909d31c..6dd992938 100644
--- a/src/net/manaserv/playerhandler.h
+++ b/src/net/manaserv/playerhandler.h
@@ -27,7 +27,7 @@
 
 #include "net/manaserv/messagehandler.h"
 
-#include <guichan/actionlistener.hpp>
+#include "guichan/actionlistener.hpp"
 
 #ifdef __GNUC__
 #define _UNUSED_  __attribute__ ((unused))
diff --git a/src/particle.cpp b/src/particle.cpp
index ecc68e6cc..3bf031058 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -39,7 +39,7 @@
 #include "utils/mathutils.h"
 #include "utils/xml.h"
 
-#include <guichan/color.hpp>
+#include "guichan/color.hpp"
 
 #include <algorithm>
 #include <cmath>
diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp
index fa5d0eea1..820d488e9 100644
--- a/src/resources/imageloader.cpp
+++ b/src/resources/imageloader.cpp
@@ -25,9 +25,9 @@
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
 
-#include <guichan/color.hpp>
+#include "guichan/color.hpp"
 
-#include <guichan/sdl/sdlpixel.hpp>
+#include "guichan/sdl/sdlpixel.hpp"
 
 #include <cassert>
 
diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h
index 5c3d29c74..fa5cfcd24 100644
--- a/src/resources/imageloader.h
+++ b/src/resources/imageloader.h
@@ -23,8 +23,8 @@
 #ifndef IMAGELOADER_H
 #define IMAGELOADER_H
 
-#include <guichan/image.hpp>
-#include <guichan/imageloader.hpp>
+#include "guichan/image.hpp"
+#include "guichan/imageloader.hpp"
 
 #include <string>
 
diff --git a/src/text.cpp b/src/text.cpp
index 8d930f4e2..622abd3f1 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -34,7 +34,7 @@
 #include "resources/resourcemanager.h"
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
+#include "guichan/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/text.h b/src/text.h
index 5249be967..0af538738 100644
--- a/src/text.h
+++ b/src/text.h
@@ -27,7 +27,7 @@
 #include "graphics.h"
 #include "guichanfwd.h"
 
-#include <guichan/color.hpp>
+#include "guichan/color.hpp"
 
 class TextManager;
 
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index 02cc97459..75fbd552d 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -24,7 +24,7 @@
 
 #include "textrenderer.h"
 
-#include <guichan/color.hpp>
+#include "guichan/color.hpp"
 
 #include "debug.h"