Revert "Switch includes to use embedded guichan."

This reverts commit 338c3b1cae626830c9b9d231aeb9f9e8034b37d1.

159 files changed, 238 insertions, 238 deletions

diff --git a/src/being.h b/src/being.h
index d2711c567..1f0d318f3 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 093fb764d..f03a213db 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 d95e2ef8c..850d335e4 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 2a915c60d..423279fb0 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 1290849fb..d3905ba56 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 85cfeb236..20d2c5c1e 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 2f399bd6a..cb225d3e7 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 55434c69d..eabf26ef8 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 f2749a3fe..2c7e5c101 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 b9f5648b2..e130a9074 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 382fe5a2d..3b0626922 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 d7333dc15..91c284985 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 f39a95ce0..2f0f83513 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 55cadde64..264df06e3 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 03d49b9fa..bcbbb7679 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 e5e86eabc..1712a3f16 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 c485a46fd..d68fa7671 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 b6522a131..661168dd9 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 b68ddb1f9..214aaba60 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 f5f0a67ca..7c0b59faf 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 6ff954060..bb80f07ed 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 09f6fa2f2..55947b23d 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 3a0b1ee0c..d23443a2f 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 2e2475934..a80562fea 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 88cde205d..edad33623 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 5b01b31d5..75118707d 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 66cb7c566..9d814bb69 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 e5d4d0964..a23da8157 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 507b001d0..13df02822 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 b3c2ecca5..df7a867d2 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 474bd454f..056afee92 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 608f70c12..9ca45aaea 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 da7a0a30a..f51c074f7 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 f3750a2fa..e7def2234 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 8cdf6a185..66d7e91a2 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 869d91b8d..610e76208 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 ca9837b53..59b1ff653 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 c91c5fb67..ade45c211 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 2eb424e09..b85826679 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 a0309eb6b..d8dc68fd1 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 2f587988e..2f5a90b5f 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 9c0d5d8ba..bc329096b 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 883096620..122d7176f 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 8590db1c7..2ee8653ec 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 cff5bad59..8c73b13e0 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 5fbdf127c..4a48bd32d 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 69f362530..e16a9fb4f 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 6311c8049..d68910596 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 096ad5a29..a44e51b2a 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 4bcf18a2a..9cbee4e89 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 f8a5a5051..86ef2f1e9 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 34f323d62..a48f35be8 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 9b279e6bb..b441380a4 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 1075fefbd..e40dd50c2 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 37232aa05..0dc817646 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 a1ec053ae..a5f5f3ee0 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 aafdd6b88..ad5ba53d9 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 4cbdd2d6a..70264f876 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 50161ff4e..2a6e5b183 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 b1db80723..6ff7e1bb7 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 49d829e86..0771d3478 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 cb2d9021d..5125541cf 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 42955bc9b..9b0c12307 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 6b81544ef..8bf4fe659 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 e9b855301..64561ed91 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 3a2bf5392..6b2c99999 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 3b4ca844d..59f3ccf34 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 0703ab594..1eba02b4f 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 01aeb2b29..0f122a876 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 8adffab91..a164d59d7 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 6ab84a4d9..6897c35ac 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 3f437e66d..c9cd296dc 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 6fb5e805f..2c7434f40 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 bb297dc5a..7356cc633 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 8acb3f03a..3c6d17599 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 c08620f2b..1b14e0e4c 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 bd324215c..9ac2cfad0 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 f1affd175..d633fb1f6 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 8bb3690be..79126a095 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 fbbd94ffc..cb88b8160 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 bc0a4eee3..a80e25260 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 98de88d78..aed26c1e9 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 acbd4a186..049f86d76 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 1c7956588..898b53555 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 a742b0e37..6ed09669a 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 11b07f625..3c5ed56b0 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 402e9a2ac..e68741e22 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 c1969a40b..03fd57d1c 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 3143a8ea5..3bf9c782a 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 436742da9..7cd12365b 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 1adfea9cf..d6ac177d6 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 f9a334bbd..c4737160b 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 2cc118a99..f3ee7270b 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 ae9e6aec9..258e0bd09 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 ba272f032..ba3ac5f36 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 a0c920bef..8c43b6ddd 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 76ae40ac0..76f74dec8 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 f1057f0b6..0422345f7 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 93ec3cda8..a8324e2fa 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 4fa808b9b..1d8872477 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 400d550f1..7666b9e22 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 177b629e0..d85c3166c 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 395cb4b9b..c072f0613 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 5098df296..6d2a716ef 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 c07c9a128..99d05b11c 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 4aea36825..4b0d12342 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 0ca18af97..ed49ba39b 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 d3d2a9ba9..d4cecced2 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 9bd138291..05988b742 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 fc7194b4e..bd3df56e5 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 0b9a194b6..775eda18c 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 313a940ac..f5e1f1749 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 533b9d14d..f4f0d25c9 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 ce5d73a87..f8f195f2d 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 e2479ea1d..ae75d469e 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 8ffba15d9..7a372e7e2 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 b5bf53188..5e9a46cfd 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 6e1b8d07e..1b1a237d8 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 6b6f7023b..444d147ff 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 81a111a6a..963477fbb 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 065e8fb88..363bab319 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 2f5816dce..52a26ddac 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 46cfb4cc3..e885aa0ec 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 46dd2bcc2..e5fcaefda 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 eeb5546f7..32a06c97d 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 60f001ce9..cf017b9ec 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 b64378052..873d74058 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 40ee4c5e4..0e5a8f850 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 89297976b..cc444fe85 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 5f11fb210..81a3b7b58 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 1e7684159..42454fe2b 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 a5d739924..bcc5de3c7 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 1056e26bf..a4ad1576a 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 d1c62753a..7287d6a8e 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 9da954a81..f9f1fa4da 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 214674605..b20237c1b 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 5ea72feda..d6f0783df 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 3b8a425bb..d5325679f 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 c26ed6f06..48075d53a 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 d4393f4a7..6c932a411 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 a6829addc..810b2f4ac 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 44ac62be6..f31c8d129 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 02f27e23b..27525fc85 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 f02a4e3a8..fd50ee4d5 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 4f4c13443..79197bb7a 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 a17c8e15d..a3f623177 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 3e6a6b751..e96bd5561 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 fccab9e99..2b6c4ef58 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 ad82c5772..f455f1238 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 9626caff2..cebae7c11 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 309f99b65..61bcc4b51 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 29e5a0282..a5d5563cf 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 6dd992938..79909d31c 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 3bf031058..ecc68e6cc 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 820d488e9..fa5d0eea1 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 fa5cfcd24..5c3d29c74 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 622abd3f1..8d930f4e2 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 0af538738..5249be967 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 75fbd552d..02cc97459 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"