diff --git a/binding-mri/binding-mri.cpp b/binding-mri/binding-mri.cpp
index 41c3990..427c414 100644
--- a/binding-mri/binding-mri.cpp
+++ b/binding-mri/binding-mri.cpp
@@ -28,9 +28,9 @@
 #include "./ruby/include/ruby.h"
 #include "./ruby/include/ruby/encoding.h"
 
-#include "zlib.h"
+#include <zlib.h>
 
-#include "SDL_filesystem.h"
+#include <SDL_filesystem.h>
 
 #include <QFile>
 #include <QByteArray>
diff --git a/binding-mruby/binding-mruby.cpp b/binding-mruby/binding-mruby.cpp
index 70d7433..9b3c2a6 100644
--- a/binding-mruby/binding-mruby.cpp
+++ b/binding-mruby/binding-mruby.cpp
@@ -21,23 +21,23 @@
 
 #include "binding.h"
 
-#include "mruby.h"
-#include "mruby/string.h"
-#include "mruby/array.h"
-#include "mruby/class.h"
-#include "mruby/irep.h"
-#include "mruby/compile.h"
-#include "mruby/proc.h"
-#include "mruby/dump.h"
+#include <mruby.h>
+#include <mruby/string.h>
+#include <mruby/array.h>
+#include <mruby/class.h>
+#include <mruby/irep.h>
+#include <mruby/compile.h>
+#include <mruby/proc.h>
+#include <mruby/dump.h>
 
 #include "binding-util.h"
 
-#include "stdio.h"
-#include "zlib.h"
+#include <stdio.h>
+#include <zlib.h>
 
-#include "SDL_messagebox.h"
-#include "SDL_rwops.h"
-#include "SDL_timer.h"
+#include <SDL_messagebox.h>
+#include <SDL_rwops.h>
+#include <SDL_timer.h>
 
 #include "sharedstate.h"
 #include "texpool.h"
diff --git a/binding-mruby/binding-util.h b/binding-mruby/binding-util.h
index 564669a..cabb775 100644
--- a/binding-mruby/binding-util.h
+++ b/binding-mruby/binding-util.h
@@ -22,10 +22,10 @@
 #ifndef BINDINGUTIL_H
 #define BINDINGUTIL_H
 
-#include "mruby.h"
-#include "mruby/data.h"
-#include "mruby/variable.h"
-#include "mruby/class.h"
+#include <mruby.h>
+#include <mruby/data.h>
+#include <mruby/variable.h>
+#include <mruby/class.h>
 
 #include <stdio.h>
 
diff --git a/binding-mruby/etc-binding.cpp b/binding-mruby/etc-binding.cpp
index 81a2d5b..c3d624b 100644
--- a/binding-mruby/etc-binding.cpp
+++ b/binding-mruby/etc-binding.cpp
@@ -23,7 +23,6 @@
 #include "binding-util.h"
 #include "binding-types.h"
 #include "serializable-binding.h"
-#include "mruby/class.h"
 
 #include <QDebug>
 
diff --git a/binding-mruby/font-binding.cpp b/binding-mruby/font-binding.cpp
index cc31f58..25477a0 100644
--- a/binding-mruby/font-binding.cpp
+++ b/binding-mruby/font-binding.cpp
@@ -24,7 +24,7 @@
 #include "binding-types.h"
 #include "exception.h"
 
-#include "mruby/string.h"
+#include <mruby/string.h>
 
 DEF_TYPE(Font);
 
diff --git a/binding-mruby/graphics-binding.cpp b/binding-mruby/graphics-binding.cpp
index bb1074b..632283c 100644
--- a/binding-mruby/graphics-binding.cpp
+++ b/binding-mruby/graphics-binding.cpp
@@ -21,7 +21,6 @@
 
 #include "graphics.h"
 #include "sharedstate.h"
-#include "mruby.h"
 #include "binding-util.h"
 #include "exception.h"
 
