diff --git a/addressbook/gui/Makefile.am b/addressbook/gui/Makefile.am
index 7f08bf4..fb552f2 100644
--- a/addressbook/gui/Makefile.am
+++ b/addressbook/gui/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = merging widgets contact-editor contact-list-editor
+SUBDIRS = widgets contact-editor contact-list-editor
 
 -include $(top_srcdir)/git.mk
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 254af85..d7fb73c 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -5,7 +5,7 @@ libecontacteditor_la_CPPFLAGS =				\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/addressbook/			\
-	-I$(top_srcdir)/addressbook/gui/merging		\
+	-I$(top_srcdir)/addressbook/gui/widgets		\
 	-I$(top_srcdir)/widgets/table			\
 	-I$(top_builddir)/shell				\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
@@ -27,11 +27,12 @@ libecontacteditor_la_SOURCES = 			\
 libecontacteditor_la_LDFLAGS = $(NO_UNDEFINED)
 
 libecontacteditor_la_LIBADD =						\
+	$(top_builddir)/a11y/libevolution-a11y.la			\
 	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/shell/libeshell.la				\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(top_builddir)/addressbook/util/libeabutil.la			\
 	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la	\
 	$(top_builddir)/addressbook/printing/libecontactprint.la	\
 	$(top_builddir)/widgets/menus/libmenus.la			\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index bcd3989..2924420 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -5,7 +5,7 @@ libecontactlisteditor_la_CPPFLAGS =			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/addressbook/			\
-	-I$(top_srcdir)/addressbook/gui/merging		\
+	-I$(top_srcdir)/addressbook/gui/widgets		\
 	-I$(top_srcdir)/addressbook/gui/contact-editor	\
 	-I$(top_builddir)/shell				\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
@@ -22,9 +22,12 @@ libecontactlisteditor_la_SOURCES = 		\
 libecontactlisteditor_la_LDFLAGS = $(NO_UNDEFINED)
 
 libecontactlisteditor_la_LIBADD =				\
+	$(top_builddir)/a11y/libevolution-a11y.la		\
 	$(top_builddir)/addressbook/util/libeabutil.la		\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
+	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
 	$(top_builddir)/widgets/table/libetable.la		\
+	$(top_builddir)/widgets/menus/libmenus.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 546a218..33afb6d 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -1,7 +1,7 @@
 ruledir = $(privdatadir)
 rule_DATA = addresstypes.xml address_formats.dat countrytransl.map
 
-noinst_LTLIBRARIES = libeabwidgets.la
+privsolib_LTLIBRARIES = libeabwidgets.la
 
 libeabwidgets_la_CPPFLAGS =				\
 	$(AM_CPPFLAGS)					\
@@ -14,7 +14,7 @@ libeabwidgets_la_CPPFLAGS =				\
 	-I$(top_srcdir)/filter				\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/addressbook			\
-	-I$(top_srcdir)/addressbook/gui/merging		\
+	-I$(top_srcdir)/addressbook/gui/widgets		\
 	-I$(top_srcdir)/addressbook/util		\
 	-I$(top_srcdir)/widgets/misc			\
 	-I$(top_builddir)/shell				\
@@ -32,6 +32,10 @@ libeabwidgets_la_SOURCES =			\
 	eab-config.c				\
 	eab-contact-display.c			\
 	eab-contact-display.h			\
+	eab-contact-compare.c			\
+	eab-contact-compare.h			\
+	eab-contact-merging.c			\
+	eab-contact-merging.h			\
 	eab-gui-util.c				\
 	eab-gui-util.h				\
 	e-minicard.c				\
@@ -72,6 +76,8 @@ libeabwidgets_la_LIBADD =					\
 	$(top_builddir)/widgets/menus/libmenus.la		\
 	$(top_builddir)/a11y/libevolution-a11y.la		\
 	$(top_builddir)/e-util/libeutil.la			\
+	$(top_builddir)/addressbook/printing/libecontactprint.la \
+	$(top_builddir)/addressbook/util/libeabutil.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(CHAMPLAIN_LIBS)					\
@@ -82,8 +88,13 @@ dist-hook:
 
 etspec_DATA= e-addressbook-view.etspec
 
