diff --git a/plugins/dummy/calls-dummy-provider.h b/plugins/dummy/calls-dummy-provider.h
index 513245a..3df9df6 100644
--- a/plugins/dummy/calls-dummy-provider.h
+++ b/plugins/dummy/calls-dummy-provider.h
@@ -25,10 +25,11 @@
 #ifndef CALLS_DUMMY_PROVIDER_H__
 #define CALLS_DUMMY_PROVIDER_H__
 
-#include <glib-object.h>
-
 #include "calls-provider.h"
 
+#include <glib-object.h>
+#include <libpeas/peas.h>
+
 G_BEGIN_DECLS
 
 #define CALLS_TYPE_DUMMY_PROVIDER (calls_dummy_provider_get_type ())
@@ -38,6 +39,7 @@ G_DECLARE_FINAL_TYPE (CallsDummyProvider, calls_dummy_provider, CALLS, DUMMY_PRO
 CallsDummyProvider *calls_dummy_provider_new        (void);
 void                calls_dummy_provider_add_origin (CallsDummyProvider *self,
                                                      const gchar        *name);
+void                peas_register_types             (PeasObjectModule *module);
 
 G_END_DECLS
 
diff --git a/plugins/mm/calls-mm-provider.c b/plugins/mm/calls-mm-provider.c
index 2156f27..017b106 100644
--- a/plugins/mm/calls-mm-provider.c
+++ b/plugins/mm/calls-mm-provider.c
@@ -96,7 +96,7 @@ update_status (CallsMMProvider *self)
 }
 
 
-gboolean
+static gboolean
 mm_provider_contains (CallsMMProvider *self,
                       MMObject        *mm_obj)
 {
@@ -252,7 +252,7 @@ add_mm_objects (CallsMMProvider *self)
 }
 
 
-void
+static void
 object_added_cb (CallsMMProvider *self,
                  GDBusObject     *object)
 {
@@ -263,7 +263,7 @@ object_added_cb (CallsMMProvider *self,
 }
 
 
-void
+static void
 object_removed_cb (CallsMMProvider *self,
                    GDBusObject     *object)
 {
@@ -326,7 +326,7 @@ mm_appeared_cb (GDBusConnection *connection,
 }
 
 
-void
+static void
 mm_vanished_cb (GDBusConnection *connection,
                 const gchar *name,
                 CallsMMProvider *self)
diff --git a/plugins/mm/calls-mm-provider.h b/plugins/mm/calls-mm-provider.h
index 0d0ec94..88c455e 100644
--- a/plugins/mm/calls-mm-provider.h
+++ b/plugins/mm/calls-mm-provider.h
@@ -25,10 +25,11 @@
 #ifndef CALLS_MM_PROVIDER_H__
 #define CALLS_MM_PROVIDER_H__
 
+#include "calls-provider.h"
+
 #include <glib-object.h>
 #include <gio/gio.h>
-
-#include "calls-provider.h"
+#include <libpeas/peas.h>
 
 G_BEGIN_DECLS
 
@@ -36,6 +37,8 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (CallsMMProvider, calls_mm_provider, CALLS, MM_PROVIDER, CallsProvider)
 
+void              peas_register_types                       (PeasObjectModule *module);
+
 G_END_DECLS
 
 #endif /* CALLS_MM_PROVIDER_H__ */
diff --git a/plugins/ofono/calls-ofono-provider.c b/plugins/ofono/calls-ofono-provider.c
index c1d4f8c..ba9e510 100644
--- a/plugins/ofono/calls-ofono-provider.c
+++ b/plugins/ofono/calls-ofono-provider.c
@@ -107,7 +107,7 @@ update_status (CallsOfonoProvider *self)
 }
 
 
-gboolean
+static gboolean
 ofono_find_origin_index (CallsOfonoProvider *self,
                          const char         *path,
                          guint              *index)
@@ -472,7 +472,7 @@ ofono_appeared_cb (GDBusConnection *connection,
 }
 
 
-void
+static void
 ofono_vanished_cb (GDBusConnection *connection,
                    const gchar *name,
                    CallsOfonoProvider *self)
diff --git a/plugins/ofono/calls-ofono-provider.h b/plugins/ofono/calls-ofono-provider.h
index eb19061..c65549d 100644
--- a/plugins/ofono/calls-ofono-provider.h
+++ b/plugins/ofono/calls-ofono-provider.h
@@ -25,10 +25,11 @@
 #ifndef CALLS_OFONO_PROVIDER_H__
 #define CALLS_OFONO_PROVIDER_H__
 
+#include "calls-provider.h"
+
 #include <glib-object.h>
 #include <gio/gio.h>
-
-#include "calls-provider.h"
+#include <libpeas/peas.h>
 
 G_BEGIN_DECLS
 
@@ -36,6 +37,8 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (CallsOfonoProvider, calls_ofono_provider, CALLS, OFONO_PROVIDER, CallsProvider)
 
+void              peas_register_types                       (PeasObjectModule *module);
+
 G_END_DECLS
 
 #endif /* CALLS_OFONO_PROVIDER_H__ */
diff --git a/plugins/sip/calls-sip-provider.h b/plugins/sip/calls-sip-provider.h
index 27c9e58..1cfc837 100644
--- a/plugins/sip/calls-sip-provider.h
+++ b/plugins/sip/calls-sip-provider.h
@@ -29,6 +29,7 @@
 #include "calls-sip-origin.h"
 
 #include <glib-object.h>
+#include <libpeas/peas.h>
 
 G_BEGIN_DECLS
 
@@ -41,5 +42,6 @@ CallsSipOrigin   *calls_sip_provider_add_origin             (CallsSipProvider *s
                                                              CallsCredentials *credentials,
                                                              gint              local_port,
                                                              gboolean          direct_connection);
+void              peas_register_types                       (PeasObjectModule *module);
 
 G_END_DECLS
diff --git a/src/calls-call-window.c b/src/calls-call-window.c
index d33ce7a..5a0f5ff 100644
--- a/src/calls-call-window.c
+++ b/src/calls-call-window.c
@@ -267,7 +267,7 @@ call_selector_child_activated_cb (GtkFlowBox      *box,
 }
 
 
-void
+static void
 add_call (CallsCallWindow *self,
           CallsCall       *call)
 {
@@ -288,7 +288,7 @@ add_call (CallsCallWindow *self,
   set_focus (self, display);
 }
 
-void
+static void
 remove_call (CallsCallWindow *self,
              CallsCall       *call,
              const gchar     *reason)
diff --git a/src/calls-provider.c b/src/calls-provider.c
index ce9c439..06b1b0a 100644
--- a/src/calls-provider.c
+++ b/src/calls-provider.c
@@ -66,7 +66,7 @@ calls_provider_real_get_status (CallsProvider *self)
   return NULL;
 }
 
-GListModel *
+static GListModel *
 calls_provider_real_get_origins (CallsProvider *self)
 {
   return NULL;