[seahorse] Makefile.am: Use a non-recursive Makefile

From: Stefan Walter <stefw src gnome org>
To: commits-list gnome org
Cc:
Subject: [seahorse] Makefile.am: Use a non-recursive Makefile
Date: Mon, 3 Mar 2014 20:09:36 +0000 (UTC)
commit 5807b18a879d2a258c53960aa1345130700c1608
Author: Stef Walter <stefw gnome org>
Date:   Mon Mar 3 11:27:35 2014 +0100

    Makefile.am: Use a non-recursive Makefile
    
    As you can imagine this involved quite a bit of cleanup.
    
    The help/ po/ pixmaps/ data/ directories are still recursive.

 Makefile.am                              |   85 ++++--
 Makefile.decl                            |    9 +-
 build/Makefile.am                        |    4 -
 common/Makefile.am                       |   90 +++---
 common/config.vapi                       |    4 +-
 configure.ac                             |   12 +-
 gkr/Makefile.am                          |   94 +++----
 gkr/gkr-module.vala                      |    2 +-
 libegg/Makefile.am                       |    6 +-
 libseahorse/Makefile.am                  |   93 +++----
 libseahorse/seahorse-application.c       |    1 +
 libseahorse/seahorse-key-manager-store.c |    8 +-
 libseahorse/seahorse-object.c            |    3 +-
 libseahorse/seahorse-predicate.c         |    3 +-
 libseahorse/seahorse-prefs.c             |    7 +-
 libseahorse/seahorse-search-provider.c   |   23 +-
 libseahorse/seahorse-widget.c            |    9 +-
 pgp/Makefile.am                          |  151 ++++------
 pgp/seahorse-combo-keys.c                |    2 +-
 pgp/seahorse-discovery.c                 |    4 +-
 pgp/seahorse-gpg-options.c               |   11 +-
 pgp/seahorse-gpgme-add-subkey.c          |   15 +-
 pgp/seahorse-gpgme-add-uid.c             |   13 +-
 pgp/seahorse-gpgme-expires.c             |   14 +-
 pgp/seahorse-gpgme-exporter.c            |    7 +-
 pgp/seahorse-gpgme-generate.c            |   28 +-
 pgp/seahorse-gpgme-key-op.c              |   31 +-
 pgp/seahorse-gpgme-key.c                 |    7 +-
 pgp/seahorse-gpgme-keyring.c             |    9 +-
 pgp/seahorse-gpgme-photos.c              |   17 +-
 pgp/seahorse-gpgme-revoke.c              |   14 +-
 pgp/seahorse-gpgme-sign.c                |   11 +-
 pgp/seahorse-gpgme-uid.c                 |    2 +-
 pgp/seahorse-gpgme-uid.h                 |    2 +-
 pgp/seahorse-gpgme.c                     |    5 +-
 pgp/seahorse-gpgme.h                     |    2 +-
 pgp/seahorse-hkp-source.c                |   10 +-
 pgp/seahorse-keyserver-results.c         |    9 +-
 pgp/seahorse-keyserver-results.h         |    2 +-
 pgp/seahorse-keyserver-search.c          |   13 +-
 pgp/seahorse-keyserver-sync.c            |   21 +-
 pgp/seahorse-keyserver-sync.h            |    2 +
 pgp/seahorse-ldap-source.c               |   11 +-
 pgp/seahorse-pgp-actions.c               |    7 +-
 pgp/seahorse-pgp-backend.c               |    7 +-
 pgp/seahorse-pgp-key-properties.c        |   24 +-
 pgp/seahorse-pgp-key.c                   |    5 +-
 pgp/seahorse-pgp-key.h                   |    4 +-
 pgp/seahorse-pgp-keysets.c               |   11 +-
 pgp/seahorse-pgp-signature.c             |    2 +-
 pgp/seahorse-pgp-signature.h             |    2 +-
 pgp/seahorse-pgp-subkey.h                |    2 +-
 pgp/seahorse-pgp-uid.c                   |    2 +-
 pgp/seahorse-pgp-uid.h                   |    4 +-
 pgp/seahorse-server-source.c             |   14 +-
 pgp/seahorse-signer.c                    |   21 +-
 pgp/seahorse-transfer.c                  |   12 +-
 pgp/seahorse-unknown-source.c            |    5 +-
 pgp/seahorse-unknown-source.h            |    2 +-
 pgp/seahorse-unknown.h                   |    2 +-
 pkcs11/Makefile.am                       |   97 +++----
 pkcs11/seahorse-certificate.c            |  484 ------------------------------
 pkcs11/seahorse-pkcs11-backend.c         |    9 +-
 pkcs11/seahorse-pkcs11-backend.h         |    2 +-
 pkcs11/seahorse-pkcs11-generate.c        |   11 +-
 src/Makefile.am                          |   63 ++---
 src/seahorse-key-manager.c               |   12 +-
 src/seahorse-main.c                      |   10 +-
 src/seahorse-sidebar.c                   |    5 +-
 ssh/Makefile.am                          |   71 ++---
 ssh/seahorse-ssh-actions.c               |    8 +-
 ssh/seahorse-ssh-askpass.c               |    2 +-
 ssh/seahorse-ssh-exporter.c              |    5 +-
 ssh/seahorse-ssh-generate.c              |    7 +-
 ssh/seahorse-ssh-key-data.c              |    3 +-
 ssh/seahorse-ssh-key-properties.c        |   11 +-
 ssh/seahorse-ssh-key.c                   |    3 +-
 ssh/seahorse-ssh-key.h                   |    4 +-
 ssh/seahorse-ssh-operation.c             |    5 +-
 ssh/seahorse-ssh-source.c                |    5 +-
 ssh/seahorse-ssh-upload.c                |    6 +-
 81 files changed, 634 insertions(+), 1181 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b2c3c2f..8a358a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,34 +1,9 @@
-## Process this file with automake to produce Makefile.in
+include Makefile.decl
 
 ACLOCAL_AMFLAGS = -I build/m4 ${ACLOCAL_FLAGS}
 
-if WITH_PKCS11
-PKCS11_DIR = pkcs11
-else
-PKCS11_DIR = 
-endif
-
-if WITH_SSH
-SSH_DIR = ssh
-else
-SSH_DIR = 
-endif
-
-if WITH_PGP
-PGP_DIR = pgp
-else
-PGP_DIR = 
-endif
-
-SUBDIRS = build \
-       libegg \
-       common \
-       libseahorse \
-       gkr \
-       $(PGP_DIR) \
-       $(PKCS11_DIR) \
-       $(SSH_DIR) \
-       src \
+SUBDIRS = \
+       . \
        po \
        data \
        help
@@ -86,3 +61,57 @@ distuninstallcheck:
 upload-release: $(DIST_ARCHIVES)
        scp $(DIST_ARCHIVES) master.gnome.org:
        ssh master.gnome.org ftpadmin install $(DIST_ARCHIVES)
+
+noinst_LTLIBRARIES =
+bin_PROGRAMS =
+man_MANS =
+
+pkgdatadir = $(datadir)/seahorse
+localedir = $(datadir)/locale
+
+uidir = $(datadir)/seahorse/ui/
+ui_DATA =
+
+seahorselibexecbindir = $(libdir)/seahorse/
+seahorselibexecbin_PROGRAMS =
+
+BUILT_SOURCES =
+CLEANFILES =
+EXTRA_DIST += $(ui_DATA)
+DISTCLEANFILES += $(BUILT_SOURCES)
+
+AM_CPPFLAGS = \
+       -I$(top_builddir) \
+       -I$(top_srcdir) \
+       -I$(top_builddir)/common \
+       -I$(top_srcdir)/common \
+       -DPKGDATADIR=\""$(pkgdatadir)/"\" \
+       -DUIDIR=\""$(uidir)"\" \
+       -DSEAHORSE_UIDIR=\""$(uidir)/"\" \
+       -DLOCALEDIR=\"$(localedir)\" \
+       -DGETTEXT_PACKAGE=\""seahorse\"" \
+       -DEXECDIR=\""$(seahorselibexecbindir)"\" \
+       $(SEAHORSE_CFLAGS) \
+       $(NULL)
+
+V_VALAC = $(V_VALAC_$(V))
+V_VALAC_ = $(V_VALAC_$(AM_DEFAULT_VERBOSITY))
+V_VALAC_0 = @echo "  VALAC   " $@;
+
+include common/Makefile.am
+include libegg/Makefile.am
+include libseahorse/Makefile.am
+include gkr/Makefile.am
+include src/Makefile.am
+
+if WITH_PGP
+include pgp/Makefile.am
+endif
+
+if WITH_SSH
+include ssh/Makefile.am
+endif
+
+if WITH_PKCS11
+include pkcs11/Makefile.am
+endif
diff --git a/Makefile.decl b/Makefile.decl
index ab3bcf9..e086f0d 100644
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -1,12 +1,5 @@
 NULL =
 
-V_ASN1 = $(V_ASN1_$(V))
-V_ASN1_ = $(V_ASN1_$(AM_DEFAULT_VERBOSITY))
-V_ASN1_0 = @echo "  ASN1  " $@;
-
-.asn.asn.h:
-       $(V_ASN1) $(ASN1PARSER) -o $@ $< && sed -i 's|#include.*|/* \0 */|' $@
-
 V_SED = $(V_SED_$(V))
 V_SED_ = $(V_SED_$(AM_DEFAULT_VERBOSITY))
 V_SED_0 = @echo "  SED   " $@;
@@ -34,4 +27,4 @@ SED_SUBST = sed \
 .service.in.service:
        $(V_SED) $(SED_SUBST) $< > $@
 
-SUFFIXES = .asn .asn.h .desktop.in .desktop.in.in .service .service.in
\ No newline at end of file
+SUFFIXES = .desktop.in .desktop.in.in .service .service.in
\ No newline at end of file
diff --git a/common/Makefile.am b/common/Makefile.am
index 38a7a1e..2f94e74 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,63 +1,53 @@
-NULL =
 
-uidir = $(datadir)/seahorse/ui/
+noinst_LTLIBRARIES += libcommon.la
+
+common_VALA = \
+       common/actions.vala \
+       common/backend.vala \
+       common/catalog.vala \
+       common/deletable.vala \
+       common/delete-dialog.vala \
+       common/deleter.vala \
+       common/exportable.vala \
+       common/exporter.vala \
+       common/icons.vala \
+       common/lockable.vala \
+       common/place.vala \
+       common/registry.vala \
+       common/types.vala \
+       common/util.vala \
+       common/viewable.vala \
+       $(NULL)
 
-AM_CPPFLAGS = -I$(top_builddir) \
-       -I$(top_srcdir) \
-       -DPKGDATADIR=\""$(pkgdatadir)/"\" \
-       -DUIDIR=\""$(uidir)"\" \
-       $(SEAHORSE_CFLAGS)
+common_C = $(common_VALA:.vala=.c)
 
-noinst_LTLIBRARIES = libcommon.la
+common_HEADER = common/seahorse-common.h
 
 libcommon_la_SOURCES = \
-       actions.vala \
-       backend.vala \
-       catalog.vala \
-       deletable.vala \
-       delete-dialog.vala \
-       deleter.vala \
-       exportable.vala \
-       exporter.vala \
-       icons.vala \
-       lockable.vala \
-       place.vala \
-       registry.vala \
-       types.vala \
-       util.vala \
-       viewable.vala \
-       $(NULL)
+       $(common_C) \
+       common/seahorse-common.h
 
-AM_VALAFLAGS = \
-       $(VALA_FLAGS) \
-       --use-header \
-       --header=$(abs_builddir)/seahorse-internal.h \
-       --vapidir=$(abs_srcdir) \
-       --pkg gtk+-3.0 \
-       --pkg gcr-3 \
-       --pkg config \
-       --vapi=common.vapi \
-       $(NULL)
+libcommon_la_CFLAGS = \
+       -include config.h -w
 
-all-local: seahorse-common.h
+$(common_HEADER): $(common_VALA)
+       $(V_VALAC) $(VALAC) $(VALA_FLAGS) -C --use-header --header=$(common_HEADER) \
+               --vapidir=$(srcdir)/common --pkg gtk+-3.0 --pkg gcr-3 --pkg config \
+               --vapi=common.vapi --directory=common $^
 
-seahorse-internal.h: backend.c
+$(common_C): $(common_HEADER)
 
-# Because vala produces broken headers
-seahorse-common.h: seahorse-internal.h
-       sed '/_constructv/d' $< > $@
+common/common.vapi: $(common_HEADER)
 
-CFLAGS += \
-       -include config.h -w \
-       $(NULL)
+common_BUILT = \
+       $(common_C) \
+       $(common_HEADER) \
+       common/common.vapi
 
-EXTRA_DIST = \
-       seahorse-common.h \
-       seahorse-internal.h \
-       common.vapi \
-       config.vapi \
-       $(NULL)
+BUILT_SOURCES += $(common_BUILT)
 