diff --git a/binding-mruby/mrb-ext/file.cpp b/binding-mruby/mrb-ext/file.cpp
index 2694582..282240c 100644
--- a/binding-mruby/mrb-ext/file.cpp
+++ b/binding-mruby/mrb-ext/file.cpp
@@ -22,11 +22,11 @@
 #include "file.h"
 
 #include "../binding-util.h"
-#include "mruby/string.h"
-#include "mruby/array.h"
-#include "mruby/class.h"
+#include <mruby/string.h>
+#include <mruby/array.h>
+#include <mruby/class.h>
 
-#include "SDL_rwops.h"
+#include <SDL_rwops.h>
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/binding-mruby/mrb-ext/file.h b/binding-mruby/mrb-ext/file.h
index 34b8967..42e379e 100644
--- a/binding-mruby/mrb-ext/file.h
+++ b/binding-mruby/mrb-ext/file.h
@@ -24,7 +24,7 @@
 
 #include "../binding-util.h"
 
-#include "SDL_rwops.h"
+#include <SDL_rwops.h>
 
 struct FileImpl
 {
diff --git a/binding-mruby/mrb-ext/kernel.cpp b/binding-mruby/mrb-ext/kernel.cpp
index 9958397..257af61 100644
--- a/binding-mruby/mrb-ext/kernel.cpp
+++ b/binding-mruby/mrb-ext/kernel.cpp
@@ -19,14 +19,14 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "mruby.h"
-#include "mruby/string.h"
-#include "mruby/compile.h"
+#include <mruby.h>
+#include <mruby/string.h>
+#include <mruby/compile.h>
 
 #include <stdlib.h>
 #include <sys/time.h>
 
-#include "SDL_messagebox.h"
+#include <SDL_messagebox.h>
 
 #include "../binding-util.h"
 #include "marshal.h"
diff --git a/binding-mruby/mrb-ext/marshal.cpp b/binding-mruby/mrb-ext/marshal.cpp
index afc5076..f0bc822 100644
--- a/binding-mruby/mrb-ext/marshal.cpp
+++ b/binding-mruby/mrb-ext/marshal.cpp
@@ -21,12 +21,12 @@
 
 #include "marshal.h"
 
-#include "mruby/array.h"
-#include "mruby/hash.h"
-#include "mruby/khash.h"
-#include "mruby/string.h"
-#include "mruby/variable.h"
-#include "mruby/class.h"
+#include <mruby/array.h>
+#include <mruby/hash.h>
+#include <mruby/khash.h>
+#include <mruby/string.h>
+#include <mruby/variable.h>
+#include <mruby/class.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -38,7 +38,7 @@
 #include "rwmem.h"
 #include "exception.h"
 
-#include "SDL_timer.h"
+#include <SDL_timer.h>
 
 #include <QVector>
 #include <QHash>
diff --git a/binding-mruby/mrb-ext/marshal.h b/binding-mruby/mrb-ext/marshal.h
index 161f86d..71af495 100644
--- a/binding-mruby/mrb-ext/marshal.h
+++ b/binding-mruby/mrb-ext/marshal.h
@@ -22,8 +22,8 @@
 #ifndef MARSHAL_H
 #define MARSHAL_H
 
-#include "mruby.h"
-#include "SDL_rwops.h"
+#include <mruby.h>
+#include <SDL_rwops.h>
 
 void marshalDumpInt(mrb_state *, SDL_RWops *, mrb_value);
 mrb_value marshalLoadInt(mrb_state *, SDL_RWops *);
diff --git a/binding-mruby/mrb-ext/rwmem.cpp b/binding-mruby/mrb-ext/rwmem.cpp
index 3a0f41a..8496cb4 100644
--- a/binding-mruby/mrb-ext/rwmem.cpp
+++ b/binding-mruby/mrb-ext/rwmem.cpp
@@ -21,7 +21,7 @@
 
 #include "rwmem.h"
 
-#include "SDL_rwops.h"
+#include <SDL_rwops.h>
 #include <QVector>
 
 typedef QVector<char> ByteVec;
diff --git a/binding-mruby/mrb-ext/time.cpp b/binding-mruby/mrb-ext/time.cpp
index c9f0e4c..b0ceead 100644
--- a/binding-mruby/mrb-ext/time.cpp
+++ b/binding-mruby/mrb-ext/time.cpp
@@ -20,9 +20,10 @@
 */
 
 #include "../binding-util.h"
-#include "mruby/string.h"
-#include "mruby/array.h"
-#include "mruby/class.h"
+
+#include <mruby/string.h>
+#include <mruby/array.h>
+#include <mruby/class.h>
 
 #include "time.h"
 #include <sys/time.h>
diff --git a/binding-mruby/serializable-binding.h b/binding-mruby/serializable-binding.h
index e1928c1..aa7bb87 100644
--- a/binding-mruby/serializable-binding.h
+++ b/binding-mruby/serializable-binding.h
@@ -25,7 +25,7 @@
 #include "serializable.h"
 #include "binding-util.h"
 
-#include "mruby/string.h"
+#include <mruby/string.h>
 
 template<class C>
 MRB_METHOD(serializableDump)
diff --git a/binding-mruby/table-binding.cpp b/binding-mruby/table-binding.cpp
index 65d357f..e2ab823 100644
--- a/binding-mruby/table-binding.cpp
+++ b/binding-mruby/table-binding.cpp
@@ -24,8 +24,6 @@
 #include "binding-types.h"
 #include "serializable-binding.h"
 
-#include "mruby.h"
-
 #include <QDebug>
 
 DEF_TYPE(Table);
diff --git a/binding-mruby/tilemap-binding.cpp b/binding-mruby/tilemap-binding.cpp
index e547a88..a1d52dc 100644
--- a/binding-mruby/tilemap-binding.cpp
+++ b/binding-mruby/tilemap-binding.cpp
@@ -28,7 +28,7 @@
 #include "binding-util.h"
 #include "binding-types.h"
 
-#include "mruby/array.h"
+#include <mruby/array.h>
 
 static const mrb_data_type TilemapAutotilesType =
 {
diff --git a/src/bitmap.cpp b/src/bitmap.cpp
index 9c8b160..ef42847 100644
--- a/src/bitmap.cpp
+++ b/src/bitmap.cpp
@@ -21,12 +21,12 @@
 
 #include "bitmap.h"
 
-#include "SDL.h"
-#include "SDL_image.h"
-#include "SDL_ttf.h"
-#include "SDL_rect.h"
+#include <SDL.h>
+#include <SDL_image.h>
+#include <SDL_ttf.h>
+#include <SDL_rect.h>
 
-#include "pixman.h"
+#include <pixman.h>
 
 #include <QString>
 #include <QChar>
diff --git a/src/bitmap.h b/src/bitmap.h
index 9a3be5d..0ac418b 100644
--- a/src/bitmap.h
+++ b/src/bitmap.h
@@ -26,7 +26,7 @@
 #include "etc-internal.h"
 #include "etc.h"
 
-#include "sigc++/signal.h"
+#include <sigc++/signal.h>
 
 class Font;
 class ShaderBase;
diff --git a/src/debuglogger.cpp b/src/debuglogger.cpp
index 383170a..43b746d 100644
--- a/src/debuglogger.cpp
+++ b/src/debuglogger.cpp
@@ -21,7 +21,7 @@
 
 #include "debuglogger.h"
 
-#include "glew.h"
+#include <glew.h>
 
 #include <QFile>
 #include <QTime>
diff --git a/src/disposable.h b/src/disposable.h
index d9e8f3b..3c10f9d 100644
--- a/src/disposable.h
+++ b/src/disposable.h
@@ -24,7 +24,7 @@
 
 #include "exception.h"
 
-#include "sigc++/signal.h"
+#include <sigc++/signal.h>
 
 class Disposable
 {
diff --git a/src/etc.cpp b/src/etc.cpp
index 3835fc6..4c38b39 100644
--- a/src/etc.cpp
+++ b/src/etc.cpp
@@ -24,8 +24,8 @@
 #include "serial-util.h"
 #include "exception.h"
 
-#include "SDL_types.h"
-#include "SDL_pixels.h"
+#include <SDL_types.h>
+#include <SDL_pixels.h>
 
 Color::Color(double red, double green, double blue, double alpha)
 	: red(red), green(green), blue(blue), alpha(alpha)
diff --git a/src/etc.h b/src/etc.h
index c060a1c..ff48a1f 100644
--- a/src/etc.h
+++ b/src/etc.h
@@ -22,7 +22,7 @@
 #ifndef ETC_H
 #define ETC_H
 
-#include "sigc++/signal.h"
+#include <sigc++/signal.h>
 
 #include "serializable.h"
 #include "etc-internal.h"
diff --git a/src/eventthread.cpp b/src/eventthread.cpp
index a3f5a56..699155e 100644
--- a/src/eventthread.cpp
+++ b/src/eventthread.cpp
@@ -21,16 +21,16 @@
 
 #include "eventthread.h"
 
-#include "SDL_events.h"
-#include "SDL_joystick.h"
-#include "SDL_messagebox.h"
-#include "SDL_timer.h"
-#include "SDL_thread.h"
+#include <SDL_events.h>
+#include <SDL_joystick.h>
+#include <SDL_messagebox.h>
+#include <SDL_timer.h>
+#include <SDL_thread.h>
 
 #include "sharedstate.h"
 #include "graphics.h"
 
-#include "string.h"
+#include <string.h>
 
 #include <QDebug>
 
diff --git a/src/eventthread.h b/src/eventthread.h
index 5a488b8..bbe32cc 100644
--- a/src/eventthread.h
+++ b/src/eventthread.h
@@ -25,11 +25,10 @@
 #include "config.h"
 #include "etc-internal.h"
 
-#include "SDL_scancode.h"
-#include "SDL_joystick.h"
-#include "SDL_mouse.h"
-
-#include "SDL_mutex.h"
+#include <SDL_scancode.h>
+#include <SDL_joystick.h>
+#include <SDL_mouse.h>
+#include <SDL_mutex.h>
 
 #include <QByteArray>
 #include <QVector>
diff --git a/src/filesystem.cpp b/src/filesystem.cpp
index f1a4890..b75a88b 100644
--- a/src/filesystem.cpp
+++ b/src/filesystem.cpp
@@ -24,7 +24,7 @@
 #include "util.h"
 #include "exception.h"
 
-#include "physfs.h"
+#include <physfs.h>
 
 #include <SDL_sound.h>
 
@@ -32,8 +32,8 @@
 #include <QSet>
 #include <QByteArray>
 
-#include "stdio.h"
-#include "string.h"
+#include <stdio.h>
+#include <string.h>
 
 #include <QDebug>
 
diff --git a/src/filesystem.h b/src/filesystem.h
index 8e97b78..a9ab2ef 100644
--- a/src/filesystem.h
+++ b/src/filesystem.h
@@ -22,7 +22,7 @@
 #ifndef FILESYSTEM_H
 #define FILESYSTEM_H
 
-#include "SDL_rwops.h"
+#include <SDL_rwops.h>
 
 struct FileSystemPrivate;
 
diff --git a/src/font.cpp b/src/font.cpp
index d419c2e..54436b2 100644
--- a/src/font.cpp
+++ b/src/font.cpp
@@ -27,7 +27,7 @@
 
 #include "../liberation.ttf.xxd"
 
-#include "SDL_ttf.h"
+#include <SDL_ttf.h>
 
 #include <QHash>
 #include <QByteArray>
diff --git a/src/gl-util.h b/src/gl-util.h
index 45aa0b9..4383d49 100644
--- a/src/gl-util.h
+++ b/src/gl-util.h
@@ -22,10 +22,9 @@
 #ifndef GLUTIL_H
 #define GLUTIL_H
 
-#include "glew.h"
+#include <glew.h>
 
 #include "etc-internal.h"
-#include <QDebug>
 
 /* Struct wrapping GLuint for some light type safety */
 #define DEF_GL_ID \
diff --git a/src/global-ibo.h b/src/global-ibo.h
index b50ef80..8a7dca0 100644
--- a/src/global-ibo.h
+++ b/src/global-ibo.h
@@ -22,7 +22,7 @@
 #ifndef GLOBALIBO_H
 #define GLOBALIBO_H
 
-#include <gl-util.h>
+#include "gl-util.h"
 #include <QVector>
 
 struct GlobalIBO
diff --git a/src/glstate.cpp b/src/glstate.cpp
index dfe8744..677c9b7 100644
--- a/src/glstate.cpp
+++ b/src/glstate.cpp
@@ -20,10 +20,12 @@
 */
 
 #include "glstate.h"
-#include "glew.h"
-#include "SDL_rect.h"
 #include "etc.h"
 
+#include <glew.h>
+
+#include <SDL_rect.h>
+
 void GLClearColor::apply(const Vec4 &value)
 {
 	glClearColor(value.x, value.y, value.z, value.w);
diff --git a/src/graphics.cpp b/src/graphics.cpp
index 8a7c66c..b8c528d 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -35,8 +35,8 @@
 #include "binding.h"
 #include "perftimer.h"
 
-#include "SDL_video.h"
-#include "SDL_timer.h"
+#include <SDL_video.h>
+#include <SDL_timer.h>
 
 #include <time.h>
 
diff --git a/src/input.cpp b/src/input.cpp
index fe0afd1..69bcb14 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -25,11 +25,11 @@
 #include "exception.h"
 #include "util.h"
 
-#include "SDL_scancode.h"
-#include "SDL_mouse.h"
+#include <SDL_scancode.h>
+#include <SDL_mouse.h>
 
 #include <QVector>
-#include "string.h"
+#include <string.h>
 
 #include <QDebug>
 
diff --git a/src/main.cpp b/src/main.cpp
index aa182cc..a39ddeb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,12 +19,12 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "glew.h"
+#include <glew.h>
 #include <alc.h>
 
-#include "SDL.h"
-#include "SDL_image.h"
-#include "SDL_ttf.h"
+#include <SDL.h>
+#include <SDL_image.h>
+#include <SDL_ttf.h>
 #include <SDL_sound.h>
 
 #include "sharedstate.h"
diff --git a/src/perftimer.cpp b/src/perftimer.cpp
index a0cbfe9..afd4aec 100644
--- a/src/perftimer.cpp
+++ b/src/perftimer.cpp
@@ -1,7 +1,7 @@
 #include "perftimer.h"
 
-#include "SDL_timer.h"
-#include "glew.h"
+#include <SDL_timer.h>
+#include <glew.h>
 
 #include <QDebug>
 
diff --git a/src/plane.h b/src/plane.h
index b7caa9d..904923c 100644
--- a/src/plane.h
+++ b/src/plane.h
@@ -25,9 +25,6 @@
 #include "disposable.h"
 #include "viewport.h"
 
-#include "SFML/Graphics/Sprite.hpp"
-#include "SFML/Graphics/RectangleShape.hpp"
-
 class Bitmap;
 struct Color;
 struct Tone;
diff --git a/src/quadarray.h b/src/quadarray.h
index 2f23853..bde73f2 100644
--- a/src/quadarray.h
+++ b/src/quadarray.h
@@ -22,12 +22,13 @@
 #ifndef QUADARRAY_H
 #define QUADARRAY_H
 
-#include <QtGlobal>
 #include "gl-util.h"
 #include "sharedstate.h"
 #include "global-ibo.h"
 #include "shader.h"
 
+#include <stdint.h>
+
 typedef uint32_t index_t;
 #define _GL_INDEX_TYPE GL_UNSIGNED_INT
 
diff --git a/src/shader.cpp b/src/shader.cpp
index 038d602..2724032 100644
--- a/src/shader.cpp
+++ b/src/shader.cpp
@@ -23,7 +23,7 @@
 #include "sharedstate.h"
 #include "glstate.h"
 
-#include "glew.h"
+#include <glew.h>
 
 #include <QFile>
 
@@ -48,6 +48,8 @@
 #include "../blurV.vert.xxd"
 #endif
 
+#include <QDebug>
+
 
 #define INIT_SHADER(vert, frag) \
 { \
diff --git a/src/sharedstate.h b/src/sharedstate.h
index ecd2ee3..b899e68 100644
--- a/src/sharedstate.h
+++ b/src/sharedstate.h
@@ -22,7 +22,7 @@
 #ifndef SHAREDSTATE_H
 #define SHAREDSTATE_H
 
-#include "sigc++/signal.h"
+#include <sigc++/signal.h>
 
 #define shState SharedState::instance
 #define glState shState->_glState()
diff --git a/src/sprite.cpp b/src/sprite.cpp
index b9e3f52..4fc3d47 100644
--- a/src/sprite.cpp
+++ b/src/sprite.cpp
@@ -33,7 +33,7 @@
 #include "shader.h"
 #include "glstate.h"
 
-#include "sigc++/connection.h"
+#include <sigc++/connection.h>
 
 #include <QDebug>
 
diff --git a/src/table.h b/src/table.h
index 94a0b03..3b8079a 100644
--- a/src/table.h
+++ b/src/table.h
@@ -25,7 +25,7 @@
 #include "serializable.h"
 
 #include <stdint.h>
-#include "sigc++/signal.h"
+#include <sigc++/signal.h>
 
 class Table : public Serializable
 {
diff --git a/src/tilemap.cpp b/src/tilemap.cpp
index f97a5e9..50fb826 100644
--- a/src/tilemap.cpp
+++ b/src/tilemap.cpp
@@ -34,14 +34,14 @@
 #include "quad.h"
 #include "tileatlas.h"
 
-#include "sigc++/connection.h"
+#include <sigc++/connection.h>
 
 #include <string.h>
 #include <stdint.h>
 
 #include <QVector>
 
-#include "SDL_surface.h"
+#include <SDL_surface.h>
 
 extern const StaticRect autotileRects[];
 
diff --git a/src/transform.h b/src/transform.h
index a6fc346..fc8bab9 100644
--- a/src/transform.h
+++ b/src/transform.h
@@ -48,8 +48,9 @@
 #define TRANSFORM_H
 
 #include "etc-internal.h"
-#include "math.h"
-#include "string.h"
+
+#include <math.h>
+#include <string.h>
 
 class Transform
 {
diff --git a/src/viewport.cpp b/src/viewport.cpp
index 19d94ae..f51ad2f 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -27,9 +27,9 @@
 #include "quad.h"
 #include "glstate.h"
 
-#include "SDL_rect.h"
+#include <SDL_rect.h>
 
-#include "sigc++/connection.h"
+#include <sigc++/connection.h>
 
 #include <QDebug>
 
diff --git a/src/viewport.h b/src/viewport.h
index 5bcb898..cb10688 100644
--- a/src/viewport.h
+++ b/src/viewport.h
@@ -27,8 +27,6 @@
 #include "disposable.h"
 #include "util.h"
 
-#include "SFML/Graphics/Rect.hpp"
-
 struct ViewportPrivate;
 
 class Viewport : public Scene, public SceneElement, public Flashable, public Disposable
diff --git a/src/window.cpp b/src/window.cpp
index 988b1ae..d2dcadd 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -34,7 +34,7 @@
 #include "texpool.h"
 #include "glstate.h"
 
-#include "sigc++/connection.h"
+#include <sigc++/connection.h>
 
 #include <QDebug>