diff --git a/src/dialogs/gm-scripts-dialog.c b/src/dialogs/gm-scripts-dialog.c
index 7a4041e..36c1605 100644
--- a/src/dialogs/gm-scripts-dialog.c
+++ b/src/dialogs/gm-scripts-dialog.c
@@ -18,12 +18,12 @@
 #include <libgnomevfs/gnome-vfs.h>
 #include <glade/glade.h>
 
-#include "gm-scripts.h"
-#include "gm-world.h"
-#include "debug.h"
-#include "gm-app.h"
-#include "gm-support.h"
-#include "gm-app-view.h"
+#include "../gm-scripts.h"
+#include "../gm-world.h"
+#include "../debug.h"
+#include "../gm-app.h"
+#include "../gm-support.h"
+#include "../gm-app-view.h"
 
 void on_gm_scripts_dialog_script_added(GmScripts *scripts, GmScript *script, 
 		gpointer user_data);
diff --git a/src/dialogs/gm-scripts-dialog.h b/src/dialogs/gm-scripts-dialog.h
index fdbb980..5b9ca86 100644
--- a/src/dialogs/gm-scripts-dialog.h
+++ b/src/dialogs/gm-scripts-dialog.h
@@ -7,8 +7,8 @@
 
 #ifdef HAVE_RUBY
 #include <gtk/gtk.h>
-#include "gm-world.h"
-#include "gm-app-view.h"
+#include "../gm-world.h"
+#include "../gm-app-view.h"
 
 void gm_scripts_dialog_run(GmAppView *view);
 void gm_scripts_dialog_init();
diff --git a/src/dialogs/gm-triggers-dialog.c b/src/dialogs/gm-triggers-dialog.c
index 48e9b33..d86e3e4 100644
--- a/src/dialogs/gm-triggers-dialog.c
+++ b/src/dialogs/gm-triggers-dialog.c
@@ -13,13 +13,13 @@
 #include <libgnomeui/libgnomeui.h>
 #include <glade/glade.h>
 
-#include "gm-support.h"
+#include "../gm-support.h"
 
