4 files changed, 9 insertions, 9 deletions
diff --git a/src/post/goom/goom_core.c b/src/post/goom/goom_core.c
index b24f2f496..274059da4 100644
--- a/src/post/goom/goom_core.c
+++ b/src/post/goom/goom_core.c
@@ -26,7 +26,7 @@
 #include "goom_fx.h"
 #include "goomsl.h"
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 /* #define VERBOSE */
 
diff --git a/src/post/goom/ifs.c b/src/post/goom/ifs.c
index af84b777b..4c7ec75d1 100644
--- a/src/post/goom/ifs.c
+++ b/src/post/goom/ifs.c
@@ -64,7 +64,7 @@ IFSPoint;
 #define ifs_opts xlockmore_opts
 
 #define DEFAULTS "*delay: 20000 \n" \
-"*ncolors: 100 \n"
+"*ncolours: 100 \n"
 
 #define SMOOTH_COLORS
 
diff --git a/src/post/goom/mmx.h b/src/post/goom/mmx.h
index 88789e86f..6861b7cfe 100644
--- a/src/post/goom/mmx.h
+++ b/src/post/goom/mmx.h
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include "attributes.h"
+#include <xine/attributes.h>
 
 #include "goom_graphic.h"
 
diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c
index 0b540694d..6971a5a1c 100644
--- a/src/post/goom/xine_goom.c
+++ b/src/post/goom/xine_goom.c
@@ -35,9 +35,9 @@
 */
 
 #include "config.h"
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/post.h>
 
 #include "goom.h"
 
@@ -116,7 +116,7 @@ static const post_info_t goom_special_info = {
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_POST | PLUGIN_MUST_PRELOAD, 9, "goom", XINE_VERSION_CODE, &goom_special_info, &goom_init_plugin },
+  { PLUGIN_POST | PLUGIN_MUST_PRELOAD, 10, "goom", XINE_VERSION_CODE, &goom_special_info, &goom_init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
 
@@ -219,8 +219,8 @@ static void *goom_init_plugin(xine_t *xine, void *data)
 
   cfg->register_enum (cfg, "effects.goom.csc_method", 0,
                            goom_csc_methods,
-                           _("colorspace conversion method"),
-                           _("You can choose the colorspace conversion method used by goom.\n"
+                           _("colour space conversion method"),
+                           _("You can choose the colour space conversion method used by goom.\n"
 			     "The available selections should be self-explaining."),
 			   20, csc_method_changed_cb, this);