Index: gauge-test/src/applet-init.c
===================================================================
--- gauge-test/src/applet-init.c	(revision 1235)
+++ gauge-test/src/applet-init.c	(working copy)
@@ -18,7 +18,7 @@
 CD_APPLET_DEFINITION ("gauge-test", 1, 5, 4, CAIRO_DOCK_CATEGORY_ACCESSORY)
 
 
-CD_APPLET_INIT_BEGIN (erreur)
+CD_APPLET_INIT_BEGIN
 	CD_APPLET_REGISTER_FOR_MIDDLE_CLICK_EVENT
 	CD_APPLET_REGISTER_FOR_CLICK_EVENT
 	CD_APPLET_REGISTER_FOR_BUILD_MENU_EVENT
Index: gauge-test/src/applet-struct.h
===================================================================
--- gauge-test/src/applet-struct.h	(revision 1235)
+++ gauge-test/src/applet-struct.h	(working copy)
@@ -4,14 +4,14 @@
 
 #include <cairo-dock.h>
 
-typedef struct {
+struct _AppletConfig {
 	gchar *cThemePath;
-	} AppletConfig;
+	} ;
 
-typedef struct {
+struct _AppletData {
 	double gaugeValue;
 	Gauge *pGauge;
-	} AppletData;
+	} ;
 
 
 #endif
Index: musicplayer/src/musicplayer-init.c
===================================================================
--- musicplayer/src/musicplayer-init.c	(revision 1235)
+++ musicplayer/src/musicplayer-init.c	(working copy)
@@ -28,7 +28,7 @@
 
 
 
-CD_APPLET_INIT_BEGIN (erreur)
+CD_APPLET_INIT_BEGIN
 	if (myDesklet)
 	{
 		CD_APPLET_SET_DESKLET_RENDERER ("Simple");
Index: musicplayer/src/musicplayer-struct.h
===================================================================
--- musicplayer/src/musicplayer-struct.h	(revision 1235)
+++ musicplayer/src/musicplayer-struct.h	(working copy)
@@ -32,7 +32,7 @@
 	PLAYER_NB_STATUS
 } MyAppletPlayerStatus;
 
-typedef struct {
+struct _AppletConfig {
 	gboolean enableDialogs;
 	gboolean enableCover;
 	gdouble timeDialogs;
@@ -42,7 +42,7 @@
 	gchar *defaultTitle;
 	gchar *cUserImage[PLAYER_NB_STATUS];
 	gboolean bStealTaskBarIcon;
-	} AppletConfig;
+	} ;
 	
 typedef struct {
 	gchar *service;
@@ -64,7 +64,7 @@
 	gchar *toggle;
 	} AppletDBus;
 
-typedef struct {
+struct _AppletData {
 	cairo_surface_t *pSurfaces[PLAYER_NB_STATUS];
 	cairo_surface_t *pCover;
 	gchar *run_program;
@@ -89,7 +89,7 @@
 	gchar *full_data;
 	guint iSidCheckCover;
 	AppletDBus DBus_commands;
-	} AppletData;
+	} ;
 	
 
 
Index: weblets/src/applet-widget-itf.cpp
===================================================================
--- weblets/src/applet-widget-itf.cpp	(revision 1235)
+++ weblets/src/applet-widget-itf.cpp	(working copy)
@@ -35,7 +35,7 @@
 #include <nsIDOMWindow.h>
 #include <nsIDOMBarProp.h>
 #include <nsIDOMMouseEvent.h>
-#include <docshell/nsIScrollable.h>
+#include <nsIScrollable.h>
 #include <nsISupports.h>
 #include <nsIServiceManager.h>