+ui_DATA = \
+	eab-contact-duplicate-detected.ui	\
+	eab-contact-commit-duplicate-detected.ui
+
 EXTRA_DIST = 			\
 	$(etspec_DATA)		\
-	$(rule_DATA)
+	$(rule_DATA)		\
+	$(ui_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index ce1f832..3d8d22a 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -201,14 +201,18 @@ libevolution_calendar_la_SOURCES = \
 	ea-gnome-calendar.h
 
 libevolution_calendar_la_LIBADD =					\
+	$(top_builddir)/a11y/libevolution-a11y.la			\
 	$(top_builddir)/composer/libcomposer.la				\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
+	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
+	$(top_builddir)/addressbook/util/libeabutil.la			\
 	$(top_builddir)/widgets/menus/libmenus.la			\
 	$(top_builddir)/shell/libeshell.la				\
 	$(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la		\
 	$(top_builddir)/calendar/importers/libevolution-calendar-importers.la \
 	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la	\
+	$(top_builddir)/widgets/menus/libmenus.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(top_builddir)/widgets/table/libetable.la			\
 	$(top_builddir)/filter/libfilter.la				\
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 013d04c..65a82a7 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -57,12 +57,17 @@ libcomposer_la_SOURCES = 			\
 libcomposer_la_LDFLAGS = $(NO_UNDEFINED)
 
 libcomposer_la_LIBADD =					\
+	$(top_builddir)/a11y/libevolution-a11y.la	\
 	$(top_builddir)/e-util/libeutil.la		\
+	$(top_builddir)/widgets/menus/libmenus.la	\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
+	$(top_builddir)/widgets/table/libetable.la	\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/em-format/libemformat.la	\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la		\
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la	\
+	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
+	$(top_builddir)/addressbook/util/libeabutil.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
 	$(GTKHTML_LIBS)
diff --git a/configure.ac b/configure.ac
index 6484b45..aeca41d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1585,7 +1585,6 @@ addressbook/Makefile
 addressbook/gui/Makefile
 addressbook/gui/contact-editor/Makefile
 addressbook/gui/contact-list-editor/Makefile
-addressbook/gui/merging/Makefile
 addressbook/gui/widgets/Makefile
 addressbook/importers/Makefile
 addressbook/printing/Makefile
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 1ddbec6..e2039c8 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -198,6 +198,7 @@ SMIME_LIBS =						\
 endif
 
 libevolution_mail_la_LIBADD =				\
+	$(top_builddir)/a11y/libevolution-a11y.la	\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/composer/libcomposer.la		\
@@ -208,6 +209,8 @@ libevolution_mail_la_LIBADD =				\
 	$(top_builddir)/widgets/menus/libmenus.la	\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
+	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
+	$(top_builddir)/addressbook/util/libeabutil.la	\
 	$(top_builddir)/em-format/libemformat.la	\
 	$(top_builddir)/filter/libfilter.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am
index 5757ac2..c5fa81f 100644
--- a/modules/addressbook/Makefile.am
+++ b/modules/addressbook/Makefile.am
@@ -58,16 +58,16 @@ endif
 
 libevolution_module_addressbook_la_LIBADD =			\
 	$(SMIME_LIB)						\
+	$(top_builddir)/a11y/libevolution-a11y.la		\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/composer/libcomposer.la			\
-	$(top_builddir)/addressbook/printing/libecontactprint.la \
 	$(top_builddir)/shell/libeshell.la			\
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
-	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
 	$(top_builddir)/filter/libfilter.la			\
-	$(top_builddir)/addressbook/util/libeabutil.la		\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
+	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
+	$(top_builddir)/addressbook/printing/libecontactprint.la \
+	$(top_builddir)/addressbook/util/libeabutil.la		\
 	$(top_builddir)/widgets/table/libetable.la		\
 	$(top_builddir)/widgets/text/libetext.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index 4f09f92..d0147d3 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -83,12 +83,15 @@ libevolution_module_calendar_la_SOURCES =		\
 	e-task-shell-view-private.h
 
 libevolution_module_calendar_la_LIBADD =		\
+	$(top_builddir)/a11y/libevolution-a11y.la	\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(top_builddir)/calendar/importers/libevolution-calendar-importers.la	\
 	$(top_builddir)/mail/libevolution-mail.la \
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la	\
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
+	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
+	$(top_builddir)/addressbook/util/libeabutil.la			\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/filter/libfilter.la				\
 	$(top_builddir)/widgets/menus/libmenus.la			\
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index d6b1116..cc8be705 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -24,12 +24,17 @@ liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c
 liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_evolution_attachment_reminder_la_LIBADD =	\
+	$(top_builddir)/a11y/libevolution-a11y.la	\
 	$(top_builddir)/composer/libcomposer.la		\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la	\
+	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
+	$(top_builddir)/addressbook/util/libeabutil.la	\
 	$(top_builddir)/e-util/libeutil.la		\
+	$(top_builddir)/widgets/menus/libmenus.la	\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
+	$(top_builddir)/widgets/table/libetable.la 	\
 	$(top_builddir)/mail/libevolution-mail.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am
index e92d054..cd81239 100644
--- a/plugins/bbdb/Makefile.am
+++ b/plugins/bbdb/Makefile.am
@@ -25,10 +25,17 @@ liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c
 liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_evolution_bbdb_la_LIBADD =		\
+	$(top_builddir)/a11y/libevolution-a11y.la	\
 	$(top_builddir)/e-util/libeutil.la	\
+	$(top_builddir)/shell/libeshell.la	\
 	$(top_builddir)/composer/libcomposer.la	\
+	$(top_builddir)/widgets/menus/libmenus.la	\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
+	$(top_builddir)/widgets/table/libetable.la \
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
+	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
+	$(top_builddir)/addressbook/util/libeabutil.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)		\
 	$(GNOME_PLATFORM_LIBS)			\
 	$(GTKHTML_LIBS)
diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am
index 7f801d7..f0b56c8 100644
--- a/plugins/external-editor/Makefile.am
+++ b/plugins/external-editor/Makefile.am
@@ -37,12 +37,18 @@ liborg_gnome_external_editor_la_SOURCES = 		\
 liborg_gnome_external_editor_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_external_editor_la_LIBADD = 			\
+	$(top_builddir)/a11y/libevolution-a11y.la		\
 	$(top_builddir)/e-util/libeutil.la 			\
 	$(top_builddir)/composer/libcomposer.la 		\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la 		\
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la	\
+	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
+	$(top_builddir)/addressbook/util/libeabutil.la		\
 	$(top_builddir)/mail/libevolution-mail.la		\
+	$(top_builddir)/widgets/menus/libmenus.la		\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
+	$(top_builddir)/widgets/table/libetable.la 		\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(GTKHTML_LIBS)
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am
index 07b747a..4b2e1b6 100644
--- a/plugins/vcard-inline/Makefile.am
+++ b/plugins/vcard-inline/Makefile.am
@@ -24,10 +24,16 @@ liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c
 liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 liborg_gnome_vcard_inline_la_LIBADD =					\
+	$(top_builddir)/a11y/libevolution-a11y.la			\
 	$(top_builddir)/mail/libevolution-mail.la			\
+	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/shell/libeshell.la				\
+	$(top_builddir)/widgets/menus/libmenus.la			\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
+	$(top_builddir)/widgets/table/libetable.la			\
+	$(top_builddir)/addressbook/util/libeabutil.la			\
 	$(top_builddir)/addressbook/util/libeabutil.la			\
 	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la	\
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la	\
 	$(top_builddir)/addressbook/printing/libecontactprint.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)						\
diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c
index cfe461b..7794ef0 100644
--- a/plugins/vcard-inline/vcard-inline.c
+++ b/plugins/vcard-inline/vcard-inline.c
@@ -28,7 +28,7 @@
 #include <libedataserverui/e-client-utils.h>
 #include <libedataserverui/e-source-selector-dialog.h>
 
-#include "addressbook/gui/merging/eab-contact-merging.h"
+#include "addressbook/gui/widgets/eab-contact-merging.h"
 #include "addressbook/gui/widgets/eab-contact-display.h"
 #include "addressbook/util/eab-book-util.h"
 #include "mail/em-format-hook.h"
