Fold the core library into the dbus librarynext-decore

tp_dbus_g_method_return_not_implemented is non-essential, so we can
easily put it in the -dbus library.

tp_proxy_check_interface_by_id should be available in the high-level
API, but with a couple of #define hacks we can make it available to
generated code in the -dbus library under the same name.

tp_proxy_pending_call_v1_new and tp_proxy_signal_connection_v1_new
can safely go in the -dbus library: they don't deserve to be part of
the high-level API.

This reduces us to one shared library per level of API stability,
which is exactly the right number.

53 files changed, 116 insertions, 177 deletions

diff --git a/configure.ac b/configure.ac
index db356c47f..3d30942aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,13 +25,13 @@ m4_define([tp_glib_nano_version], [1])
 # If interfaces have been removed since last release, set age to 0
 #
 # If interfaces have been added, release builds will fail unless you add a new
-# file like telepathy-glib/versions/core-1.2.abi to add them to the official
+# file like telepathy-glib/versions/main-1.2.abi to add them to the official
 # ABI of the next stable branch. This also forces binaries built against
 # devel versions to be rebuilt (we don't guarantee that we won't add ABI in
 # a development branch then remove it again, particularly if it was never
 # seen in a release).
 
-# These are shared by libtelepathy-glib-1 and libtelepathy-glib-1-core
+# libtelepathy-glib-1
 m4_define([tp_glib_lt_current], [0])
 m4_define([tp_glib_lt_revision], [0])
 m4_define([tp_glib_lt_age], [0])
