[Xfce4-commits] [apps/xfdashboard] 01/01: Split application into core library (shared library libxfdashboard.so) and simple application to make objects reusable (e.g. plugin object in settings application) and to have an API

Wed Feb 17 09:01:19 CET 2016

This is an automated email from the git hooks/post-receive script.

nomad pushed a commit to branch master
in repository apps/xfdashboard.

commit 95d81b21b5bb2a4a1cc6524ca8e0932f42cc83bb
Author: Stephan Haller <nomad at froevel.de>
Date:   Wed Feb 17 08:59:29 2016 +0100

    Split application into core library (shared library libxfdashboard.so) and simple application to make objects reusable (e.g. plugin object in settings application) and to have an API
---
 .gitignore                                         |   8 +-
 Makefile.am                                        |   3 +-
 configure.ac.in                                    |  32 +--
 {xfdashboard => libxfdashboard}/Makefile.am        |  41 ++--
 {xfdashboard => libxfdashboard}/action-button.c    |   6 +-
 {xfdashboard => libxfdashboard}/action-button.h    |   2 +-
 {xfdashboard => libxfdashboard}/actor.c            |  10 +-
 {xfdashboard => libxfdashboard}/actor.h            |   0
 .../application-button.c                           |  12 +-
 .../application-button.h                           |   4 +-
 .../application-database.c                         |   4 +-
 .../application-database.h                         |   0
 .../application-tracker.c                          |   8 +-
 .../application-tracker.h                          |   0
 {xfdashboard => libxfdashboard}/application.c      |  34 +--
 {xfdashboard => libxfdashboard}/application.h      |   4 +-
 .../applications-menu-model.c                      |   4 +-
 .../applications-menu-model.h                      |   0
 .../applications-search-provider.c                 |  14 +-
 .../applications-search-provider.h                 |   2 +-
 .../applications-view.c                            |  32 +--
 .../applications-view.h                            |   2 +-
 {xfdashboard => libxfdashboard}/background.c       |   6 +-
 {xfdashboard => libxfdashboard}/background.h       |   4 +-
 {xfdashboard => libxfdashboard}/binding.c          |   4 +-
 {xfdashboard => libxfdashboard}/binding.h          |   0
 {xfdashboard => libxfdashboard}/bindings-pool.c    |   4 +-
 {xfdashboard => libxfdashboard}/bindings-pool.h    |   4 +-
 {xfdashboard => libxfdashboard}/box-layout.c       |   2 +-
 {xfdashboard => libxfdashboard}/box-layout.h       |   0
 {xfdashboard => libxfdashboard}/button.c           |   8 +-
 {xfdashboard => libxfdashboard}/button.h           |   4 +-
 {xfdashboard => libxfdashboard}/click-action.c     |   8 +-
 {xfdashboard => libxfdashboard}/click-action.h     |   0
 {xfdashboard => libxfdashboard}/collapse-box.c     |   8 +-
 {xfdashboard => libxfdashboard}/collapse-box.h     |   4 +-
 {xfdashboard => libxfdashboard}/css-selector.c     |   2 +-
 {xfdashboard => libxfdashboard}/css-selector.h     |   2 +-
 {xfdashboard => libxfdashboard}/desktop-app-info.c |   4 +-
 {xfdashboard => libxfdashboard}/desktop-app-info.h |   0
 {xfdashboard => libxfdashboard}/drag-action.c      |  10 +-
 {xfdashboard => libxfdashboard}/drag-action.h      |   0
 {xfdashboard => libxfdashboard}/drop-action.c      |   8 +-
 {xfdashboard => libxfdashboard}/drop-action.h      |   2 +-
 .../dynamic-table-layout.c                         |   2 +-
 .../dynamic-table-layout.h                         |   0
 {xfdashboard => libxfdashboard}/emblem-effect.c    |   6 +-
 {xfdashboard => libxfdashboard}/emblem-effect.h    |   2 +-
 {xfdashboard => libxfdashboard}/enums.c.template   |   0
 {xfdashboard => libxfdashboard}/enums.h.template   |   0
 {xfdashboard => libxfdashboard}/fill-box-layout.c  |   2 +-
 {xfdashboard => libxfdashboard}/fill-box-layout.h  |   0
 {xfdashboard => libxfdashboard}/focus-manager.c    |  10 +-
 {xfdashboard => libxfdashboard}/focus-manager.h    |   2 +-
 {xfdashboard => libxfdashboard}/focusable.c        |  12 +-
 {xfdashboard => libxfdashboard}/focusable.h        |   2 +-
 {xfdashboard => libxfdashboard}/image-content.c    |   6 +-
 {xfdashboard => libxfdashboard}/image-content.h    |   0
 libxfdashboard/libxfdashboard.pc.in                |  11 +
 {xfdashboard => libxfdashboard}/live-window.c      |  14 +-
 {xfdashboard => libxfdashboard}/live-window.h      |   6 +-
 {xfdashboard => libxfdashboard}/live-workspace.c   |  18 +-
 {xfdashboard => libxfdashboard}/live-workspace.h   |   6 +-
 {xfdashboard => libxfdashboard}/marshal.list       |   0
 {xfdashboard => libxfdashboard}/outline-effect.c   |   4 +-
 {xfdashboard => libxfdashboard}/outline-effect.h   |   2 +-
 {xfdashboard => libxfdashboard}/plugin.c           |   4 +-
 {xfdashboard => libxfdashboard}/plugin.h           |   0
 {xfdashboard => libxfdashboard}/plugins-manager.c  |   6 +-
 {xfdashboard => libxfdashboard}/plugins-manager.h  |   0
 {xfdashboard => libxfdashboard}/quicklaunch.c      |  32 +--
 {xfdashboard => libxfdashboard}/quicklaunch.h      |   6 +-
 .../scaled-table-layout.c                          |   2 +-
 .../scaled-table-layout.h                          |   0
 {xfdashboard => libxfdashboard}/scrollbar.c        |   4 +-
 {xfdashboard => libxfdashboard}/scrollbar.h        |   2 +-
 {xfdashboard => libxfdashboard}/search-manager.c   |   8 +-
 {xfdashboard => libxfdashboard}/search-manager.h   |   4 +-
 {xfdashboard => libxfdashboard}/search-provider.c  |   6 +-
 {xfdashboard => libxfdashboard}/search-provider.h  |   2 +-
 .../search-result-container.c                      |  20 +-
 .../search-result-container.h                      |   8 +-
 .../search-result-set.c                            |   2 +-
 .../search-result-set.h                            |   0
 {xfdashboard => libxfdashboard}/search-view.c      |  16 +-
 {xfdashboard => libxfdashboard}/search-view.h      |   2 +-
 {xfdashboard => libxfdashboard}/stage-interface.c  |   8 +-
 {xfdashboard => libxfdashboard}/stage-interface.h  |   6 +-
 {xfdashboard => libxfdashboard}/stage.c            |  40 ++--
 {xfdashboard => libxfdashboard}/stage.h            |   2 +-
 {xfdashboard => libxfdashboard}/stylable.c         |   4 +-
 {xfdashboard => libxfdashboard}/stylable.h         |   0
 {xfdashboard => libxfdashboard}/text-box.c         |  12 +-
 {xfdashboard => libxfdashboard}/text-box.h         |   2 +-
 {xfdashboard => libxfdashboard}/theme-css.c        |   6 +-
 {xfdashboard => libxfdashboard}/theme-css.h        |   2 +-
 {xfdashboard => libxfdashboard}/theme-effects.c    |   4 +-
 {xfdashboard => libxfdashboard}/theme-effects.h    |   0
 {xfdashboard => libxfdashboard}/theme-layout.c     |   4 +-
 {xfdashboard => libxfdashboard}/theme-layout.h     |   0
 {xfdashboard => libxfdashboard}/theme.c            |   2 +-
 {xfdashboard => libxfdashboard}/theme.h            |   6 +-
 {xfdashboard => libxfdashboard}/toggle-button.c    |   4 +-
 {xfdashboard => libxfdashboard}/toggle-button.h    |   2 +-
 {xfdashboard => libxfdashboard}/tooltip-action.c   |   6 +-
 {xfdashboard => libxfdashboard}/tooltip-action.h   |   0
 {xfdashboard => libxfdashboard}/types.h            |   0
 {xfdashboard => libxfdashboard}/utils.c            |   8 +-
 {xfdashboard => libxfdashboard}/utils.h            |   6 +-
 {xfdashboard => libxfdashboard}/view-manager.c     |   6 +-
 {xfdashboard => libxfdashboard}/view-manager.h     |   0
 {xfdashboard => libxfdashboard}/view-selector.c    |   6 +-
 {xfdashboard => libxfdashboard}/view-selector.h    |   6 +-
 {xfdashboard => libxfdashboard}/view.c             |  14 +-
 {xfdashboard => libxfdashboard}/view.h             |   6 +-
 {xfdashboard => libxfdashboard}/viewpad.c          |  14 +-
 {xfdashboard => libxfdashboard}/viewpad.h          |   6 +-
 {xfdashboard => libxfdashboard}/window-content.c   |  12 +-
 {xfdashboard => libxfdashboard}/window-content.h   |   4 +-
 .../window-tracker-monitor.c                       |   2 +-
 .../window-tracker-monitor.h                       |   0
 .../window-tracker-window.c                        |   6 +-
 .../window-tracker-window.h                        |   4 +-
 .../window-tracker-workspace.c                     |   6 +-
 .../window-tracker-workspace.h                     |   0
 {xfdashboard => libxfdashboard}/window-tracker.c   |   6 +-
 {xfdashboard => libxfdashboard}/window-tracker.h   |   6 +-
 {xfdashboard => libxfdashboard}/windows-view.c     |  30 +--
 {xfdashboard => libxfdashboard}/windows-view.h     |   4 +-
 .../workspace-selector.c                           |  26 +--
 .../workspace-selector.h                           |   2 +-
 plugins/clock-view/Makefile.am                     |   9 +-
 plugins/clock-view/clock-view.c                    |   8 +-
 plugins/clock-view/clock-view.h                    |   4 +-
 plugins/clock-view/plugin.c                        |   4 +-
 plugins/gnome-shell-search-provider/Makefile.am    |   9 +-
 .../gnome-shell-search-provider.c                  |   7 +-
 .../gnome-shell-search-provider.h                  |   4 +-
 plugins/gnome-shell-search-provider/plugin.c       |   6 +-
 plugins/hot-corner/Makefile.am                     |   9 +-
 plugins/hot-corner/hot-corner.c                    |   8 +-
 plugins/hot-corner/hot-corner.h                    |   2 +-
 plugins/hot-corner/plugin.c                        |   4 +-
 settings/Makefile.am                               |  14 +-
 xfdashboard/Makefile.am                            | 249 +--------------------
 xfdashboard/main.c                                 |   4 +-
 146 files changed, 467 insertions(+), 699 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8ef474f..987b878 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,10 +5,10 @@
 *.la
 .deps
 .libs
-xfoverview.geany
-xfdashboard/enums.[ch]
-xfdashboard/marshal.[ch]
-xfdashboard/stamp-marshal.h
+*.geany
+libxfdashboard/enums.[ch]
+libxfdashboard/marshal.[ch]
+libxfdashboard/stamp-marshal.h
 xfdashboard/xfdashboard
 settings/xfdashboard-settings
 data/appdata/xfdashboard.appdata.xml
diff --git a/Makefile.am b/Makefile.am
index 8e3689c..6ad4534 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,8 +14,9 @@ DISTCLEANFILES = \
 
 SUBDIRS = \
 	data \
-	plugins \
 	po \
+	libxfdashboard \
+	plugins \
 	settings \
 	xfdashboard
 
diff --git a/configure.ac.in b/configure.ac.in
index ff7a060..74f62dd 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -257,6 +257,8 @@ data/themes/xfdashboard-dark/Makefile
 data/themes/xfdashboard-mint/Makefile
 data/themes/xfdashboard-moranga/Makefile
 data/themes/xfdashboard-wine/Makefile
+libxfdashboard/libxfdashboard.pc
+libxfdashboard/Makefile
 plugins/Makefile
 plugins/clock-view/Makefile
 plugins/gnome-shell-search-provider/Makefile
@@ -273,25 +275,25 @@ echo
 echo "Build Configuration for $PACKAGE version $VERSION revision $REVISION:"
 echo
 echo "Library versions used:"
-echo "  libwnck:       $LIBWNCK_VERSION"
-echo "  clutter:       $CLUTTER_VERSION"
-echo "  cogl:          $CLUTTER_COGL_VERSION"
-echo "  gtk+:          $GTK_VERSION"
-echo "  glib:          $GLIB_VERSION"
-echo "  gio:           $GIO_VERSION"
-echo "  gio-unix:      $GIO_UNIX_VERSION"
-echo "  garcon:        $GARCON_VERSION"
-echo "  libxconf:      $LIBXFCONF_VERSION"
-echo "  libxfce4ui:    $LIBXFCE4UI_VERSION"
-echo "  libxfce4util:  $LIBXFCE4UTIL_VERSION"
-echo "  dbus-glib:     $DBUS_GLIB_VERSION"
+echo "  libwnck:          $LIBWNCK_VERSION"
+echo "  clutter:          $CLUTTER_VERSION"
+echo "  cogl:             $CLUTTER_COGL_VERSION"
+echo "  gtk+:             $GTK_VERSION"
+echo "  glib:             $GLIB_VERSION"
+echo "  gio:              $GIO_VERSION"
+echo "  gio-unix:         $GIO_UNIX_VERSION"
+echo "  garcon:           $GARCON_VERSION"
+echo "  libxconf:         $LIBXFCONF_VERSION"
+echo "  libxfce4ui:       $LIBXFCE4UI_VERSION"
+echo "  libxfce4util:     $LIBXFCE4UTIL_VERSION"
+echo "  dbus-glib:        $DBUS_GLIB_VERSION"
 echo
 echo "Tools used:"
 echo "  glib-genmarshal:  $GLIB_GENMARSHAL"
 echo "  glib-mkenums:     $GLIB_MKENUMS"
 echo
 echo "Features enabled:"
-echo "  XComposite:    $enabled_x11_extension_composite"
-echo "  XDamage:       $enabled_x11_extension_damage"
-echo "  Xinerama:      $enabled_x11_extension_xinerama"
+echo "  XComposite:       $enabled_x11_extension_composite"
+echo "  XDamage:          $enabled_x11_extension_damage"
+echo "  Xinerama:         $enabled_x11_extension_xinerama"
 echo
diff --git a/xfdashboard/Makefile.am b/libxfdashboard/Makefile.am
similarity index 86%
copy from xfdashboard/Makefile.am
copy to libxfdashboard/Makefile.am
index 5cd83d1..030293b 100644
--- a/xfdashboard/Makefile.am
+++ b/libxfdashboard/Makefile.am
@@ -6,21 +6,21 @@ AM_CPPFLAGS = \
 	-DPACKAGE_LIBDIR=\"$(libdir)\" \
 	$(PLATFORM_CPPFLAGS)
 