-DISTCLEANFILES = \
-       common.vapi \
+EXTRA_DIST += \
+       $(common_BUILT) \
+       $(common_VALA) \
+       common/config.vapi \
        $(NULL)
diff --git a/common/config.vapi b/common/config.vapi
index 98e8474..4de8348 100644
--- a/common/config.vapi
+++ b/common/config.vapi
@@ -15,7 +15,6 @@ namespace Config
  * listing stuff here. Otherwise things will get unmanageable.
  */
 
-[CCode (cheader_filename = "libseahorse/seahorse-util.h")]
 namespace Seahorse {
 
 [CCode (cheader_filename = "libseahorse/seahorse-prefs.h")]
@@ -29,7 +28,10 @@ namespace Application {
        public unowned Gtk.Application @get();
 }
 
+[CCode (cheader_filename = "libseahorse/seahorse-util.h")]
 public static GLib.HashFunc<ulong?> ulong_hash;
+
+[CCode (cheader_filename = "libseahorse/seahorse-util.h")]
 public static GLib.EqualFunc<ulong?> ulong_equal;
 
 [CCode (cheader_filename = "libseahorse/seahorse-interaction.h")]
diff --git a/configure.ac b/configure.ac
index 771857c..4dd216e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -476,7 +476,7 @@ if test "$GCC" = "yes"; then
        -Wall \
        -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
        -Wnested-externs -Wpointer-arith \
-       -Wcast-align -Wsign-compare \
+       -Wcast-align -Wsign-compare -Wno-deprecated-declarations \
        $CFLAGS"
 
        for option in -Wno-strict-aliasing -Wno-sign-compare; do
@@ -554,19 +554,11 @@ AC_SUBST(VALA_FLAGS)
 
 AC_OUTPUT([
 Makefile
-build/Makefile
-common/Makefile
-gkr/Makefile
-libegg/Makefile
-libseahorse/Makefile
-pgp/Makefile
 po/Makefile.in
 help/Makefile
 data/Makefile
 data/icons/Makefile
-pkcs11/Makefile
-src/Makefile
-ssh/Makefile
+src/seahorse.desktop.in
 ])
 
 echo "
diff --git a/gkr/Makefile.am b/gkr/Makefile.am
index 488b811..0d45432 100644
--- a/gkr/Makefile.am
+++ b/gkr/Makefile.am
@@ -1,65 +1,51 @@
 
-pkgdatadir = $(datadir)/seahorse
-uidir = $(pkgdatadir)/ui
-localedir = $(datadir)/locale
-seahorselibexecbindir = $(libdir)/seahorse/
-
-AM_CPPFLAGS = -I$(top_builddir) \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/common \
-       -I$(top_builddir)/common \
-       -I$(top_srcdir)/libseahorse \
-       $(SEAHORSE_CFLAGS) \
-       -DSEAHORSE_UIDIR=\""$(uidir)/"\" \
-       -DUIDIR=\""$(uidir)/"\" \
-       -DLOCALEDIR=\"$(localedir)\" \
-       -DEXECDIR=\""$(seahorselibexecbindir)"\" \
-       -DGETTEXT_PACKAGE=\""seahorse\"" \
-       -DSECRET_API_SUBJECT_TO_CHANGE
-
-noinst_LTLIBRARIES = \
+noinst_LTLIBRARIES += \
        libseahorse-gkr.la
 
-AM_VALAFLAGS = \
-       $(VALA_FLAGS) \
-       --use-header \
-       --header=seahorse-gkr.h \
-       --vapidir $(top_builddir)/common \
-       --pkg common \
-       --pkg config \
-       --pkg gtk+-3.0 \
-       --pkg gcr-3 \
-       --pkg gcr-ui-3 \
-       --pkg libsecret-1 \
+gkr_VALA = \
+       gkr/gkr-backend.vala \
+       gkr/gkr-dialogs.vala \
+       gkr/gkr-module.vala \
+       gkr/gkr-item.vala \
+       gkr/gkr-item-add.vala \
+       gkr/gkr-item-properties.vala \
+       gkr/gkr-keyring.vala \
+       gkr/gkr-keyring-add.vala \
+       gkr/gkr-keyring-properties.vala \
        $(NULL)
 
-libseahorse_gkr_la_CFLAGS = \
-       -include config.h -w
+gkr_HEADER = gkr/seahorse-gkr.h
+
+gkr_C = $(gkr_VALA:.vala=.c)
 
 libseahorse_gkr_la_SOURCES = \
-       gkr-backend.vala \
-       gkr-dialogs.vala \
-       gkr-module.vala \
-       gkr-item.vala \
-       gkr-item-add.vala \
-       gkr-item-properties.vala \
-       gkr-keyring.vala \
-       gkr-keyring-add.vala \
-       gkr-keyring-properties.vala \
-       $(NULL)
+       $(gkr_C) $(gkr_HEADER)
 
-libseahorse_gkr_la_LIBADD = \
-       $(top_builddir)/common/libcommon.la \
-       $(top_builddir)/libseahorse/libseahorse.la \
-       $(NULL)
+libseahorse_gkr_la_CFLAGS = \
+       -include config.h -w \
+       -DSECRET_API_SUBJECT_TO_CHANGE
+
+$(gkr_HEADER): $(gkr_VALA)
+       $(V_VALAC) $(VALAC) $(VALA_FLAGS) -C --use-header --header=$(gkr_HEADER) \
+               --vapidir=$(builddir)/common --vapidir=$(srcdir)/common \
+               --pkg common --pkg config --pkg gtk+-3.0 --pkg gcr-3 --pkg gcr-ui-3 --pkg libsecret-1 \
+               --directory=gkr $^
 
-ui_DATA = \
-       seahorse-add-keyring.xml \
-       seahorse-gkr-add-item.xml \
-       seahorse-gkr-item-properties.xml \
-       seahorse-gkr-keyring.xml
+$(gkr_C): $(gkr_HEADER)
 
-EXTRA_DIST = \
-       $(ui_DATA) \
-       seahorse-gkr.h \
+gkr_BUILT = \
+       $(gkr_C) \
+       $(gkr_HEADER)
+
+BUILT_SOURCES += $(gkr_BUILT)
+
+EXTRA_DIST += \
+       $(gkr_BUILT) \
+       $(gkr_VALA) \
        $(NULL)
+
+ui_DATA += \
+       gkr/seahorse-add-keyring.xml \
+       gkr/seahorse-gkr-add-item.xml \
+       gkr/seahorse-gkr-item-properties.xml \
+       gkr/seahorse-gkr-keyring.xml
diff --git a/gkr/gkr-module.vala b/gkr/gkr-module.vala
index eb0ce23..1cd9b69 100644
--- a/gkr/gkr-module.vala
+++ b/gkr/gkr-module.vala
@@ -24,4 +24,4 @@ namespace Gkr {
 public const string NAME = "gkr";
 
 }
-}
\ No newline at end of file
+}
diff --git a/libegg/Makefile.am b/libegg/Makefile.am
index fe3379a..0ac35b1 100644
--- a/libegg/Makefile.am
+++ b/libegg/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = \
+noinst_LTLIBRARIES += \
        libeggdatetime.la \
        libeggtreemultidnd.la
 
@@ -8,7 +8,7 @@ libeggdatetime_la_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \
 
 libeggdatetime_la_LIBADD = $(GTK_LIBS)
 libeggdatetime_la_CFLAGS = $(GTK_CFLAGS)
-libeggdatetime_la_SOURCES = egg-datetime.h egg-datetime.c
+libeggdatetime_la_SOURCES = libegg/egg-datetime.h libegg/egg-datetime.c
 
 libeggtreemultidnd_la_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \
                                 -DGDK_DISABLE_DEPRECATED \
@@ -16,4 +16,4 @@ libeggtreemultidnd_la_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \
 
 libeggtreemultidnd_la_LIBADD = $(GTK_LIBS)
 libeggtreemultidnd_la_CFLAGS = $(GTK_CFLAGS)
-libeggtreemultidnd_la_SOURCES = eggtreemultidnd.c eggtreemultidnd.h
+libeggtreemultidnd_la_SOURCES = libegg/eggtreemultidnd.c libegg/eggtreemultidnd.h
diff --git a/libseahorse/Makefile.am b/libseahorse/Makefile.am
index 927e0c9..bd02e70 100644
--- a/libseahorse/Makefile.am
+++ b/libseahorse/Makefile.am
@@ -1,89 +1,72 @@
 
-uidir = $(datadir)/seahorse/ui/
-localedir = $(datadir)/locale
-seahorselibexecbindir = $(libdir)/seahorse/
-
-AM_CPPFLAGS = -I$(top_builddir) \
-       -I$(top_srcdir) \
-       -I$(top_builddir) \
-       -I$(top_srcdir)/common \
-       -I$(top_builddir)/common \
-       -I$(top_srcdir)/libegg \
-       $(SEAHORSE_CFLAGS) \
-       -DPKGDATADIR=\""$(pkgdatadir)/"\" \
-       -DDATA_DIR=\""$(datadir)"\" \
-       -DSEAHORSE_UIDIR=\""$(uidir)"\" \
-       -DLOCALEDIR=\"$(localedir)\" \
-       -DEXECDIR=\""$(seahorselibexecbindir)"\"
-
 dbus_shell_search_provider_built_sources =     \
        seahorse-shell-search-provider-generated.c      \
        seahorse-shell-search-provider-generated.h
 
 # The upstream for the DBus interface definition is
 # at http://git.gnome.org/browse/gnome-shell/plain/data/org.gnome.ShellSearchProvider2.xml
-$(dbus_shell_search_provider_built_sources) : Makefile.am $(srcdir)/org.gnome.ShellSearchProvider2.xml
-       gdbus-codegen                                                           \
+$(dbus_shell_search_provider_built_sources) : Makefile.am 
$(srcdir)/libseahorse/org.gnome.ShellSearchProvider2.xml
+       $(AM_V_GEN) gdbus-codegen \
                --interface-prefix org.gnome.                                   \
                --c-namespace Seahorse                                          \
                --generate-c-code seahorse-shell-search-provider-generated      \
-               $(srcdir)/org.gnome.ShellSearchProvider2.xml
+               $(srcdir)/libseahorse/org.gnome.ShellSearchProvider2.xml
 
 MARSHAL_SRCS = \
        seahorse-marshal.c seahorse-marshal.h
 
-BUILT_SOURCES = \
+BUILT_SOURCES += \
        $(dbus_shell_search_provider_built_sources) \
        $(MARSHAL_SRCS)
 
-noinst_LTLIBRARIES = libseahorse.la
+noinst_LTLIBRARIES += libseahorse.la
 
 if WITH_KEYSERVER
-KEYSERVER_SRCS = seahorse-keyserver-control.c seahorse-keyserver-control.h
+KEYSERVER_SRCS = libseahorse/seahorse-keyserver-control.c libseahorse/seahorse-keyserver-control.h
 else
 KEYSERVER_SRCS = 
 endif
 
 libseahorse_la_SOURCES = \
-       seahorse-application.c seahorse-application.h \
-       seahorse-bind.c seahorse-bind.h \
-       seahorse-collection.c seahorse-collection.h \
-       seahorse-debug.c seahorse-debug.h \
-       seahorse-interaction.c seahorse-interaction.h \
-       seahorse-key-manager-store.c seahorse-key-manager-store.h \
-       seahorse-object.c seahorse-object.h \
-       seahorse-object-list.c seahorse-object-list.h \
-       seahorse-object-model.c seahorse-object-model.h \
-       seahorse-object-widget.c seahorse-object-widget.h \
-       seahorse-passphrase.c seahorse-passphrase.h \
-       seahorse-predicate.c seahorse-predicate.h \
-       seahorse-prefs.c seahorse-prefs.h \
-       seahorse-progress.c seahorse-progress.h \
-       seahorse-search-provider.c seahorse-search-provider.h \
-       seahorse-servers.c seahorse-servers.h \
-       seahorse-util.c seahorse-util.h \
-       seahorse-validity.c seahorse-validity.h \
-       seahorse-widget.c seahorse-widget.h \
+       libseahorse/seahorse-application.c libseahorse/seahorse-application.h \
+       libseahorse/seahorse-bind.c libseahorse/seahorse-bind.h \
+       libseahorse/seahorse-collection.c libseahorse/seahorse-collection.h \
+       libseahorse/seahorse-debug.c libseahorse/seahorse-debug.h \
+       libseahorse/seahorse-interaction.c libseahorse/seahorse-interaction.h \
+       libseahorse/seahorse-key-manager-store.c libseahorse/seahorse-key-manager-store.h \
+       libseahorse/seahorse-object.c libseahorse/seahorse-object.h \
+       libseahorse/seahorse-object-list.c libseahorse/seahorse-object-list.h \
+       libseahorse/seahorse-object-model.c libseahorse/seahorse-object-model.h \
+       libseahorse/seahorse-object-widget.c libseahorse/seahorse-object-widget.h \
+       libseahorse/seahorse-passphrase.c libseahorse/seahorse-passphrase.h \
+       libseahorse/seahorse-predicate.c libseahorse/seahorse-predicate.h \
+       libseahorse/seahorse-prefs.c libseahorse/seahorse-prefs.h \
+       libseahorse/seahorse-progress.c libseahorse/seahorse-progress.h \
+       libseahorse/seahorse-search-provider.c libseahorse/seahorse-search-provider.h \
+       libseahorse/seahorse-servers.c libseahorse/seahorse-servers.h \
+       libseahorse/seahorse-util.c libseahorse/seahorse-util.h \
+       libseahorse/seahorse-validity.c libseahorse/seahorse-validity.h \
+       libseahorse/seahorse-widget.c libseahorse/seahorse-widget.h \
        $(dbus_shell_search_provider_built_sources) \
        $(MARSHAL_SRCS) \
        $(KEYSERVER_SRCS)
 
 libseahorse_la_LIBADD = \
