Index: test/login-helper-server-test.c
===================================================================
--- test/login-helper-server-test.c	(revisjon 881)
+++ test/login-helper-server-test.c	(arbeidskopi)
@@ -126,7 +126,7 @@ test_get_raise_windows (LoginHelper *hel
 
 
 void
-test_set_wm_dock ()
+test_set_wm_dock (void)
 {
   Atom atom_type[1], atom_window_type;
 
@@ -149,7 +149,7 @@ test_set_wm_dock ()
 }
 
 static void
-test_post_window ()
+test_post_window (void)
 {
         mainwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
Index: test/key-listener-test.c
===================================================================
--- test/key-listener-test.c	(revisjon 881)
+++ test/key-listener-test.c	(arbeidskopi)
@@ -114,7 +114,7 @@ main (int argc, char **argv)
 }
 
 static void
-simple_at_exit ()
+simple_at_exit (void)
 {
   SPI_deregisterAccessibleKeystrokeListener (command_key_listener, SPI_KEYMASK_ALT | SPI_KEYMASK_CONTROL);
   AccessibleKeystrokeListener_unref         (command_key_listener);
Index: libspi/util.c
===================================================================
--- libspi/util.c	(revisjon 881)
+++ libspi/util.c	(arbeidskopi)
@@ -66,7 +66,7 @@ spi_re_entrant_list_delete_link (GList *
   next = element->next;
   first_item = (element->prev == NULL);
 
-  g_list_remove_link (NULL, element);
+  element = g_list_remove_link (NULL, element);
 
   for (l = working_list; l; l = l->next)
     {
Index: libspi/streamablecontent.c
===================================================================
--- libspi/streamablecontent.c	(revisjon 881)
+++ libspi/streamablecontent.c	(arbeidskopi)
@@ -24,6 +24,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <string.h>
 #include <libspi/accessible.h>
 #include <libspi/component.h>
 #include <libspi/streamablecontent.h>
Index: login-helper/login-helper.c
===================================================================
--- login-helper/login-helper.c	(revisjon 881)
+++ login-helper/login-helper.c	(arbeidskopi)
@@ -38,7 +38,7 @@ login_helper_finalize (GObject *object)
   (G_OBJECT_CLASS (bonobo_object_parent_class))->finalize (object);
 }
 
-gboolean
+static gboolean
 login_helper_set_safe (LoginHelper *helper, gboolean safe)
 {
   LoginHelperClass *klass = LOGIN_HELPER_GET_CLASS (helper);
@@ -59,7 +59,7 @@ impl_login_helper_set_safe (PortableServ
   return login_helper_set_safe (helper, safe);
 }
 
-LoginHelperDeviceReqFlags
+static LoginHelperDeviceReqFlags
 login_helper_get_device_reqs (LoginHelper *helper)
 {
   LoginHelperClass *klass = LOGIN_HELPER_GET_CLASS (helper);
@@ -143,7 +143,7 @@ impl_login_helper_get_device_reqs (Porta
   return list;
 }
 
-Window*
+static Window*
 login_helper_get_raise_windows (LoginHelper *helper)
 {
   LoginHelperClass *klass = LOGIN_HELPER_GET_CLASS (helper);
Index: cspi/spi_main.c
===================================================================
--- cspi/spi_main.c	(revisjon 881)
+++ cspi/spi_main.c	(arbeidskopi)
@@ -35,7 +35,7 @@
 
 #undef DEBUG_OBJECTS
 
-static CORBA_Environment ev = { 0 };
+static CORBA_Environment ev = { NULL };
 static Accessibility_Registry registry = CORBA_OBJECT_NIL;
 static GHashTable *live_refs = NULL;
 static GQueue *exception_handlers = NULL;
@@ -430,7 +430,7 @@ SPI_event_quit (void)
  *
  **/
 SPIBoolean
-SPI_eventIsReady ()
+SPI_eventIsReady (void)
 {
   return FALSE;
 }
Index: cspi/spi_hypertext.c
===================================================================
--- cspi/spi_hypertext.c	(revisjon 881)
+++ cspi/spi_hypertext.c	(arbeidskopi)
@@ -94,7 +94,7 @@ AccessibleHypertext_getLink (AccessibleH
 {
   AccessibleHyperlink *retval;
 	
-  cspi_return_val_if_fail (obj != NULL, FALSE);
+  cspi_return_val_if_fail (obj != NULL, NULL);
 
   retval = cspi_object_add (
     Accessibility_Hypertext_getLink (CSPI_OBJREF (obj),
Index: cspi/spi_streamablecontent.c
===================================================================
--- cspi/spi_streamablecontent.c	(revisjon 881)
+++ cspi/spi_streamablecontent.c	(arbeidskopi)
@@ -400,7 +400,7 @@ AccessibleStreamableContent_read (Access
   cached = g_hash_table_lookup (get_streams (), CSPI_OBJREF (obj));
   if (cached)
     {
-      CORBA_long len_read;
+      CORBA_long len_read = 0;
       stream = cached->stream;
       if (stream != CORBA_OBJECT_NIL)
 	{
Index: cspi/bonobo/cspi-bonobo-listener.h
===================================================================
--- cspi/bonobo/cspi-bonobo-listener.h	(revisjon 881)
+++ cspi/bonobo/cspi-bonobo-listener.h	(arbeidskopi)
@@ -56,6 +56,8 @@ typedef struct {
 } CSpiDeviceListener;
 typedef SpiDeviceListenerClass CSpiDeviceListenerClass;
 
+CORBA_Object
+cspi_device_listener_get_corba (AccessibleDeviceListener *listener);
 GType cspi_device_listener_get_type (void);
 gpointer cspi_device_listener_new (void);
 void cspi_device_listener_add_cb (AccessibleDeviceListener  *al,
Index: cspi/bonobo/cspi-bonobo.c
===================================================================
--- cspi/bonobo/cspi-bonobo.c	(revisjon 881)
+++ cspi/bonobo/cspi-bonobo.c	(arbeidskopi)
@@ -145,12 +145,11 @@ cspi_get_registry_ior (void)
 CORBA_Object
 cspi_init (void)
 {
-  char *obj_id;
-  CORBA_Object registry;
+  CORBA_Object registry = NULL;
   CORBA_Environment ev;
   char *ior =  NULL;
 
-  if (!bonobo_init (0, NULL))
+  if (!bonobo_init (NULL, NULL))
     {
       g_error ("Could not initialize Bonobo");
     }
Index: atk-bridge/bridge.c
===================================================================
--- atk-bridge/bridge.c	(revisjon 881)
+++ atk-bridge/bridge.c	(arbeidskopi)
@@ -148,7 +148,7 @@ extern void gnome_accessibility_module_i
 extern void gnome_accessibility_module_shutdown (void);
 
 static void
-spi_atk_bridge_init_event_type_consts ()
+spi_atk_bridge_init_event_type_consts (void)
 {
   static gboolean done = FALSE;
 
@@ -600,7 +600,7 @@ spi_atk_bridge_exit_func (void)
   if (!bonobo_is_initialized ())
     {
       DBG (1, g_warning ("Re-initializing bonobo\n"));
-      g_assert (bonobo_init (0, NULL));
+      g_assert (bonobo_init (NULL, NULL));
       g_assert (bonobo_activate ());
     }
   
Index: registryd/deviceeventcontroller.c
===================================================================
--- registryd/deviceeventcontroller.c	(revisjon 881)
+++ registryd/deviceeventcontroller.c	(arbeidskopi)
@@ -83,7 +83,7 @@ static unsigned int _numlock_physical_ma
 
 static GQuark spi_dec_private_quark = 0;
 
-int (*x_default_error_handler) (Display *display, XErrorEvent *error_event);
+static int (*x_default_error_handler) (Display *display, XErrorEvent *error_event);
 
 typedef enum {
   SPI_DEVICE_TYPE_KBD,
@@ -1236,7 +1236,7 @@ global_filter_fn (GdkXEvent *gdk_xevent,
   return GDK_FILTER_CONTINUE;
 }
 
-int
+static int
 _spi_controller_device_error_handler (Display *display, XErrorEvent *error)
 {
   if (error->error_code == BadAccess) 
@@ -1677,7 +1677,7 @@ spi_controller_update_key_grabs (SpiDECo
 {
   GList *l, *next;
   gboolean   update_failed = FALSE;
-  KeyCode keycode;
+  KeyCode keycode = 0;
   
   g_return_val_if_fail (controller != NULL, FALSE);
 
@@ -2435,15 +2435,12 @@ spi_device_event_controller_class_init (
 }
 
 #ifdef HAVE_XEVIE
-Bool isEvent(dpy,event,arg)
-     Display *dpy;
-     XEvent *event;
-     char *arg;
+static Bool isEvent(Display *dpy, XEvent *event, char *arg)
 {
    return TRUE;
 }
 
-gboolean
+static gboolean
 handle_io (GIOChannel *source,
            GIOCondition condition,
            gpointer data) 
Index: registryd/registry.c
===================================================================
--- registryd/registry.c	(revisjon 881)
+++ registryd/registry.c	(arbeidskopi)
@@ -81,7 +81,7 @@ spi_registry_set_debug (const char *debu
     _dbg = (int) g_ascii_strtod (debug_flag_string, NULL);
 }
 
-SpiListenerStruct *
+static SpiListenerStruct *
 spi_listener_struct_new (Accessibility_EventListener listener, CORBA_Environment *ev)
 {
   SpiListenerStruct *retval = g_malloc (sizeof (SpiListenerStruct));
@@ -90,7 +90,7 @@ spi_listener_struct_new (Accessibility_E
 }
 
 
-void
+static void
 spi_listener_struct_free (SpiListenerStruct *ls, CORBA_Environment *ev)
 {
   bonobo_object_release_unref (ls->listener, ev);