-noinst_LTLIBRARIES = \
-	libxfdashboard.la
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libxfdashboard.pc
 
-bin_PROGRAMS = \
-	xfdashboard
+lib_LTLIBRARIES = \
+	libxfdashboard.la
 
 xfdashboard_marshal_prefix = xfdashboard
 
-xfdashboard_built_sources = \
+libxfdashboard_la_built_sources = \
 	enums.h \
 	enums.c \
 	marshal.h \
 	marshal.c
 
-xfdashboard_headers = \
+libxfdashboard_la_headers = \
 	action-button.h \
 	actor.h \
 	application.h \
@@ -85,7 +85,7 @@ xfdashboard_headers = \
 	workspace-selector.h
 
 libxfdashboard_la_SOURCES = \
-	$(xfdashboard_built_sources) \
+	$(libxfdashboard_la_built_sources) \
 	$(xfdashboard_headers) \
 	action-button.c \
 	actor.c \
@@ -201,32 +201,17 @@ libxfdashboard_la_LIBADD += \
 	$(XINERAMA_LIBS)
 endif
 
-xfdashboard_SOURCES = \
-	main.c
-
-xfdashboard_CFLAGS = \
-	$(libxfdashboard_la_CFLAGS)
-
-xfdashboard_LDADD = \
-	libxfdashboard.la
-
-xfdashboard_LDFLAGS = \
-	$(PLATFORM_LDFLAGS) \
-	-export-dynamic \
-	-no-undefined \
-	-Wl,--whole-archive,.libs/libxfdashboard.a,--no-whole-archive
-
 if MAINTAINER_MODE
 
 CLEANFILES = \
 	xgen-xmc \
 	xgen-xmh
 
-enums.h: $(xfdashboard_headers) Makefile
-	$(AM_V_GEN) $(GLIB_MKENUMS) --template enums.h.template $(xfdashboard_headers) > $@
+enums.h: $(libxfdashboard_la_headers) Makefile
+	$(AM_V_GEN) $(GLIB_MKENUMS) --template enums.h.template $(libxfdashboard_la_headers) > $@
 
-enums.c: $(xfdashboard_headers) Makefile
-	$(AM_V_GEN) $(GLIB_MKENUMS) --template enums.c.template $(xfdashboard_headers) > $@
+enums.c: $(libxfdashboard_la_headers) Makefile
+	$(AM_V_GEN) $(GLIB_MKENUMS) --template enums.c.template $(libxfdashboard_la_headers) > $@
 
 marshal.h: stamp-marshal.h
 	@true
@@ -256,10 +241,10 @@ marshal.c: marshal.list Makefile
 	)
 
 DISTCLEANFILES = \
-	$(xfdashboard_built_sources)
+	$(libxfdashboard_la_built_sources)
 
 BUILT_SOURCES = \
-	$(xfdashboard_built_sources)
+	$(libxfdashboard_la_built_sources)
 
 endif
 
diff --git a/xfdashboard/action-button.c b/libxfdashboard/action-button.c
similarity index 99%
rename from xfdashboard/action-button.c
rename to libxfdashboard/action-button.c
index a866f2d..bd4cf95 100644
--- a/xfdashboard/action-button.c
+++ b/libxfdashboard/action-button.c
@@ -25,12 +25,12 @@
 #include "config.h"
 #endif
 
-#include "action-button.h"
+#include <libxfdashboard/action-button.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "focusable.h"
-#include "focus-manager.h"
+#include <libxfdashboard/focusable.h>
+#include <libxfdashboard/focus-manager.h>
 
 /* Define this class in GObject system */
 static void _xfdashboard_action_button_focusable_iface_init(XfdashboardFocusableInterface *iface);
diff --git a/xfdashboard/action-button.h b/libxfdashboard/action-button.h
similarity index 98%
rename from xfdashboard/action-button.h
rename to libxfdashboard/action-button.h
index 4c3e1cf..fdd8d20 100644
--- a/xfdashboard/action-button.h
+++ b/libxfdashboard/action-button.h
@@ -24,7 +24,7 @@
 #ifndef __XFDASHBOARD_ACTION_BUTTON__
 #define __XFDASHBOARD_ACTION_BUTTON__
 
-#include "button.h"
+#include <libxfdashboard/button.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/actor.c b/libxfdashboard/actor.c
similarity index 99%
rename from xfdashboard/actor.c
rename to libxfdashboard/actor.c
index fe6e379..7ec354b 100644
--- a/xfdashboard/actor.c
+++ b/libxfdashboard/actor.c
@@ -25,14 +25,14 @@
 #include "config.h"
 #endif
 
-#include "actor.h"
+#include <libxfdashboard/actor.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "application.h"
-#include "stylable.h"
-#include "focusable.h"
-#include "utils.h"
+#include <libxfdashboard/application.h>
+#include <libxfdashboard/stylable.h>
+#include <libxfdashboard/focusable.h>
+#include <libxfdashboard/utils.h>
 
 /* Define this class in GObject system */
 static gpointer				xfdashboard_actor_parent_class=NULL;
diff --git a/xfdashboard/actor.h b/libxfdashboard/actor.h
similarity index 100%
rename from xfdashboard/actor.h
rename to libxfdashboard/actor.h
diff --git a/xfdashboard/application-button.c b/libxfdashboard/application-button.c
similarity index 98%
rename from xfdashboard/application-button.c
rename to libxfdashboard/application-button.c
index 8caa61e..bc8e4b5 100644
--- a/xfdashboard/application-button.c
+++ b/libxfdashboard/application-button.c
@@ -26,17 +26,17 @@
 #include "config.h"
 #endif
 
-#include "application-button.h"
+#include <libxfdashboard/application-button.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gio/gdesktopappinfo.h>
 
-#include "enums.h"
-#include "utils.h"
-#include "application-tracker.h"
-#include "stylable.h"
-#include "application.h"
+#include <libxfdashboard/enums.h>
+#include <libxfdashboard/utils.h>
+#include <libxfdashboard/application-tracker.h>
+#include <libxfdashboard/stylable.h>
+#include <libxfdashboard/application.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardApplicationButton,
diff --git a/xfdashboard/application-button.h b/libxfdashboard/application-button.h
similarity index 98%
rename from xfdashboard/application-button.h
rename to libxfdashboard/application-button.h
index a59e525..d8b2e3a 100644
--- a/xfdashboard/application-button.h
+++ b/libxfdashboard/application-button.h
@@ -27,8 +27,8 @@
 
 #include <garcon/garcon.h>
 
-#include "button.h"
-#include "desktop-app-info.h"
+#include <libxfdashboard/button.h>
+#include <libxfdashboard/desktop-app-info.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/application-database.c b/libxfdashboard/application-database.c
similarity index 99%
rename from xfdashboard/application-database.c
rename to libxfdashboard/application-database.c
index 65d3d2c..fed27e0 100644
--- a/xfdashboard/application-database.c
+++ b/libxfdashboard/application-database.c
@@ -28,8 +28,8 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "application-database.h"
-#include "desktop-app-info.h"
+#include <libxfdashboard/application-database.h>
+#include <libxfdashboard/desktop-app-info.h>
 
 
 /* Define this class in GObject system */
diff --git a/xfdashboard/application-database.h b/libxfdashboard/application-database.h
similarity index 100%
rename from xfdashboard/application-database.h
rename to libxfdashboard/application-database.h
diff --git a/xfdashboard/application-tracker.c b/libxfdashboard/application-tracker.c
similarity index 99%
rename from xfdashboard/application-tracker.c
rename to libxfdashboard/application-tracker.c
index fc979c6..193a6ee 100644
--- a/xfdashboard/application-tracker.c
+++ b/libxfdashboard/application-tracker.c
@@ -28,11 +28,11 @@
 #include <glib/gi18n-lib.h>
 #include <stdlib.h>
 
-#include "application-tracker.h"
+#include <libxfdashboard/application-tracker.h>
 
-#include "application-database.h"
-#include "window-tracker.h"
-#include "marshal.h"
+#include <libxfdashboard/application-database.h>
+#include <libxfdashboard/window-tracker.h>
+#include <libxfdashboard/marshal.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardApplicationTracker,
diff --git a/xfdashboard/application-tracker.h b/libxfdashboard/application-tracker.h
similarity index 100%
rename from xfdashboard/application-tracker.h
rename to libxfdashboard/application-tracker.h
diff --git a/xfdashboard/application.c b/libxfdashboard/application.c
similarity index 98%
rename from xfdashboard/application.c
rename to libxfdashboard/application.c
index 7445c56..c0d48c4 100644
--- a/xfdashboard/application.c
+++ b/libxfdashboard/application.c
@@ -26,7 +26,7 @@
 #include "config.h"
 #endif
 
-#include "application.h"
+#include <libxfdashboard/application.h>
 
 #include <glib/gi18n-lib.h>
 #include <clutter/x11/clutter-x11.h>
@@ -34,22 +34,22 @@
 #include <garcon/garcon.h>
 #include <libxfce4ui/libxfce4ui.h>
 
-#include "stage.h"
-#include "types.h"
-#include "view-manager.h"
-#include "applications-view.h"
-#include "windows-view.h"
-#include "search-view.h"
-#include "search-manager.h"
-#include "applications-search-provider.h"
-#include "utils.h"
-#include "theme.h"
-#include "focus-manager.h"
-#include "bindings-pool.h"
-#include "application-database.h"
-#include "application-tracker.h"
-#include "plugins-manager.h"
-#include "marshal.h"
+#include <libxfdashboard/stage.h>
+#include <libxfdashboard/types.h>
+#include <libxfdashboard/view-manager.h>
+#include <libxfdashboard/applications-view.h>
+#include <libxfdashboard/windows-view.h>
+#include <libxfdashboard/search-view.h>
+#include <libxfdashboard/search-manager.h>
+#include <libxfdashboard/applications-search-provider.h>
+#include <libxfdashboard/utils.h>
+#include <libxfdashboard/theme.h>
+#include <libxfdashboard/focus-manager.h>
+#include <libxfdashboard/bindings-pool.h>
+#include <libxfdashboard/application-database.h>
+#include <libxfdashboard/application-tracker.h>
+#include <libxfdashboard/plugins-manager.h>
+#include <libxfdashboard/marshal.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardApplication,
diff --git a/xfdashboard/application.h b/libxfdashboard/application.h
similarity index 98%
rename from xfdashboard/application.h
rename to libxfdashboard/application.h
index 392f9cb..c47e7d5 100644
--- a/xfdashboard/application.h
+++ b/libxfdashboard/application.h
@@ -28,8 +28,8 @@
 #include <gio/gio.h>
 #include <xfconf/xfconf.h>
 