diff --git a/docs/reference/libtelepathy-logger/Makefile.am b/docs/reference/libtelepathy-logger/Makefile.am
index 4e647d7d5..7ddf1413e 100644
--- a/docs/reference/libtelepathy-logger/Makefile.am
+++ b/docs/reference/libtelepathy-logger/Makefile.am
@@ -108,7 +108,6 @@ GTKDOC_LIBS= \
 	$(top_builddir)/telepathy-logger/libtelepathy-logger-1.la \
 	$(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
 	$(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-	$(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
 	$(NULL)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/docs/reference/telepathy-farstream/Makefile.am b/docs/reference/telepathy-farstream/Makefile.am
index c42f3d3be..5a3a42aaa 100644
--- a/docs/reference/telepathy-farstream/Makefile.am
+++ b/docs/reference/telepathy-farstream/Makefile.am
@@ -83,7 +83,6 @@ GTKDOC_LIBS= \
 	$(top_builddir)/telepathy-farstream/libtelepathy-farstream-1.la \
 	$(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
 	$(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-	$(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
 	$(NULL)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/docs/reference/telepathy-glib/Makefile.am b/docs/reference/telepathy-glib/Makefile.am
index 9404d267a..fb15db8fb 100644
--- a/docs/reference/telepathy-glib/Makefile.am
+++ b/docs/reference/telepathy-glib/Makefile.am
@@ -87,7 +87,6 @@ GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) @DBUS_CFLAGS@ @GLIB_CFLAGS@
 GTKDOC_LIBS = \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(DBUS_LIBS) \
     $(GLIB_LIBS) \
     $(NULL)
diff --git a/examples/client/Makefile.am b/examples/client/Makefile.am
index 4e69b47c5..73b0cb4e6 100644
--- a/examples/client/Makefile.am
+++ b/examples/client/Makefile.am
@@ -49,7 +49,6 @@ endif
 LDADD = \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(GLIB_LIBS) \
     $(DBUS_LIBS) \
     $(NULL)
diff --git a/examples/client/dbus-tubes/Makefile.am b/examples/client/dbus-tubes/Makefile.am
index d30b83b79..f047c33b6 100644
--- a/examples/client/dbus-tubes/Makefile.am
+++ b/examples/client/dbus-tubes/Makefile.am
@@ -11,7 +11,6 @@ accepter_SOURCES = accepter.c constants.h
 LDADD = \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     @DBUS_LIBS@ \
     @GLIB_LIBS@
 
diff --git a/examples/client/stream-tubes/Makefile.am b/examples/client/stream-tubes/Makefile.am
index 5cc7340f6..4adb9af90 100644
--- a/examples/client/stream-tubes/Makefile.am
+++ b/examples/client/stream-tubes/Makefile.am
@@ -11,7 +11,6 @@ accepter_SOURCES = accepter.c
 LDADD = \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     @DBUS_LIBS@ \
     @GLIB_LIBS@ \
     $(NULL)
diff --git a/examples/cm/call/Makefile.am b/examples/cm/call/Makefile.am
index d6d614f83..47fd98b41 100644
--- a/examples/cm/call/Makefile.am
+++ b/examples/cm/call/Makefile.am
@@ -56,7 +56,6 @@ distclean-local:
 LDADD = \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(GLIB_LIBS) \
     $(DBUS_LIBS) \
     $(NULL)
diff --git a/examples/cm/channelspecific/Makefile.am b/examples/cm/channelspecific/Makefile.am
index c45696454..f13ee0e00 100644
--- a/examples/cm/channelspecific/Makefile.am
+++ b/examples/cm/channelspecific/Makefile.am
@@ -53,7 +53,6 @@ distclean-local:
 LDADD = \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(GLIB_LIBS) \
     $(DBUS_LIBS) \
     $(NULL)
diff --git a/examples/cm/contactlist/Makefile.am b/examples/cm/contactlist/Makefile.am
index b25bef1b9..f0ec7d90f 100644
--- a/examples/cm/contactlist/Makefile.am
+++ b/examples/cm/contactlist/Makefile.am
@@ -49,7 +49,6 @@ distclean-local:
 LDADD = \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(GLIB_LIBS) \
     $(DBUS_LIBS) \
     $(NULL)
diff --git a/examples/cm/echo-message-parts/Makefile.am b/examples/cm/echo-message-parts/Makefile.am
index 966c3c01e..d0bc972e6 100644
--- a/examples/cm/echo-message-parts/Makefile.am
+++ b/examples/cm/echo-message-parts/Makefile.am
@@ -49,7 +49,6 @@ distclean-local:
 LDADD = \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(GLIB_LIBS) \
     $(DBUS_LIBS) \
     $(NULL)
diff --git a/examples/cm/extended/Makefile.am b/examples/cm/extended/Makefile.am
index ba02bc2e0..7c07d5ccd 100644
--- a/examples/cm/extended/Makefile.am
+++ b/examples/cm/extended/Makefile.am
@@ -38,7 +38,6 @@ LDADD = \
     $(top_builddir)/examples/extensions/libexample-extensions.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(GLIB_LIBS) \
     $(DBUS_LIBS) \
     $(NULL)
diff --git a/examples/cm/no-protocols/Makefile.am b/examples/cm/no-protocols/Makefile.am
index a5a9fd84f..c4ba6b1e9 100644
--- a/examples/cm/no-protocols/Makefile.am
+++ b/examples/cm/no-protocols/Makefile.am
@@ -33,7 +33,6 @@ distclean-local:
 LDADD = \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(GLIB_LIBS) \
     $(DBUS_LIBS) \
     $(NULL)
diff --git a/examples/extensions/Makefile.am b/examples/extensions/Makefile.am
index ff92bc33b..6de2441ee 100644
--- a/examples/extensions/Makefile.am
+++ b/examples/extensions/Makefile.am
@@ -32,7 +32,6 @@ libexample_extensions_la_LIBADD = \
     $(DBUS_LIBS) \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(NULL)
 
 # The client-specific parts are built into a separate .o file, so the linker
diff --git a/telepathy-farstream/Makefile.am b/telepathy-farstream/Makefile.am
index ce104aa64..0b30f12af 100644
--- a/telepathy-farstream/Makefile.am
+++ b/telepathy-farstream/Makefile.am
@@ -46,7 +46,6 @@ AM_CFLAGS = \
 libtelepathy_farstream_internal_la_LIBADD = \
 	$(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
 	$(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-	$(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
 	$(GST_LIBS) \
diff --git a/telepathy-farstream/examples/Makefile.am b/telepathy-farstream/examples/Makefile.am
index bd2dc0d38..4f45c9f50 100644
--- a/telepathy-farstream/examples/Makefile.am
+++ b/telepathy-farstream/examples/Makefile.am
@@ -6,7 +6,6 @@ LDADD =  \
    $(top_builddir)/telepathy-farstream/libtelepathy-farstream-1.la \
    $(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-   $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
    $(GLIB_LIBS) \
    $(DBUS_LIBS) \
    $(GST_LIBS) \
diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am
index d1503f9d5..6f9973deb 100644
--- a/telepathy-glib/Makefile.am
+++ b/telepathy-glib/Makefile.am
@@ -16,8 +16,8 @@ EXTRA_DIST = \
 
 # libtelepathy-glib-1 is just a shared version of
 # libtelepathy-glib-main-internal, produced by abi.am. Similarly,
-# libtelepathy-glib-1-core and libtelepathy-glib-1-dbus are shared versions of
-# libtelepathy-glib-core-internal and -dbus-internal.
+# libtelepathy-glib-1-dbus is a shared version of
+# libtelepathy-glib-dbus-internal.
 #
 # The static version is necessary because one of the tests wants to use
 # internal symbols (_tp_log) which are made invisible by GNU ld, and it
@@ -26,7 +26,6 @@ EXTRA_DIST = \
 # Put the lowest-level library first, so that libtool will be able to relink
 # them during installation.
 lib_LTLIBRARIES = \
-    libtelepathy-glib-1-core.la \
     libtelepathy-glib-1-dbus.la \
     libtelepathy-glib-1.la \
     $(NULL)
@@ -34,7 +33,6 @@ lib_LTLIBRARIES = \
 noinst_LTLIBRARIES = \
     libtelepathy-glib-main-internal.la \
     libtelepathy-glib-dbus-internal.la \
-    libtelepathy-glib-core-internal.la \
     libtelepathy-glib-reentrants.la \
     $(NULL)
 
@@ -139,6 +137,7 @@ tpgdbusinclude_HEADERS = \
     cli-channel.h \
     cli-connection.h \
     cli-misc.h \
+    cli-proxy.h \
     gnio-util.h \
     gtypes.h \
     interfaces.h \
@@ -182,7 +181,6 @@ clean-local:
 check_c_sources = \
     $(tpginclude_HEADERS) \
     $(tpgdbusinclude_HEADERS) \
-    $(libtelepathy_glib_core_internal_la_SOURCES) \
     $(libtelepathy_glib_dbus_internal_la_SOURCES) \
     $(libtelepathy_glib_main_internal_la_SOURCES) \
     $(NULL)
@@ -190,21 +188,15 @@ check_c_sources = \
 include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
 
-libtelepathy_glib_core_internal_la_LIBADD = $(ALL_LIBS)
-libtelepathy_glib_core_internal_la_SOURCES = \
-    core-dbus.c \
-    core-proxy.c \
-    $(NULL)
-
 libtelepathy_glib_dbus_internal_la_LIBADD = \
     $(ALL_LIBS) \
-    libtelepathy-glib-1-core.la \
     $(NULL)
 libtelepathy_glib_dbus_internal_la_SOURCES = \
     asv.c \
     cli-channel.c \
     cli-connection.c \
     cli-misc.c \
+    core-proxy.c \
     gnio-util.c \
     gtypes.c \
     interfaces.c \
@@ -382,22 +374,13 @@ include introspection.am
 Android.mk: Makefile.am $(codegen_sources)
 	androgenizer -:PROJECT telepathy-glib \
 	\
-	-:SHARED libtelepathy-glib-1-core -:TAGS eng debug \
-	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-	 -:SOURCES $(libtelepathy_glib_core_internal_la_SOURCES) \
-	  $(nodist_libtelepathy_glib_core_internal_la_SOURCES) \
-	 -:CFLAGS $(DEFAULT_INCLUDES) $(DEFS) $(CFLAGS) $(GIO_UNIX_CFLAGS) $(DBUS_CFLAGS) $(AM_CFLAGS) \
-	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) $(INCLUDES) \
-	 -:LDFLAGS $(ALL_LIBS) \
-	  $(libtelepathy_glib_core_internal_la_LDFLAGS) \
-	\
 	 -:SHARED libtelepathy-glib-1-dbus -:TAGS eng debug \
 	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
 	 -:SOURCES $(libtelepathy_glib_dbus_internal_la_SOURCES) \
 	  $(nodist_libtelepathy_glib_dbus_internal_la_SOURCES) \
 	 -:CFLAGS $(DEFAULT_INCLUDES) $(DEFS) $(CFLAGS) $(GIO_UNIX_CFLAGS) $(DBUS_CFLAGS) $(AM_CFLAGS) \
 	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) $(INCLUDES) \
-	 -:LDFLAGS $(ALL_LIBS) -ltelepathy-glib-1-core \
+	 -:LDFLAGS $(ALL_LIBS) \
 	  $(libtelepathy_glib_dbus_internal_la_LDFLAGS) \
 	\
 	 -:SHARED libtelepathy-glib-1 -:TAGS eng debug \
@@ -406,7 +389,7 @@ Android.mk: Makefile.am $(codegen_sources)
 	  $(nodist_libtelepathy_glib_main_internal_la_SOURCES) \
 	 -:CFLAGS $(DEFAULT_INCLUDES) $(DEFS) $(CFLAGS) $(GIO_UNIX_CFLAGS) $(DBUS_CFLAGS) $(AM_CFLAGS) \
 	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) $(INCLUDES) \
-	 -:LDFLAGS $(ALL_LIBS) -ltelepathy-glib-1-dbus -ltelepathy-glib-1-core \
+	 -:LDFLAGS $(ALL_LIBS) -ltelepathy-glib-1-dbus \
 	  $(libtelepathy_glib_main_internal_la_LDFLAGS) \
 	\
 	> $@
diff --git a/telepathy-glib/abi.am b/telepathy-glib/abi.am
index 8236cc9e0..ce94c09eb 100644
--- a/telepathy-glib/abi.am
+++ b/telepathy-glib/abi.am
@@ -2,7 +2,6 @@
 
 # Must put oldest versions first
 ABI_LISTS = \
-    versions/core-1.0.abi \
     versions/dbus-1.0.abi \
     versions/main-1.0.abi \
     $(NULL)
@@ -10,22 +9,6 @@ ABI_LISTS = \
 # The quoting here is unnecessary but harmless, and has the useful side-effect
 # that vim quickfix mode (:make) doesn't interpret the libtool --mode=link
 # command as an error message in a bizarrely named file
-#
-# libtelepathy-glib-core shares its Libtool versioning with libtelepathy-glib:
-# they are intended to be upgraded in lockstep, and always break ABI at the
-# same time.
-libtelepathy_glib_1_core_la_LDFLAGS = \
-    $(AM_LDFLAGS) \
-    -no-undefined \
-    -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \
-    $(NULL)
-libtelepathy_glib_1_core_la_LIBADD = libtelepathy-glib-core-internal.la
-nodist_libtelepathy_glib_1_core_la_SOURCES =
-libtelepathy_glib_1_core_la_DEPENDENCIES = \
-    libtelepathy-glib-core-internal.la \
-    abi.am \
-    $(NULL)
-
 libtelepathy_glib_1_dbus_la_LDFLAGS = \
     $(AM_LDFLAGS) \
     -no-undefined \
@@ -57,9 +40,6 @@ nodist_libtelepathy_glib_1_la_SOURCES += \
 nodist_libtelepathy_glib_1_dbus_la_SOURCES += \
     _gen/dbus-version-script.txt \
     $(NULL)
-nodist_libtelepathy_glib_1_core_la_SOURCES += \
-    _gen/core-version-script.txt \
-    $(NULL)
 libtelepathy_glib_1_la_DEPENDENCIES += \
     _gen/main-version-script.txt \
     _gen/main-abi.txt \
@@ -68,10 +48,6 @@ libtelepathy_glib_1_dbus_la_DEPENDENCIES += \
     _gen/dbus-version-script.txt \
     _gen/dbus-abi.txt \
     $(NULL)
-libtelepathy_glib_1_core_la_DEPENDENCIES += \
-    _gen/core-version-script.txt \
-    _gen/core-abi.txt \
-    $(NULL)
 
 if OFFICIAL_RELEASE
 # don't allow undocumented ABI
@@ -123,12 +99,8 @@ libtelepathy_glib_1_la_LDFLAGS += \
 libtelepathy_glib_1_dbus_la_LDFLAGS += \
     $(VERSION_SCRIPT_ARG)=_gen/dbus-version-script.txt
 
-libtelepathy_glib_1_core_la_LDFLAGS += \
-    $(VERSION_SCRIPT_ARG)=_gen/core-version-script.txt
-
 else # !HAVE_LD_VERSION_SCRIPT
 
-libtelepathy_glib_1_core_la_LDFLAGS += -export-symbols-regex '^tp'
 libtelepathy_glib_1_dbus_la_LDFLAGS += -export-symbols-regex '^tp'
 libtelepathy_glib_1_la_LDFLAGS += -export-symbols-regex '^tp'
 
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index 01365757d..9e399396c 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -189,6 +189,7 @@
 #include <telepathy-glib/observe-channel-context-internal.h>
 #include <telepathy-glib/svc-client.h>
 #include <telepathy-glib/svc-generic.h>
+#include <telepathy-glib/svc-interface.h>
 #include <telepathy-glib/util.h>
 #include <telepathy-glib/value-array.h>
 
diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index 82f1123b8..e776e9316 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -251,6 +251,7 @@
 #include <telepathy-glib/sliced-gvalue.h>
 #include <telepathy-glib/svc-connection.h>
 #include <telepathy-glib/svc-generic.h>
+#include <telepathy-glib/svc-interface.h>
 #include <telepathy-glib/util.h>
 #include <telepathy-glib/value-array.h>
 
diff --git a/telepathy-glib/base-protocol.c b/telepathy-glib/base-protocol.c
index a133db8eb..619402b8f 100644
--- a/telepathy-glib/base-protocol.c
+++ b/telepathy-glib/base-protocol.c
@@ -31,6 +31,7 @@
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/sliced-gvalue.h>
 #include <telepathy-glib/svc-generic.h>
+#include <telepathy-glib/svc-interface.h>
 #include <telepathy-glib/svc-protocol.h>
 #include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/value-array.h>
diff --git a/telepathy-glib/cli-channel.c b/telepathy-glib/cli-channel.c
index c1376929d..65c16f4cc 100644
--- a/telepathy-glib/cli-channel.c
+++ b/telepathy-glib/cli-channel.c
@@ -25,9 +25,13 @@
 
 #include <dbus/dbus-glib.h>
 
+#include <telepathy-glib/cli-proxy.h>
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/proxy-subclass.h>
 #include <telepathy-glib/util.h>
 #include <telepathy-glib/value-array.h>
 
+#define tp_proxy_check_interface_by_id(s, i, e) \
+  _tp_proxy_core_check_interface_by_id (s, i, e)
+
 #include "_gen/tp-cli-channel-body.h"
diff --git a/telepathy-glib/cli-connection.c b/telepathy-glib/cli-connection.c
index 809c43e08..b3511c6c7 100644
--- a/telepathy-glib/cli-connection.c
+++ b/telepathy-glib/cli-connection.c
@@ -25,9 +25,13 @@
 
 #include <dbus/dbus-glib.h>
 
+#include <telepathy-glib/cli-proxy.h>
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/proxy-subclass.h>
 #include <telepathy-glib/util.h>
 #include <telepathy-glib/value-array.h>
 
+#define tp_proxy_check_interface_by_id(s, i, e) \
+  _tp_proxy_core_check_interface_by_id (s, i, e)
+
 #include "_gen/tp-cli-connection-body.h"
diff --git a/telepathy-glib/cli-misc.c b/telepathy-glib/cli-misc.c
index a2a23d323..c19f2bb89 100644
--- a/telepathy-glib/cli-misc.c
+++ b/telepathy-glib/cli-misc.c
@@ -26,11 +26,15 @@
 
 #include <dbus/dbus-glib.h>
 
+#include <telepathy-glib/cli-proxy.h>
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/proxy-subclass.h>
 #include <telepathy-glib/util.h>
 #include <telepathy-glib/value-array.h>
 
+#define tp_proxy_check_interface_by_id(s, i, e) \
+  _tp_proxy_core_check_interface_by_id (s, i, e)
+
 #include "telepathy-glib/_gen/tp-cli-account-body.h"
 #include "telepathy-glib/_gen/tp-cli-account-manager-body.h"
 #include "telepathy-glib/_gen/tp-cli-call-content-body.h"
diff --git a/telepathy-glib/cli-proxy.h b/telepathy-glib/cli-proxy.h
new file mode 100644
index 000000000..e2d9f7bd5
--- /dev/null
+++ b/telepathy-glib/cli-proxy.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2014 Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
+#ifndef __TP_CLI_PROXY_H__
+#define __TP_CLI_PROXY_H__
+
+#include <gio/gio.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+
+G_BEGIN_DECLS
+
+typedef void (*TpProxyWrapperFunc) (TpProxy *self,
+    const GError *error, GVariant *args,
+    GCallback callback, gpointer user_data, GObject *weak_object);
+
+TpProxyPendingCall *tp_proxy_pending_call_v1_new (TpProxy *self,
+    gint timeout_ms, GQuark iface, const gchar *member,
+    GVariant *args, const GVariantType *reply_type, TpProxyWrapperFunc wrapper,
+    GCallback callback, gpointer user_data, GDestroyNotify destroy,
+    GObject *weak_object);
+
+TpProxySignalConnection *tp_proxy_signal_connection_v1_new (TpProxy *self,
+    GQuark iface, const gchar *member, const GVariantType *expected_types,
+    TpProxyWrapperFunc wrapper,
+    GCallback callback, gpointer user_data, GDestroyNotify destroy,
+    GObject *weak_object, GError **error);
+
+G_END_DECLS
+
+#endif
diff --git a/telepathy-glib/codegen.am b/telepathy-glib/codegen.am
index 1875bdae0..6cb147801 100644
--- a/telepathy-glib/codegen.am
+++ b/telepathy-glib/codegen.am
@@ -27,7 +27,6 @@ codegen_extra_dist = \
     logger.xml
 
 codegen_sources = \
-    $(nodist_libtelepathy_glib_core_internal_la_SOURCES) \
     $(nodist_libtelepathy_glib_dbus_internal_la_SOURCES) \
     $(nodist_libtelepathy_glib_main_internal_la_SOURCES) \
     $(nodist_geninclude_HEADERS) \
diff --git a/telepathy-glib/core-dbus.c b/telepathy-glib/core-dbus.c
deleted file mode 100644
index 06a5812ea..000000000
--- a/telepathy-glib/core-dbus.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * core-dbus.c - minimal D-Bus utilities for generated code
- *
- * Copyright © 2005-2012 Collabora Ltd. <http://www.collabora.co.uk/>
- * Copyright © 2005-2008 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "config.h"
-
-#include "telepathy-glib/dbus.h"
-#include "telepathy-glib/errors.h"
-
-/**
- * tp_dbus_g_method_return_not_implemented: (skip)
- * @context: The D-Bus method invocation context
- *
- * Return the Telepathy error NotImplemented from the method invocation
- * given by @context.
- */
-void
-tp_dbus_g_method_return_not_implemented (GDBusMethodInvocation *context)
-{
-  g_dbus_method_invocation_return_dbus_error (context,
-      TP_ERROR_STR_NOT_IMPLEMENTED, "Not implemented");
-}
diff --git a/telepathy-glib/core-proxy.c b/telepathy-glib/core-proxy.c
index ef70dcc86..b0a982339 100644
--- a/telepathy-glib/core-proxy.c
+++ b/telepathy-glib/core-proxy.c
@@ -32,7 +32,7 @@
 static TpProxyImplementation _tp_proxy_implementation = { NULL };
 
 gboolean
-tp_proxy_check_interface_by_id (gpointer proxy,
+_tp_proxy_core_check_interface_by_id (gpointer proxy,
     GQuark iface,
     GError **error)
 {
diff --git a/telepathy-glib/dbus.h b/telepathy-glib/dbus.h
index 831764f9d..6b6c0f10a 100644
--- a/telepathy-glib/dbus.h
+++ b/telepathy-glib/dbus.h
@@ -35,8 +35,6 @@
 
 G_BEGIN_DECLS
 
-void tp_dbus_g_method_return_not_implemented (GDBusMethodInvocation *context);
-
 typedef enum /*< flags >*/
 {
   TP_DBUS_NAME_TYPE_UNIQUE = 1,
diff --git a/telepathy-glib/gnio-util.h b/telepathy-glib/gnio-util.h
index 5dead020f..b876d2ce1 100644
--- a/telepathy-glib/gnio-util.h
+++ b/telepathy-glib/gnio-util.h
@@ -20,7 +20,7 @@
  */
 
 #if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
-#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
 #endif
 
 #include <glib-object.h>
diff --git a/telepathy-glib/introspection.am b/telepathy-glib/introspection.am
index e8af51553..d9b8bf12a 100644
--- a/telepathy-glib/introspection.am
+++ b/telepathy-glib/introspection.am
@@ -15,10 +15,9 @@ INTROSPECTION_GIRS = TelepathyGLib-1.gir TelepathyGLibDBus-1.gir
 # telepathy-glib-1-dbus
 INTROSPECTION_SCANNER_ENV = PKG_CONFIG_PATH=$(builddir):$${PKG_CONFIG_PATH}
 
-TelepathyGLib-1.gir: libtelepathy-glib-1.la libtelepathy-glib-1-core.la
+TelepathyGLib-1.gir: libtelepathy-glib-1.la
 # /!\ Order matters, see https://bugzilla.gnome.org/show_bug.cgi?id=660629
 TelepathyGLib_1_gir_FILES = \
-	$(srcdir)/core-dbus.c \
 	$(srcdir)/proxy.c _gen/proxy-introspectable.h \
 	$(srcdir)/account.c $(srcdir)/account.h \
 	$(srcdir)/account-channel-request.c $(srcdir)/account-channel-request.h \
@@ -90,7 +89,6 @@ TelepathyGLib_1_gir_NAMESPACE = TelepathyGLib
 TelepathyGLib_1_gir_VERSION = 1
 TelepathyGLib_1_gir_LIBS = \
     libtelepathy-glib-1.la \
-    libtelepathy-glib-1-core.la \
     $(NULL)
 TelepathyGLib_1_gir_EXPORT_PACKAGES = telepathy-glib-1
 TelepathyGLib_1_gir_CFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS)
@@ -124,7 +122,6 @@ TelepathyGLibDBus_1_gir_NAMESPACE = TelepathyGLibDBus
 TelepathyGLibDBus_1_gir_VERSION = 1
 TelepathyGLibDBus_1_gir_LIBS = \
     libtelepathy-glib-1-dbus.la \
-    libtelepathy-glib-1-core.la \
     $(NULL)
 TelepathyGLibDBus_1_gir_EXPORT_PACKAGES = telepathy-glib-1-dbus
 TelepathyGLibDBus_1_gir_CFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS)
diff --git a/telepathy-glib/message-mixin.c b/telepathy-glib/message-mixin.c
index 180225cff..e5dd03686 100644
--- a/telepathy-glib/message-mixin.c
+++ b/telepathy-glib/message-mixin.c
@@ -79,6 +79,7 @@
 #include <telepathy-glib/message-internal.h>
 #include <telepathy-glib/sliced-gvalue.h>
 #include <telepathy-glib/svc-channel.h>
+#include <telepathy-glib/svc-interface.h>
 
 #define DEBUG_FLAG TP_DEBUG_IM
 
diff --git a/telepathy-glib/proxy-internal.h b/telepathy-glib/proxy-internal.h
index ed16f273a..e71ac79e2 100644
--- a/telepathy-glib/proxy-internal.h
+++ b/telepathy-glib/proxy-internal.h
@@ -22,13 +22,15 @@
 #define __TP_PROXY_INTERNAL_H__
 
 #include <telepathy-glib/proxy.h>
+
+#include <telepathy-glib/cli-proxy.h>
 #include <telepathy-glib/proxy-subclass.h>
 
 typedef struct {
     const gchar *version;
     gsize size;
 
-    gboolean (*check_interface_by_id) (TpProxy *,
+    gboolean (*check_interface_by_id) (gpointer,
         GQuark,
         GError **);
 
@@ -58,7 +60,8 @@ typedef struct {
     GType type;
 } TpProxyImplementation;
 
-gboolean _tp_proxy_check_interface_by_id (TpProxy *self,
+/* Only available in the -dbus library */
+gboolean _tp_proxy_core_check_interface_by_id (gpointer proxy,
     GQuark iface,
     GError **error);
 
@@ -88,10 +91,10 @@ _tp_proxy_signal_connection_v1_new (TpProxy *self,
     GError **error);
 
 /*
- * Implemented in the -core library, and called by the -main library.
+ * Implemented in the -dbus library, and called by the -main library.
  *
  * This is only extern so that the -main part can call into the
- * -core part across a shared-library boundary. If you are not
+ * -dbus part across a shared-library boundary. If you are not
  * TpProxy early initialization, don't.
  */
 void tp_private_proxy_set_implementation (TpProxyImplementation *impl);
diff --git a/telepathy-glib/proxy-methods.c b/telepathy-glib/proxy-methods.c
index 9dcf327a8..387cf98fa 100644
--- a/telepathy-glib/proxy-methods.c
+++ b/telepathy-glib/proxy-methods.c
@@ -247,7 +247,7 @@ finally:
  * This function is intended to be called by generated code. If possible,
  * use g_dbus_connection_call() or g_dbus_proxy_call() instead.
  */
-/* implemented in the core library as a call to this: */
+/* implemented in the dbus library as a call to this: */
 TpProxyPendingCall *
 _tp_proxy_pending_call_v1_new (TpProxy *self,
     gint timeout_ms,
@@ -324,9 +324,7 @@ _tp_proxy_pending_call_v1_new (TpProxy *self,
   if (weak_object != NULL)
     g_object_weak_ref (weak_object, tp_proxy_pending_call_lost_weak_ref, pc);
 
-  /* very slight optimization: intra-library call to the real implementation
-   * rather than calling across library boundaries via the core library */
-  if (_tp_proxy_check_interface_by_id (self, iface, &pc->error))
+  if (tp_proxy_check_interface_by_id (self, iface, &pc->error))
     {
       DEBUG ("... doing GDBus call");
 
diff --git a/telepathy-glib/proxy-signals.c b/telepathy-glib/proxy-signals.c
index fd5531382..99a1f3655 100644
--- a/telepathy-glib/proxy-signals.c
+++ b/telepathy-glib/proxy-signals.c
@@ -259,7 +259,7 @@ tp_proxy_signal_connection_cb (GDBusConnection *connection,
  * Since: 0.7.1
  */
 
-/* that's implemented in the core library, but it calls this: */
+/* that's implemented in the dbus library, but it calls this: */
 
 TpProxySignalConnection *
 _tp_proxy_signal_connection_v1_new (TpProxy *self,
diff --git a/telepathy-glib/proxy-subclass.h b/telepathy-glib/proxy-subclass.h
index 2640b23e5..c6ee118a3 100644
--- a/telepathy-glib/proxy-subclass.h
+++ b/telepathy-glib/proxy-subclass.h
@@ -29,22 +29,6 @@
 
 G_BEGIN_DECLS
 
-typedef void (*TpProxyWrapperFunc) (TpProxy *self,
-    const GError *error, GVariant *args,
-    GCallback callback, gpointer user_data, GObject *weak_object);
-
-TpProxyPendingCall *tp_proxy_pending_call_v1_new (TpProxy *self,
-    gint timeout_ms, GQuark iface, const gchar *member,
-    GVariant *args, const GVariantType *reply_type, TpProxyWrapperFunc wrapper,
-    GCallback callback, gpointer user_data, GDestroyNotify destroy,
-    GObject *weak_object);
-
-TpProxySignalConnection *tp_proxy_signal_connection_v1_new (TpProxy *self,
-    GQuark iface, const gchar *member, const GVariantType *expected_types,
-    TpProxyWrapperFunc wrapper,
-    GCallback callback, gpointer user_data, GDestroyNotify destroy,
-    GObject *weak_object, GError **error);
-
 void tp_proxy_add_interface_by_id (TpProxy *self, GQuark iface);
 void tp_proxy_add_interfaces (TpProxy *self, const gchar * const *interfaces);
 
diff --git a/telepathy-glib/proxy.c b/telepathy-glib/proxy.c
index 957cc67d8..da1ca5b0a 100644
--- a/telepathy-glib/proxy.c
+++ b/telepathy-glib/proxy.c
@@ -382,7 +382,7 @@ static guint signals[N_SIGNALS] = {0};
 
 /**
  * tp_proxy_check_interface_by_id:
- * @self: the #TpProxy (or subclass)
+ * @proxy: the #TpProxy (or subclass)
  * @iface: quark representing the D-Bus interface required
  * @error: used to raise an error in the #TP_DBUS_ERRORS domain if @iface
  *         is invalid, @self has been invalidated or @self does not implement
@@ -394,13 +394,13 @@ static guint signals[N_SIGNALS] = {0};
  * Returns: %TRUE if this proxy implements the given interface.
  */
 
-/* The implementation in the core library calls this: */
-
 gboolean
-_tp_proxy_check_interface_by_id (TpProxy *self,
+tp_proxy_check_interface_by_id (gpointer proxy,
     GQuark iface,
     GError **error)
 {
+  TpProxy *self = proxy;
+
   g_return_val_if_fail (TP_IS_PROXY (self), FALSE);
 
   if (self->priv->invalidated != NULL)
@@ -1028,7 +1028,7 @@ tp_proxy_class_init (TpProxyClass *klass)
   TpProxyImplementation impl = {
       VERSION,
       sizeof (TpProxyImplementation),
-      _tp_proxy_check_interface_by_id,
+      tp_proxy_check_interface_by_id,
       _tp_proxy_pending_call_v1_new,
       _tp_proxy_signal_connection_v1_new,
       /* keep this at the end as a final sanity-check of the size */
diff --git a/telepathy-glib/proxy.h b/telepathy-glib/proxy.h
index 97925dbe8..6d21dda7c 100644
--- a/telepathy-glib/proxy.h
+++ b/telepathy-glib/proxy.h
@@ -147,7 +147,7 @@ GType tp_proxy_get_type (void);
                               TpProxyClass))
 
 gboolean tp_proxy_has_interface_by_id (gpointer self, GQuark iface);
-gboolean tp_proxy_check_interface_by_id (gpointer self, GQuark iface,
+gboolean tp_proxy_check_interface_by_id (gpointer proxy, GQuark iface,
     GError **error);
 gboolean tp_proxy_has_interface (gpointer self, const gchar *iface);
 
diff --git a/telepathy-glib/reentrants.c b/telepathy-glib/reentrants.c
index b7c766326..75cfa4dd5 100644
--- a/telepathy-glib/reentrants.c
+++ b/telepathy-glib/reentrants.c
@@ -6,6 +6,7 @@
 #include <dbus/dbus-glib.h>
 #include <telepathy-glib/value-array.h>
 
+#include <telepathy-glib/cli-proxy.h>
 #include <telepathy-glib/_gen/tp-cli-account-reentrant-body.h>
 #include <telepathy-glib/_gen/tp-cli-account-manager-reentrant-body.h>
 #include <telepathy-glib/_gen/tp-cli-channel-reentrant-body.h>
diff --git a/telepathy-glib/svc-interface.c b/telepathy-glib/svc-interface.c
index 3ae829769..fc4e1ed57 100644
--- a/telepathy-glib/svc-interface.c
+++ b/telepathy-glib/svc-interface.c
@@ -195,3 +195,17 @@ tp_svc_interface_set_dbus_properties_info (GType g_interface,
 
   g_type_set_qdata (g_interface, q, info);
 }
+
+/**
+ * tp_dbus_g_method_return_not_implemented: (skip)
+ * @context: The D-Bus method invocation context
+ *
+ * Return the Telepathy error NotImplemented from the method invocation
+ * given by @context.
+ */
+void
+tp_dbus_g_method_return_not_implemented (GDBusMethodInvocation *context)
+{
+  g_dbus_method_invocation_return_dbus_error (context,
+      TP_ERROR_STR_NOT_IMPLEMENTED, "Not implemented");
+}
diff --git a/telepathy-glib/svc-interface.h b/telepathy-glib/svc-interface.h
index 465ecffc2..7fee22661 100644
--- a/telepathy-glib/svc-interface.h
+++ b/telepathy-glib/svc-interface.h
@@ -53,6 +53,8 @@ _TP_AVAILABLE_IN_0_16
 TpDBusPropertiesMixinIfaceInfo *tp_svc_interface_get_dbus_properties_info (
     GType g_interface);
 
+void tp_dbus_g_method_return_not_implemented (GDBusMethodInvocation *context);
+
 G_END_DECLS
 
 #endif
diff --git a/telepathy-glib/telepathy-glib-1-dbus-uninstalled.pc.in b/telepathy-glib/telepathy-glib-1-dbus-uninstalled.pc.in
index fbe308ec2..2c009a5ce 100644
--- a/telepathy-glib/telepathy-glib-1-dbus-uninstalled.pc.in
+++ b/telepathy-glib/telepathy-glib-1-dbus-uninstalled.pc.in
@@ -8,5 +8,5 @@ Description: D-Bus interfaces from the Telepathy framework
 Version: @VERSION@
 Requires: pkg-config >= 0.21
 Requires.private: dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30
-Libs: ${abs_top_builddir}/telepathy-glib/libtelepathy-glib-1-dbus.la ${abs_top_builddir}/telepathy-glib/libtelepathy-glib-1-core.la
+Libs: ${abs_top_builddir}/telepathy-glib/libtelepathy-glib-1-dbus.la
 Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
diff --git a/telepathy-glib/telepathy-glib-1-dbus.pc.in b/telepathy-glib/telepathy-glib-1-dbus.pc.in
index 07b29d8df..a9d5cd786 100644
--- a/telepathy-glib/telepathy-glib-1-dbus.pc.in
+++ b/telepathy-glib/telepathy-glib-1-dbus.pc.in
@@ -8,5 +8,5 @@ Description: D-Bus interfaces from the Telepathy framework
 Version: @VERSION@
 Requires: pkg-config >= 0.21
 Requires.private: dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30
-Libs: -L${libdir} -ltelepathy-glib-1-dbus -ltelepathy-glib-1-core
+Libs: -L${libdir} -ltelepathy-glib-1-dbus
 Cflags: -I${includedir}/telepathy-glib-1-dbus -I${includedir}/telepathy-glib-1
diff --git a/telepathy-glib/telepathy-glib-1-uninstalled.pc.in b/telepathy-glib/telepathy-glib-1-uninstalled.pc.in
index 153e9b39a..10c5def8b 100644
--- a/telepathy-glib/telepathy-glib-1-uninstalled.pc.in
+++ b/telepathy-glib/telepathy-glib-1-uninstalled.pc.in
@@ -7,5 +7,5 @@ Name: Telepathy-GLib-1 (uninstalled copy)
 Description: GLib utility library for the Telepathy framework
 Version: @VERSION@
 Requires.private: dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30
-Libs: ${abs_top_builddir}/telepathy-glib/libtelepathy-glib-1.la ${abs_top_builddir}/telepathy-glib/libtelepathy-glib-1-dbus.la ${abs_top_builddir}/telepathy-glib/libtelepathy-glib-1-core.la
+Libs: ${abs_top_builddir}/telepathy-glib/libtelepathy-glib-1.la ${abs_top_builddir}/telepathy-glib/libtelepathy-glib-1-dbus.la
 Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
diff --git a/telepathy-glib/telepathy-glib-1.pc.in b/telepathy-glib/telepathy-glib-1.pc.in
index 5b2443e80..f216bba7c 100644
--- a/telepathy-glib/telepathy-glib-1.pc.in
+++ b/telepathy-glib/telepathy-glib-1.pc.in
@@ -7,6 +7,6 @@ Name: Telepathy-GLib-1
 Description: GLib utility library for the Telepathy framework
 Version: @VERSION@
 Requires.private: dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30
-Libs: -L${libdir} -ltelepathy-glib-1 -ltelepathy-glib-1-core
+Libs: -L${libdir} -ltelepathy-glib-1
 Libs.private: -ltelepathy-glib-1-dbus
 Cflags: -I${includedir}/telepathy-glib-1
diff --git a/telepathy-glib/telepathy-glib-dbus.h b/telepathy-glib/telepathy-glib-dbus.h
index be43929d2..b32f58b70 100644
--- a/telepathy-glib/telepathy-glib-dbus.h
+++ b/telepathy-glib/telepathy-glib-dbus.h
@@ -36,6 +36,7 @@
 #include <telepathy-glib/interfaces.h>
 
 /* client-side */
+#include <telepathy-glib/cli-proxy.h>
 #include <telepathy-glib/_gen/tp-cli-account.h>
 #include <telepathy-glib/_gen/tp-cli-account-manager.h>
 #include <telepathy-glib/_gen/tp-cli-call-content.h>
diff --git a/telepathy-glib/versions/core-1.0.abi b/telepathy-glib/versions/core-1.0.abi
deleted file mode 100644
index 2640b62dc..000000000
--- a/telepathy-glib/versions/core-1.0.abi
+++ /dev/null
@@ -1,9 +0,0 @@
-Version: TELEPATHY_GLIB_CORE_1.0
-Extends: -
-Release: 1.0
-
-tp_dbus_g_method_return_not_implemented
-tp_private_proxy_set_implementation
-tp_proxy_check_interface_by_id
-tp_proxy_pending_call_v1_new
-tp_proxy_signal_connection_v1_new
diff --git a/telepathy-glib/versions/main-1.0.abi b/telepathy-glib/versions/main-1.0.abi
index 8e25a4126..473b25bf1 100644
--- a/telepathy-glib/versions/main-1.0.abi
+++ b/telepathy-glib/versions/main-1.0.abi
@@ -1051,6 +1051,7 @@ tp_protocol_normalize_vcard_address_async
 tp_protocol_normalize_vcard_address_finish
 tp_proxy_add_interface_by_id
 tp_proxy_add_interfaces
+tp_proxy_check_interface_by_id
 tp_proxy_dbus_error_to_gerror
 tp_proxy_get_bus_name
 tp_proxy_get_dbus_connection
diff --git a/telepathy-logger/Makefile.am b/telepathy-logger/Makefile.am
index 60cad8acd..a7191a465 100644
--- a/telepathy-logger/Makefile.am
+++ b/telepathy-logger/Makefile.am
@@ -36,7 +36,6 @@ telepathy_logger_1_LDADD = \
 	libtelepathy-logger-1.la \
 	$(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
 	$(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-	$(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
 	$(TPL_LIBS) \
 	$(NULL)
 
@@ -129,7 +128,6 @@ nodist_libtelepathy_logger_internal_la_SOURCES = \
 libtelepathy_logger_internal_la_LIBADD = \
 	$(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
 	$(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-	$(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
 	$(TPL_LIBS) \
 	$(NULL)
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 22bb8a224..e022e5154 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -101,7 +101,6 @@ test_asv_LDADD = \
     $(top_builddir)/tests/lib/libtp-glib-tests-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-main-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(GLIB_LIBS)
 
 # this one uses internal ABI
@@ -111,7 +110,6 @@ test_capabilities_LDADD = \
     $(top_builddir)/tests/lib/libtp-glib-tests-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-main-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(GLIB_LIBS)
 
 # this one uses internal ABI
@@ -121,7 +119,6 @@ test_channel_filter_LDADD = \
     $(top_builddir)/tests/lib/libtp-glib-tests-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-main-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(GLIB_LIBS)
 
 # this one uses internal ABI
@@ -131,7 +128,6 @@ test_contact_search_result_LDADD = \
     $(top_builddir)/tests/lib/libtp-glib-tests-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-main-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(GLIB_LIBS)
 
 test_dtmf_player_SOURCES = dtmf-player.c
@@ -180,12 +176,10 @@ test_signal_connect_object_LDADD = \
 test_debug_domain_LDADD = \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-main-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(NULL)
 test_internal_debug_LDADD = \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-main-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(NULL)
 
 check_c_sources = *.c
@@ -195,7 +189,6 @@ check-local: check-coding-style
 LDADD = \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(GLIB_LIBS) \
     $(DBUS_LIBS) \
     $(NULL)
diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index d34f14e81..120996703 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -100,7 +100,6 @@ LDADD = \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-reentrants.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(GLIB_LIBS) \
     $(DBUS_LIBS) \
     $(NULL)
@@ -113,7 +112,6 @@ test_account_channel_request_LDADD = \
     $(top_builddir)/tests/lib/libtp-glib-tests-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-main-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(GLIB_LIBS)
 
 test_account_request_SOURCES = account-request.c
@@ -134,7 +132,6 @@ test_channel_dispatch_operation_LDADD = \
     $(top_builddir)/tests/lib/libtp-glib-tests-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-main-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(GLIB_LIBS)
 
 test_channel_introspect_SOURCES = channel-introspect.c
@@ -145,7 +142,6 @@ test_channel_request_LDADD = \
     $(top_builddir)/tests/lib/libtp-glib-tests-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-main-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(GLIB_LIBS)
 
 test_call_channel_SOURCES = call-channel.c
@@ -263,7 +259,6 @@ test_cm_message_LDADD = \
     $(top_builddir)/tests/lib/libtp-glib-tests-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-main-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(GLIB_LIBS)
 
 test_text_channel_SOURCES = text-channel.c
diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 6a10f0f7c..72286f355 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -94,7 +94,6 @@ libtp_glib_tests_internal_la_LIBADD = \
     $(GLIB_LIBS) \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-main-internal.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(NULL)
 
 libtp_glib_tests_la_LIBADD = \
@@ -102,7 +101,6 @@ libtp_glib_tests_la_LIBADD = \
     $(GLIB_LIBS) \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
     $(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-    $(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
     $(NULL)
 
 if ENABLE_LOGGER
diff --git a/tests/logger/Makefile.am b/tests/logger/Makefile.am
index 938187d14..e7f83fb08 100644
--- a/tests/logger/Makefile.am
+++ b/tests/logger/Makefile.am
@@ -16,7 +16,6 @@ LDADD = \
 	$(top_builddir)/telepathy-logger/libtelepathy-logger-1.la \
 	$(top_builddir)/telepathy-glib/libtelepathy-glib-1.la \
 	$(top_builddir)/telepathy-glib/libtelepathy-glib-1-dbus.la \
-	$(top_builddir)/telepathy-glib/libtelepathy-glib-1-core.la \
 	$(TPL_LIBS)
 
 AM_CFLAGS = \