-       $(top_builddir)/common/libcommon.la
+       libcommon.la
 
-seahorse-marshal.h: seahorse-marshal.list $(GLIB_GENMARSHAL)
-       $(GLIB_GENMARSHAL) $< --header --prefix=seahorse_marshal > $@
+seahorse-marshal.h: libseahorse/seahorse-marshal.list $(GLIB_GENMARSHAL)
+       $(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=seahorse_marshal > $@
 
-seahorse-marshal.c: seahorse-marshal.list $(GLIB_GENMARSHAL)
-       echo "#include \"seahorse-marshal.h\"" > $@ && \
+seahorse-marshal.c: libseahorse/seahorse-marshal.list $(GLIB_GENMARSHAL)
+       $(AM_V_GEN) echo "#include \"seahorse-marshal.h\"" > $@ && \
        $(GLIB_GENMARSHAL) $< --body --prefix=seahorse_marshal >> $@
 
-ui_DATA = \
-       seahorse-prefs.xml \
-       seahorse-add-keyserver.xml \
-       seahorse-progress.xml \
-       seahorse.css
+ui_DATA += \
+       libseahorse/seahorse-prefs.xml \
+       libseahorse/seahorse-add-keyserver.xml \
+       libseahorse/seahorse-progress.xml \
+       libseahorse/seahorse.css
 
-EXTRA_DIST = $(ui_DATA) \
-       seahorse-marshal.list \
-       org.gnome.ShellSearchProvider2.xml
+EXTRA_DIST += \
+       libseahorse/seahorse-marshal.list \
+       libseahorse/org.gnome.ShellSearchProvider2.xml
diff --git a/libseahorse/seahorse-application.c b/libseahorse/seahorse-application.c
index 1204bfe..0c86bb4 100644
--- a/libseahorse/seahorse-application.c
+++ b/libseahorse/seahorse-application.c
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include "seahorse-application.h"
+
 #include "seahorse-common.h"
 
 #include "pgp/seahorse-pgp.h"
diff --git a/libseahorse/seahorse-key-manager-store.c b/libseahorse/seahorse-key-manager-store.c
index 3d93872..7cdff11 100644
--- a/libseahorse/seahorse-key-manager-store.c
+++ b/libseahorse/seahorse-key-manager-store.c
@@ -21,12 +21,12 @@
 
 #include "config.h"
 
-#include "seahorse-common.h"
-#include "seahorse-util.h"
-
 #include "seahorse-key-manager-store.h"
 #include "seahorse-prefs.h"
 #include "seahorse-validity.h"
+#include "seahorse-util.h"
+
+#include "seahorse-common.h"
 
 #include <string.h>
 #include <unistd.h>
@@ -37,7 +37,7 @@
 #define DEBUG_FLAG SEAHORSE_DEBUG_DRAG
 #include "seahorse-debug.h"
 
-#include "eggtreemultidnd.h"
+#include "libegg/eggtreemultidnd.h"
 
 #define KEY_MANAGER_SORT_KEY "/apps/seahorse/listing/sort_by"
 
diff --git a/libseahorse/seahorse-object.c b/libseahorse/seahorse-object.c
index b99de79..219cd73 100644
--- a/libseahorse/seahorse-object.c
+++ b/libseahorse/seahorse-object.c
@@ -21,10 +21,11 @@
 
 #include "config.h"
 
-#include "seahorse-common.h"
 #include "seahorse-object.h"
 #include "seahorse-predicate.h"
 
+#include "seahorse-common.h"
+
 #include "string.h"
 
 #include <glib/gi18n.h>
diff --git a/libseahorse/seahorse-predicate.c b/libseahorse/seahorse-predicate.c
index 6687c18..76684fe 100644
--- a/libseahorse/seahorse-predicate.c
+++ b/libseahorse/seahorse-predicate.c
@@ -21,10 +21,11 @@
 
 #include "config.h"
 
-#include "seahorse-common.h"
 #include "seahorse-object.h"
 #include "seahorse-predicate.h"
 
+#include "seahorse-common.h"
+
 #include "string.h"
 
 #include <glib/gi18n.h>
diff --git a/libseahorse/seahorse-prefs.c b/libseahorse/seahorse-prefs.c
index fe1948d..b6f94c6 100644
--- a/libseahorse/seahorse-prefs.c
+++ b/libseahorse/seahorse-prefs.c
@@ -18,16 +18,17 @@
  */
 #include "config.h"
 
-#include <glib/gi18n.h>
-
 #include "seahorse-application.h"
-#include "seahorse-common.h"
 #include "seahorse-keyserver-control.h"
 #include "seahorse-prefs.h"
 #include "seahorse-servers.h"
 #include "seahorse-util.h"
 #include "seahorse-widget.h"
 
+#include "seahorse-common.h"
+
+#include <glib/gi18n.h>
+
 G_MODULE_EXPORT
 void           on_prefs_keyserver_add_clicked           (GtkButton *button,
                                                          gpointer user_data);
diff --git a/libseahorse/seahorse-search-provider.c b/libseahorse/seahorse-search-provider.c
index b79922c..7133314 100644
--- a/libseahorse/seahorse-search-provider.c
+++ b/libseahorse/seahorse-search-provider.c
@@ -17,22 +17,25 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <string.h>
-
-#include <gcr/gcr.h>
-#define SECRET_API_SUBJECT_TO_CHANGE
-#include <libsecret/secret.h>
+#include "seahorse-search-provider.h"
 
+#include "seahorse-collection.h"
 #include "seahorse-predicate.h"
-#include "seahorse-common.h"
 #include "seahorse-widget.h"
-#include "seahorse-collection.h"
+#include "seahorse-shell-search-provider-generated.h"
+
+#include "seahorse-common.h"
+
 #include "src/seahorse-key-manager.h"
 
-#include "seahorse-shell-search-provider-generated.h"
-#include "seahorse-search-provider.h"
+#include <gcr/gcr.h>
+
+#define SECRET_API_SUBJECT_TO_CHANGE
+#include <libsecret/secret.h>
+
+#include <string.h>
 
 struct _SeahorseSearchProvider {
        SeahorseShellSearchProvider2Skeleton parent;
diff --git a/libseahorse/seahorse-widget.c b/libseahorse/seahorse-widget.c
index 174eca8..963dfd2 100644
--- a/libseahorse/seahorse-widget.c
+++ b/libseahorse/seahorse-widget.c
@@ -18,14 +18,15 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <string.h>
+#include "seahorse-widget.h"
+
+#include "seahorse-common.h"
 
 #include <glib/gi18n.h>
 
-#include "seahorse-common.h"
-#include "seahorse-widget.h"
+#include <string.h>
 
 /**
  * SECTION:seahorse-widget
diff --git a/pgp/Makefile.am b/pgp/Makefile.am
index 220a7a4..033f53c 100644
--- a/pgp/Makefile.am
+++ b/pgp/Makefile.am
@@ -1,110 +1,89 @@
 
-uidir = $(datadir)/seahorse/ui/
-localedir = $(datadir)/locale
-seahorselibexecbindir = $(libdir)/seahorse/
-
-AM_CPPFLAGS = -I$(top_builddir) \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/libegg \
-       -I$(top_srcdir)/common \
-       -I$(top_builddir)/common \
-       -I$(top_srcdir)/libseahorse \
-       $(SEAHORSE_CFLAGS) \
-       -DSEAHORSE_UIDIR=\""$(uidir)"\" \
-       -DLOCALEDIR=\"$(localedir)\" \
-       -DEXECDIR=\""$(seahorselibexecbindir)"\" \
-       -DLDAP_DEPRECATED \
-       -DGETTEXT_PACKAGE=\""seahorse\""
-
-noinst_LTLIBRARIES = libseahorse-pgp.la
+noinst_LTLIBRARIES += libseahorse-pgp.la
 
 if WITH_LDAP
-LDAP_SRCS = seahorse-ldap-source.c seahorse-ldap-source.h
+LDAP_SRCS = pgp/seahorse-ldap-source.c pgp/seahorse-ldap-source.h
 else
 LDAP_SRCS = 
 endif
 
 if WITH_HKP
-HKP_SRCS = seahorse-hkp-source.c seahorse-hkp-source.h
+HKP_SRCS = pgp/seahorse-hkp-source.c pgp/seahorse-hkp-source.h
 else
 HKP_SRCS =
 endif
 
 if WITH_KEYSERVER
-KEYSERVER_SRCS = seahorse-server-source.c seahorse-server-source.h 
-KEYSERVER_SRCS += seahorse-keyserver-search.c seahorse-keyserver-search.h
-KEYSERVER_SRCS += seahorse-keyserver-sync.c seahorse-keyserver-sync.h
-KEYSERVER_SRCS += seahorse-keyserver-results.c seahorse-keyserver-results.h
-else
-KEYSERVER_SRCS = 
+pgp_KEYSERVER_SRCS = pgp/seahorse-server-source.c pgp/seahorse-server-source.h
+pgp_KEYSERVER_SRCS += pgp/seahorse-keyserver-search.c pgp/seahorse-keyserver-search.h
+pgp_KEYSERVER_SRCS += pgp/seahorse-keyserver-sync.c pgp/seahorse-keyserver-sync.h
+pgp_KEYSERVER_SRCS += pgp/seahorse-keyserver-results.c pgp/seahorse-keyserver-results.h
 endif
 
 libseahorse_pgp_la_SOURCES = \
-       seahorse-combo-keys.c seahorse-combo-keys.h \
-       seahorse-discovery.c seahorse-discovery.h \
-       seahorse-gpgme.c seahorse-gpgme.h \
-       seahorse-gpgme-add-subkey.c \
-       seahorse-gpgme-add-uid.c \
-       seahorse-gpgme-dialogs.h \
-       seahorse-gpgme-data.c seahorse-gpgme-data.h \
-       seahorse-gpgme-expires.c \
-       seahorse-gpgme-exporter.c seahorse-gpgme-exporter.h \
-       seahorse-gpgme-generate.c \
-       seahorse-gpgme-key.c seahorse-gpgme-key.h \
-       seahorse-gpgme-key-deleter.c seahorse-gpgme-key-deleter.h \
-       seahorse-gpgme-key-op.c seahorse-gpgme-key-op.h \
-       seahorse-gpgme-keyring.c seahorse-gpgme-keyring.h \
-       seahorse-gpgme-photo.c seahorse-gpgme-photo.h \
-       seahorse-gpgme-photos.c \
-       seahorse-gpgme-revoke.c \
-       seahorse-gpgme-secret-deleter.c seahorse-gpgme-secret-deleter.h \
-       seahorse-gpgme-sign.c \
-       seahorse-gpgme-subkey.c seahorse-gpgme-subkey.h \
-       seahorse-gpgme-uid.c seahorse-gpgme-uid.h \
-       seahorse-gpg-op.h seahorse-gpg-op.c \
-       seahorse-gpg-options.c seahorse-gpg-options.h \
-       seahorse-pgp.c seahorse-pgp.h \
-       seahorse-pgp-actions.c seahorse-pgp-actions.h \
-       seahorse-pgp-backend.c seahorse-pgp-backend.h \
-       seahorse-pgp-key.c seahorse-pgp-key.h \
-       seahorse-pgp-key-properties.c \
-       seahorse-pgp-keysets.c seahorse-pgp-keysets.h \
-       seahorse-pgp-photo.c seahorse-pgp-photo.h \
-       seahorse-pgp-signature.c seahorse-pgp-signature.h \
-       seahorse-pgp-subkey.c seahorse-pgp-subkey.h \
-       seahorse-pgp-uid.c seahorse-pgp-uid.h \
-       seahorse-signer.c seahorse-pgp-dialogs.h \
-       seahorse-transfer.c seahorse-transfer.h \
-       seahorse-unknown.c seahorse-unknown.h \
-       seahorse-unknown-source.c seahorse-unknown-source.h \
-       $(VALA_CFILES) $(VALA_HFILES) \
-       $(KEYSERVER_SRCS) \
+       pgp/seahorse-combo-keys.c pgp/seahorse-combo-keys.h \
+       pgp/seahorse-discovery.c pgp/seahorse-discovery.h \
+       pgp/seahorse-gpgme.c pgp/seahorse-gpgme.h \
+       pgp/seahorse-gpgme-add-subkey.c \
+       pgp/seahorse-gpgme-add-uid.c \
+       pgp/seahorse-gpgme-dialogs.h \
+       pgp/seahorse-gpgme-data.c pgp/seahorse-gpgme-data.h \
+       pgp/seahorse-gpgme-expires.c \
+       pgp/seahorse-gpgme-exporter.c pgp/seahorse-gpgme-exporter.h \
+       pgp/seahorse-gpgme-generate.c \
+       pgp/seahorse-gpgme-key.c pgp/seahorse-gpgme-key.h \
+       pgp/seahorse-gpgme-key-deleter.c pgp/seahorse-gpgme-key-deleter.h \
+       pgp/seahorse-gpgme-key-op.c pgp/seahorse-gpgme-key-op.h \
+       pgp/seahorse-gpgme-keyring.c pgp/seahorse-gpgme-keyring.h \
+       pgp/seahorse-gpgme-photo.c pgp/seahorse-gpgme-photo.h \
+       pgp/seahorse-gpgme-photos.c \
+       pgp/seahorse-gpgme-revoke.c \
+       pgp/seahorse-gpgme-secret-deleter.c pgp/seahorse-gpgme-secret-deleter.h \
+       pgp/seahorse-gpgme-sign.c \
+       pgp/seahorse-gpgme-subkey.c pgp/seahorse-gpgme-subkey.h \
+       pgp/seahorse-gpgme-uid.c pgp/seahorse-gpgme-uid.h \
+       pgp/seahorse-gpg-op.h pgp/seahorse-gpg-op.c \
+       pgp/seahorse-gpg-options.c pgp/seahorse-gpg-options.h \
+       pgp/seahorse-pgp.c pgp/seahorse-pgp.h \
+       pgp/seahorse-pgp-actions.c pgp/seahorse-pgp-actions.h \
+       pgp/seahorse-pgp-backend.c pgp/seahorse-pgp-backend.h \
+       pgp/seahorse-pgp-key.c pgp/seahorse-pgp-key.h \
+       pgp/seahorse-pgp-key-properties.c \
+       pgp/seahorse-pgp-keysets.c pgp/seahorse-pgp-keysets.h \
+       pgp/seahorse-pgp-photo.c pgp/seahorse-pgp-photo.h \
+       pgp/seahorse-pgp-signature.c pgp/seahorse-pgp-signature.h \
+       pgp/seahorse-pgp-subkey.c pgp/seahorse-pgp-subkey.h \
+       pgp/seahorse-pgp-uid.c pgp/seahorse-pgp-uid.h \
+       pgp/seahorse-signer.c pgp/seahorse-pgp-dialogs.h \
+       pgp/seahorse-transfer.c pgp/seahorse-transfer.h \
+       pgp/seahorse-unknown.c pgp/seahorse-unknown.h \
+       pgp/seahorse-unknown-source.c pgp/seahorse-unknown-source.h \
+       $(pgp_KEYSERVER_SRCS) \
        $(LDAP_SRCS) \
        $(HKP_SRCS)
 
 libseahorse_pgp_la_LIBADD = \
-       $(top_builddir)/common/libcommon.la \
-       $(top_builddir)/libseahorse/libseahorse.la
-
-seahorselibexecbin_PROGRAMS = xloadimage
+       libcommon.la \
+       libseahorse.la
 
-xloadimage_SOURCES = seahorse-xloadimage.c
+libseahorse_pgp_la_CFLAGS = \
+       -DLDAP_DEPRECATED
 
-ui_DATA = \
-       seahorse-add-subkey.xml \
-       seahorse-add-uid.xml \
-       seahorse-expires.xml \
-       seahorse-keyserver-search.xml \
-       seahorse-keyserver-results.ui \
-       seahorse-keyserver-results.xml \
-       seahorse-keyserver-sync.xml \
-       seahorse-pgp-public-key-properties.xml \
-       seahorse-pgp-private-key-properties.xml \
-       seahorse-pgp-generate.xml \
-       seahorse-revoke.xml \
-       seahorse-sign.xml \
-       seahorse-signer.xml
+seahorselibexecbin_PROGRAMS += xloadimage
 
-EXTRA_DIST = \
-       $(ui_DATA)
+xloadimage_SOURCES = pgp/seahorse-xloadimage.c
 
+ui_DATA += \
+       pgp/seahorse-add-subkey.xml \
+       pgp/seahorse-add-uid.xml \
+       pgp/seahorse-expires.xml \
+       pgp/seahorse-keyserver-search.xml \
+       pgp/seahorse-keyserver-results.ui \
+       pgp/seahorse-keyserver-results.xml \
+       pgp/seahorse-keyserver-sync.xml \
+       pgp/seahorse-pgp-public-key-properties.xml \
+       pgp/seahorse-pgp-private-key-properties.xml \
+       pgp/seahorse-pgp-generate.xml \
+       pgp/seahorse-revoke.xml \
+       pgp/seahorse-sign.xml \
+       pgp/seahorse-signer.xml
diff --git a/pgp/seahorse-combo-keys.c b/pgp/seahorse-combo-keys.c
index 9e569ef..66c28b8 100644
--- a/pgp/seahorse-combo-keys.c
+++ b/pgp/seahorse-combo-keys.c
@@ -21,7 +21,7 @@
 
 #include "seahorse-combo-keys.h"
 
-#include "seahorse-object.h"
+#include "libseahorse/seahorse-object.h"
 
 enum {
   COMBO_LABEL,
diff --git a/pgp/seahorse-discovery.c b/pgp/seahorse-discovery.c
index 90dcbdf..ea30334 100644
--- a/pgp/seahorse-discovery.c
+++ b/pgp/seahorse-discovery.c
@@ -31,10 +31,10 @@
 #include <avahi-glib/glib-malloc.h>
 #endif /* WITH_SHARING */
 
-#include "seahorse-util.h"
+#include "libseahorse/seahorse-util.h"
 
 #define DEBUG_FLAG SEAHORSE_DEBUG_DNSSD
-#include "seahorse-debug.h"
+#include "libseahorse/seahorse-debug.h"
 
 #define HKP_SERVICE_TYPE "_pgpkey-hkp._tcp."
 
diff --git a/pgp/seahorse-gpg-options.c b/pgp/seahorse-gpg-options.c
index 05e0910..a5ade38 100644
--- a/pgp/seahorse-gpg-options.c
+++ b/pgp/seahorse-gpg-options.c
@@ -19,6 +19,12 @@
 
 #include "config.h"
 
+#include "seahorse-gpg-options.h"
+
+#include "seahorse-gpgme.h"
+
+#include "libseahorse/seahorse-util.h"
+
 #include <sys/param.h>
 #include <sys/wait.h>
 #include <sys/file.h>
@@ -31,11 +37,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "seahorse-util.h"
-
-#include "pgp/seahorse-gpgme.h"
-#include "pgp/seahorse-gpg-options.h"
-
 #define  GPG_CONF_HEADER    "# FILE CREATED BY SEAHORSE\n\n"
 #define  GPG_VERSION_PREFIX1   "1."
 #define  GPG_VERSION_PREFIX2   "2."
diff --git a/pgp/seahorse-gpgme-add-subkey.c b/pgp/seahorse-gpgme-add-subkey.c
index 75223b2..3103255 100644
--- a/pgp/seahorse-gpgme-add-subkey.c
+++ b/pgp/seahorse-gpgme-add-subkey.c
@@ -19,15 +19,16 @@
 
 #include "config.h" 
 
-#include <glib/gi18n.h>
-
-#include "egg-datetime.h"
- 
-#include "seahorse-object-widget.h"
-#include "seahorse-util.h"
+#include "seahorse-gpgme-key-op.h"
 
 #include "seahorse-gpgme-dialogs.h"
-#include "seahorse-gpgme-key-op.h"
+
+#include "libseahorse/seahorse-object-widget.h"
+#include "libseahorse/seahorse-util.h"
+
+#include "libegg/egg-datetime.h"
+
+#include <glib/gi18n.h>
 
 #define LENGTH "length"
 
diff --git a/pgp/seahorse-gpgme-add-uid.c b/pgp/seahorse-gpgme-add-uid.c
index b0434bd..af8f9e2 100644
--- a/pgp/seahorse-gpgme-add-uid.c
+++ b/pgp/seahorse-gpgme-add-uid.c
@@ -19,15 +19,16 @@
 
 #include "config.h" 
 
-#include <string.h>
+#include "seahorse-gpgme-key-op.h"
+
+#include "seahorse-gpgme-dialogs.h"
+
+#include "libseahorse/seahorse-object-widget.h"
+#include "libseahorse/seahorse-util.h"
 
 #include <glib/gi18n.h>
- 
-#include "seahorse-object-widget.h"
-#include "seahorse-util.h"
 
-#include "seahorse-gpgme-dialogs.h"
-#include "seahorse-gpgme-key-op.h"
+#include <string.h>
 
 #define NAME "name"
 #define EMAIL "email"
diff --git a/pgp/seahorse-gpgme-expires.c b/pgp/seahorse-gpgme-expires.c
index fb6432f..4d432b1 100644
--- a/pgp/seahorse-gpgme-expires.c
+++ b/pgp/seahorse-gpgme-expires.c
@@ -19,17 +19,17 @@
  
 #include "config.h"
 
-#include <string.h>
-
-#include <glib/gi18n.h>
- 
-#include "seahorse-object-widget.h"
-#include "seahorse-util.h"
-
 #include "seahorse-gpgme-dialogs.h"
 #include "seahorse-gpgme-key-op.h"
 #include "seahorse-gpgme-subkey.h"
 
+#include "libseahorse/seahorse-object-widget.h"
+#include "libseahorse/seahorse-util.h"
+
+#include <glib/gi18n.h>
+
+#include <string.h>
+
 void              on_gpgme_expire_ok_clicked             (GtkButton *button,
                                                           gpointer user_data);
 
diff --git a/pgp/seahorse-gpgme-exporter.c b/pgp/seahorse-gpgme-exporter.c
index 0b9a3dc..3e7819f 100644
--- a/pgp/seahorse-gpgme-exporter.c
+++ b/pgp/seahorse-gpgme-exporter.c
@@ -27,11 +27,12 @@
 #include "seahorse-gpgme-key.h"
 #include "seahorse-gpgme-keyring.h"
 #include "seahorse-gpg-op.h"
-#include "seahorse-progress.h"
 
 #include "seahorse-common.h"
-#include "seahorse-object.h"
-#include "seahorse-util.h"
+
+#include "libseahorse/seahorse-progress.h"
+#include "libseahorse/seahorse-object.h"
+#include "libseahorse/seahorse-util.h"
 
 #include <glib/gi18n.h>
 
diff --git a/pgp/seahorse-gpgme-generate.c b/pgp/seahorse-gpgme-generate.c
index f15b65d..d28d447 100644
--- a/pgp/seahorse-gpgme-generate.c
+++ b/pgp/seahorse-gpgme-generate.c
@@ -20,27 +20,29 @@
 
 #include "config.h"
 
-#include <time.h>
-#include <string.h>
- 
-#include <glib/gi18n.h>
- 
-#include "egg-datetime.h"
-
-#include "seahorse-common.h"
-#include "seahorse-passphrase.h"
-#include "seahorse-progress.h"
-#include "seahorse-util.h"
-#include "seahorse-widget.h"
+#include "seahorse-gpgme-dialogs.h"
 
 #include "seahorse-pgp.h"
 #include "seahorse-pgp-backend.h"
 #include "seahorse-gpgme.h"
-#include "seahorse-gpgme-dialogs.h"
 #include "seahorse-gpgme-key.h"
 #include "seahorse-gpgme-key-op.h"
 #include "seahorse-gpgme-keyring.h"
 
+#include "seahorse-common.h"
+
+#include "libegg/egg-datetime.h"
+
+#include "libseahorse/seahorse-passphrase.h"
+#include "libseahorse/seahorse-progress.h"
+#include "libseahorse/seahorse-util.h"
+#include "libseahorse/seahorse-widget.h"
+
+#include <glib/gi18n.h>
+
+#include <string.h>
+#include <time.h>
+
 /**
  * SECTION:seahorse-gpgme-generate
  * @short_description: This file contains creation dialogs for pgp key creation.
diff --git a/pgp/seahorse-gpgme-key-op.c b/pgp/seahorse-gpgme-key-op.c
index f6f46d9..813dbe8 100644
--- a/pgp/seahorse-gpgme-key-op.c
+++ b/pgp/seahorse-gpgme-key-op.c
@@ -22,25 +22,26 @@
 
 #include "config.h"
 
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
+#include "seahorse-gpgme-key-op.h"
 
-#include <glib/gstdio.h>
-#include <glib/gi18n.h>
+#include "seahorse-gpgme.h"
+#include "seahorse-gpgme-data.h"
+#include "seahorse-gpg-op.h"
 
-#include "seahorse-object-list.h"
-#include "seahorse-progress.h"
-#include "seahorse-util.h"
-
-#include "pgp/seahorse-gpgme.h"
-#include "pgp/seahorse-gpgme-data.h"
-#include "pgp/seahorse-gpg-op.h"
-#include "pgp/seahorse-gpgme-key-op.h"
+#include "libseahorse/seahorse-object-list.h"
+#include "libseahorse/seahorse-progress.h"
+#include "libseahorse/seahorse-util.h"
 
 #define DEBUG_FLAG SEAHORSE_DEBUG_KEYS
-#include "seahorse-debug.h"
+#include "libseahorse/seahorse-debug.h"
+
+#include <glib/gstdio.h>
+#include <glib/gi18n.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #define PROMPT "keyedit.prompt"
 #define QUIT "quit"
diff --git a/pgp/seahorse-gpgme-key.c b/pgp/seahorse-gpgme-key.c
index 108c75d..8d79e45 100644
--- a/pgp/seahorse-gpgme-key.c
+++ b/pgp/seahorse-gpgme-key.c
@@ -32,9 +32,10 @@
 #include "seahorse-pgp-key.h"
 
 #include "seahorse-common.h"
-#include "seahorse-predicate.h"
-#include "seahorse-object-list.h"
-#include "seahorse-util.h"
+
+#include "libseahorse/seahorse-predicate.h"
+#include "libseahorse/seahorse-object-list.h"
+#include "libseahorse/seahorse-util.h"
 
 #include <glib/gi18n.h>
 
diff --git a/pgp/seahorse-gpgme-keyring.c b/pgp/seahorse-gpgme-keyring.c
index 40374ce..179c915 100644
--- a/pgp/seahorse-gpgme-keyring.c
+++ b/pgp/seahorse-gpgme-keyring.c
@@ -30,9 +30,10 @@
 #include "seahorse-pgp-key.h"
 
 #include "seahorse-common.h"
-#include "seahorse-progress.h"
-#include "seahorse-util.h"
-#include "seahorse-passphrase.h"
+
+#include "libseahorse/seahorse-progress.h"
+#include "libseahorse/seahorse-util.h"
+#include "libseahorse/seahorse-passphrase.h"
 
 #include <gcr/gcr.h>
 
@@ -45,7 +46,7 @@
 #include <locale.h>
 
 #define DEBUG_FLAG SEAHORSE_DEBUG_OPERATION
-#include "seahorse-debug.h"
+#include "libseahorse/seahorse-debug.h"
 
 enum {
        PROP_0,
diff --git a/pgp/seahorse-gpgme-photos.c b/pgp/seahorse-gpgme-photos.c
index 305efb4..2f2b77a 100644
--- a/pgp/seahorse-gpgme-photos.c
+++ b/pgp/seahorse-gpgme-photos.c
@@ -19,19 +19,20 @@
 
 #include "config.h"
 
-#include <sys/stat.h>
-#include <errno.h>
-#include <unistd.h>
+#include "seahorse-gpgme-dialogs.h"
 
-#include <glib/gi18n.h>
+#include "seahorse-gpgme-key-op.h"
+
+#include "libseahorse/seahorse-widget.h"
+#include "libseahorse/seahorse-util.h"
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "seahorse-widget.h"
-#include "seahorse-util.h"
+#include <glib/gi18n.h>
 
-#include "seahorse-gpgme-dialogs.h"
-#include "seahorse-gpgme-key-op.h"
+#include <sys/stat.h>
+#include <errno.h>
+#include <unistd.h>
 
 #define DEFAULT_WIDTH    120
 #define DEFAULT_HEIGHT   150
diff --git a/pgp/seahorse-gpgme-revoke.c b/pgp/seahorse-gpgme-revoke.c
index b51477c..19f1211 100644
--- a/pgp/seahorse-gpgme-revoke.c
+++ b/pgp/seahorse-gpgme-revoke.c
@@ -19,17 +19,17 @@
 
 #include "config.h"
 
-#include <string.h>
- 
-#include <glib/gi18n.h>
- 
-#include "seahorse-object-widget.h"
-#include "seahorse-util.h"
-
 #include "seahorse-gpgme-dialogs.h"
 #include "seahorse-gpgme-key-op.h"
 #include "seahorse-pgp-dialogs.h"
 
+#include "libseahorse/seahorse-object-widget.h"
+#include "libseahorse/seahorse-util.h"
+
+#include <glib/gi18n.h>
+
+#include <string.h>
+
 enum {
   COLUMN_TEXT,
   COLUMN_TOOLTIP,
diff --git a/pgp/seahorse-gpgme-sign.c b/pgp/seahorse-gpgme-sign.c
index 97b1b37..2bd34ea 100644
--- a/pgp/seahorse-gpgme-sign.c
+++ b/pgp/seahorse-gpgme-sign.c
@@ -21,13 +21,14 @@
 #include "config.h"
 
 #include "seahorse-combo-keys.h"
+#include "seahorse-gpgme-dialogs.h"
+#include "seahorse-gpgme-key-op.h"
+#include "seahorse-pgp-keysets.h"
+
 #include "seahorse-common.h"
-#include "seahorse-object-widget.h"
-#include "seahorse-util.h"
 
-#include "pgp/seahorse-gpgme-dialogs.h"
-#include "pgp/seahorse-gpgme-key-op.h"
-#include "pgp/seahorse-pgp-keysets.h"
+#include "libseahorse/seahorse-object-widget.h"
+#include "libseahorse/seahorse-util.h"
 
 #include <glib/gi18n.h>
 
diff --git a/pgp/seahorse-gpgme-uid.c b/pgp/seahorse-gpgme-uid.c
index b0feca4..cec3856 100644
--- a/pgp/seahorse-gpgme-uid.c
+++ b/pgp/seahorse-gpgme-uid.c
@@ -25,7 +25,7 @@
 #include "seahorse-pgp-key.h"
 #include "seahorse-pgp-signature.h"
 
-#include "seahorse-object-list.h"
+#include "libseahorse/seahorse-object-list.h"
 
 #include <string.h>
 
diff --git a/pgp/seahorse-gpgme-uid.h b/pgp/seahorse-gpgme-uid.h
index 1b6d294..46edf84 100644
--- a/pgp/seahorse-gpgme-uid.h
+++ b/pgp/seahorse-gpgme-uid.h
@@ -24,7 +24,7 @@
 
 #include <gpgme.h>
 
-#include "seahorse-object.h"
+#include "libseahorse/seahorse-object.h"
 
 #include "pgp/seahorse-gpgme-key.h"
 #include "pgp/seahorse-pgp-uid.h"
diff --git a/pgp/seahorse-gpgme.c b/pgp/seahorse-gpgme.c
index ed47700..9a621ec 100644
--- a/pgp/seahorse-gpgme.c
+++ b/pgp/seahorse-gpgme.c
@@ -24,9 +24,10 @@
 #include "seahorse-gpgme.h"
 
 #include "seahorse-common.h"
+
 #define DEBUG_FLAG SEAHORSE_DEBUG_OPERATION
-#include "seahorse-debug.h"
-#include "seahorse-util.h"
+#include "libseahorse/seahorse-debug.h"
+#include "libseahorse/seahorse-util.h"
 
 #include <glib/gi18n.h>
 
diff --git a/pgp/seahorse-gpgme.h b/pgp/seahorse-gpgme.h
index 5c2f257..4c5cec8 100644
--- a/pgp/seahorse-gpgme.h
+++ b/pgp/seahorse-gpgme.h
@@ -27,7 +27,7 @@
 
 #include <gpgme.h>
 
-#include "seahorse-validity.h"
+#include "libseahorse/seahorse-validity.h"
 
 typedef struct _SeahorseKeyTypeTable *SeahorseKeyTypeTable;
 
diff --git a/pgp/seahorse-hkp-source.c b/pgp/seahorse-hkp-source.c
index 9832774..b15d5b3 100644
--- a/pgp/seahorse-hkp-source.c
+++ b/pgp/seahorse-hkp-source.c
@@ -30,16 +30,16 @@
 #include "seahorse-pgp-key.h"
 #include "seahorse-pgp-subkey.h"
 #include "seahorse-pgp-uid.h"
-#include "seahorse-servers.h"
 
-#include "seahorse-object-list.h"
-#include "seahorse-progress.h"
-#include "seahorse-util.h"
+#include "libseahorse/seahorse-object-list.h"
+#include "libseahorse/seahorse-progress.h"
+#include "libseahorse/seahorse-servers.h"
+#include "libseahorse/seahorse-util.h"
 
 #include <libsoup/soup.h>
 
 #define DEBUG_FLAG SEAHORSE_DEBUG_HKP
-#include "seahorse-debug.h"
+#include "libseahorse/seahorse-debug.h"
 
 /**
  * SECTION: seahorse-hkp-source
diff --git a/pgp/seahorse-keyserver-results.c b/pgp/seahorse-keyserver-results.c
index 2b7cd2e..285d318 100644
--- a/pgp/seahorse-keyserver-results.c
+++ b/pgp/seahorse-keyserver-results.c
@@ -21,14 +21,15 @@
 
 #include "config.h"
 
+#include "seahorse-keyserver-results.h"
+
 #include "seahorse-pgp-backend.h"
 #include "seahorse-gpgme-keyring.h"
 #include "seahorse-keyserver-search.h"
-#include "seahorse-keyserver-results.h"
 
-#include "seahorse-key-manager-store.h"
-#include "seahorse-progress.h"
-#include "seahorse-util.h"
+#include "libseahorse/seahorse-key-manager-store.h"
+#include "libseahorse/seahorse-progress.h"
+#include "libseahorse/seahorse-util.h"
 
 #include <glib/gi18n.h>
 
diff --git a/pgp/seahorse-keyserver-results.h b/pgp/seahorse-keyserver-results.h
index 7c4dd75..d59fbcd 100644
--- a/pgp/seahorse-keyserver-results.h
+++ b/pgp/seahorse-keyserver-results.h
@@ -27,7 +27,7 @@
 #include <gtk/gtk.h>
 
 #include "seahorse-common.h"
-#include "seahorse-object.h"
+#include "libseahorse/seahorse-object.h"
 
 G_BEGIN_DECLS
 
diff --git a/pgp/seahorse-keyserver-search.c b/pgp/seahorse-keyserver-search.c
index 5ae8aff..7dadeeb 100644
--- a/pgp/seahorse-keyserver-search.c
+++ b/pgp/seahorse-keyserver-search.c
@@ -18,18 +18,17 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
-#include "seahorse-discovery.h"
 #include "seahorse-keyserver-search.h"
+
+#include "seahorse-discovery.h"
 #include "seahorse-keyserver-results.h"
 #include "seahorse-pgp-backend.h"
 
-#include "seahorse-servers.h"
-#include "seahorse-util.h"
-#include "seahorse-widget.h"
-
-#include "seahorse-keyserver-results.h"
+#include "libseahorse/seahorse-servers.h"
+#include "libseahorse/seahorse-util.h"
+#include "libseahorse/seahorse-widget.h"
 
 /**
  * SECTION:seahorse-keyserver-search
diff --git a/pgp/seahorse-keyserver-sync.c b/pgp/seahorse-keyserver-sync.c
index ad61f8b..6bf0cbb 100644
--- a/pgp/seahorse-keyserver-sync.c
+++ b/pgp/seahorse-keyserver-sync.c
@@ -18,21 +18,22 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <glib/gi18n.h>
-
-#include "seahorse-object.h"
-#include "seahorse-progress.h"
-#include "seahorse-servers.h"
-#include "seahorse-util.h"
-#include "seahorse-widget.h"
-
-#include "seahorse-prefs.h"
 #include "seahorse-keyserver-sync.h"
+
 #include "seahorse-pgp-backend.h"
 #include "seahorse-transfer.h"
 
+#include "libseahorse/seahorse-object.h"
+#include "libseahorse/seahorse-prefs.h"
+#include "libseahorse/seahorse-progress.h"
+#include "libseahorse/seahorse-servers.h"
+#include "libseahorse/seahorse-util.h"
+#include "libseahorse/seahorse-widget.h"
+
+#include <glib/gi18n.h>
+
 void            on_sync_ok_clicked                (GtkButton *button,
                                                    SeahorseWidget *swidget);
 
diff --git a/pgp/seahorse-keyserver-sync.h b/pgp/seahorse-keyserver-sync.h
index 15de2b6..04a10e3 100644
--- a/pgp/seahorse-keyserver-sync.h
+++ b/pgp/seahorse-keyserver-sync.h
@@ -20,6 +20,8 @@
 #ifndef __SEAHORSE_KEYSERVER_SYNC_H__
 #define __SEAHORSE_KEYSERVER_SYNC_H__
 
+#include <gtk/gtk.h>
+
 void        seahorse_keyserver_sync             (GList *keys);
 
 
diff --git a/pgp/seahorse-ldap-source.c b/pgp/seahorse-ldap-source.c
index 3e754f9..0991131 100644
--- a/pgp/seahorse-ldap-source.c
+++ b/pgp/seahorse-ldap-source.c
@@ -33,10 +33,11 @@
 #include "seahorse-pgp-uid.h"
 
 #include "seahorse-common.h"
-#include "seahorse-object-list.h"
-#include "seahorse-progress.h"
-#include "seahorse-servers.h"
-#include "seahorse-util.h"
+
+#include "libseahorse/seahorse-object-list.h"
+#include "libseahorse/seahorse-progress.h"
+#include "libseahorse/seahorse-servers.h"
+#include "libseahorse/seahorse-util.h"
 
 #include <ldap.h>
 
@@ -47,7 +48,7 @@
 #ifdef WITH_LDAP
 
 #define DEBUG_FLAG SEAHORSE_DEBUG_LDAP
-#include "seahorse-debug.h"
+#include "libseahorse/seahorse-debug.h"
 
 /* Amount of keys to load in a batch */
 #define DEFAULT_LOAD_BATCH 30
diff --git a/pgp/seahorse-pgp-actions.c b/pgp/seahorse-pgp-actions.c
index 2faba8f..7c134d7 100644
--- a/pgp/seahorse-pgp-actions.c
+++ b/pgp/seahorse-pgp-actions.c
@@ -34,9 +34,10 @@
 #include "seahorse-keyserver-sync.h"
 
 #include "seahorse-common.h"
-#include "seahorse-object.h"
-#include "seahorse-object-list.h"
-#include "seahorse-util.h"
+
+#include "libseahorse/seahorse-object.h"
+#include "libseahorse/seahorse-object-list.h"
+#include "libseahorse/seahorse-util.h"
 
 GType   seahorse_pgp_backend_actions_get_type         (void) G_GNUC_CONST;
 #define SEAHORSE_TYPE_PGP_BACKEND_ACTIONS             (seahorse_pgp_backend_actions_get_type ())
diff --git a/pgp/seahorse-pgp-backend.c b/pgp/seahorse-pgp-backend.c
index 92b1059..ab9b8fb 100644
--- a/pgp/seahorse-pgp-backend.c
+++ b/pgp/seahorse-pgp-backend.c
@@ -28,9 +28,10 @@
 #include "seahorse-unknown-source.h"
 
 #include "seahorse-common.h"
-#include "seahorse-progress.h"
-#include "seahorse-servers.h"
-#include "seahorse-util.h"
+
+#include "libseahorse/seahorse-progress.h"
+#include "libseahorse/seahorse-servers.h"
+#include "libseahorse/seahorse-util.h"
 
 #include <glib/gi18n.h>
 
diff --git a/pgp/seahorse-pgp-key-properties.c b/pgp/seahorse-pgp-key-properties.c
index b8c23f8..30c9608 100644
--- a/pgp/seahorse-pgp-key-properties.c
+++ b/pgp/seahorse-pgp-key-properties.c
@@ -24,17 +24,6 @@
 
 #include "config.h"
 
-#include <string.h>
-  
-#include <glib/gi18n.h>
-
-#include "seahorse-bind.h"
-#include "seahorse-common.h"
-#include "seahorse-object.h"
-#include "seahorse-object-model.h"
-#include "seahorse-object-widget.h"
-#include "seahorse-util.h"
-
 #include "seahorse-gpgme-dialogs.h"
 #include "seahorse-gpgme-exporter.h"
 #include "seahorse-gpgme-key.h"
@@ -47,9 +36,20 @@
 #include "seahorse-pgp-signature.h"
 #include "seahorse-pgp-subkey.h"
 
+#include "seahorse-common.h"
+
+#include "libseahorse/seahorse-bind.h"
+#include "libseahorse/seahorse-object.h"
+#include "libseahorse/seahorse-object-model.h"
+#include "libseahorse/seahorse-object-widget.h"
+#include "libseahorse/seahorse-util.h"
+
 #define DEBUG_FLAG SEAHORSE_DEBUG_KEYS
-#include "seahorse-debug.h"
+#include "libseahorse/seahorse-debug.h"
 
+#include <glib/gi18n.h>
+
+#include <string.h>
 #include <time.h>
 
 #define NOTEBOOK "notebook"
diff --git a/pgp/seahorse-pgp-key.c b/pgp/seahorse-pgp-key.c
index 71c1e01..160dc90 100644
--- a/pgp/seahorse-pgp-key.c
+++ b/pgp/seahorse-pgp-key.c
@@ -25,8 +25,9 @@
 #include "seahorse-pgp-subkey.h"
 
 #include "seahorse-common.h"
-#include "seahorse-object-list.h"
-#include "seahorse-util.h"
+
+#include "libseahorse/seahorse-object-list.h"
+#include "libseahorse/seahorse-util.h"
 
 #include <gcr/gcr.h>
 
diff --git a/pgp/seahorse-pgp-key.h b/pgp/seahorse-pgp-key.h
index 32aa148..edb2e13 100644
--- a/pgp/seahorse-pgp-key.h
+++ b/pgp/seahorse-pgp-key.h
@@ -22,8 +22,8 @@
 
 #include <glib-object.h>
 
-#include "seahorse-object.h"
-#include "seahorse-validity.h"
+#include "libseahorse/seahorse-object.h"
+#include "libseahorse/seahorse-validity.h"
 
 enum {
     SKEY_PGPSIG_TRUSTED = 0x0001,
diff --git a/pgp/seahorse-pgp-keysets.c b/pgp/seahorse-pgp-keysets.c
index f7b5488..b3dd354 100644
--- a/pgp/seahorse-pgp-keysets.c
+++ b/pgp/seahorse-pgp-keysets.c
@@ -20,15 +20,16 @@
 
 #include "config.h"
 
-#include "seahorse-application.h"
-#include "seahorse-collection.h"
-#include "seahorse-object.h"
-#include "seahorse-predicate.h"
+#include "seahorse-pgp-keysets.h"
 
 #include "seahorse-gpgme-key.h"
 #include "seahorse-pgp-backend.h"
 #include "seahorse-pgp-key.h"
-#include "seahorse-pgp-keysets.h"
+
+#include "libseahorse/seahorse-application.h"
+#include "libseahorse/seahorse-collection.h"
+#include "libseahorse/seahorse-object.h"
+#include "libseahorse/seahorse-predicate.h"
 
 /* -----------------------------------------------------------------------------
  * COMMON KEYSETS 
diff --git a/pgp/seahorse-pgp-signature.c b/pgp/seahorse-pgp-signature.c
index 5625ae7..628af51 100644
--- a/pgp/seahorse-pgp-signature.c
+++ b/pgp/seahorse-pgp-signature.c
@@ -25,7 +25,7 @@
 #include "seahorse-pgp-key.h"
 #include "seahorse-pgp-signature.h"
 
-#include "seahorse-object.h"
+#include "libseahorse/seahorse-object.h"
 
 #include <string.h>
 
diff --git a/pgp/seahorse-pgp-signature.h b/pgp/seahorse-pgp-signature.h
index 11b86e9..a4d2f2f 100644
--- a/pgp/seahorse-pgp-signature.h
+++ b/pgp/seahorse-pgp-signature.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include "seahorse-validity.h"
+#include "libseahorse/seahorse-validity.h"
 
 #define SEAHORSE_TYPE_PGP_SIGNATURE            (seahorse_pgp_signature_get_type ())
 
diff --git a/pgp/seahorse-pgp-subkey.h b/pgp/seahorse-pgp-subkey.h
index 3b2a145..c3c3b7a 100644
--- a/pgp/seahorse-pgp-subkey.h
+++ b/pgp/seahorse-pgp-subkey.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
-#include "seahorse-object.h"
+#include "libseahorse/seahorse-object.h"
 
 #define SEAHORSE_TYPE_PGP_SUBKEY            (seahorse_pgp_subkey_get_type ())
 
diff --git a/pgp/seahorse-pgp-uid.c b/pgp/seahorse-pgp-uid.c
index 22ac19c..71663ab 100644
--- a/pgp/seahorse-pgp-uid.c
+++ b/pgp/seahorse-pgp-uid.c
@@ -24,7 +24,7 @@
 #include "seahorse-pgp-uid.h"
 #include "seahorse-pgp-signature.h"
 
-#include "seahorse-object-list.h"
+#include "libseahorse/seahorse-object-list.h"
 
 #include <string.h>
 
diff --git a/pgp/seahorse-pgp-uid.h b/pgp/seahorse-pgp-uid.h
index 742b026..48c9182 100644
--- a/pgp/seahorse-pgp-uid.h
+++ b/pgp/seahorse-pgp-uid.h
@@ -22,8 +22,8 @@
 
 #include <glib-object.h>
 
-#include "seahorse-object.h"
-#include "seahorse-validity.h"
+#include "libseahorse/seahorse-object.h"
+#include "libseahorse/seahorse-validity.h"
 
 #include "seahorse-pgp-key.h"
 
diff --git a/pgp/seahorse-server-source.c b/pgp/seahorse-server-source.c
index 4ef5c3f..f25a270 100644
--- a/pgp/seahorse-server-source.c
+++ b/pgp/seahorse-server-source.c
@@ -20,18 +20,20 @@
 
 #include <config.h>
 
-#include <stdlib.h>
-#include <string.h>
-
-#include <glib/gi18n.h>
+#include "seahorse-server-source.h"
 
 #include "seahorse-hkp-source.h"
 #include "seahorse-ldap-source.h"
 #include "seahorse-pgp-key.h"
-#include "seahorse-server-source.h"
 
 #include "seahorse-common.h"
-#include "seahorse-util.h"
+
+#include "libseahorse/seahorse-util.h"
+
+#include <glib/gi18n.h>
+
+#include <stdlib.h>
+#include <string.h>
 
 /**
  * SECTION:seahorse-server-source
diff --git a/pgp/seahorse-signer.c b/pgp/seahorse-signer.c
index 5b3bebe..b6d25e5 100755
--- a/pgp/seahorse-signer.c
+++ b/pgp/seahorse-signer.c
@@ -20,19 +20,20 @@
 
 #include <config.h>
 
-#include <stdlib.h>
-
-#include <glib/gi18n.h>
-
 #include "seahorse-pgp-dialogs.h"
-#include "seahorse-progress.h"
-#include "seahorse-widget.h"
-#include "seahorse-validity.h"
+
 #include "seahorse-combo-keys.h"
-#include "seahorse-util.h"
+#include "seahorse-pgp-key.h"
+#include "seahorse-pgp-keysets.h"
 
-#include "pgp/seahorse-pgp-key.h"
-#include "pgp/seahorse-pgp-keysets.h"
+#include "libseahorse/seahorse-progress.h"
+#include "libseahorse/seahorse-widget.h"
+#include "libseahorse/seahorse-validity.h"
+#include "libseahorse/seahorse-util.h"
+
+#include <glib/gi18n.h>
+
+#include <stdlib.h>
 
 SeahorsePgpKey*
 seahorse_signer_get (GtkWindow *parent)
diff --git a/pgp/seahorse-transfer.c b/pgp/seahorse-transfer.c
index cb63d3c..5875d0e 100644
--- a/pgp/seahorse-transfer.c
+++ b/pgp/seahorse-transfer.c
@@ -20,17 +20,19 @@
 
 #include "config.h"
 
+#include "seahorse-transfer.h"
+
 #include "seahorse-server-source.h"
 #include "seahorse-gpgme-exporter.h"
 #include "seahorse-gpgme-keyring.h"
 
 #include "seahorse-common.h"
+
 #define DEBUG_FLAG SEAHORSE_DEBUG_OPERATION
-#include "seahorse-debug.h"
-#include "seahorse-object-list.h"
-#include "seahorse-progress.h"
-#include "seahorse-transfer.h"
-#include "seahorse-util.h"
+#include "libseahorse/seahorse-debug.h"
+#include "libseahorse/seahorse-object-list.h"
+#include "libseahorse/seahorse-progress.h"
+#include "libseahorse/seahorse-util.h"
 
 #include <glib/gi18n.h>
 
diff --git a/pgp/seahorse-unknown-source.c b/pgp/seahorse-unknown-source.c
index 53715eb..8f4e694 100644
--- a/pgp/seahorse-unknown-source.c
+++ b/pgp/seahorse-unknown-source.c
@@ -20,12 +20,13 @@
 
 #include "config.h"
 
-#include "seahorse-pgp-key.h"
 #include "seahorse-unknown-source.h"
 
-#include "seahorse-common.h"
+#include "seahorse-pgp-key.h"
 #include "seahorse-unknown.h"
 
+#include "seahorse-common.h"
+
 #include <gcr/gcr-base.h>
 
 #include <glib/gi18n.h>
diff --git a/pgp/seahorse-unknown-source.h b/pgp/seahorse-unknown-source.h
index fc0cd2c..9716533 100644
--- a/pgp/seahorse-unknown-source.h
+++ b/pgp/seahorse-unknown-source.h
@@ -21,7 +21,7 @@
 #ifndef __SEAHORSE_UNKNOWN_SOURCE_H__
 #define __SEAHORSE_UNKNOWN_SOURCE_H__
 
-#include "seahorse-object.h"
+#include "libseahorse/seahorse-object.h"
 
 #define SEAHORSE_TYPE_UNKNOWN_SOURCE            (seahorse_unknown_source_get_type ())
 #define SEAHORSE_UNKNOWN_SOURCE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
SEAHORSE_TYPE_UNKNOWN_SOURCE, SeahorseUnknownSource))
diff --git a/pgp/seahorse-unknown.h b/pgp/seahorse-unknown.h
index 71e825b..56d6a33 100644
--- a/pgp/seahorse-unknown.h
+++ b/pgp/seahorse-unknown.h
@@ -22,7 +22,7 @@
 
 #include <gtk/gtk.h>
 
-#include "seahorse-object.h"
+#include "libseahorse/seahorse-object.h"
 #include "seahorse-unknown-source.h"
 
 #define SEAHORSE_TYPE_UNKNOWN            (seahorse_unknown_get_type ())
diff --git a/pkcs11/Makefile.am b/pkcs11/Makefile.am
index 781347e..a69ef2d 100644
--- a/pkcs11/Makefile.am
+++ b/pkcs11/Makefile.am
@@ -1,71 +1,50 @@
-NULL =
 
-uidir = $(datadir)/seahorse/ui/
-localedir = $(datadir)/locale
-seahorselibexecbindir = $(libdir)/seahorse/
-
-# Generate seahorse-pkcs11.h before building libseahorse_pkcs11_la_SOURCES
-BUILT_SOURCES = libvala_code_la_vala.stamp
-
-AM_CPPFLAGS = -I$(top_builddir) \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/common \
-       -I$(top_builddir)/common \
-       -I$(top_srcdir)/libseahorse \
-       $(SEAHORSE_CFLAGS) \
-       -DUIDIR=\""$(uidir)"\" \
-       -DLOCALEDIR=\"$(localedir)\" \
-       -DEXECDIR=\""$(seahorselibexecbindir)"\" \
-       -DGETTEXT_PACKAGE=\""seahorse\""
-
-noinst_LTLIBRARIES = \
-       libvala-code.la \
+noinst_LTLIBRARIES += \
        libseahorse-pkcs11.la
 
-AM_VALAFLAGS = \
-       $(VALA_FLAGS) \
-       --header=seahorse-pkcs11.h \
-       --use-header \
-       --vapidir $(top_builddir)/common \
-       --pkg config \
-       --pkg common \
-       --pkg gtk+-3.0 \
-       --pkg gcr-3 \
-       --pkg gcr-ui-3 \
-       --pkg pkcs11 \
+pkcs11_VALA = \
+       pkcs11/certificate-der-exporter.vala \
+       pkcs11/pkcs11-certificate.vala \
+       pkcs11/pkcs11-deleter.vala \
+       pkcs11/pkcs11-key-deleter.vala \
+       pkcs11/pkcs11-module.vala \
+       pkcs11/pkcs11-private-key.vala \
+       pkcs11/pkcs11-properties.vala \
+       pkcs11/pkcs11-request.vala \
+       pkcs11/pkcs11-token.vala \
        $(NULL)
 
-libvala_code_la_SOURCES = \
-       certificate-der-exporter.vala \
-       pkcs11-certificate.vala \
-       pkcs11-deleter.vala \
-       pkcs11-key-deleter.vala \
-       pkcs11-module.vala \
-       pkcs11-private-key.vala \
-       pkcs11-properties.vala \
-       pkcs11-request.vala \
-       pkcs11-token.vala \
-       $(NULL)
+pkcs11_HEADER = pkcs11/seahorse-pkcs11.h
 
-libvala_code_la_CFLAGS = \
-       -include seahorse-pkcs11.h -w \
-       $(NULL)
+pkcs11_C = $(pkcs11_VALA:.vala=.c)
 
 libseahorse_pkcs11_la_SOURCES = \
-       seahorse-pkcs11-backend.c seahorse-pkcs11-backend.h \
-       seahorse-pkcs11-generate.c seahorse-pkcs11-generate.h
+       $(pkcs11_C) $(pkcs11_HEADER) \
+       pkcs11/seahorse-pkcs11-backend.c pkcs11/seahorse-pkcs11-backend.h \
+       pkcs11/seahorse-pkcs11-generate.c pkcs11/seahorse-pkcs11-generate.h
 
-libseahorse_pkcs11_la_LIBADD = \
-       $(top_builddir)/common/libcommon.la \
-       $(top_builddir)/libseahorse/libseahorse.la \
-       libvala-code.la \
-       $(GCR_LIBS)
+libseahorse_pkcs11_la_CFLAGS = \
+       -include config.h -w
 
-ui_DATA = \
-       seahorse-pkcs11-generate.xml \
-       seahorse-pkcs11-request.xml
+$(pkcs11_HEADER): $(pkcs11_VALA)
+       $(V_VALAC) $(VALAC) $(VALA_FLAGS) -C --use-header --header=$(pkcs11_HEADER) \
+               --vapidir=$(builddir)/common --vapidir=$(srcdir)/common \
+               --pkg common --pkg config --pkg gtk+-3.0  --pkg gcr-3 --pkg gcr-ui-3 --pkg pkcs11 \
+               --directory=pkcs11 $^
 
-EXTRA_DIST = \
-       $(ui_DATA) \
-       seahorse-pkcs11.h \
+$(pkcs11_C): $(pkcs11_HEADER)
+
+pkcs11_BUILT = \
+       $(pkcs11_C) \
+       $(pkcs11_HEADER)
+
+BUILT_SOURCES += $(pkcs11_BUILT)
+
+EXTRA_DIST += \
+       $(pkcs11_BUILT) \
+       $(pkcs11_VALA) \
        $(NULL)
+
+ui_DATA += \
+       pkcs11/seahorse-pkcs11-generate.xml \
+       pkcs11/seahorse-pkcs11-request.xml
diff --git a/pkcs11/seahorse-pkcs11-backend.c b/pkcs11/seahorse-pkcs11-backend.c
index 54542c3..671316a 100644
--- a/pkcs11/seahorse-pkcs11-backend.c
+++ b/pkcs11/seahorse-pkcs11-backend.c
@@ -19,13 +19,16 @@
  */
 
 #include "config.h"
-#include "seahorse-common.h"
 
-#include "seahorse-pkcs11.h"
 #include "seahorse-pkcs11-backend.h"
+
 #include "seahorse-pkcs11-generate.h"
 
-#include "seahorse-util.h"
+#include "pkcs11/seahorse-pkcs11.h"
+
+#include "seahorse-common.h"
+
+#include "libseahorse/seahorse-util.h"
 
 #include <gcr/gcr-base.h>
 
diff --git a/pkcs11/seahorse-pkcs11-backend.h b/pkcs11/seahorse-pkcs11-backend.h
index f8ff3ab..d6195ff 100644
--- a/pkcs11/seahorse-pkcs11-backend.h
+++ b/pkcs11/seahorse-pkcs11-backend.h
@@ -21,7 +21,7 @@
 #ifndef SEAHORSE_PKCS11_BACKEND_H_
 #define SEAHORSE_PKCS11_BACKEND_H_
 
-#include "seahorse-pkcs11.h"
+#include "pkcs11/seahorse-pkcs11.h"
 
 #include <gcr/gcr.h>
 
diff --git a/pkcs11/seahorse-pkcs11-generate.c b/pkcs11/seahorse-pkcs11-generate.c
index c5608b5..ccadc45 100644
--- a/pkcs11/seahorse-pkcs11-generate.c
+++ b/pkcs11/seahorse-pkcs11-generate.c
@@ -20,15 +20,16 @@
  */
 
 #include "config.h"
-#include "seahorse-common.h"
 
-#include "seahorse-pkcs11-backend.h"
 #include "seahorse-pkcs11-generate.h"
 
+#include "seahorse-pkcs11-backend.h"
+
 #include "seahorse-common.h"
-#include "seahorse-progress.h"
-#include "seahorse-interaction.h"
-#include "seahorse-util.h"
+
+#include "libseahorse/seahorse-progress.h"
+#include "libseahorse/seahorse-interaction.h"
+#include "libseahorse/seahorse-util.h"
 
 #include <glib/gi18n.h>
 
diff --git a/src/Makefile.am b/src/Makefile.am
index e663cd3..afbf2c7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,75 +1,60 @@
-include $(top_srcdir)/Makefile.decl
-
-uidir = $(datadir)/seahorse/ui/
-localedir = $(datadir)/locale
-
-AM_CPPFLAGS = -I$(top_builddir) \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/common \
-       -I$(top_builddir)/common \
-       -I$(top_srcdir)/libseahorse \
-       $(SEAHORSE_CFLAGS) \
-       -DSEAHORSE_UIDIR=\""$(uidir)"\" \
-       -DLOCALEDIR=\"$(localedir)\" \
-       -DGETTEXT_PACKAGE=\""seahorse\""
 
 if WITH_PGP
-PGP_LDADD = $(top_builddir)/pgp/libseahorse-pgp.la
+PGP_LDADD = libseahorse-pgp.la
 else
 PGP_LDADD = 
 endif
 
 if WITH_SSH
-SSH_LDADD = $(top_builddir)/ssh/libseahorse-ssh.la
+SSH_LDADD = libseahorse-ssh.la
 else
 SSH_LDADD = 
 endif
 
 if WITH_PKCS11
-PKCS11_LDADD = $(top_builddir)/pkcs11/libseahorse-pkcs11.la
+PKCS11_LDADD = libseahorse-pkcs11.la
 else
 PKCS11_LDADD = 
 endif
 
-bin_PROGRAMS = seahorse
+bin_PROGRAMS += seahorse
 
 seahorse_SOURCES = \
-       seahorse-generate-select.c seahorse-generate-select.h \
-       seahorse-import-dialog.c seahorse-import-dialog.h \
-       seahorse-key-manager.c seahorse-key-manager.h \
-       seahorse-main.c \
-       seahorse-sidebar.c seahorse-sidebar.h \
-       $(KEYSERVER_SRCS)
+       src/seahorse-generate-select.c src/seahorse-generate-select.h \
+       src/seahorse-import-dialog.c src/seahorse-import-dialog.h \
+       src/seahorse-key-manager.c src/seahorse-key-manager.h \
+       src/seahorse-main.c \
+       src/seahorse-sidebar.c src/seahorse-sidebar.h
 
 seahorse_LDADD = \
-       $(top_builddir)/common/libcommon.la \
-       $(top_builddir)/libseahorse/libseahorse.la \
+       libcommon.la \
+       libseahorse.la \
        $(PGP_LDADD) \
        $(SSH_LDADD) \
        $(PKCS11_LDADD) \
-       $(top_builddir)/gkr/libseahorse-gkr.la \
-       $(top_builddir)/libegg/libeggdatetime.la \
-       $(top_builddir)/libegg/libeggtreemultidnd.la \
+       libseahorse-gkr.la \
+       libeggdatetime.la \
+       libeggtreemultidnd.la \
        $(SEAHORSE_LIBS)
 
-ui_DATA = \
-       seahorse-key-manager.ui \
-       seahorse-key-manager.xml \
-       seahorse-change-passphrase.xml \
-       seahorse-generate-select.xml
+ui_DATA += \
+       src/seahorse-key-manager.ui \
+       src/seahorse-key-manager.xml \
+       src/seahorse-change-passphrase.xml \
+       src/seahorse-generate-select.xml
 
 desktopdir = $(datadir)/applications
-desktop_in_files = seahorse.desktop.in 
+desktop_in_files = src/seahorse.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-man_MANS = seahorse.1
+man_MANS += src/seahorse.1
 
-EXTRA_DIST = \
+EXTRA_DIST += \
        $(man_MANS) \
        $(ui_DATA) \
-       seahorse.desktop.in.in
+       src/seahorse.desktop.in.in
 
-CLEANFILES = *.xmlp* *.bak \
+CLEANFILES += *.xmlp* *.bak \
        $(desktop_DATA) \
        $(desktop_in_files)
diff --git a/src/seahorse-key-manager.c b/src/seahorse-key-manager.c
index ac8671d..c9856ce 100644
--- a/src/seahorse-key-manager.c
+++ b/src/seahorse-key-manager.c
@@ -21,17 +21,17 @@
 
 #include "config.h"
 
-#include "seahorse-application.h"
+#include "libseahorse/seahorse-application.h"
+#include "libseahorse/seahorse-collection.h"
+#include "libseahorse/seahorse-key-manager-store.h"
+#include "libseahorse/seahorse-progress.h"
+#include "libseahorse/seahorse-util.h"
+
 #include "seahorse-generate-select.h"
 #include "seahorse-import-dialog.h"
 #include "seahorse-key-manager.h"
-#include "seahorse-key-manager-store.h"
 #include "seahorse-sidebar.h"
 
-#include "seahorse-collection.h"
-#include "seahorse-progress.h"
-#include "seahorse-util.h"
-
 #include <glib/gi18n.h>
 
 enum {
diff --git a/src/seahorse-main.c b/src/seahorse-main.c
index c83c4c1..7eaeac2 100644
--- a/src/seahorse-main.c
+++ b/src/seahorse-main.c
@@ -20,12 +20,14 @@
 
 #include "config.h"
 
-#include "seahorse-application.h"
+#include "seahorse-key-manager.h"
+
 #include "seahorse-common.h"
-#include "seahorse-servers.h"
-#include "seahorse-util.h"
 
-#include "seahorse-key-manager.h"
+#include "libseahorse/seahorse-application.h"
+#include "libseahorse/seahorse-servers.h"
+#include "libseahorse/seahorse-util.h"
+
 
 #include <glib/gi18n.h>
 
diff --git a/src/seahorse-sidebar.c b/src/seahorse-sidebar.c
index d926dfc..d2cdd44 100644
--- a/src/seahorse-sidebar.c
+++ b/src/seahorse-sidebar.c
@@ -22,8 +22,9 @@
 #include "seahorse-sidebar.h"
 
 #include "seahorse-common.h"
-#include "seahorse-interaction.h"
-#include "seahorse-util.h"
+
+#include "libseahorse/seahorse-interaction.h"
+#include "libseahorse/seahorse-util.h"
 
 #include <glib/gi18n.h>
 
diff --git a/ssh/Makefile.am b/ssh/Makefile.am
index f8d661a..010b52f 100644
--- a/ssh/Makefile.am
+++ b/ssh/Makefile.am
@@ -1,54 +1,29 @@
 
-uidir = $(datadir)/seahorse/ui/
-localedir = $(datadir)/locale
-seahorselibexecbindir = $(libdir)/seahorse/
-
-AM_CPPFLAGS = -I$(top_builddir) \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/common \
-       -I$(top_builddir)/common \
-       -I$(top_srcdir)/libseahorse \
-       $(SEAHORSE_CFLAGS) \
-       -DSEAHORSE_UIDIR=\""$(uidir)"\" \
-       -DLOCALEDIR=\"$(localedir)\" \
-       -DEXECDIR=\""$(seahorselibexecbindir)"\" \
-       -DGETTEXT_PACKAGE=\""seahorse\""
-
-AM_LDFLAGS = @NETLIBS@
-       
-noinst_LTLIBRARIES = libseahorse-ssh.la
+noinst_LTLIBRARIES += libseahorse-ssh.la
 
 libseahorse_ssh_la_SOURCES = \
-       seahorse-ssh.h seahorse-ssh.c \
-       seahorse-ssh-actions.c seahorse-ssh-actions.h \
-       seahorse-ssh-backend.c seahorse-ssh-backend.h \
-       seahorse-ssh-deleter.c seahorse-ssh-deleter.h \
-       seahorse-ssh-dialogs.h \
-       seahorse-ssh-exporter.c seahorse-ssh-exporter.h \
-       seahorse-ssh-generate.c \
-       seahorse-ssh-key-data.c seahorse-ssh-key-data.h \
-       seahorse-ssh-key.c seahorse-ssh-key.h  \
-       seahorse-ssh-key-properties.c \
-       seahorse-ssh-source.c seahorse-ssh-source.h \
-       seahorse-ssh-operation.c seahorse-ssh-operation.h \
-       seahorse-ssh-upload.c
-
-libseahorse_ssh_la_LIBADD = \
-       $(top_builddir)/common/libcommon.la \
-       $(top_builddir)/libseahorse/libseahorse.la
-
-seahorselibexecbin_PROGRAMS = seahorse-ssh-askpass
-
-seahorse_ssh_askpass_SOURCES = seahorse-ssh-askpass.c
+       ssh/seahorse-ssh.h ssh/seahorse-ssh.c \
+       ssh/seahorse-ssh-actions.c ssh/seahorse-ssh-actions.h \
+       ssh/seahorse-ssh-backend.c ssh/seahorse-ssh-backend.h \
+       ssh/seahorse-ssh-deleter.c ssh/seahorse-ssh-deleter.h \
+       ssh/seahorse-ssh-dialogs.h \
+       ssh/seahorse-ssh-exporter.c ssh/seahorse-ssh-exporter.h \
+       ssh/seahorse-ssh-generate.c \
+       ssh/seahorse-ssh-key-data.c ssh/seahorse-ssh-key-data.h \
+       ssh/seahorse-ssh-key.c ssh/seahorse-ssh-key.h  \
+       ssh/seahorse-ssh-key-properties.c \
+       ssh/seahorse-ssh-source.c ssh/seahorse-ssh-source.h \
+       ssh/seahorse-ssh-operation.c ssh/seahorse-ssh-operation.h \
+       ssh/seahorse-ssh-upload.c
+
+seahorselibexecbin_PROGRAMS += seahorse-ssh-askpass
+
+seahorse_ssh_askpass_SOURCES = ssh/seahorse-ssh-askpass.c
 seahorse_ssh_askpass_LDADD = \
-       $(top_builddir)/libseahorse/libseahorse.la \
+       libseahorse.la \
        $(SEAHORSE_LIBS)
 
-ui_DATA = \
-       seahorse-ssh-key-properties.xml \
-       seahorse-ssh-generate.xml \
-       seahorse-ssh-upload.xml
-
-EXTRA_DIST = \
-       $(ui_DATA)
-
+ui_DATA += \
+       ssh/seahorse-ssh-key-properties.xml \
+       ssh/seahorse-ssh-generate.xml \
+       ssh/seahorse-ssh-upload.xml
diff --git a/ssh/seahorse-ssh-actions.c b/ssh/seahorse-ssh-actions.c
index d84a206..2b13b78 100644
--- a/ssh/seahorse-ssh-actions.c
+++ b/ssh/seahorse-ssh-actions.c
@@ -27,12 +27,12 @@
 #include "seahorse-ssh-operation.h"
 
 #include "seahorse-common.h"
-#include "seahorse-object.h"
-#include "seahorse-object-list.h"
-#include "seahorse-util.h"
 
-#include <glib/gi18n.h>
+#include "libseahorse/seahorse-object.h"
+#include "libseahorse/seahorse-object-list.h"
+#include "libseahorse/seahorse-util.h"
 
+#include <glib/gi18n.h>
 #include <glib.h>
 #include <glib-object.h>
 
diff --git a/ssh/seahorse-ssh-askpass.c b/ssh/seahorse-ssh-askpass.c
index 329354b..4617d73 100644
--- a/ssh/seahorse-ssh-askpass.c
+++ b/ssh/seahorse-ssh-askpass.c
@@ -22,7 +22,7 @@
  
 #include "config.h"
 
-#include "seahorse-passphrase.h"
+#include "libseahorse/seahorse-passphrase.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/ssh/seahorse-ssh-exporter.c b/ssh/seahorse-ssh-exporter.c
index e361c7e..1f53212 100644
--- a/ssh/seahorse-ssh-exporter.c
+++ b/ssh/seahorse-ssh-exporter.c
@@ -27,8 +27,9 @@
 #include "seahorse-ssh-source.h"
 
 #include "seahorse-common.h"
-#include "seahorse-object.h"
-#include "seahorse-util.h"
+
+#include "libseahorse/seahorse-object.h"
+#include "libseahorse/seahorse-util.h"
 
 #include <glib/gi18n.h>
 
diff --git a/ssh/seahorse-ssh-generate.c b/ssh/seahorse-ssh-generate.c
index 25b0b4f..3ba0259 100644
--- a/ssh/seahorse-ssh-generate.c
+++ b/ssh/seahorse-ssh-generate.c
@@ -31,9 +31,10 @@
 #include "seahorse-ssh-operation.h"
 
 #include "seahorse-common.h"
-#include "seahorse-progress.h"
-#include "seahorse-util.h"
-#include "seahorse-widget.h"
+
+#include "libseahorse/seahorse-progress.h"
+#include "libseahorse/seahorse-util.h"
+#include "libseahorse/seahorse-widget.h"
 
 
 /* --------------------------------------------------------------------------
diff --git a/ssh/seahorse-ssh-key-data.c b/ssh/seahorse-ssh-key-data.c
index a70b880..05db76a 100644
--- a/ssh/seahorse-ssh-key-data.c
+++ b/ssh/seahorse-ssh-key-data.c
@@ -22,7 +22,8 @@
 
 #include "seahorse-ssh-key-data.h"
 #include "seahorse-ssh-source.h"
-#include "seahorse-util.h"
+
+#include "libseahorse/seahorse-util.h"
 
 #define SSH_PRIVATE_BEGIN "-----BEGIN "
 #define SSH_PRIVATE_END   "-----END "
diff --git a/ssh/seahorse-ssh-key-properties.c b/ssh/seahorse-ssh-key-properties.c
index 2c5c015..2f3f44f 100644
--- a/ssh/seahorse-ssh-key-properties.c
+++ b/ssh/seahorse-ssh-key-properties.c
@@ -24,12 +24,13 @@
 #include "seahorse-ssh-key.h"
 #include "seahorse-ssh-operation.h"
 
-#include "seahorse-bind.h"
 #include "seahorse-common.h"
-#include "seahorse-object.h"
-#include "seahorse-object-widget.h"
-#include "seahorse-util.h"
-#include "seahorse-validity.h"
+
+#include "libseahorse/seahorse-bind.h"
+#include "libseahorse/seahorse-object.h"
+#include "libseahorse/seahorse-object-widget.h"
+#include "libseahorse/seahorse-util.h"
+#include "libseahorse/seahorse-validity.h"
 
 #include <glib/gi18n.h>
 
diff --git a/ssh/seahorse-ssh-key.c b/ssh/seahorse-ssh-key.c
index 0d95fec..43f71ed 100644
--- a/ssh/seahorse-ssh-key.c
+++ b/ssh/seahorse-ssh-key.c
@@ -29,7 +29,8 @@
 #include "seahorse-ssh-source.h"
 
 #include "seahorse-common.h"
-#include "seahorse-validity.h"
+
+#include "libseahorse/seahorse-validity.h"
 
 #include <gcr/gcr.h>
 
diff --git a/ssh/seahorse-ssh-key.h b/ssh/seahorse-ssh-key.h
index c8fc940..7ecbae9 100644
--- a/ssh/seahorse-ssh-key.h
+++ b/ssh/seahorse-ssh-key.h
@@ -23,8 +23,8 @@
 
 #include <gtk/gtk.h>
 
-#include "seahorse-object.h"
-#include "seahorse-validity.h"
+#include "libseahorse/seahorse-object.h"
+#include "libseahorse/seahorse-validity.h"
 
 #include "seahorse-ssh-key-data.h"
 
diff --git a/ssh/seahorse-ssh-operation.c b/ssh/seahorse-ssh-operation.c
index bee1317..9f0e8b3 100644
--- a/ssh/seahorse-ssh-operation.c
+++ b/ssh/seahorse-ssh-operation.c
@@ -23,9 +23,10 @@
 #include "seahorse-ssh-operation.h"
 
 #include "seahorse-common.h"
+
 #define DEBUG_FLAG SEAHORSE_DEBUG_OPERATION
-#include "seahorse-debug.h"
-#include "seahorse-util.h"
+#include "libseahorse/seahorse-debug.h"
+#include "libseahorse/seahorse-util.h"
 
 #include <sys/wait.h>
 #include <signal.h>
diff --git a/ssh/seahorse-ssh-source.c b/ssh/seahorse-ssh-source.c
index 71aa191..e8f6c2c 100644
--- a/ssh/seahorse-ssh-source.c
+++ b/ssh/seahorse-ssh-source.c
@@ -26,7 +26,8 @@
 #include "seahorse-ssh-source.h"
 
 #include "seahorse-common.h"
-#include "seahorse-util.h"
+
+#include "libseahorse/seahorse-util.h"
 
 #include <gcr/gcr.h>
 
@@ -39,7 +40,7 @@
 #include <errno.h>
 
 #define DEBUG_FLAG SEAHORSE_DEBUG_LOAD
-#include "seahorse-debug.h"
+#include "libseahorse/seahorse-debug.h"
 
 enum {
        PROP_0,
diff --git a/ssh/seahorse-ssh-upload.c b/ssh/seahorse-ssh-upload.c
index 1eb8108..e16abd7 100644
--- a/ssh/seahorse-ssh-upload.c
+++ b/ssh/seahorse-ssh-upload.c
@@ -25,9 +25,9 @@
 #include <glib/gi18n.h>
 
 #include "seahorse-common.h"
-#include "seahorse-widget.h"
-#include "seahorse-util.h"
-#include "seahorse-progress.h"
+#include "libseahorse/seahorse-widget.h"
+#include "libseahorse/seahorse-util.h"
+#include "libseahorse/seahorse-progress.h"
 
 #include "ssh/seahorse-ssh-dialogs.h"
 #include "ssh/seahorse-ssh-source.h"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]