-#include "theme.h"
-#include "focusable.h"
+#include <libxfdashboard/theme.h>
+#include <libxfdashboard/focusable.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/applications-menu-model.c b/libxfdashboard/applications-menu-model.c
similarity index 99%
rename from xfdashboard/applications-menu-model.c
rename to libxfdashboard/applications-menu-model.c
index f83b261..478d2d8 100644
--- a/xfdashboard/applications-menu-model.c
+++ b/libxfdashboard/applications-menu-model.c
@@ -28,8 +28,8 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "applications-menu-model.h"
-#include "application-database.h"
+#include <libxfdashboard/applications-menu-model.h>
+#include <libxfdashboard/application-database.h>
 
 /* Define these classes in GObject system */
 G_DEFINE_TYPE(XfdashboardApplicationsMenuModel,
diff --git a/xfdashboard/applications-menu-model.h b/libxfdashboard/applications-menu-model.h
similarity index 100%
rename from xfdashboard/applications-menu-model.h
rename to libxfdashboard/applications-menu-model.h
diff --git a/xfdashboard/applications-search-provider.c b/libxfdashboard/applications-search-provider.c
similarity index 99%
rename from xfdashboard/applications-search-provider.c
rename to libxfdashboard/applications-search-provider.c
index 70c8e5e..3513479 100644
--- a/xfdashboard/applications-search-provider.c
+++ b/libxfdashboard/applications-search-provider.c
@@ -26,18 +26,18 @@
 #include "config.h"
 #endif
 
-#include "applications-search-provider.h"
+#include <libxfdashboard/applications-search-provider.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <errno.h>
 
-#include "application-database.h"
-#include "application-button.h"
-#include "application.h"
-#include "drag-action.h"
-#include "utils.h"
-#include "enums.h"
+#include <libxfdashboard/application-database.h>
+#include <libxfdashboard/application-button.h>
+#include <libxfdashboard/application.h>
+#include <libxfdashboard/drag-action.h>
+#include <libxfdashboard/utils.h>
+#include <libxfdashboard/enums.h>
 
 
 /* Define this class in GObject system */
diff --git a/xfdashboard/applications-search-provider.h b/libxfdashboard/applications-search-provider.h
similarity index 98%
rename from xfdashboard/applications-search-provider.h
rename to libxfdashboard/applications-search-provider.h
index 878c833..010f6ae 100644
--- a/xfdashboard/applications-search-provider.h
+++ b/libxfdashboard/applications-search-provider.h
@@ -25,7 +25,7 @@
 #ifndef __XFDASHBOARD_APPLICATIONS_SEARCH_PROVIDER__
 #define __XFDASHBOARD_APPLICATIONS_SEARCH_PROVIDER__
 
-#include "search-provider.h"
+#include <libxfdashboard/search-provider.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/applications-view.c b/libxfdashboard/applications-view.c
similarity index 98%
rename from xfdashboard/applications-view.c
rename to libxfdashboard/applications-view.c
index af85501..cd33984 100644
--- a/xfdashboard/applications-view.c
+++ b/libxfdashboard/applications-view.c
@@ -28,22 +28,22 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include "applications-view.h"
-#include "view.h"
-#include "applications-menu-model.h"
-#include "types.h"
-#include "button.h"
-#include "application.h"
-#include "application-button.h"
-#include "enums.h"
-#include "drag-action.h"
-#include "stylable.h"
-#include "focusable.h"
-#include "focus-manager.h"
-#include "dynamic-table-layout.h"
-#include "utils.h"
-#include "desktop-app-info.h"
-#include "application-database.h"
+#include <libxfdashboard/applications-view.h>
+#include <libxfdashboard/view.h>
+#include <libxfdashboard/applications-menu-model.h>
+#include <libxfdashboard/types.h>
+#include <libxfdashboard/button.h>
+#include <libxfdashboard/application.h>
+#include <libxfdashboard/application-button.h>
+#include <libxfdashboard/enums.h>
+#include <libxfdashboard/drag-action.h>
+#include <libxfdashboard/stylable.h>
+#include <libxfdashboard/focusable.h>
+#include <libxfdashboard/focus-manager.h>
+#include <libxfdashboard/dynamic-table-layout.h>
+#include <libxfdashboard/utils.h>
+#include <libxfdashboard/desktop-app-info.h>
+#include <libxfdashboard/application-database.h>
 
 /* Define this class in GObject system */
 static void _xfdashboard_applications_view_focusable_iface_init(XfdashboardFocusableInterface *iface);
diff --git a/xfdashboard/applications-view.h b/libxfdashboard/applications-view.h
similarity index 99%
rename from xfdashboard/applications-view.h
rename to libxfdashboard/applications-view.h
index dcc130a..caf02ce 100644
--- a/xfdashboard/applications-view.h
+++ b/libxfdashboard/applications-view.h
@@ -24,7 +24,7 @@
 #ifndef __XFDASHBOARD_APPLICATIONS_VIEW__
 #define __XFDASHBOARD_APPLICATIONS_VIEW__
 
-#include "view.h"
+#include <libxfdashboard/view.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/background.c b/libxfdashboard/background.c
similarity index 99%
rename from xfdashboard/background.c
rename to libxfdashboard/background.c
index 1154a48..bb25cfe 100644
--- a/xfdashboard/background.c
+++ b/libxfdashboard/background.c
@@ -26,14 +26,14 @@
 #include "config.h"
 #endif
 
-#include "background.h"
+#include <libxfdashboard/background.h>
 
 #include <glib/gi18n-lib.h>
 #include <gdk/gdk.h>
 #include <math.h>
 
-#include "enums.h"
-#include "outline-effect.h"
+#include <libxfdashboard/enums.h>
+#include <libxfdashboard/outline-effect.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardBackground,
diff --git a/xfdashboard/background.h b/libxfdashboard/background.h
similarity index 98%
rename from xfdashboard/background.h
rename to libxfdashboard/background.h
index 6667474..03f5bc0 100644
--- a/xfdashboard/background.h
+++ b/libxfdashboard/background.h
@@ -27,8 +27,8 @@
 
 #include <clutter/clutter.h>
 
-#include "actor.h"
-#include "types.h"
+#include <libxfdashboard/actor.h>
+#include <libxfdashboard/types.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/binding.c b/libxfdashboard/binding.c
similarity index 99%
rename from xfdashboard/binding.c
rename to libxfdashboard/binding.c
index 8a7e66e..7b3f194 100644
--- a/xfdashboard/binding.c
+++ b/libxfdashboard/binding.c
@@ -28,8 +28,8 @@
 #include <glib/gi18n-lib.h>
 #include <gdk/gdk.h>
 
-#include "binding.h"
-#include "enums.h"
+#include <libxfdashboard/binding.h>
+#include <libxfdashboard/enums.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardBinding,
diff --git a/xfdashboard/binding.h b/libxfdashboard/binding.h
similarity index 100%
rename from xfdashboard/binding.h
rename to libxfdashboard/binding.h
diff --git a/xfdashboard/bindings-pool.c b/libxfdashboard/bindings-pool.c
similarity index 99%
rename from xfdashboard/bindings-pool.c
rename to libxfdashboard/bindings-pool.c
index 7793965..3fa3775 100644
--- a/xfdashboard/bindings-pool.c
+++ b/libxfdashboard/bindings-pool.c
@@ -25,14 +25,14 @@
 #include "config.h"
 #endif
 
-#include "bindings-pool.h"
+#include <libxfdashboard/bindings-pool.h>
 
 #include <glib-object.h>
 #include <glib/gi18n-lib.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "utils.h"
+#include <libxfdashboard/utils.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardBindingsPool,
diff --git a/xfdashboard/bindings-pool.h b/libxfdashboard/bindings-pool.h
similarity index 97%
rename from xfdashboard/bindings-pool.h
rename to libxfdashboard/bindings-pool.h
index fc2e786..0844f91 100644
--- a/xfdashboard/bindings-pool.h
+++ b/libxfdashboard/bindings-pool.h
@@ -26,8 +26,8 @@
 
 #include <clutter/clutter.h>
 
-#include "binding.h"
-#include "types.h"
+#include <libxfdashboard/binding.h>
+#include <libxfdashboard/types.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/box-layout.c b/libxfdashboard/box-layout.c
similarity index 99%
rename from xfdashboard/box-layout.c
rename to libxfdashboard/box-layout.c
index 209834b..e1cfd49 100644
--- a/xfdashboard/box-layout.c
+++ b/libxfdashboard/box-layout.c
@@ -40,7 +40,7 @@
 #include "config.h"
 #endif
 
-#include "box-layout.h"
+#include <libxfdashboard/box-layout.h>
 
 #include <glib/gi18n-lib.h>
 #include <clutter/clutter.h>
diff --git a/xfdashboard/box-layout.h b/libxfdashboard/box-layout.h
similarity index 100%
rename from xfdashboard/box-layout.h
rename to libxfdashboard/box-layout.h
diff --git a/xfdashboard/button.c b/libxfdashboard/button.c
similarity index 99%
rename from xfdashboard/button.c
rename to libxfdashboard/button.c
index a0e55d7..b40c536 100644
--- a/xfdashboard/button.c
+++ b/libxfdashboard/button.c
@@ -26,15 +26,15 @@
 #include "config.h"
 #endif
 
-#include "button.h"
+#include <libxfdashboard/button.h>
 
 #include <glib/gi18n-lib.h>
 #include <gdk/gdk.h>
 #include <math.h>
 
-#include "enums.h"
-#include "click-action.h"
-#include "image-content.h"
+#include <libxfdashboard/enums.h>
+#include <libxfdashboard/click-action.h>
+#include <libxfdashboard/image-content.h>
 
 /* Forward declarations */
 typedef enum /*< skip,prefix=XFDASHBOARD_BUTTON_ICON_TYPE >*/
diff --git a/xfdashboard/button.h b/libxfdashboard/button.h
similarity index 98%
rename from xfdashboard/button.h
rename to libxfdashboard/button.h
index c61e1f4..93c5802 100644
--- a/xfdashboard/button.h
+++ b/libxfdashboard/button.h
@@ -27,8 +27,8 @@
 
 #include <clutter/clutter.h>
 
-#include "background.h"
-#include "types.h"
+#include <libxfdashboard/background.h>
+#include <libxfdashboard/types.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/click-action.c b/libxfdashboard/click-action.c
similarity index 99%
rename from xfdashboard/click-action.c
rename to libxfdashboard/click-action.c
index ec9fcb9..a04ff56 100644
--- a/xfdashboard/click-action.c
+++ b/libxfdashboard/click-action.c
@@ -35,13 +35,13 @@
 #include "config.h"
 #endif
 
-#include "click-action.h"
+#include <libxfdashboard/click-action.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "marshal.h"
-#include "actor.h"
-#include "stylable.h"
+#include <libxfdashboard/marshal.h>
+#include <libxfdashboard/actor.h>
+#include <libxfdashboard/stylable.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardClickAction,
diff --git a/xfdashboard/click-action.h b/libxfdashboard/click-action.h
similarity index 100%
rename from xfdashboard/click-action.h
rename to libxfdashboard/click-action.h
diff --git a/xfdashboard/collapse-box.c b/libxfdashboard/collapse-box.c
similarity index 99%
rename from xfdashboard/collapse-box.c
rename to libxfdashboard/collapse-box.c
index f93cda4..fcc7d17 100644
--- a/xfdashboard/collapse-box.c
+++ b/libxfdashboard/collapse-box.c
@@ -26,13 +26,13 @@
 #include "config.h"
 #endif
 
-#include "collapse-box.h"
+#include <libxfdashboard/collapse-box.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "enums.h"
-#include "focus-manager.h"
-#include "utils.h"
+#include <libxfdashboard/enums.h>
+#include <libxfdashboard/focus-manager.h>
+#include <libxfdashboard/utils.h>
 
 /* Define this class in GObject system */
 static void _xfdashboard_collapse_box_container_iface_init(ClutterContainerIface *inInterface);
diff --git a/xfdashboard/collapse-box.h b/libxfdashboard/collapse-box.h
similarity index 97%
rename from xfdashboard/collapse-box.h
rename to libxfdashboard/collapse-box.h
index bb0afd7..8738f45 100644
--- a/xfdashboard/collapse-box.h
+++ b/libxfdashboard/collapse-box.h
@@ -27,8 +27,8 @@
 
 #include <clutter/clutter.h>
 
-#include "actor.h"
-#include "types.h"
+#include <libxfdashboard/actor.h>
+#include <libxfdashboard/types.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/css-selector.c b/libxfdashboard/css-selector.c
similarity index 99%
rename from xfdashboard/css-selector.c
rename to libxfdashboard/css-selector.c
index 5612573..0cce156 100644
--- a/xfdashboard/css-selector.c
+++ b/libxfdashboard/css-selector.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include "css-selector.h"
+#include <libxfdashboard/css-selector.h>
 
 #include <glib/gi18n-lib.h>
 
diff --git a/xfdashboard/css-selector.h b/libxfdashboard/css-selector.h
similarity index 99%
rename from xfdashboard/css-selector.h
rename to libxfdashboard/css-selector.h
index 6213f67..150c44f 100644
--- a/xfdashboard/css-selector.h
+++ b/libxfdashboard/css-selector.h
@@ -27,7 +27,7 @@
 #include <glib-object.h>
 #include <glib.h>
 
-#include "stylable.h"
+#include <libxfdashboard/stylable.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/desktop-app-info.c b/libxfdashboard/desktop-app-info.c
similarity index 99%
rename from xfdashboard/desktop-app-info.c
rename to libxfdashboard/desktop-app-info.c
index f052ff2..773efcd 100644
--- a/xfdashboard/desktop-app-info.c
+++ b/libxfdashboard/desktop-app-info.c
@@ -28,8 +28,8 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "desktop-app-info.h"
-#include "application-database.h"
+#include <libxfdashboard/desktop-app-info.h>
+#include <libxfdashboard/application-database.h>
 
 /* Define this class in GObject system */
 static void _xfdashboard_desktop_app_info_gappinfo_iface_init(GAppInfoIface *iface);
diff --git a/xfdashboard/desktop-app-info.h b/libxfdashboard/desktop-app-info.h
similarity index 100%
rename from xfdashboard/desktop-app-info.h
rename to libxfdashboard/desktop-app-info.h
diff --git a/xfdashboard/drag-action.c b/libxfdashboard/drag-action.c
similarity index 99%
rename from xfdashboard/drag-action.c
rename to libxfdashboard/drag-action.c
index 2f0a2da..334ee59 100644
--- a/xfdashboard/drag-action.c
+++ b/libxfdashboard/drag-action.c
@@ -25,14 +25,14 @@
 #include "config.h"
 #endif
 
-#include "drag-action.h"
+#include <libxfdashboard/drag-action.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "drop-action.h"
-#include "marshal.h"
-#include "actor.h"
-#include "stylable.h"
+#include <libxfdashboard/drop-action.h>
+#include <libxfdashboard/marshal.h>
+#include <libxfdashboard/actor.h>
+#include <libxfdashboard/stylable.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardDragAction,
diff --git a/xfdashboard/drag-action.h b/libxfdashboard/drag-action.h
similarity index 100%
rename from xfdashboard/drag-action.h
rename to libxfdashboard/drag-action.h
diff --git a/xfdashboard/drop-action.c b/libxfdashboard/drop-action.c
similarity index 98%
rename from xfdashboard/drop-action.c
rename to libxfdashboard/drop-action.c
index 561e489..1a12f1d 100644
--- a/xfdashboard/drop-action.c
+++ b/libxfdashboard/drop-action.c
@@ -25,13 +25,13 @@
 #include "config.h"
 #endif
 
-#include "drop-action.h"
+#include <libxfdashboard/drop-action.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "marshal.h"
-#include "actor.h"
-#include "stylable.h"
+#include <libxfdashboard/marshal.h>
+#include <libxfdashboard/actor.h>
+#include <libxfdashboard/stylable.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardDropAction,
diff --git a/xfdashboard/drop-action.h b/libxfdashboard/drop-action.h
similarity index 98%
rename from xfdashboard/drop-action.h
rename to libxfdashboard/drop-action.h
index 21af7b9..e3af0d3 100644
--- a/xfdashboard/drop-action.h
+++ b/libxfdashboard/drop-action.h
@@ -26,7 +26,7 @@
 
 #include <clutter/clutter.h>
 
-#include "drag-action.h"
+#include <libxfdashboard/drag-action.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/dynamic-table-layout.c b/libxfdashboard/dynamic-table-layout.c
similarity index 99%
rename from xfdashboard/dynamic-table-layout.c
rename to libxfdashboard/dynamic-table-layout.c
index 2fbeeda..c4953c7 100644
--- a/xfdashboard/dynamic-table-layout.c
+++ b/libxfdashboard/dynamic-table-layout.c
@@ -28,7 +28,7 @@
 #include "config.h"
 #endif
 
-#include "dynamic-table-layout.h"
+#include <libxfdashboard/dynamic-table-layout.h>
 
 #include <glib/gi18n-lib.h>
 #include <clutter/clutter.h>
diff --git a/xfdashboard/dynamic-table-layout.h b/libxfdashboard/dynamic-table-layout.h
similarity index 100%
rename from xfdashboard/dynamic-table-layout.h
rename to libxfdashboard/dynamic-table-layout.h
diff --git a/xfdashboard/emblem-effect.c b/libxfdashboard/emblem-effect.c
similarity index 99%
rename from xfdashboard/emblem-effect.c
rename to libxfdashboard/emblem-effect.c
index d95d8af..109fd71 100644
--- a/xfdashboard/emblem-effect.c
+++ b/libxfdashboard/emblem-effect.c
@@ -28,14 +28,14 @@
 #define COGL_ENABLE_EXPERIMENTAL_API
 #define CLUTTER_ENABLE_EXPERIMENTAL_API
 
-#include "emblem-effect.h"
+#include <libxfdashboard/emblem-effect.h>
 
 #include <glib/gi18n-lib.h>
 #include <math.h>
 #include <cogl/cogl.h>
 
-#include "image-content.h"
-#include "enums.h"
+#include <libxfdashboard/image-content.h>
+#include <libxfdashboard/enums.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardEmblemEffect,
diff --git a/xfdashboard/emblem-effect.h b/libxfdashboard/emblem-effect.h
similarity index 99%
rename from xfdashboard/emblem-effect.h
rename to libxfdashboard/emblem-effect.h
index 3829d24..f9a42ff 100644
--- a/xfdashboard/emblem-effect.h
+++ b/libxfdashboard/emblem-effect.h
@@ -26,7 +26,7 @@
 
 #include <clutter/clutter.h>
 
-#include "types.h"
+#include <libxfdashboard/types.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/enums.c.template b/libxfdashboard/enums.c.template
similarity index 100%
rename from xfdashboard/enums.c.template
rename to libxfdashboard/enums.c.template
diff --git a/xfdashboard/enums.h.template b/libxfdashboard/enums.h.template
similarity index 100%
rename from xfdashboard/enums.h.template
rename to libxfdashboard/enums.h.template
diff --git a/xfdashboard/fill-box-layout.c b/libxfdashboard/fill-box-layout.c
similarity index 99%
rename from xfdashboard/fill-box-layout.c
rename to libxfdashboard/fill-box-layout.c
index 6886338..b9101bd 100644
--- a/xfdashboard/fill-box-layout.c
+++ b/libxfdashboard/fill-box-layout.c
@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#include "fill-box-layout.h"
+#include <libxfdashboard/fill-box-layout.h>
 
 #include <glib/gi18n-lib.h>
 #include <clutter/clutter.h>
diff --git a/xfdashboard/fill-box-layout.h b/libxfdashboard/fill-box-layout.h
similarity index 100%
rename from xfdashboard/fill-box-layout.h
rename to libxfdashboard/fill-box-layout.h
diff --git a/xfdashboard/focus-manager.c b/libxfdashboard/focus-manager.c
similarity index 99%
rename from xfdashboard/focus-manager.c
rename to libxfdashboard/focus-manager.c
index 4c0aade..cff0340 100644
--- a/xfdashboard/focus-manager.c
+++ b/libxfdashboard/focus-manager.c
@@ -26,14 +26,14 @@
 #include "config.h"
 #endif
 
-#include "focus-manager.h"
+#include <libxfdashboard/focus-manager.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "marshal.h"
-#include "stylable.h"
-#include "bindings-pool.h"
-#include "application.h"
+#include <libxfdashboard/marshal.h>
+#include <libxfdashboard/stylable.h>
+#include <libxfdashboard/bindings-pool.h>
+#include <libxfdashboard/application.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardFocusManager,
diff --git a/xfdashboard/focus-manager.h b/libxfdashboard/focus-manager.h
similarity index 99%
rename from xfdashboard/focus-manager.h
rename to libxfdashboard/focus-manager.h
index 670d1f8..65a603e 100644
--- a/xfdashboard/focus-manager.h
+++ b/libxfdashboard/focus-manager.h
@@ -27,7 +27,7 @@
 
 #include <glib-object.h>
 
-#include "focusable.h"
+#include <libxfdashboard/focusable.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/focusable.c b/libxfdashboard/focusable.c
similarity index 99%
rename from xfdashboard/focusable.c
rename to libxfdashboard/focusable.c
index ba1003d..b34bcc8 100644
--- a/xfdashboard/focusable.c
+++ b/libxfdashboard/focusable.c
@@ -27,16 +27,16 @@
 #include "config.h"
 #endif
 
-#include "focusable.h"
+#include <libxfdashboard/focusable.h>
 
 #include <clutter/clutter.h>
 #include <glib/gi18n-lib.h>
 
-#include "utils.h"
-#include "stylable.h"
-#include "marshal.h"
-#include "focus-manager.h"
-#include "application.h"
+#include <libxfdashboard/utils.h>
+#include <libxfdashboard/stylable.h>
+#include <libxfdashboard/marshal.h>
+#include <libxfdashboard/focus-manager.h>
+#include <libxfdashboard/application.h>
 
 /* Define this interface in GObject system */
 G_DEFINE_INTERFACE(XfdashboardFocusable,
diff --git a/xfdashboard/focusable.h b/libxfdashboard/focusable.h
similarity index 99%
rename from xfdashboard/focusable.h
rename to libxfdashboard/focusable.h
index dc95359..d702d8f 100644
--- a/xfdashboard/focusable.h
+++ b/libxfdashboard/focusable.h
@@ -28,7 +28,7 @@
 
 #include <clutter/clutter.h>
 
-#include "types.h"
+#include <libxfdashboard/types.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/image-content.c b/libxfdashboard/image-content.c
similarity index 99%
rename from xfdashboard/image-content.c
rename to libxfdashboard/image-content.c
index 7a6c2d8..d3daac1 100644
--- a/xfdashboard/image-content.c
+++ b/libxfdashboard/image-content.c
@@ -25,14 +25,14 @@
 #include "config.h"
 #endif
 
-#include "image-content.h"
+#include <libxfdashboard/image-content.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <math.h>
 
-#include "application.h"
-#include "stylable.h"
+#include <libxfdashboard/application.h>
+#include <libxfdashboard/stylable.h>
 
 #if GTK_CHECK_VERSION(3, 14 ,0)
 #undef USE_GTK_BUILTIN_ICONS
diff --git a/xfdashboard/image-content.h b/libxfdashboard/image-content.h
similarity index 100%
rename from xfdashboard/image-content.h
rename to libxfdashboard/image-content.h
diff --git a/libxfdashboard/libxfdashboard.pc.in b/libxfdashboard/libxfdashboard.pc.in
new file mode 100644
index 0000000..a55fec9
--- /dev/null
+++ b/libxfdashboard/libxfdashboard.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE_TARNAME@
+Description: Library for xfdashboard
+Requires: libwnck-3.0 clutter-1.0 clutter-cogl-1.0 gtk+-3.0 glib-2.0 gio-2.0 gio-unix-2.0 garcon-1 libxfconf-0 libxfce4util-1.0 libxfce4ui-2 dbus-glib-1
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lxfdashboard
+Cflags: -I${includedir}/xfdashboard
diff --git a/xfdashboard/live-window.c b/libxfdashboard/live-window.c
similarity index 99%
rename from xfdashboard/live-window.c
rename to libxfdashboard/live-window.c
index c2d1cd1..9f9b1ca 100644
--- a/xfdashboard/live-window.c
+++ b/libxfdashboard/live-window.c
@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#include "live-window.h"
+#include <libxfdashboard/live-window.h>
 
 #include <glib/gi18n-lib.h>
 #include <clutter/clutter.h>
@@ -35,12 +35,12 @@
 #include <gtk/gtk.h>
 #include <math.h>
 
-#include "button.h"
-#include "stage.h"
-#include "click-action.h"
-#include "window-content.h"
-#include "image-content.h"
-#include "stylable.h"
+#include <libxfdashboard/button.h>
+#include <libxfdashboard/stage.h>
+#include <libxfdashboard/click-action.h>
+#include <libxfdashboard/window-content.h>
+#include <libxfdashboard/image-content.h>
+#include <libxfdashboard/stylable.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardLiveWindow,
diff --git a/xfdashboard/live-window.h b/libxfdashboard/live-window.h
similarity index 96%
rename from xfdashboard/live-window.h
rename to libxfdashboard/live-window.h
index 26c9523..be073dc 100644
--- a/xfdashboard/live-window.h
+++ b/libxfdashboard/live-window.h
@@ -28,9 +28,9 @@
 
 #include <clutter/clutter.h>
 
-#include "background.h"
-#include "button.h"
-#include "window-tracker.h"
+#include <libxfdashboard/background.h>
+#include <libxfdashboard/button.h>
+#include <libxfdashboard/window-tracker.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/live-workspace.c b/libxfdashboard/live-workspace.c
similarity index 99%
rename from xfdashboard/live-workspace.c
rename to libxfdashboard/live-workspace.c
index 93c3d2e..4c7034f 100644
--- a/xfdashboard/live-workspace.c
+++ b/libxfdashboard/live-workspace.c
@@ -26,21 +26,21 @@
 #include "config.h"
 #endif
 
-#include "live-workspace.h"
+#include <libxfdashboard/live-workspace.h>
 
 #include <glib/gi18n-lib.h>
 #include <clutter/clutter.h>
 #include <clutter/x11/clutter-x11.h>
 #include <math.h>
 
-#include "button.h"
-#include "live-window.h"
-#include "window-tracker.h"
-#include "click-action.h"
-#include "window-content.h"
-#include "image-content.h"
-#include "enums.h"
-#include "stylable.h"
+#include <libxfdashboard/button.h>
+#include <libxfdashboard/live-window.h>
+#include <libxfdashboard/window-tracker.h>
+#include <libxfdashboard/click-action.h>
+#include <libxfdashboard/window-content.h>
+#include <libxfdashboard/image-content.h>
+#include <libxfdashboard/enums.h>
+#include <libxfdashboard/stylable.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardLiveWorkspace,
diff --git a/xfdashboard/live-workspace.h b/libxfdashboard/live-workspace.h
similarity index 96%
rename from xfdashboard/live-workspace.h
rename to libxfdashboard/live-workspace.h
index 30203e1..d5cc6ce 100644
--- a/xfdashboard/live-workspace.h
+++ b/libxfdashboard/live-workspace.h
@@ -27,9 +27,9 @@
 
 #include <clutter/clutter.h>
 
-#include "background.h"
-#include "window-tracker-workspace.h"
-#include "window-tracker-monitor.h"
+#include <libxfdashboard/background.h>
+#include <libxfdashboard/window-tracker-workspace.h>
+#include <libxfdashboard/window-tracker-monitor.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/marshal.list b/libxfdashboard/marshal.list
similarity index 100%
rename from xfdashboard/marshal.list
rename to libxfdashboard/marshal.list
diff --git a/xfdashboard/outline-effect.c b/libxfdashboard/outline-effect.c
similarity index 99%
rename from xfdashboard/outline-effect.c
rename to libxfdashboard/outline-effect.c
index 8028f1c..507dada 100644
--- a/xfdashboard/outline-effect.c
+++ b/libxfdashboard/outline-effect.c
@@ -25,12 +25,12 @@
 #include "config.h"
 #endif
 
-#include "outline-effect.h"
+#include <libxfdashboard/outline-effect.h>
 
 #include <glib/gi18n-lib.h>
 #include <math.h>
 
-#include "enums.h"
+#include <libxfdashboard/enums.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardOutlineEffect,
diff --git a/xfdashboard/outline-effect.h b/libxfdashboard/outline-effect.h
similarity index 99%
rename from xfdashboard/outline-effect.h
rename to libxfdashboard/outline-effect.h
index f0e4adf..a687cbb 100644
--- a/xfdashboard/outline-effect.h
+++ b/libxfdashboard/outline-effect.h
@@ -26,7 +26,7 @@
 
 #include <clutter/clutter.h>
 
-#include "types.h"
+#include <libxfdashboard/types.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/plugin.c b/libxfdashboard/plugin.c
similarity index 99%
rename from xfdashboard/plugin.c
rename to libxfdashboard/plugin.c
index 4dafce3..889a43e 100644
--- a/xfdashboard/plugin.c
+++ b/libxfdashboard/plugin.c
@@ -26,11 +26,11 @@
 #include "config.h"
 #endif
 
-#include "plugin.h"
+#include <libxfdashboard/plugin.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "marshal.h"
+#include <libxfdashboard/marshal.h>
 
 
 /* Forward declaration */
diff --git a/xfdashboard/plugin.h b/libxfdashboard/plugin.h
similarity index 100%
rename from xfdashboard/plugin.h
rename to libxfdashboard/plugin.h
diff --git a/xfdashboard/plugins-manager.c b/libxfdashboard/plugins-manager.c
similarity index 98%
rename from xfdashboard/plugins-manager.c
rename to libxfdashboard/plugins-manager.c
index ad1879f..0490ea9 100644
--- a/xfdashboard/plugins-manager.c
+++ b/libxfdashboard/plugins-manager.c
@@ -25,12 +25,12 @@
 #include "config.h"
 #endif
 
-#include "plugins-manager.h"
+#include <libxfdashboard/plugins-manager.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "plugin.h"
-#include "application.h"
+#include <libxfdashboard/plugin.h>
+#include <libxfdashboard/application.h>
 
 
 /* Define this class in GObject system */
diff --git a/xfdashboard/plugins-manager.h b/libxfdashboard/plugins-manager.h
similarity index 100%
rename from xfdashboard/plugins-manager.h
rename to libxfdashboard/plugins-manager.h
diff --git a/xfdashboard/quicklaunch.c b/libxfdashboard/quicklaunch.c
similarity index 99%
rename from xfdashboard/quicklaunch.c
rename to libxfdashboard/quicklaunch.c
index 6d50077..7b4d5ea 100644
--- a/xfdashboard/quicklaunch.c
+++ b/libxfdashboard/quicklaunch.c
@@ -25,27 +25,27 @@
 #include "config.h"
 #endif
 
-#include "quicklaunch.h"
+#include <libxfdashboard/quicklaunch.h>
 
 #include <glib/gi18n-lib.h>
 #include <math.h>
 #include <gtk/gtk.h>
 
-#include "enums.h"
-#include "application.h"
-#include "application-button.h"
-#include "toggle-button.h"
-#include "drag-action.h"
-#include "drop-action.h"
-#include "applications-view.h"
-#include "utils.h"
-#include "tooltip-action.h"
-#include "focusable.h"
-#include "marshal.h"
-#include "desktop-app-info.h"
-#include "application-database.h"
-#include "application-tracker.h"
-#include "window-tracker-window.h"
+#include <libxfdashboard/enums.h>
+#include <libxfdashboard/application.h>
+#include <libxfdashboard/application-button.h>
+#include <libxfdashboard/toggle-button.h>
+#include <libxfdashboard/drag-action.h>
+#include <libxfdashboard/drop-action.h>
+#include <libxfdashboard/applications-view.h>
+#include <libxfdashboard/utils.h>
+#include <libxfdashboard/tooltip-action.h>
+#include <libxfdashboard/focusable.h>
+#include <libxfdashboard/marshal.h>
+#include <libxfdashboard/desktop-app-info.h>
+#include <libxfdashboard/application-database.h>
+#include <libxfdashboard/application-tracker.h>
+#include <libxfdashboard/window-tracker-window.h>
 
 /* Define this class in GObject system */
 static void _xfdashboard_quicklaunch_focusable_iface_init(XfdashboardFocusableInterface *iface);
diff --git a/xfdashboard/quicklaunch.h b/libxfdashboard/quicklaunch.h
similarity index 97%
rename from xfdashboard/quicklaunch.h
rename to libxfdashboard/quicklaunch.h
index 153a482..2679d41 100644
--- a/xfdashboard/quicklaunch.h
+++ b/libxfdashboard/quicklaunch.h
@@ -24,9 +24,9 @@
 #ifndef __XFDASHBOARD_QUICKLAUNCH__
 #define __XFDASHBOARD_QUICKLAUNCH__
 
-#include "background.h"
-#include "toggle-button.h"
-#include "focusable.h"
+#include <libxfdashboard/background.h>
+#include <libxfdashboard/toggle-button.h>
+#include <libxfdashboard/focusable.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/scaled-table-layout.c b/libxfdashboard/scaled-table-layout.c
similarity index 99%
rename from xfdashboard/scaled-table-layout.c
rename to libxfdashboard/scaled-table-layout.c
index eb11b30..c70eda4 100644
--- a/xfdashboard/scaled-table-layout.c
+++ b/libxfdashboard/scaled-table-layout.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "scaled-table-layout.h"
+#include <libxfdashboard/scaled-table-layout.h>
 
 #include <glib/gi18n-lib.h>
 #include <clutter/clutter.h>
diff --git a/xfdashboard/scaled-table-layout.h b/libxfdashboard/scaled-table-layout.h
similarity index 100%
rename from xfdashboard/scaled-table-layout.h
rename to libxfdashboard/scaled-table-layout.h
diff --git a/xfdashboard/scrollbar.c b/libxfdashboard/scrollbar.c
similarity index 99%
rename from xfdashboard/scrollbar.c
rename to libxfdashboard/scrollbar.c
index e66ba63..9179248 100644
--- a/xfdashboard/scrollbar.c
+++ b/libxfdashboard/scrollbar.c
@@ -25,11 +25,11 @@
 #include "config.h"
 #endif
 
-#include "scrollbar.h"
+#include <libxfdashboard/scrollbar.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "stylable.h"
+#include <libxfdashboard/stylable.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardScrollbar,
diff --git a/xfdashboard/scrollbar.h b/libxfdashboard/scrollbar.h
similarity index 98%
rename from xfdashboard/scrollbar.h
rename to libxfdashboard/scrollbar.h
index c2365af..1d60b55 100644
--- a/xfdashboard/scrollbar.h
+++ b/libxfdashboard/scrollbar.h
@@ -26,7 +26,7 @@
 
 #include <clutter/clutter.h>
 
-#include "background.h"
+#include <libxfdashboard/background.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/search-manager.c b/libxfdashboard/search-manager.c
similarity index 98%
rename from xfdashboard/search-manager.c
rename to libxfdashboard/search-manager.c
index 6bbe482..e0433ad 100644
--- a/xfdashboard/search-manager.c
+++ b/libxfdashboard/search-manager.c
@@ -26,13 +26,13 @@
 #include "config.h"
 #endif
 
-#include "search-manager.h"
+#include <libxfdashboard/search-manager.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "search-provider.h"
-#include "utils.h"
-#include "marshal.h"
+#include <libxfdashboard/search-provider.h>
+#include <libxfdashboard/utils.h>
+#include <libxfdashboard/marshal.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardSearchManager,
diff --git a/xfdashboard/search-manager.h b/libxfdashboard/search-manager.h
similarity index 97%
rename from xfdashboard/search-manager.h
rename to libxfdashboard/search-manager.h
index d0c90c8..9babbd4 100644
--- a/xfdashboard/search-manager.h
+++ b/libxfdashboard/search-manager.h
@@ -27,8 +27,8 @@
 
 #include <glib-object.h>
 
-#include "search-provider.h"
-#include "search-result-set.h"
+#include <libxfdashboard/search-provider.h>
+#include <libxfdashboard/search-result-set.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/search-provider.c b/libxfdashboard/search-provider.c
similarity index 98%
rename from xfdashboard/search-provider.c
rename to libxfdashboard/search-provider.c
index ad484ae..df08e60 100644
--- a/xfdashboard/search-provider.c
+++ b/libxfdashboard/search-provider.c
@@ -25,12 +25,12 @@
 #include "config.h"
 #endif
 
-#include "search-provider.h"
+#include <libxfdashboard/search-provider.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "actor.h"
-#include "text-box.h"
+#include <libxfdashboard/actor.h>
+#include <libxfdashboard/text-box.h>
 
 /* Define this class in GObject system */
 G_DEFINE_ABSTRACT_TYPE(XfdashboardSearchProvider,
diff --git a/xfdashboard/search-provider.h b/libxfdashboard/search-provider.h
similarity index 98%
rename from xfdashboard/search-provider.h
rename to libxfdashboard/search-provider.h
index e7aae15..8998244 100644
--- a/xfdashboard/search-provider.h
+++ b/libxfdashboard/search-provider.h
@@ -26,7 +26,7 @@
 
 #include <clutter/clutter.h>
 
-#include "search-result-set.h"
+#include <libxfdashboard/search-result-set.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/search-result-container.c b/libxfdashboard/search-result-container.c
similarity index 99%
rename from xfdashboard/search-result-container.c
rename to libxfdashboard/search-result-container.c
index 8c943fb..f3e22ce 100644
--- a/xfdashboard/search-result-container.c
+++ b/libxfdashboard/search-result-container.c
@@ -26,21 +26,21 @@
 #include "config.h"
 #endif
 
-#include "search-result-container.h"
+#include <libxfdashboard/search-result-container.h>
 
 #include <glib/gi18n-lib.h>
 #include <gdk/gdk.h>
 #include <math.h>
 
-#include "enums.h"
-#include "text-box.h"
-#include "button.h"
-#include "stylable.h"
-#include "dynamic-table-layout.h"
-#include "utils.h"
-#include "click-action.h"
-#include "drag-action.h"
-#include "marshal.h"
+#include <libxfdashboard/enums.h>
+#include <libxfdashboard/text-box.h>
+#include <libxfdashboard/button.h>
+#include <libxfdashboard/stylable.h>
+#include <libxfdashboard/dynamic-table-layout.h>
+#include <libxfdashboard/utils.h>
+#include <libxfdashboard/click-action.h>
+#include <libxfdashboard/drag-action.h>
+#include <libxfdashboard/marshal.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardSearchResultContainer,
diff --git a/xfdashboard/search-result-container.h b/libxfdashboard/search-result-container.h
similarity index 97%
rename from xfdashboard/search-result-container.h
rename to libxfdashboard/search-result-container.h
index 7fa5f53..39bb721 100644
--- a/xfdashboard/search-result-container.h
+++ b/libxfdashboard/search-result-container.h
@@ -27,10 +27,10 @@
 
 #include <clutter/clutter.h>
 
-#include "actor.h"
-#include "search-provider.h"
-#include "types.h"
-#include "view.h"
+#include <libxfdashboard/actor.h>
+#include <libxfdashboard/search-provider.h>
+#include <libxfdashboard/types.h>
+#include <libxfdashboard/view.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/search-result-set.c b/libxfdashboard/search-result-set.c
similarity index 99%
rename from xfdashboard/search-result-set.c
rename to libxfdashboard/search-result-set.c
index 3b3154a..f418070 100644
--- a/xfdashboard/search-result-set.c
+++ b/libxfdashboard/search-result-set.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include "search-result-set.h"
+#include <libxfdashboard/search-result-set.h>
 
 #include <glib/gi18n-lib.h>
 
diff --git a/xfdashboard/search-result-set.h b/libxfdashboard/search-result-set.h
similarity index 100%
rename from xfdashboard/search-result-set.h
rename to libxfdashboard/search-result-set.h
diff --git a/xfdashboard/search-view.c b/libxfdashboard/search-view.c
similarity index 99%
rename from xfdashboard/search-view.c
rename to libxfdashboard/search-view.c
index fdc3de9..7e7f41a 100644
--- a/xfdashboard/search-view.c
+++ b/libxfdashboard/search-view.c
@@ -25,18 +25,18 @@
 #include "config.h"
 #endif
 
-#include "search-view.h"
+#include <libxfdashboard/search-view.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include "search-manager.h"
-#include "focusable.h"
-#include "utils.h"
-#include "search-result-container.h"
-#include "focus-manager.h"
-#include "enums.h"
-#include "application.h"
+#include <libxfdashboard/search-manager.h>
+#include <libxfdashboard/focusable.h>
+#include <libxfdashboard/utils.h>
+#include <libxfdashboard/search-result-container.h>
+#include <libxfdashboard/focus-manager.h>
+#include <libxfdashboard/enums.h>
+#include <libxfdashboard/application.h>
 
 /* Define this class in GObject system */
 static void _xfdashboard_search_view_focusable_iface_init(XfdashboardFocusableInterface *iface);
diff --git a/xfdashboard/search-view.h b/libxfdashboard/search-view.h
similarity index 98%
rename from xfdashboard/search-view.h
rename to libxfdashboard/search-view.h
index 7f73dd8..55e423a 100644
--- a/xfdashboard/search-view.h
+++ b/libxfdashboard/search-view.h
@@ -24,7 +24,7 @@
 #ifndef __XFDASHBOARD_SEARCH_VIEW__
 #define __XFDASHBOARD_SEARCH_VIEW__
 
-#include "view.h"
+#include <libxfdashboard/view.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/stage-interface.c b/libxfdashboard/stage-interface.c
similarity index 99%
rename from xfdashboard/stage-interface.c
rename to libxfdashboard/stage-interface.c
index 06b1ca2..0864540 100644
--- a/xfdashboard/stage-interface.c
+++ b/libxfdashboard/stage-interface.c
@@ -25,13 +25,13 @@
 #include "config.h"
 #endif
 
-#include "stage-interface.h"
+#include <libxfdashboard/stage-interface.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "actor.h"
-#include "enums.h"
-#include "stage.h"
+#include <libxfdashboard/actor.h>
+#include <libxfdashboard/enums.h>
+#include <libxfdashboard/stage.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardStageInterface,
diff --git a/xfdashboard/stage-interface.h b/libxfdashboard/stage-interface.h
similarity index 96%
rename from xfdashboard/stage-interface.h
rename to libxfdashboard/stage-interface.h
index bcf9b5e..616d8a6 100644
--- a/xfdashboard/stage-interface.h
+++ b/libxfdashboard/stage-interface.h
@@ -26,9 +26,9 @@
 
 #include <clutter/clutter.h>
 
-#include "stage.h"
-#include "types.h"
-#include "window-tracker-monitor.h"
+#include <libxfdashboard/stage.h>
+#include <libxfdashboard/types.h>
+#include <libxfdashboard/window-tracker-monitor.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/stage.c b/libxfdashboard/stage.c
similarity index 98%
rename from xfdashboard/stage.c
rename to libxfdashboard/stage.c
index 26dcd4a..b34853e 100644
--- a/xfdashboard/stage.c
+++ b/libxfdashboard/stage.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include "stage.h"
+#include <libxfdashboard/stage.h>
 
 #include <glib/gi18n-lib.h>
 #include <clutter/clutter.h>
@@ -33,25 +33,25 @@
 #include <gdk/gdk.h>
 #include <math.h>
 
-#include "application.h"
-#include "viewpad.h"
-#include "view-selector.h"
-#include "text-box.h"
-#include "quicklaunch.h"
-#include "applications-view.h"
-#include "windows-view.h"
-#include "search-view.h"
-#include "toggle-button.h"
-#include "workspace-selector.h"
-#include "collapse-box.h"
-#include "tooltip-action.h"
-#include "stylable.h"
-#include "utils.h"
-#include "focus-manager.h"
-#include "enums.h"
-#include "window-tracker.h"
-#include "window-content.h"
-#include "stage-interface.h"
+#include <libxfdashboard/application.h>
+#include <libxfdashboard/viewpad.h>
+#include <libxfdashboard/view-selector.h>
+#include <libxfdashboard/text-box.h>
+#include <libxfdashboard/quicklaunch.h>
+#include <libxfdashboard/applications-view.h>
+#include <libxfdashboard/windows-view.h>
+#include <libxfdashboard/search-view.h>
+#include <libxfdashboard/toggle-button.h>
+#include <libxfdashboard/workspace-selector.h>
+#include <libxfdashboard/collapse-box.h>
+#include <libxfdashboard/tooltip-action.h>
+#include <libxfdashboard/stylable.h>
+#include <libxfdashboard/utils.h>
+#include <libxfdashboard/focus-manager.h>
+#include <libxfdashboard/enums.h>
+#include <libxfdashboard/window-tracker.h>
+#include <libxfdashboard/window-content.h>
+#include <libxfdashboard/stage-interface.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardStage,
diff --git a/xfdashboard/stage.h b/libxfdashboard/stage.h
similarity index 98%
rename from xfdashboard/stage.h
rename to libxfdashboard/stage.h
index aa5080b..5816852 100644
--- a/xfdashboard/stage.h
+++ b/libxfdashboard/stage.h
@@ -26,7 +26,7 @@
 
 #include <clutter/clutter.h>
 
-#include "types.h"
+#include <libxfdashboard/types.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/stylable.c b/libxfdashboard/stylable.c
similarity index 99%
rename from xfdashboard/stylable.c
rename to libxfdashboard/stylable.c
index a96435c..ae7f1dd 100644
--- a/xfdashboard/stylable.c
+++ b/libxfdashboard/stylable.c
@@ -26,11 +26,11 @@
 #include "config.h"
 #endif
 
-#include "stylable.h"
+#include <libxfdashboard/stylable.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "application.h"
+#include <libxfdashboard/application.h>
 
 /* Define this interface in GObject system */
 G_DEFINE_INTERFACE(XfdashboardStylable,
diff --git a/xfdashboard/stylable.h b/libxfdashboard/stylable.h
similarity index 100%
rename from xfdashboard/stylable.h
rename to libxfdashboard/stylable.h
diff --git a/xfdashboard/text-box.c b/libxfdashboard/text-box.c
similarity index 99%
rename from xfdashboard/text-box.c
rename to libxfdashboard/text-box.c
index acf56d4..b3d1160 100644
--- a/xfdashboard/text-box.c
+++ b/libxfdashboard/text-box.c
@@ -26,16 +26,16 @@
 #include "config.h"
 #endif
 
-#include "text-box.h"
+#include <libxfdashboard/text-box.h>
 
 #include <glib/gi18n-lib.h>
 #include <math.h>
 
-#include "enums.h"
-#include "button.h"
-#include "stylable.h"
-#include "focusable.h"
-#include "focus-manager.h"
+#include <libxfdashboard/enums.h>
+#include <libxfdashboard/button.h>
+#include <libxfdashboard/stylable.h>
+#include <libxfdashboard/focusable.h>
+#include <libxfdashboard/focus-manager.h>
 
 /* Define this class in GObject system */
 static void _xfdashboard_text_box_focusable_iface_init(XfdashboardFocusableInterface *iface);
diff --git a/xfdashboard/text-box.h b/libxfdashboard/text-box.h
similarity index 99%
rename from xfdashboard/text-box.h
rename to libxfdashboard/text-box.h
index 4588524..43dc334 100644
--- a/xfdashboard/text-box.h
+++ b/libxfdashboard/text-box.h
@@ -25,7 +25,7 @@
 #ifndef __XFDASHBOARD_TEXT_BOX__
 #define __XFDASHBOARD_TEXT_BOX__
 
-#include "background.h"
+#include <libxfdashboard/background.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/theme-css.c b/libxfdashboard/theme-css.c
similarity index 99%
rename from xfdashboard/theme-css.c
rename to libxfdashboard/theme-css.c
index 9360359..827bc5a 100644
--- a/xfdashboard/theme-css.c
+++ b/libxfdashboard/theme-css.c
@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#include "theme-css.h"
+#include <libxfdashboard/theme-css.h>
 
 #include <glib/gi18n-lib.h>
 #include <glib.h>
@@ -36,8 +36,8 @@
 #include <clutter/clutter.h>
 #include <gtk/gtk.h>
 
-#include "stylable.h"
-#include "css-selector.h"
+#include <libxfdashboard/stylable.h>
+#include <libxfdashboard/css-selector.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardThemeCSS,
diff --git a/xfdashboard/theme-css.h b/libxfdashboard/theme-css.h
similarity index 98%
rename from xfdashboard/theme-css.h
rename to libxfdashboard/theme-css.h
index 64487cb..d7f9a77 100644
--- a/xfdashboard/theme-css.h
+++ b/libxfdashboard/theme-css.h
@@ -28,7 +28,7 @@
 
 #include <glib-object.h>
 
-#include "stylable.h"
+#include <libxfdashboard/stylable.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/theme-effects.c b/libxfdashboard/theme-effects.c
similarity index 99%
rename from xfdashboard/theme-effects.c
rename to libxfdashboard/theme-effects.c
index cd033fa..229c4ad 100644
--- a/xfdashboard/theme-effects.c
+++ b/libxfdashboard/theme-effects.c
@@ -25,13 +25,13 @@
 #include "config.h"
 #endif
 
-#include "theme-effects.h"
+#include <libxfdashboard/theme-effects.h>
 
 #include <glib/gi18n-lib.h>
 #include <glib.h>
 #include <gio/gio.h>
 
-#include "utils.h"
+#include <libxfdashboard/utils.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardThemeEffects,
diff --git a/xfdashboard/theme-effects.h b/libxfdashboard/theme-effects.h
similarity index 100%
rename from xfdashboard/theme-effects.h
rename to libxfdashboard/theme-effects.h
diff --git a/xfdashboard/theme-layout.c b/libxfdashboard/theme-layout.c
similarity index 99%
rename from xfdashboard/theme-layout.c
rename to libxfdashboard/theme-layout.c
index 648fdc2..1360ced 100644
--- a/xfdashboard/theme-layout.c
+++ b/libxfdashboard/theme-layout.c
@@ -25,13 +25,13 @@
 #include "config.h"
 #endif
 
-#include "theme-layout.h"
+#include <libxfdashboard/theme-layout.h>
 
 #include <glib/gi18n-lib.h>
 #include <glib.h>
 #include <gio/gio.h>
 
-#include "utils.h"
+#include <libxfdashboard/utils.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardThemeLayout,
diff --git a/xfdashboard/theme-layout.h b/libxfdashboard/theme-layout.h
similarity index 100%
rename from xfdashboard/theme-layout.h
rename to libxfdashboard/theme-layout.h
diff --git a/xfdashboard/theme.c b/libxfdashboard/theme.c
similarity index 99%
rename from xfdashboard/theme.c
rename to libxfdashboard/theme.c
index 7ac2d17..ccf46d8 100644
--- a/xfdashboard/theme.c
+++ b/libxfdashboard/theme.c
@@ -26,7 +26,7 @@
 #include "config.h"
 #endif
 
-#include "theme.h"
+#include <libxfdashboard/theme.h>
 
 #include <glib/gi18n-lib.h>
 #include <glib.h>
diff --git a/xfdashboard/theme.h b/libxfdashboard/theme.h
similarity index 96%
rename from xfdashboard/theme.h
rename to libxfdashboard/theme.h
index f97c6ed..92e4387 100644
--- a/xfdashboard/theme.h
+++ b/libxfdashboard/theme.h
@@ -27,9 +27,9 @@
 
 #include <clutter/clutter.h>
 
-#include "theme-css.h"
-#include "theme-layout.h"
-#include "theme-effects.h"
+#include <libxfdashboard/theme-css.h>
+#include <libxfdashboard/theme-layout.h>
+#include <libxfdashboard/theme-effects.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/toggle-button.c b/libxfdashboard/toggle-button.c
similarity index 99%
rename from xfdashboard/toggle-button.c
rename to libxfdashboard/toggle-button.c
index eb272e3..e41627e 100644
--- a/xfdashboard/toggle-button.c
+++ b/libxfdashboard/toggle-button.c
@@ -25,11 +25,11 @@
 #include "config.h"
 #endif
 
-#include "toggle-button.h"
+#include <libxfdashboard/toggle-button.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "stylable.h"
+#include <libxfdashboard/stylable.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardToggleButton,
diff --git a/xfdashboard/toggle-button.h b/libxfdashboard/toggle-button.h
similarity index 98%
rename from xfdashboard/toggle-button.h
rename to libxfdashboard/toggle-button.h
index 6b5745c..e45bd57 100644
--- a/xfdashboard/toggle-button.h
+++ b/libxfdashboard/toggle-button.h
@@ -24,7 +24,7 @@
 #ifndef __XFDASHBOARD_TOGGLE_BUTTON__
 #define __XFDASHBOARD_TOGGLE_BUTTON__
 
-#include "button.h"
+#include <libxfdashboard/button.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/tooltip-action.c b/libxfdashboard/tooltip-action.c
similarity index 99%
rename from xfdashboard/tooltip-action.c
rename to libxfdashboard/tooltip-action.c
index 3db7765..19efd41 100644
--- a/xfdashboard/tooltip-action.c
+++ b/libxfdashboard/tooltip-action.c
@@ -26,13 +26,13 @@
 #include "config.h"
 #endif
 
-#include "tooltip-action.h"
+#include <libxfdashboard/tooltip-action.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include "actor.h"
-#include "stage.h"
+#include <libxfdashboard/actor.h>
+#include <libxfdashboard/stage.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardTooltipAction,
diff --git a/xfdashboard/tooltip-action.h b/libxfdashboard/tooltip-action.h
similarity index 100%
rename from xfdashboard/tooltip-action.h
rename to libxfdashboard/tooltip-action.h
diff --git a/xfdashboard/types.h b/libxfdashboard/types.h
similarity index 100%
rename from xfdashboard/types.h
rename to libxfdashboard/types.h
diff --git a/xfdashboard/utils.c b/libxfdashboard/utils.c
similarity index 99%
rename from xfdashboard/utils.c
rename to libxfdashboard/utils.c
index 07e4b2c..75ecf29 100644
--- a/xfdashboard/utils.c
+++ b/libxfdashboard/utils.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include "utils.h"
+#include <libxfdashboard/utils.h>
 
 #include <glib/gi18n-lib.h>
 #include <clutter/clutter.h>
@@ -33,9 +33,9 @@
 #include <dbus/dbus-glib.h>
 #include <gio/gdesktopappinfo.h>
 
-#include "stage.h"
-#include "stage-interface.h"
-#include "window-tracker.h"
+#include <libxfdashboard/stage.h>
+#include <libxfdashboard/stage-interface.h>
+#include <libxfdashboard/window-tracker.h>
 
 /**
  * SECTION:utils
diff --git a/xfdashboard/utils.h b/libxfdashboard/utils.h
similarity index 95%
rename from xfdashboard/utils.h
rename to libxfdashboard/utils.h
index 7f10792..fb3f75a 100644
--- a/xfdashboard/utils.h
+++ b/libxfdashboard/utils.h
@@ -27,9 +27,9 @@
 #include <clutter/clutter.h>
 #include <gio/gio.h>
 
-#include "window-tracker-workspace.h"
-#include "stage-interface.h"
-#include "stage.h"
+#include <libxfdashboard/window-tracker-workspace.h>
+#include <libxfdashboard/stage-interface.h>
+#include <libxfdashboard/stage.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/view-manager.c b/libxfdashboard/view-manager.c
similarity index 99%
rename from xfdashboard/view-manager.c
rename to libxfdashboard/view-manager.c
index 9a1129d..05c5a36 100644
--- a/xfdashboard/view-manager.c
+++ b/libxfdashboard/view-manager.c
@@ -25,12 +25,12 @@
 #include "config.h"
 #endif
 
-#include "view-manager.h"
+#include <libxfdashboard/view-manager.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "view.h"
-#include "utils.h"
+#include <libxfdashboard/view.h>
+#include <libxfdashboard/utils.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardViewManager,
diff --git a/xfdashboard/view-manager.h b/libxfdashboard/view-manager.h
similarity index 100%
rename from xfdashboard/view-manager.h
rename to libxfdashboard/view-manager.h
diff --git a/xfdashboard/view-selector.c b/libxfdashboard/view-selector.c
similarity index 99%
rename from xfdashboard/view-selector.c
rename to libxfdashboard/view-selector.c
index 651b775..d140e01 100644
--- a/xfdashboard/view-selector.c
+++ b/libxfdashboard/view-selector.c
@@ -41,12 +41,12 @@
 #include "config.h"
 #endif
 
-#include "view-selector.h"
+#include <libxfdashboard/view-selector.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "view.h"
-#include "tooltip-action.h"
+#include <libxfdashboard/view.h>
+#include <libxfdashboard/tooltip-action.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardViewSelector,
diff --git a/xfdashboard/view-selector.h b/libxfdashboard/view-selector.h
similarity index 96%
rename from xfdashboard/view-selector.h
rename to libxfdashboard/view-selector.h
index 318bddf..a0891cf 100644
--- a/xfdashboard/view-selector.h
+++ b/libxfdashboard/view-selector.h
@@ -26,9 +26,9 @@
 
 #include <clutter/clutter.h>
 
-#include "actor.h"
-#include "viewpad.h"
-#include "toggle-button.h"
+#include <libxfdashboard/actor.h>
+#include <libxfdashboard/viewpad.h>
+#include <libxfdashboard/toggle-button.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/view.c b/libxfdashboard/view.c
similarity index 98%
rename from xfdashboard/view.c
rename to libxfdashboard/view.c
index b74cd63..684fc8f 100644
--- a/xfdashboard/view.c
+++ b/libxfdashboard/view.c
@@ -25,17 +25,17 @@
 #include "config.h"
 #endif
 
-#include "view.h"
+#include <libxfdashboard/view.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include "marshal.h"
-#include "image-content.h"
-#include "utils.h"
-#include "focus-manager.h"
-#include "viewpad.h"
-#include "enums.h"
+#include <libxfdashboard/marshal.h>
+#include <libxfdashboard/image-content.h>
+#include <libxfdashboard/utils.h>
+#include <libxfdashboard/focus-manager.h>
+#include <libxfdashboard/viewpad.h>
+#include <libxfdashboard/enums.h>
 
 /* Define this class in GObject system */
 G_DEFINE_ABSTRACT_TYPE(XfdashboardView,
diff --git a/xfdashboard/view.h b/libxfdashboard/view.h
similarity index 97%
rename from xfdashboard/view.h
rename to libxfdashboard/view.h
index 91dbf35..1a9649a 100644
--- a/xfdashboard/view.h
+++ b/libxfdashboard/view.h
@@ -26,9 +26,9 @@
 
 #include <clutter/clutter.h>
 
-#include "actor.h"
-#include "types.h"
-#include "focusable.h"
+#include <libxfdashboard/actor.h>
+#include <libxfdashboard/types.h>
+#include <libxfdashboard/focusable.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/viewpad.c b/libxfdashboard/viewpad.c
similarity index 99%
rename from xfdashboard/viewpad.c
rename to libxfdashboard/viewpad.c
index 78f244a..f4ec016 100644
--- a/xfdashboard/viewpad.c
+++ b/libxfdashboard/viewpad.c
@@ -25,18 +25,18 @@
 #include "config.h"
 #endif
 
-#include "viewpad.h"
+#include <libxfdashboard/viewpad.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <math.h>
 
-#include "view-manager.h"
-#include "scrollbar.h"
-#include "enums.h"
-#include "utils.h"
-#include "focusable.h"
-#include "focus-manager.h"
+#include <libxfdashboard/view-manager.h>
+#include <libxfdashboard/scrollbar.h>
+#include <libxfdashboard/enums.h>
+#include <libxfdashboard/utils.h>
+#include <libxfdashboard/focusable.h>
+#include <libxfdashboard/focus-manager.h>
 
 /* Define this class in GObject system */
 static void _xfdashboard_viewpad_focusable_iface_init(XfdashboardFocusableInterface *iface);
diff --git a/xfdashboard/viewpad.h b/libxfdashboard/viewpad.h
similarity index 97%
rename from xfdashboard/viewpad.h
rename to libxfdashboard/viewpad.h
index 34b4a66..b6ca3c3 100644
--- a/xfdashboard/viewpad.h
+++ b/libxfdashboard/viewpad.h
@@ -26,9 +26,9 @@
 
 #include <clutter/clutter.h>
 
-#include "background.h"
-#include "view.h"
-#include "types.h"
+#include <libxfdashboard/background.h>
+#include <libxfdashboard/view.h>
+#include <libxfdashboard/types.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/window-content.c b/libxfdashboard/window-content.c
similarity index 99%
rename from xfdashboard/window-content.c
rename to libxfdashboard/window-content.c
index d69a244..99eec9e 100644
--- a/xfdashboard/window-content.c
+++ b/libxfdashboard/window-content.c
@@ -28,7 +28,7 @@
 #define COGL_ENABLE_EXPERIMENTAL_API
 #define CLUTTER_ENABLE_EXPERIMENTAL_API
 
-#include "window-content.h"
+#include <libxfdashboard/window-content.h>
 
 #include <glib/gi18n-lib.h>
 #include <clutter/x11/clutter-x11.h>
@@ -41,11 +41,11 @@
 #endif
 #include <gdk/gdkx.h>
 
-#include "application.h"
-#include "marshal.h"
-#include "stylable.h"
-#include "window-tracker.h"
-#include "enums.h"
+#include <libxfdashboard/application.h>
+#include <libxfdashboard/marshal.h>
+#include <libxfdashboard/stylable.h>
+#include <libxfdashboard/window-tracker.h>
+#include <libxfdashboard/enums.h>
 
 /* Definitions */
 typedef enum /*< skip,prefix=XFDASHBOARD_WINDOW_CONTENT_WORKAROUND_MODE >*/
diff --git a/xfdashboard/window-content.h b/libxfdashboard/window-content.h
similarity index 98%
rename from xfdashboard/window-content.h
rename to libxfdashboard/window-content.h
index 0e9e741..f192e1c 100644
--- a/xfdashboard/window-content.h
+++ b/libxfdashboard/window-content.h
@@ -26,8 +26,8 @@
 
 #include <clutter/clutter.h>
 
-#include "window-tracker-window.h"
-#include "types.h"
+#include <libxfdashboard/window-tracker-window.h>
+#include <libxfdashboard/types.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/window-tracker-monitor.c b/libxfdashboard/window-tracker-monitor.c
similarity index 99%
rename from xfdashboard/window-tracker-monitor.c
rename to libxfdashboard/window-tracker-monitor.c
index bb6f164..889264e 100644
--- a/xfdashboard/window-tracker-monitor.c
+++ b/libxfdashboard/window-tracker-monitor.c
@@ -28,7 +28,7 @@
 #include "config.h"
 #endif
 
-#include "window-tracker-monitor.h"
+#include <libxfdashboard/window-tracker-monitor.h>
 
 #include <glib/gi18n-lib.h>
 #include <gdk/gdkx.h>
diff --git a/xfdashboard/window-tracker-monitor.h b/libxfdashboard/window-tracker-monitor.h
similarity index 100%
rename from xfdashboard/window-tracker-monitor.h
rename to libxfdashboard/window-tracker-monitor.h
diff --git a/xfdashboard/window-tracker-window.c b/libxfdashboard/window-tracker-window.c
similarity index 99%
rename from xfdashboard/window-tracker-window.c
rename to libxfdashboard/window-tracker-window.c
index cea6dfb..d8d5bfa 100644
--- a/xfdashboard/window-tracker-window.c
+++ b/libxfdashboard/window-tracker-window.c
@@ -30,7 +30,7 @@
 #include "config.h"
 #endif
 
-#include "window-tracker-window.h"
+#include <libxfdashboard/window-tracker-window.h>
 
 #define WNCK_I_KNOW_THIS_IS_UNSTABLE
 #include <libwnck/libwnck.h>
@@ -43,8 +43,8 @@
 #include <X11/extensions/Xinerama.h>
 #endif
 
-#include "window-tracker.h"
-#include "marshal.h"
+#include <libxfdashboard/window-tracker.h>
+#include <libxfdashboard/marshal.h>
 
 /* Usually we would define a class in GObject system here but
  * this class is a wrapper around WnckWindow to create a virtual stable
diff --git a/xfdashboard/window-tracker-window.h b/libxfdashboard/window-tracker-window.h
similarity index 98%
rename from xfdashboard/window-tracker-window.h
rename to libxfdashboard/window-tracker-window.h
index 09be746..fa3798d 100644
--- a/xfdashboard/window-tracker-window.h
+++ b/libxfdashboard/window-tracker-window.h
@@ -33,8 +33,8 @@
 #include <glib-object.h>
 #include <gdk/gdk.h>
 
-#include "window-tracker-workspace.h"
-#include "window-tracker-monitor.h"
+#include <libxfdashboard/window-tracker-workspace.h>
+#include <libxfdashboard/window-tracker-monitor.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/window-tracker-workspace.c b/libxfdashboard/window-tracker-workspace.c
similarity index 96%
rename from xfdashboard/window-tracker-workspace.c
rename to libxfdashboard/window-tracker-workspace.c
index bfc09ac..23ce989 100644
--- a/xfdashboard/window-tracker-workspace.c
+++ b/libxfdashboard/window-tracker-workspace.c
@@ -31,15 +31,15 @@
 #include "config.h"
 #endif
 
-#include "window-tracker-workspace.h"
+#include <libxfdashboard/window-tracker-workspace.h>
 
 #define WNCK_I_KNOW_THIS_IS_UNSTABLE
 #include <libwnck/libwnck.h>
 
 #include <glib/gi18n-lib.h>
 
-#include "window-tracker.h"
-#include "marshal.h"
+#include <libxfdashboard/window-tracker.h>
+#include <libxfdashboard/marshal.h>
 
 /* Usually we found define a class in GObject system here but
  * this class is a wrapper around WnckWorkspace to create a virtual stable
diff --git a/xfdashboard/window-tracker-workspace.h b/libxfdashboard/window-tracker-workspace.h
similarity index 100%
rename from xfdashboard/window-tracker-workspace.h
rename to libxfdashboard/window-tracker-workspace.h
diff --git a/xfdashboard/window-tracker.c b/libxfdashboard/window-tracker.c
similarity index 99%
rename from xfdashboard/window-tracker.c
rename to libxfdashboard/window-tracker.c
index 4892942..46482ee 100644
--- a/xfdashboard/window-tracker.c
+++ b/libxfdashboard/window-tracker.c
@@ -31,7 +31,7 @@
 #include "config.h"
 #endif
 
-#include "window-tracker.h"
+#include <libxfdashboard/window-tracker.h>
 
 #define WNCK_I_KNOW_THIS_IS_UNSTABLE
 #include <libwnck/libwnck.h>
@@ -44,8 +44,8 @@
 #include <X11/extensions/Xinerama.h>
 #endif
 
-#include "marshal.h"
-#include "application.h"
+#include <libxfdashboard/marshal.h>
+#include <libxfdashboard/application.h>
 
 /* Define this class in GObject system */
 G_DEFINE_TYPE(XfdashboardWindowTracker,
diff --git a/xfdashboard/window-tracker.h b/libxfdashboard/window-tracker.h
similarity index 97%
rename from xfdashboard/window-tracker.h
rename to libxfdashboard/window-tracker.h
index da4cdff..4af023b 100644
--- a/xfdashboard/window-tracker.h
+++ b/libxfdashboard/window-tracker.h
@@ -32,9 +32,9 @@
 
 #include <glib-object.h>
 
-#include "window-tracker-window.h"
-#include "window-tracker-workspace.h"
-#include "window-tracker-monitor.h"
+#include <libxfdashboard/window-tracker-window.h>
+#include <libxfdashboard/window-tracker-workspace.h>
+#include <libxfdashboard/window-tracker-monitor.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/windows-view.c b/libxfdashboard/windows-view.c
similarity index 99%
rename from xfdashboard/windows-view.c
rename to libxfdashboard/windows-view.c
index 7cf0a7b..f1e9a88 100644
--- a/xfdashboard/windows-view.c
+++ b/libxfdashboard/windows-view.c
@@ -25,25 +25,25 @@
 #include "config.h"
 #endif
 
-#include "windows-view.h"
+#include <libxfdashboard/windows-view.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include "live-window.h"
-#include "scaled-table-layout.h"
-#include "stage.h"
-#include "application.h"
-#include "view.h"
-#include "drop-action.h"
-#include "quicklaunch.h"
-#include "application-button.h"
-#include "window-tracker.h"
-#include "image-content.h"
-#include "utils.h"
-#include "marshal.h"
-#include "enums.h"
-#include "stage-interface.h"
+#include <libxfdashboard/live-window.h>
+#include <libxfdashboard/scaled-table-layout.h>
+#include <libxfdashboard/stage.h>
+#include <libxfdashboard/application.h>
+#include <libxfdashboard/view.h>
+#include <libxfdashboard/drop-action.h>
+#include <libxfdashboard/quicklaunch.h>
+#include <libxfdashboard/application-button.h>
+#include <libxfdashboard/window-tracker.h>
+#include <libxfdashboard/image-content.h>
+#include <libxfdashboard/utils.h>
+#include <libxfdashboard/marshal.h>
+#include <libxfdashboard/enums.h>
+#include <libxfdashboard/stage-interface.h>
 
 
 /* Define this class in GObject system */
diff --git a/xfdashboard/windows-view.h b/libxfdashboard/windows-view.h
similarity index 98%
rename from xfdashboard/windows-view.h
rename to libxfdashboard/windows-view.h
index 03609eb..28eed45 100644
--- a/xfdashboard/windows-view.h
+++ b/libxfdashboard/windows-view.h
@@ -24,8 +24,8 @@
 #ifndef __XFDASHBOARD_WINDOWS_VIEW__
 #define __XFDASHBOARD_WINDOWS_VIEW__
 
-#include "view.h"
-#include "focusable.h"
+#include <libxfdashboard/view.h>
+#include <libxfdashboard/focusable.h>
 
 G_BEGIN_DECLS
 
diff --git a/xfdashboard/workspace-selector.c b/libxfdashboard/workspace-selector.c
similarity index 99%
rename from xfdashboard/workspace-selector.c
rename to libxfdashboard/workspace-selector.c
index 00d97a3..b1df194 100644
--- a/xfdashboard/workspace-selector.c
+++ b/libxfdashboard/workspace-selector.c
@@ -25,23 +25,23 @@
 #include "config.h"
 #endif
 
-#include "workspace-selector.h"
+#include <libxfdashboard/workspace-selector.h>
 
 #include <glib/gi18n-lib.h>
 #include <math.h>
 
-#include "enums.h"
-#include "window-tracker.h"
-#include "live-workspace.h"
-#include "application.h"
-#include "drop-action.h"
-#include "windows-view.h"
-#include "live-window.h"
-#include "application-button.h"
-#include "utils.h"
-#include "stylable.h"
-#include "focusable.h"
-#include "stage-interface.h"
+#include <libxfdashboard/enums.h>
+#include <libxfdashboard/window-tracker.h>
+#include <libxfdashboard/live-workspace.h>
+#include <libxfdashboard/application.h>
+#include <libxfdashboard/drop-action.h>
+#include <libxfdashboard/windows-view.h>
+#include <libxfdashboard/live-window.h>
+#include <libxfdashboard/application-button.h>
+#include <libxfdashboard/utils.h>
+#include <libxfdashboard/stylable.h>
+#include <libxfdashboard/focusable.h>
+#include <libxfdashboard/stage-interface.h>
 
 /* Define this class in GObject system */
 static void _xfdashboard_workspace_selector_focusable_iface_init(XfdashboardFocusableInterface *iface);
diff --git a/xfdashboard/workspace-selector.h b/libxfdashboard/workspace-selector.h
similarity index 98%
rename from xfdashboard/workspace-selector.h
rename to libxfdashboard/workspace-selector.h
index c1bbb36..06841fc 100644
--- a/xfdashboard/workspace-selector.h
+++ b/libxfdashboard/workspace-selector.h
@@ -24,7 +24,7 @@
 #ifndef __XFDASHBOARD_WORKSPACE_SELECTOR__
 #define __XFDASHBOARD_WORKSPACE_SELECTOR__
 
-#include "background.h"
+#include <libxfdashboard/background.h>
 
 G_BEGIN_DECLS
 
diff --git a/plugins/clock-view/Makefile.am b/plugins/clock-view/Makefile.am
index 142a132..3658385 100644
--- a/plugins/clock-view/Makefile.am
+++ b/plugins/clock-view/Makefile.am
@@ -3,7 +3,6 @@ plugindir = $(libdir)/xfdashboard/plugins
 AM_CPPFLAGS = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/xfdashboard \
 	-DG_LOG_DOMAIN=\"xfdashboard-plugin-clock_view\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
@@ -18,15 +17,16 @@ clock_view_la_SOURCES = \
 	plugin.c
 
 clock_view_la_CFLAGS = \
-	$(PLATFORM_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(CLUTTER_CFLAGS) \
-	$(LIBXFCONF_CFLAGS)
+	$(LIBXFCONF_CFLAGS) \
+	$(PLATFORM_CFLAGS)
 
 clock_view_la_LDFLAGS = \
 	-avoid-version \
 	-export-dynamic \
+	-no-undefined \
 	-module \
 	$(PLATFORM_LDFLAGS)
 
@@ -34,7 +34,8 @@ clock_view_la_LIBADD = \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(GTK_LIBS) \
 	$(CLUTTER_LIBS) \
-	$(LIBXFCONF_LIBS)
+	$(LIBXFCONF_LIBS) \
+	$(top_builddir)/libxfdashboard/libxfdashboard.la
 
 CLEANFILES = \
 	$(plugin_DATA)
diff --git a/plugins/clock-view/clock-view.c b/plugins/clock-view/clock-view.c
index d554d7e..552734b 100644
--- a/plugins/clock-view/clock-view.c
+++ b/plugins/clock-view/clock-view.c
@@ -31,10 +31,10 @@
 #include <gtk/gtk.h>
 #include <math.h>
 
-#include "utils.h"
-#include "view.h"
-#include "fill-box-layout.h"
-#include "application.h"
+#include "libxfdashboard/utils.h"
+#include "libxfdashboard/view.h"
+#include "libxfdashboard/fill-box-layout.h"
+#include "libxfdashboard/application.h"
 
 
 /* Define this class in GObject system */
diff --git a/plugins/clock-view/clock-view.h b/plugins/clock-view/clock-view.h
index 0102309..bec5392 100644
--- a/plugins/clock-view/clock-view.h
+++ b/plugins/clock-view/clock-view.h
@@ -24,8 +24,8 @@
 #ifndef __XFDASHBOARD_CLOCK_VIEW__
 #define __XFDASHBOARD_CLOCK_VIEW__
 
-#include "plugin.h"
-#include "view.h"
+#include "libxfdashboard/plugin.h"
+#include "libxfdashboard/view.h"
 
 G_BEGIN_DECLS
 
diff --git a/plugins/clock-view/plugin.c b/plugins/clock-view/plugin.c
index 4dd9455..1d48751 100644
--- a/plugins/clock-view/plugin.c
+++ b/plugins/clock-view/plugin.c
@@ -29,8 +29,8 @@
 
 #include <libxfce4util/libxfce4util.h>
 
-#include "plugin.h"
-#include "view-manager.h"
+#include "libxfdashboard/plugin.h"
+#include "libxfdashboard/view-manager.h"
 
 
 /* IMPLEMENTATION: XfdashboardPlugin */
diff --git a/plugins/gnome-shell-search-provider/Makefile.am b/plugins/gnome-shell-search-provider/Makefile.am
index 2c462c8..918eb0f 100644
--- a/plugins/gnome-shell-search-provider/Makefile.am
+++ b/plugins/gnome-shell-search-provider/Makefile.am
@@ -3,7 +3,6 @@ plugindir = $(libdir)/xfdashboard/plugins
 AM_CPPFLAGS = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/xfdashboard \
 	-DG_LOG_DOMAIN=\"xfdashboard-plugin-gnome_shell_search_provider\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
@@ -19,15 +18,16 @@ gnome_shell_search_provider_la_SOURCES = \
 	plugin.c
 
 gnome_shell_search_provider_la_CFLAGS = \
-	$(PLATFORM_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(CLUTTER_CFLAGS) \
-	$(GARCON_CFLAGS)
+	$(GARCON_CFLAGS) \
+	$(PLATFORM_CFLAGS)
 
 gnome_shell_search_provider_la_LDFLAGS = \
 	-avoid-version \
 	-export-dynamic \
+	-no-undefined \
 	-module \
 	$(PLATFORM_LDFLAGS)
 
@@ -35,7 +35,8 @@ gnome_shell_search_provider_la_LIBADD = \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(GTK_LIBS) \
 	$(CLUTTER_LIBS) \
-	$(GARCON_LIBS)
+	$(GARCON_LIBS) \
+	$(top_builddir)/libxfdashboard/libxfdashboard.la
 
 CLEANFILES = \
 	$(plugin_DATA)
diff --git a/plugins/gnome-shell-search-provider/gnome-shell-search-provider.c b/plugins/gnome-shell-search-provider/gnome-shell-search-provider.c
index 4f35dd4..eedaf14 100644
--- a/plugins/gnome-shell-search-provider/gnome-shell-search-provider.c
+++ b/plugins/gnome-shell-search-provider/gnome-shell-search-provider.c
@@ -26,12 +26,13 @@
 #include "config.h"
 #endif
 
+#include "gnome-shell-search-provider.h"
+
 #include <glib/gi18n-lib.h>
 #include <gio/gio.h>
 
-#include "gnome-shell-search-provider.h"
-#include "application-database.h"
-#include "button.h"
+#include "libxfdashboard/application-database.h"
+#include "libxfdashboard/button.h"
 
 
 /* Define this class in GObject system */
diff --git a/plugins/gnome-shell-search-provider/gnome-shell-search-provider.h b/plugins/gnome-shell-search-provider/gnome-shell-search-provider.h
index 146ddd3..7254d07 100644
--- a/plugins/gnome-shell-search-provider/gnome-shell-search-provider.h
+++ b/plugins/gnome-shell-search-provider/gnome-shell-search-provider.h
@@ -25,8 +25,8 @@
 #ifndef __XFDASHBOARD_GNOME_SHELL_SEARCH_PROVIDER__
 #define __XFDASHBOARD_GNOME_SHELL_SEARCH_PROVIDER__
 
-#include "plugin.h"
-#include "search-provider.h"
+#include "libxfdashboard/plugin.h"
+#include "libxfdashboard/search-provider.h"
 
 G_BEGIN_DECLS
 
diff --git a/plugins/gnome-shell-search-provider/plugin.c b/plugins/gnome-shell-search-provider/plugin.c
index bd3ebe3..7d5d307 100644
--- a/plugins/gnome-shell-search-provider/plugin.c
+++ b/plugins/gnome-shell-search-provider/plugin.c
@@ -25,12 +25,12 @@
 #include <config.h>
 #endif
 
-#include "plugin.h"
+#include "gnome-shell-search-provider.h"
 
 #include <libxfce4util/libxfce4util.h>
 
-#include "search-manager.h"
-#include "gnome-shell-search-provider.h"
+#include "libxfdashboard/search-manager.h"
+#include "libxfdashboard/plugin.h"
 
 
 /* IMPLEMENTATION: Private variables and methods */
diff --git a/plugins/hot-corner/Makefile.am b/plugins/hot-corner/Makefile.am
index 2f02509..fd22494 100644
--- a/plugins/hot-corner/Makefile.am
+++ b/plugins/hot-corner/Makefile.am
@@ -3,7 +3,6 @@ plugindir = $(libdir)/xfdashboard/plugins
 AM_CPPFLAGS = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/xfdashboard \
 	-DG_LOG_DOMAIN=\"xfdashboard-plugin-hot_corner\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
@@ -18,15 +17,16 @@ hot_corner_la_SOURCES = \
 	plugin.c
 
 hot_corner_la_CFLAGS = \
-	$(PLATFORM_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(CLUTTER_CFLAGS) \
-	$(LIBXFCONF_CFLAGS)
+	$(LIBXFCONF_CFLAGS) \
+	$(PLATFORM_CFLAGS)
 
 hot_corner_la_LDFLAGS = \
 	-avoid-version \
 	-export-dynamic \
+	-no-undefined \
 	-module \
 	$(PLATFORM_LDFLAGS)
 
@@ -34,7 +34,8 @@ hot_corner_la_LIBADD = \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(GTK_LIBS) \
 	$(CLUTTER_LIBS) \
-	$(LIBXFCONF_LIBS)
+	$(LIBXFCONF_LIBS) \
+	$(top_builddir)/libxfdashboard/libxfdashboard.la
 
 CLEANFILES = \
 	$(plugin_DATA)
diff --git a/plugins/hot-corner/hot-corner.c b/plugins/hot-corner/hot-corner.c
index f5c43f3..9c3d54c 100644
--- a/plugins/hot-corner/hot-corner.c
+++ b/plugins/hot-corner/hot-corner.c
@@ -25,14 +25,14 @@
 #include "config.h"
 #endif
 
+#include "hot-corner.h"
+
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <math.h>
 
-#include "hot-corner.h"
-
-#include <window-tracker.h>
-#include <application.h>
+#include "libxfdashboard/window-tracker.h"
+#include "libxfdashboard/application.h"
 
 
 /* Define this class in GObject system */
diff --git a/plugins/hot-corner/hot-corner.h b/plugins/hot-corner/hot-corner.h
index 8428b2b..43007b7 100644
--- a/plugins/hot-corner/hot-corner.h
+++ b/plugins/hot-corner/hot-corner.h
@@ -24,7 +24,7 @@
 #ifndef __XFDASHBOARD_HOT_CORNER__
 #define __XFDASHBOARD_HOT_CORNER__
 
-#include "plugin.h"
+#include "libxfdashboard/plugin.h"
 
 G_BEGIN_DECLS
 
diff --git a/plugins/hot-corner/plugin.c b/plugins/hot-corner/plugin.c
index 25c3534..a594eb9 100644
--- a/plugins/hot-corner/plugin.c
+++ b/plugins/hot-corner/plugin.c
@@ -25,11 +25,11 @@
 #include <config.h>
 #endif
 
-#include "plugin.h"
+#include "hot-corner.h"
 
 #include <libxfce4util/libxfce4util.h>
 
-#include "hot-corner.h"
+#include "libxfdashboard/plugin.h"
 
 
 /* IMPLEMENTATION: XfdashboardPlugin */
diff --git a/settings/Makefile.am b/settings/Makefile.am
index c9aef5d..5c3195c 100644
--- a/settings/Makefile.am
+++ b/settings/Makefile.am
@@ -3,6 +3,7 @@ AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"xfdashboard\" \
 	-DPACKAGE_DATADIR=\"$(datadir)\" \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+	-DPACKAGE_LIBDIR=\"$(libdir)\" \
 	$(PLATFORM_CPPFLAGS)
 
 bin_PROGRAMS = \
@@ -26,13 +27,14 @@ xfdashboard_settings_CFLAGS = \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(PLATFORM_CFLAGS)
 
-xfdashboard_settings_LDFLAGS = \
-	-export-dynamic \
-	-no-undefined \
-	$(PLATFORM_LDFLAGS)
-
 xfdashboard_settings_LDADD = \
 	$(GTK_LIBS) \
 	$(LIBXFCONF_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
-	$(LIBM)
+	$(LIBM) \
+	$(top_builddir)/libxfdashboard/libxfdashboard.la
+
+xfdashboard_settings_LDFLAGS = \
+	-export-dynamic \
+	-no-undefined \
+	$(PLATFORM_LDFLAGS)
diff --git a/xfdashboard/Makefile.am b/xfdashboard/Makefile.am
index 5cd83d1..ac57e31 100644
--- a/xfdashboard/Makefile.am
+++ b/xfdashboard/Makefile.am
@@ -6,264 +6,27 @@ AM_CPPFLAGS = \
 	-DPACKAGE_LIBDIR=\"$(libdir)\" \
 	$(PLATFORM_CPPFLAGS)
 
-noinst_LTLIBRARIES = \
-	libxfdashboard.la
-
 bin_PROGRAMS = \
 	xfdashboard
 
-xfdashboard_marshal_prefix = xfdashboard
-
-xfdashboard_built_sources = \
-	enums.h \
-	enums.c \
-	marshal.h \
-	marshal.c
-
-xfdashboard_headers = \
-	action-button.h \
-	actor.h \
-	application.h \
-	application-button.h \
-	application-database.h \
-	application-tracker.h \
-	applications-menu-model.h \
-	applications-search-provider.h \
-	applications-view.h \
-	background.h \
-	binding.h \
-	bindings-pool.h \
-	box-layout.h \
-	button.h \
-	click-action.h \
-	collapse-box.h \
-	css-selector.h \
-	desktop-app-info.h \
-	drag-action.h \
-	drop-action.h \
-	dynamic-table-layout.h \
-	emblem-effect.h \
-	fill-box-layout.h \
-	focusable.h \
-	focus-manager.h \
-	image-content.h \
-	live-window.h \
-	live-workspace.h \
-	outline-effect.h \
-	plugin.h \
-	plugins-manager.h \
-	quicklaunch.h \
-	scaled-table-layout.h \
-	scrollbar.h \
-	search-manager.h \
-	search-provider.h \
-	search-result-container.h \
-	search-result-set.h \
-	search-view.h \
-	stage.h \
-	stage-interface.h \
-	stylable.h \
-	text-box.h \
-	theme.h \
-	theme-css.h \
-	theme-effects.h \
-	theme-layout.h \
-	toggle-button.h \
-	tooltip-action.h \
-	types.h \
-	utils.h \
-	view.h \
-	view-manager.h \
-	view-selector.h \
-	viewpad.h \
-	window-content.h \
-	window-tracker.h \
-	window-tracker-monitor.h \
-	window-tracker-window.h \
-	window-tracker-workspace.h \
-	windows-view.h \
-	workspace-selector.h
-
-libxfdashboard_la_SOURCES = \
-	$(xfdashboard_built_sources) \
-	$(xfdashboard_headers) \
-	action-button.c \
-	actor.c \
-	application.c \
-	application-button.c \
-	application-database.c \
-	application-tracker.c \
-	applications-menu-model.c \
-	applications-search-provider.c \
-	applications-view.c \
-	background.c \
-	binding.c \
-	bindings-pool.c \
-	box-layout.c \
-	button.c \
-	click-action.c \
-	collapse-box.c \
-	css-selector.c \
-	desktop-app-info.c \
-	drag-action.c \
-	drop-action.c \
-	dynamic-table-layout.c \
-	emblem-effect.c \
-	fill-box-layout.c \
-	focusable.c \
-	focus-manager.c \
-	image-content.c \
-	live-window.c \
-	live-workspace.c \
-	outline-effect.c \
-	plugin.c \
-	plugins-manager.c \
-	quicklaunch.c \
-	scaled-table-layout.c \
-	scrollbar.c \
-	search-manager.c \
-	search-provider.c \
-	search-result-container.c \
-	search-result-set.c \
-	search-view.c \
-	stage.c \
-	stage-interface.c \
-	stylable.c \
-	text-box.c \
-	theme.c \
-	theme-css.c \
-	theme-effects.c \
-	theme-layout.c \
-	toggle-button.c \
-	tooltip-action.c \
-	utils.c \
-	view.c \
-	view-manager.c \
-	view-selector.c \
-	viewpad.c \
-	window-content.c \
-	window-tracker.c \
-	window-tracker-monitor.c \
-	window-tracker-window.c \
-	window-tracker-workspace.c \
-	windows-view.c \
-	workspace-selector.c
+xfdashboard_SOURCES = \
+	main.c
 
-libxfdashboard_la_CFLAGS = \
-	$(LIBWNCK_CFLAGS) \
+xfdashboard_CFLAGS = \
 	$(CLUTTER_CFLAGS) \
-	$(CLUTTER_COGL_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GIO_CFLAGS) \
-	$(GIO_UNIX_CFLAGS) \
-	$(GARCON_CFLAGS) \
 	$(LIBXFCONF_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
-	$(LIBXFCE4UI_CFLAGS) \
-	$(DBUS_GLIB_CFLAGS) \
 	$(PLATFORM_CFLAGS)
 
-libxfdashboard_la_LIBADD = \
-	$(LIBWNCK_LIBS) \
+xfdashboard_LDADD = \
 	$(CLUTTER_LIBS) \
-	$(CLUTTER_COGL_LIBS) \
 	$(GLIB_LIBS) \
-	$(GIO_LIBS) \
-	$(GIO_UNIX_LIBS) \
-	$(GARCON_LIBS) \
 	$(LIBXFCONF_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
-	$(LIBXFCE4UI_LIBS) \
-	$(DBUS_GLIB_LIBS) \
-	$(LIBM)
-
-if XFDASHBOARD_BUILD_WITH_XCOMPOSITE
-libxfdashboard_la_CFLAGS += \
-	$(XCOMPOSITE_CFLAGS)
-
-libxfdashboard_la_LIBADD += \
-	$(XCOMPOSITE_LIBS)
-endif
-
-if XFDASHBOARD_BUILD_WITH_XDAMAGE
-libxfdashboard_la_CFLAGS += \
-	$(XDAMAGE_CFLAGS)
-
-libxfdashboard_la_LIBADD += \
-	$(XDAMAGE_LIBS)
-endif
-
-if XFDASHBOARD_BUILD_WITH_XINERAMA
-libxfdashboard_la_CFLAGS += \
-	$(XINERAMA_CFLAGS)
-
-libxfdashboard_la_LIBADD += \
-	$(XINERAMA_LIBS)
-endif
-
-xfdashboard_SOURCES = \
-	main.c
-
-xfdashboard_CFLAGS = \
-	$(libxfdashboard_la_CFLAGS)
-
-xfdashboard_LDADD = \
-	libxfdashboard.la
+	$(top_builddir)/libxfdashboard/libxfdashboard.la
 
 xfdashboard_LDFLAGS = \
 	$(PLATFORM_LDFLAGS) \
 	-export-dynamic \
-	-no-undefined \
-	-Wl,--whole-archive,.libs/libxfdashboard.a,--no-whole-archive
-
-if MAINTAINER_MODE
-
-CLEANFILES = \
-	xgen-xmc \
-	xgen-xmh
-
-enums.h: $(xfdashboard_headers) Makefile
-	$(AM_V_GEN) $(GLIB_MKENUMS) --template enums.h.template $(xfdashboard_headers) > $@
-
-enums.c: $(xfdashboard_headers) Makefile
-	$(AM_V_GEN) $(GLIB_MKENUMS) --template enums.c.template $(xfdashboard_headers) > $@
-
-marshal.h: stamp-marshal.h
-	@true
-
-stamp-marshal.h: marshal.list Makefile
-	$(AM_V_GEN) \
-	( \
-		cd $(srcdir) \
-		&& ( $(GLIB_GENMARSHAL) \
-			--prefix=_xfdashboard_marshal \
-			--header marshal.list ) > xgen-xmh \
-		&& ( cmp -s xgen-xmh marshal.h || cp xgen-xmh marshal.h ) \
-		&& rm -f xgen-xmh \
-		&& echo timestamp > $(@F) \
-	)
-
-marshal.c: marshal.list Makefile
-	$(AM_V_GEN) \
-	( \
-		cd $(srcdir) \
-		&& echo "#include \"marshal.h\"" > xgen-xmc \
-		&& ( $(GLIB_GENMARSHAL) \
-			--prefix=_xfdashboard_marshal \
-			--body marshal.list ) >> xgen-xmc \
-		&& cp xgen-xmc marshal.c \
-		&& rm -f xgen-xmc \
-	)
-
-DISTCLEANFILES = \
-	$(xfdashboard_built_sources)
-
-BUILT_SOURCES = \
-	$(xfdashboard_built_sources)
-
-endif
-
-EXTRA_DIST = \
-	enums.h.template \
-	enums.c.template \
-	marshal.list
+	-no-undefined
diff --git a/xfdashboard/main.c b/xfdashboard/main.c
index d61909e..c87ba0d 100644
--- a/xfdashboard/main.c
+++ b/xfdashboard/main.c
@@ -31,8 +31,8 @@
 #include <gtk/gtk.h>
 #include <libxfce4util/libxfce4util.h>
 
-#include "application.h"
-#include "types.h"
+#include <libxfdashboard/application.h>
+#include <libxfdashboard/types.h>
 
 typedef struct _RestartData		RestartData;
 struct _RestartData

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