-#include "debug.h"
-#include "gm-triggers-dialog.h"
-#include "gm-app.h"
-#include "gm-pixbuf.h"
-#include "gm-scripts.h"
+#include "../debug.h"
+#include "../gm-triggers-dialog.h"
+#include "../gm-app.h"
+#include "../gm-pixbuf.h"
+#include "../gm-scripts.h"
 
 typedef struct _GmTriggersDialog {
 	GtkWidget *dialog;	
diff --git a/src/dialogs/gm-triggers-dialog.h b/src/dialogs/gm-triggers-dialog.h
index 81db91d..7d6f886 100644
--- a/src/dialogs/gm-triggers-dialog.h
+++ b/src/dialogs/gm-triggers-dialog.h
@@ -1,8 +1,8 @@
 #ifndef __GM_TRIGGERS_DIALOG__
 #define __GM_TRIGGERS_DIALOG__
 
-#include "gm-triggers.h"
-#include "gm-world.h"
+#include "../gm-triggers.h"
+#include "../gm-world.h"
 
 GmTrigger *gm_triggers_dialog_run(GmWorld *world, GmTrigger *trig);
 GmTrigger *gm_triggers_dialog_run_new(GmWorld *world, GmTrigger *trig);
diff --git a/src/dialogs/gm-world-info-dialog.c b/src/dialogs/gm-world-info-dialog.c
index 2e9b619..e259c6e 100644
--- a/src/dialogs/gm-world-info-dialog.c
+++ b/src/dialogs/gm-world-info-dialog.c
@@ -6,9 +6,9 @@
 #include <glade/glade.h>
 #include <libgnome/libgnome.h>
 
-#include "gm-world.h"
-#include "gm-support.h"
-#include "gm-pixbuf.h"
+#include "../gm-world.h"
+#include "../gm-support.h"
+#include "../gm-pixbuf.h"
 
 #define G_WORLD_INFO_XML PACKAGE_DATA_DIR "/" PACKAGE "/ui/gm-world-info.glade"
 
diff --git a/src/dialogs/gm-world-logs-dialog.c b/src/dialogs/gm-world-logs-dialog.c
index 5a9519b..1059d84 100644
--- a/src/dialogs/gm-world-logs-dialog.c
+++ b/src/dialogs/gm-world-logs-dialog.c
@@ -4,8 +4,8 @@
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include "gm-world.h"
-#include "gm-support.h"
+#include "../gm-world.h"
+#include "../gm-support.h"
 
 #define G_WORLD_LOGS_XML PACKAGE_DATA_DIR "/" PACKAGE "/ui/gm-world-info.glade"
 
diff --git a/src/dialogs/gm-world-logs-dialog.h b/src/dialogs/gm-world-logs-dialog.h
index c057402..41694da 100644
--- a/src/dialogs/gm-world-logs-dialog.h
+++ b/src/dialogs/gm-world-logs-dialog.h
@@ -2,7 +2,7 @@
 #define __GM_WORLD_LOGS_DIALOG_H__
 
 #include <gtk/gtk.h>
-#include "gm-world.h"
+#include "../gm-world.h"
 
 GtkDialog *gm_world_logs_dialog_new(GmWorld *world, GtkTreeView **view, 
 		GtkProgressBar **progress);
diff --git a/src/dialogs/gm-world-properties-dialog.c b/src/dialogs/gm-world-properties-dialog.c
index 3184d25..0285c6b 100644
--- a/src/dialogs/gm-world-properties-dialog.c
+++ b/src/dialogs/gm-world-properties-dialog.c
@@ -13,12 +13,12 @@
 #include <gtk/gtk.h>
 
 #include "gm-world-properties-dialog.h"
-#include "gm-triggers.h"
-#include "gm-support.h"
-#include "gm-app.h"
-#include "debug.h"
-#include "gm-options.h"
-#include "gm-pixbuf.h"
+#include "../gm-triggers.h"
+#include "../gm-support.h"
+#include "../gm-app.h"
+#include "../debug.h"
+#include "../gm-options.h"
+#include "../gm-pixbuf.h"
 
 typedef struct _GmWorldPropertiesDialog {
 	GtkWidget *dialog;
diff --git a/src/dialogs/gm-world-properties-dialog.h b/src/dialogs/gm-world-properties-dialog.h
index f77dfb6..82f9808 100644
--- a/src/dialogs/gm-world-properties-dialog.h
+++ b/src/dialogs/gm-world-properties-dialog.h
@@ -2,9 +2,10 @@
 #define __GM_WORLD_PROPERTIES_DIALOG__
 
 #include <gtk/gtk.h>
-#include "gm-world.h"
 #include <glade/glade.h>
 
+#include "../gm-world.h"
+
 typedef struct _encoding {
 	const gchar *charset;
 	const gchar *name;
diff --git a/src/dialogs/gm-worlds-list-dialog.c b/src/dialogs/gm-worlds-list-dialog.c
index 5abf6c2..9b12e3b 100644
--- a/src/dialogs/gm-worlds-list-dialog.c
+++ b/src/dialogs/gm-worlds-list-dialog.c
@@ -12,12 +12,12 @@
 #include <gtk/gtk.h>
 #include <libgnomeui/libgnomeui.h>
 
-#include "gm-support.h"
-#include "debug.h"
-#include "gm-app.h"
+#include "../gm-support.h"
+#include "../debug.h"
+#include "../gm-app.h"
 #include "gm-worlds-list-dialog.h"
 #include "gm-world-properties-dialog.h"
-#include "gm-pixbuf.h"
+#include "../gm-pixbuf.h"
 
 typedef struct _GmWorldsListDialog {
 	GladeXML *xml;