95 files changed, 265 insertions, 151 deletions

diff --git a/ChangeLog b/ChangeLog
index 6029bd6..6c08137 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-19  Tomas Frydrych  <tf@o-hand.com>
+
+	* configure.ac, *.am, *.h:
+	Changes for building mbwm2 as a library (based on patch by Johan
+	Bilien):
+
+	Moved 'src' to 'matchbox'; fixed up headers to use #include <>.
+	Moved config.h to matchbox/mb-wm-config.h.
+	Added --enable-libmatchbox configure option, libmatchbox2.pc.in
+
 2008-02-18  Tomas Frydrych  <tf@o-hand.com>
 
 	* src/comp-mgr/README:
diff --git a/Makefile.am b/Makefile.am
index 1b94da0..8ae243e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src data doc
+SUBDIRS = matchbox data doc
 
 # Extra clean files so that maintainer-clean removes *everything*
 
diff --git a/configure.ac b/configure.ac
index 490e1d7..aed8238 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,30 @@
+# mbwm2 package version number, (as distinct from shared library version)
+# An odd minor number indicates in-progress development, (eg. from svn)
+# An even minor number indicates a released version.
+m4_define([mbwm2_major_version], [0])
+m4_define([mbwm2_minor_version], [1])
+m4_define([mbwm2_micro_version], [0])
+
+m4_define([mbwm2_version],
+          [mbwm2_major_version.mbwm2_minor_version.mbwm2_micro_version])
+
+m4_define([mbwm2_api_version],
+          [mbwm2_major_version.mbwm2_minor_version])
+
 AC_PREREQ(2.59)
-AC_INIT([matchbox-window-manager-2], 0.0.0, [mallum@handhelds.org])
-AC_CONFIG_SRCDIR([src/core/mb-window-manager.c])
+AC_INIT([matchbox-window-manager-2], mbwm2_version, [mallum@handhelds.org])
+AC_CONFIG_SRCDIR([matchbox/core/mb-window-manager.c])
 
 AM_INIT_AUTOMAKE()
+
+MBWM2_API_VERSION=mbwm2_api_version
+AC_SUBST(MBWM2_API_VERSION)
+
+MBWM2_INCDIR=matchbox-wm-2/$MBWM2_API_VERSION
+AC_SUBST(MBWM2_INCDIR)
+
 AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(matchbox/mb-wm-config.h)
 
 AC_PROG_CC
 AM_PROG_LIBTOOL
@@ -43,6 +63,10 @@ AC_ARG_ENABLE(glib-main-loop,
   [  --enable-glib-main-loop      Enable use of glib main loop],
   [gmloop=$enableval], [gmloop=no])
 
+AC_ARG_ENABLE(libmatchbox,
+  [  --enable-libmatchbox      Enable building as a library],
+  [libmatchbox=$enableval], [libmatchbox=no])
+
 if test "x$use_cairo" = "xyes"; then
   needed_pkgs="$needed_pkgs pangocairo "
 else
@@ -105,6 +129,8 @@ if test "$comp_mgr" = "yes (clutter)"; then
   AC_DEFINE(USE_CLUTTER, 1, [Use clutter for compositing])
 fi
 
+AM_CONDITIONAL(ENABLE_LIBMATCHBOX, [test "x$libmatchbox" = "xyes"])
+
 AC_ARG_ENABLE(simple-manager,
   [  --disable-simple-manager   Do not build simple window manager],
   [simple_manager=$enableval], [simple_manager=yes])
@@ -141,11 +167,11 @@ if test x$have_xcursor = xyes; then
   AC_DEFINE(HAVE_XCURSOR, [1], [Use XCursor to sync pointer themes])
 fi
 
-MBWM_INCS='-I$(top_srcdir)/src/core -I$(top_srcdir)/src/client-types -I$(top_srcdir)/src/theme-engines -I$(top_srcdir)/src/comp-mgr'
-MBWM_CORE_LIB='$(top_builddir)/src/core/libmatchbox-window-manager-2-core.a'
-MBWM_CLIENT_LIBS='$(top_builddir)/src/client-types'
-MBWM_THEME_LIBS='$(top_builddir)/src/theme-engines'
-MBWM_COMPMGR_LIBS='$(top_builddir)/src/comp-mgr'
+MBWM_INCS='-I$(top_srcdir) -I$(top_srcdir)/matchbox/core -I$(top_srcdir)/matchbox/client-types -I$(top_srcdir)/matchbox/theme-engines -I$(top_srcdir)/matchbox/comp-mgr'
+MBWM_CORE_LIB='$(top_builddir)/matchbox/core/libmatchbox-window-manager-2-core.a'
+MBWM_CLIENT_LIBS='$(top_builddir)/matchbox/client-types'
+MBWM_THEME_LIBS='$(top_builddir)/matchbox/theme-engines'
+MBWM_COMPMGR_LIBS='$(top_builddir)/matchbox/comp-mgr'
 MBWM_CFLAGS="$MBWM_CFLAGS $MBWM_DEBUG_CFLAGS $THEME_PNG_CFLAGS $XFIXES_CFLAGS $XEXT_CFLAGS $XCURSOR_CFLAGS"
 MBWM_LIBS="$MBWM_LIBS $THEME_PNG_LIBS $XFIXES_LIBS $XEXT_LIBS $XCURSOR_LIBS"
 
@@ -161,18 +187,19 @@ AC_SUBST([MBWM_DEBUG_LDFLAGS])
 
 AC_OUTPUT([
 Makefile
-src/Makefile
-src/core/Makefile
-src/client-types/Makefile
-src/comp-mgr/Makefile
-src/managers/Makefile
-src/managers/simple/Makefile
-src/managers/maemo/Makefile
-src/managers/maemo/theme/Makefile
-src/theme-engines/Makefile
+matchbox/Makefile
+matchbox/core/Makefile
+matchbox/client-types/Makefile
+matchbox/comp-mgr/Makefile
+matchbox/managers/Makefile
+matchbox/managers/simple/Makefile
+matchbox/managers/maemo/Makefile
+matchbox/managers/maemo/theme/Makefile
+matchbox/theme-engines/Makefile
 data/Makefile
 data/themes/Makefile
 data/themes/Default/Makefile
+data/libmatchbox2.pc
 doc/Makefile
 ])
 
@@ -202,5 +229,6 @@ echo "
 
     Miscel:
         Glib main loop      :   ${gmloop}
+	Build libmatchbox   :   ${libmatchbox}
 	Debugging output    :   ${want_debug}
 "
diff --git a/data/Makefile.am b/data/Makefile.am
index c94959d..6951ace 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1,6 @@
 SUBDIRS=themes
+
+if ENABLE_LIBMATCHBOX
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libmatchbox2.pc
+endif
diff --git a/data/libmatchbox2.pc.in b/data/libmatchbox2.pc.in
new file mode 100644
index 0000000..e8c9b13
--- /dev/null
+++ b/data/libmatchbox2.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/@MBWM2_INCDIR@
+localedir=@localedir@
+apiversion=@MBWM2_API_VERSION@
+
+Name: libmatchbox
+Description: Framework to build window managers not on the Desktop.
+Requires: xcb
+Version: @VERSION@
+Libs: -L${libdir} -lmatchbox2-${apiversion}
+Cflags: -I${includedir}
diff --git a/matchbox/Makefile.am b/matchbox/Makefile.am
new file mode 100644
index 0000000..f82e177
--- /dev/null
+++ b/matchbox/Makefile.am
@@ -0,0 +1,36 @@
+if ENABLE_COMPOSITE
+comp=comp-mgr
+complib=$(comp)/libmatchbox-window-manager-2-compmgr.la
+endif
+
+MAINTAINERCLEANFILES = Makefile.in
+
+pkgincludedir = $(includedir)/@MBWM2_INCDIR@
+
+if ENABLE_LIBMATCHBOX
+SUBDIRS = core client-types theme-engines $(comp)
+
+lib_LTLIBRARIES = libmatchbox2-@MBWM2_API_VERSION@.la
+
+
+libmatchbox2_@MBWM2_API_VERSION@_la_LIBADD = \
+			core/libmatchbox-window-manager-2-core.la \
+                        client-types/libmb-wm-client-app.la \
+			client-types/libmb-wm-client-desktop.la \
+			client-types/libmb-wm-client-dialog.la \
+			client-types/libmb-wm-client-input.la \
+			client-types/libmb-wm-client-menu.la \
+			client-types/libmb-wm-client-note.la \
+			client-types/libmb-wm-client-override.la \
+			client-types/libmb-wm-client-panel.la \
+			theme-engines/libmb-theme.la \
+			$(complib)
+
+libmatchbox2_@MBWM2_API_VERSION@_la_SOURCES =
+
+pkginclude_HEADERS = *.h
+
+else
+SUBDIRS = core client-types theme-engines $(comp) managers
+endif
+
diff --git a/matchbox/client-types/Makefile.am b/matchbox/client-types/Makefile.am
new file mode 100644
index 0000000..71d438d
--- /dev/null
+++ b/matchbox/client-types/Makefile.am
@@ -0,0 +1,64 @@
+if ENABLE_COMPOSITE
+compmgr_libs = libmb-wm-client-override.a
+compmgr_ltlibs = libmb-wm-client-override.la
+endif
+
+THEME_LIBS = @MBWM_THEME_LIBS@/libmb-theme.a
+
+INCLUDES     = @MBWM_INCS@ @MBWM_CFLAGS@
+LDADD        =$(THEME_LIBS)
+DEPENDENCIES = $(THEME_LIBS)
+
+pkgincludedir = $(includedir)/@MBWM2_INCDIR@/client-types
+
+if ENABLE_LIBMATCHBOX
+pkginclude_HEADERS = *.h
+noinst_LTLIBRARIES = libmb-wm-client-app.la	\
+	             libmb-wm-client-panel.la	\
+	             libmb-wm-client-dialog.la	\
+	             libmb-wm-client-note.la	\
+		     libmb-wm-client-input.la	\
+		     libmb-wm-client-desktop.la    \
+		     libmb-wm-client-menu.la	\
+		     $(compmgr_ltlibs)
+
+libmb_wm_client_app_la_SOURCES     = mb-wm-client-app.c mb-wm-client-app.h
+libmb_wm_client_panel_la_SOURCES   = mb-wm-client-panel.c mb-wm-client-panel.h
+libmb_wm_client_dialog_la_SOURCES  = mb-wm-client-dialog.c mb-wm-client-dialog.h
+libmb_wm_client_note_la_SOURCES    = mb-wm-client-note.c mb-wm-client-note.h
+libmb_wm_client_input_la_SOURCES   = mb-wm-client-input.c mb-wm-client-input.h
+libmb_wm_client_desktop_la_SOURCES = mb-wm-client-desktop.c mb-wm-client-desktop.h
+libmb_wm_client_menu_la_SOURCES    = mb-wm-client-menu.c mb-wm-client-menu.h
+libmb_wm_client_override_la_SOURCES= mb-wm-client-override.c \
+				    mb-wm-client-override.h
+libmb_wm_client_app_la_CFLAGS =
+libmb_wm_client_panel_la_CFLAGS =
+libmb_wm_client_dialog_la_CFLAGS =
+libmb_wm_client_note_la_CFLAGS =
+libmb_wm_client_input_la_CFLAGS =
+libmb_wm_client_desktop_la_CFLAGS =
+libmb_wm_client_menu_la_CFLAGS =
+libmb_wm_client_override_la_CFLAGS =
+else
+noinst_LIBRARIES = libmb-wm-client-app.a	\
+	           libmb-wm-client-panel.a	\
+	           libmb-wm-client-dialog.a	\
+	           libmb-wm-client-note.a	\
+		   libmb-wm-client-input.a	\
+		   libmb-wm-client-desktop.a    \
+		   libmb-wm-client-menu.a	\
+		   $(compmgr_libs)
+
+libmb_wm_client_app_a_SOURCES     = mb-wm-client-app.c mb-wm-client-app.h
+libmb_wm_client_panel_a_SOURCES   = mb-wm-client-panel.c mb-wm-client-panel.h
+libmb_wm_client_dialog_a_SOURCES  = mb-wm-client-dialog.c mb-wm-client-dialog.h
+libmb_wm_client_note_a_SOURCES    = mb-wm-client-note.c mb-wm-client-note.h
+libmb_wm_client_input_a_SOURCES   = mb-wm-client-input.c mb-wm-client-input.h
+libmb_wm_client_desktop_a_SOURCES = mb-wm-client-desktop.c mb-wm-client-desktop.h
+libmb_wm_client_menu_a_SOURCES    = mb-wm-client-menu.c mb-wm-client-menu.h
+libmb_wm_client_override_a_SOURCES= mb-wm-client-override.c \
+				    mb-wm-client-override.h
+endif
+
+
+MAINTAINERCLEANFILES = config.h.in Makefile.in
diff --git a/src/client-types/mb-wm-client-app.c b/matchbox/client-types/mb-wm-client-app.c
index 73e9594..73e9594 100644
--- a/src/client-types/mb-wm-client-app.c
+++ b/matchbox/client-types/mb-wm-client-app.c
diff --git a/src/client-types/mb-wm-client-app.h b/matchbox/client-types/mb-wm-client-app.h
index 247b6d1..935a99c 100644
--- a/src/client-types/mb-wm-client-app.h
+++ b/matchbox/client-types/mb-wm-client-app.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_APP_H
 #define _HAVE_MB_CLIENT_APP_H
 
-#include "mb-wm.h"
+#include <matchbox/core/mb-wm.h>
 
 typedef struct MBWMClientApp      MBWMClientApp;
 typedef struct MBWMClientAppClass MBWMClientAppClass;
diff --git a/src/client-types/mb-wm-client-desktop.c b/matchbox/client-types/mb-wm-client-desktop.c
index 2004831..2004831 100644
--- a/src/client-types/mb-wm-client-desktop.c
+++ b/matchbox/client-types/mb-wm-client-desktop.c
diff --git a/src/client-types/mb-wm-client-desktop.h b/matchbox/client-types/mb-wm-client-desktop.h
index 6efd8fe..128c450 100644
--- a/src/client-types/mb-wm-client-desktop.h
+++ b/matchbox/client-types/mb-wm-client-desktop.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_DESKTOP_H
 #define _HAVE_MB_CLIENT_DESKTOP_H
 
-#include "mb-wm.h"
+#include <matchbox/core/mb-wm.h>
 
 typedef struct MBWMClientDesktop      MBWMClientDesktop;
 typedef struct MBWMClientDesktopClass MBWMClientDesktopClass;
diff --git a/src/client-types/mb-wm-client-dialog.c b/matchbox/client-types/mb-wm-client-dialog.c
index 903324a..903324a 100644
--- a/src/client-types/mb-wm-client-dialog.c
+++ b/matchbox/client-types/mb-wm-client-dialog.c
diff --git a/src/client-types/mb-wm-client-dialog.h b/matchbox/client-types/mb-wm-client-dialog.h
index 48df8d9..48df8d9 100644
--- a/src/client-types/mb-wm-client-dialog.h
+++ b/matchbox/client-types/mb-wm-client-dialog.h
diff --git a/src/client-types/mb-wm-client-input.c b/matchbox/client-types/mb-wm-client-input.c
index 24e871c..24e871c 100644
--- a/src/client-types/mb-wm-client-input.c
+++ b/matchbox/client-types/mb-wm-client-input.c
diff --git a/src/client-types/mb-wm-client-input.h b/matchbox/client-types/mb-wm-client-input.h
index 1ae111e..05ffabd 100644
--- a/src/client-types/mb-wm-client-input.h
+++ b/matchbox/client-types/mb-wm-client-input.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_INPUT_H
 #define _HAVE_MB_CLIENT_INPUT_H
 
-#include "mb-wm.h"
+#include <matchbox/core/mb-wm.h>
 
 typedef struct MBWMClientInput      MBWMClientInput;
 typedef struct MBWMClientInputClass MBWMClientInputClass;
diff --git a/src/client-types/mb-wm-client-menu.c b/matchbox/client-types/mb-wm-client-menu.c
index a6cd20f..a6cd20f 100644
--- a/src/client-types/mb-wm-client-menu.c
+++ b/matchbox/client-types/mb-wm-client-menu.c
diff --git a/src/client-types/mb-wm-client-menu.h b/matchbox/client-types/mb-wm-client-menu.h
index 43bf1b3..4908736 100644
--- a/src/client-types/mb-wm-client-menu.h
+++ b/matchbox/client-types/mb-wm-client-menu.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_MENU_H
 #define _HAVE_MB_CLIENT_MENU_H
 
-#include "mb-wm.h"
+#include <matchbox/core/mb-wm.h>
 
 typedef struct MBWMClientMenu      MBWMClientMenu;
 typedef struct MBWMClientMenuClass MBWMClientMenuClass;
diff --git a/src/client-types/mb-wm-client-note.c b/matchbox/client-types/mb-wm-client-note.c
index f9e3bd7..f9e3bd7 100644
--- a/src/client-types/mb-wm-client-note.c
+++ b/matchbox/client-types/mb-wm-client-note.c
diff --git a/src/client-types/mb-wm-client-note.h b/matchbox/client-types/mb-wm-client-note.h
index d610529..3a7d5ba 100644
--- a/src/client-types/mb-wm-client-note.h
+++ b/matchbox/client-types/mb-wm-client-note.h
@@ -21,8 +21,8 @@
 #ifndef _HAVE_MB_CLIENT_NOTE_H
 #define _HAVE_MB_CLIENT_NOTE_H
 
-#include "mb-wm.h"
-#include "mb-wm-client-dialog.h"
+#include <matchbox/core/mb-wm.h>
+#include <matchbox/client-types/mb-wm-client-dialog.h>
 
 typedef struct MBWMClientNote      MBWMClientNote;
 typedef struct MBWMClientNoteClass MBWMClientNoteClass;
diff --git a/src/client-types/mb-wm-client-override.c b/matchbox/client-types/mb-wm-client-override.c
index ae70823..ae70823 100644
--- a/src/client-types/mb-wm-client-override.c
+++ b/matchbox/client-types/mb-wm-client-override.c
diff --git a/src/client-types/mb-wm-client-override.h b/matchbox/client-types/mb-wm-client-override.h
index 69588c4..7bf896a 100644
--- a/src/client-types/mb-wm-client-override.h
+++ b/matchbox/client-types/mb-wm-client-override.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_OVERRIDE_H
 #define _HAVE_MB_CLIENT_OVERRIDE_H
 
-#include "mb-wm.h"
+#include <matchbox/core/mb-wm.h>
 
 typedef struct MBWMClientOverride      MBWMClientOverride;
 typedef struct MBWMClientOverrideClass MBWMClientOverrideClass;
diff --git a/src/client-types/mb-wm-client-panel.c b/matchbox/client-types/mb-wm-client-panel.c
index 46117ee..46117ee 100644
--- a/src/client-types/mb-wm-client-panel.c
+++ b/matchbox/client-types/mb-wm-client-panel.c
diff --git a/src/client-types/mb-wm-client-panel.h b/matchbox/client-types/mb-wm-client-panel.h
index 07124b8..e0b7d77 100644
--- a/src/client-types/mb-wm-client-panel.h
+++ b/matchbox/client-types/mb-wm-client-panel.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_PANEL_H
 #define _HAVE_MB_CLIENT_PANEL_H
 
-#include "mb-wm.h"
+#include <matchbox/core/mb-wm.h>
 
 typedef struct MBWMClientPanel      MBWMClientPanel;
 typedef struct MBWMClientPanelClass MBWMClientPanelClass;
diff --git a/src/comp-mgr/Makefile.am b/matchbox/comp-mgr/Makefile.am
index 44c0ebd..f3e9c39 100644
--- a/src/comp-mgr/Makefile.am
+++ b/matchbox/comp-mgr/Makefile.am
@@ -1,26 +1,30 @@
-noinst_LIBRARIES = libmatchbox-window-manager-2-compmgr.a
 
 core_h    = mb-wm-comp-mgr.h
+core_c    = mb-wm-comp-mgr.c
 
 if USE_CLUTTER
 clutter_h = mb-wm-comp-clutter.h
+clutter_c = mb-wm-comp-mgr-clutter.c
 else
 default_h = mb-wm-comp-mgr-default.h
+default_c = mb-wm-comp-mgr-default.c
 endif
 
-core_c    = mb-wm-comp-mgr.c
-
+pkgincludedir = $(includedir)/@MBWM2_INCDIR@/comp-mgr
 
-if USE_CLUTTER
-clutter_c = mb-wm-comp-mgr-clutter.c
+if ENABLE_LIBMATCHBOX
+pkginclude_HEADERS = *.h
+noinst_LTLIBRARIES = libmatchbox-window-manager-2-compmgr.la
+libmatchbox_window_manager_2_compmgr_la_SOURCES = $(core_h) $(core_c)
+libmatchbox_window_manager_2_compmgr_la_CFLAGS = @MBWM_INCS@ @MBWM_CFLAGS@
 else
-default_c = mb-wm-comp-mgr-default.c
-endif
+noinst_LIBRARIES = libmatchbox-window-manager-2-compmgr.a
 
 libmatchbox_window_manager_2_compmgr_a_SOURCES = $(core_h) $(core_c)	   \
 						 $(default_h) $(default_c) \
 						 $(clutter_h) $(clutter_c)
 
 libmatchbox_window_manager_2_compmgr_a_CFLAGS = @MBWM_INCS@ @MBWM_CFLAGS@
+endif
 
-MAINTAINERCLEANFILES = Makefile.in
\ No newline at end of file
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/comp-mgr/README b/matchbox/comp-mgr/README
index fb53cf1..fb53cf1 100644
--- a/src/comp-mgr/README
+++ b/matchbox/comp-mgr/README
diff --git a/src/comp-mgr/mb-wm-comp-mgr-clutter.c b/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
index bfc7dba..bfc7dba 100644
--- a/src/comp-mgr/mb-wm-comp-mgr-clutter.c
+++ b/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
diff --git a/src/comp-mgr/mb-wm-comp-mgr-clutter.h b/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.h
index 9984b6e..9a3ef13 100644
--- a/src/comp-mgr/mb-wm-comp-mgr-clutter.h
+++ b/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.h
@@ -21,9 +21,7 @@
 #ifndef _HAVE_MB_WM_COMP_MGR_CLUTTER_H
 #define _HAVE_MB_WM_COMP_MGR_CLUTTER_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <matchbox/mb-wm-config.h>
 
 #define MB_WM_COMP_MGR_CLUTTER(c) ((MBWMCompMgrClutter*)(c))
 #define MB_WM_COMP_MGR_CLUTTER_CLASS(c) ((MBWMCompMgrClutterClass*)(c))
diff --git a/src/comp-mgr/mb-wm-comp-mgr-default.c b/matchbox/comp-mgr/mb-wm-comp-mgr-default.c
index 067567d..067567d 100644
--- a/src/comp-mgr/mb-wm-comp-mgr-default.c
+++ b/matchbox/comp-mgr/mb-wm-comp-mgr-default.c
diff --git a/src/comp-mgr/mb-wm-comp-mgr-default.h b/matchbox/comp-mgr/mb-wm-comp-mgr-default.h
index bc5e4ad..04ae436 100644
--- a/src/comp-mgr/mb-wm-comp-mgr-default.h
+++ b/matchbox/comp-mgr/mb-wm-comp-mgr-default.h
@@ -22,9 +22,7 @@
 #ifndef _HAVE_MB_WM_COMP_MGR_DEFAULT_H
 #define _HAVE_MB_WM_COMP_MGR_DEFAULT_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <matchbox/mb-wm-config.h>
 
 #define MB_WM_COMP_MGR_DEFAULT(c) ((MBWMCompMgrDefault*)(c))
 #define MB_WM_COMP_MGR_DEFAULT_CLASS(c) ((MBWMCompMgrDefaultClass*)(c))
diff --git a/src/comp-mgr/mb-wm-comp-mgr.c b/matchbox/comp-mgr/mb-wm-comp-mgr.c
index 34fa349..34fa349 100644
--- a/src/comp-mgr/mb-wm-comp-mgr.c
+++ b/matchbox/comp-mgr/mb-wm-comp-mgr.c
diff --git a/src/comp-mgr/mb-wm-comp-mgr.h b/matchbox/comp-mgr/mb-wm-comp-mgr.h
index fb79984..fb79984 100644
--- a/src/comp-mgr/mb-wm-comp-mgr.h
+++ b/matchbox/comp-mgr/mb-wm-comp-mgr.h
diff --git a/src/core/Makefile.am b/matchbox/core/Makefile.am
index fa04f42..2ae9b40 100644
--- a/src/core/Makefile.am
+++ b/matchbox/core/Makefile.am
@@ -1,4 +1,3 @@
-noinst_LIBRARIES = libmatchbox-window-manager-2-core.a
 
 core_h  = mb-wm.h             	\
           mb-wm-macros.h      	\
@@ -38,7 +37,17 @@ core_c  = mb-wm-object.c      	\
 	  mb-wm-main-context.c	\
           xas.c
 
+pkgincludedir = $(includedir)/@MBWM2_INCDIR@/core
+
+if ENABLE_LIBMATCHBOX
+pkginclude_HEADERS = $(core_h)
+noinst_LTLIBRARIES =  libmatchbox-window-manager-2-core.la
+libmatchbox_window_manager_2_core_la_SOURCES = $(core_h) $(core_c)
+libmatchbox_window_manager_2_core_la_CFLAGS =  @MBWM_INCS@ @MBWM_CFLAGS@
+else
+noinst_LIBRARIES = libmatchbox-window-manager-2-core.a
 libmatchbox_window_manager_2_core_a_SOURCES = $(core_h) $(core_c)
 libmatchbox_window_manager_2_core_a_CFLAGS =  @MBWM_INCS@ @MBWM_CFLAGS@
+endif
 
-MAINTAINERCLEANFILES = Makefile.in
\ No newline at end of file
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/core/mb-window-manager.c b/matchbox/core/mb-window-manager.c
index 1936b30..1936b30 100644
--- a/src/core/mb-window-manager.c
+++ b/matchbox/core/mb-window-manager.c
diff --git a/src/core/mb-window-manager.h b/matchbox/core/mb-window-manager.h
index b6a39f7..6b7cc44 100644
--- a/src/core/mb-window-manager.h
+++ b/matchbox/core/mb-window-manager.h
@@ -21,9 +21,7 @@
 #ifndef _HAVE_MB_WM_WINDOW_MANAGER_H
 #define _HAVE_MB_WM_WINDOW_MANAGER_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <matchbox/mb-wm-config.h>
 
 typedef struct MBWindowManagerClass   MBWindowManagerClass;
 typedef struct MBWindowManagerPriv    MBWindowManagerPriv;
diff --git a/src/core/mb-wm-atoms.c b/matchbox/core/mb-wm-atoms.c
index 4821712..4821712 100644
--- a/src/core/mb-wm-atoms.c
+++ b/matchbox/core/mb-wm-atoms.c
diff --git a/src/core/mb-wm-atoms.h b/matchbox/core/mb-wm-atoms.h
index ef06083..ef06083 100644
--- a/src/core/mb-wm-atoms.h
+++ b/matchbox/core/mb-wm-atoms.h
diff --git a/src/core/mb-wm-client-base.c b/matchbox/core/mb-wm-client-base.c
index 4596e8d..4596e8d 100644
--- a/src/core/mb-wm-client-base.c
+++ b/matchbox/core/mb-wm-client-base.c
diff --git a/src/core/mb-wm-client-base.h b/matchbox/core/mb-wm-client-base.h
index edc8008..edc8008 100644
--- a/src/core/mb-wm-client-base.h
+++ b/matchbox/core/mb-wm-client-base.h
diff --git a/src/core/mb-wm-client-window.c b/matchbox/core/mb-wm-client-window.c
index a9daf32..a9daf32 100644
--- a/src/core/mb-wm-client-window.c
+++ b/matchbox/core/mb-wm-client-window.c
diff --git a/src/core/mb-wm-client-window.h b/matchbox/core/mb-wm-client-window.h
index 98068e8..98068e8 100644
--- a/src/core/mb-wm-client-window.h
+++ b/matchbox/core/mb-wm-client-window.h
diff --git a/src/core/mb-wm-client.c b/matchbox/core/mb-wm-client.c
index 6815ea5..6815ea5 100644
--- a/src/core/mb-wm-client.c
+++ b/matchbox/core/mb-wm-client.c
diff --git a/src/core/mb-wm-client.h b/matchbox/core/mb-wm-client.h
index 6871ba0..3360267 100644
--- a/src/core/mb-wm-client.h
+++ b/matchbox/core/mb-wm-client.h
@@ -21,9 +21,7 @@
 #ifndef _HAVE_MB_CLIENT_H
 #define _HAVE_MB_CLIENT_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <matchbox/mb-wm-config.h>
 
 #define MB_WM_CLIENT(c) ((MBWindowManagerClient*)(c))
 #define MB_WM_CLIENT_CLASS(c) ((MBWindowManagerClientClass*)(c))
diff --git a/src/core/mb-wm-debug.c b/matchbox/core/mb-wm-debug.c
index 836bb06..836bb06 100644
--- a/src/core/mb-wm-debug.c
+++ b/matchbox/core/mb-wm-debug.c
diff --git a/src/core/mb-wm-debug.h b/matchbox/core/mb-wm-debug.h
index 2d0f31b..2d0f31b 100644
--- a/src/core/mb-wm-debug.h
+++ b/matchbox/core/mb-wm-debug.h
diff --git a/src/core/mb-wm-decor.c b/matchbox/core/mb-wm-decor.c
index 17c7a52..17c7a52 100644
--- a/src/core/mb-wm-decor.c
+++ b/matchbox/core/mb-wm-decor.c
diff --git a/src/core/mb-wm-decor.h b/matchbox/core/mb-wm-decor.h
index 9285cdd..2cb3e14 100644
--- a/src/core/mb-wm-decor.h
+++ b/matchbox/core/mb-wm-decor.h
@@ -78,12 +78,6 @@ MBWMDecor*
 mb_wm_decor_new (MBWindowManager     *wm,
 		 MBWMDecorType        type);
 
-static Bool
-mb_wm_decor_reparent (MBWMDecor *decor);
-
-static void
-mb_wm_decor_calc_geometry (MBWMDecor *decor);
-
 void
 mb_wm_decor_handle_repaint (MBWMDecor *decor);
 
diff --git a/src/core/mb-wm-keys.c b/matchbox/core/mb-wm-keys.c
index 7c32105..7c32105 100644
--- a/src/core/mb-wm-keys.c
+++ b/matchbox/core/mb-wm-keys.c
diff --git a/src/core/mb-wm-keys.h b/matchbox/core/mb-wm-keys.h
index 750123e..af4dc02 100644
--- a/src/core/mb-wm-keys.h
+++ b/matchbox/core/mb-wm-keys.h
@@ -1,4 +1,4 @@
-/* 
+/*
  *  Matchbox Window Manager II - A lightweight window manager not for the
  *                               desktop.
  *
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_WM_KEYS_H
 #define _HAVE_MB_WM_KEYS_H
 
-#include "mb-wm.h"
+#include <matchbox/core/mb-wm.h>
 
 void
 mb_wm_keys_binding_remove_all (MBWindowManager    *wm);
@@ -30,7 +30,7 @@ void
 mb_wm_keys_binding_remove (MBWindowManager    *wm,
 			   MBWMKeyBinding     *binding);
 MBWMKeyBinding*
-mb_wm_keys_binding_add (MBWindowManager    *wm, 
+mb_wm_keys_binding_add (MBWindowManager    *wm,
 			KeySym              ks,
 			int                 mask,
 			MBWMKeyPressedFunc  press_func,
@@ -38,8 +38,8 @@ mb_wm_keys_binding_add (MBWindowManager    *wm,
 			void               *userdata);
 
 MBWMKeyBinding*
-mb_wm_keys_binding_add_with_spec (MBWindowManager    *wm, 
-				  const char         *keystr, 
+mb_wm_keys_binding_add_with_spec (MBWindowManager    *wm,
+				  const char         *keystr,
 				  MBWMKeyPressedFunc  press_func,
 				  MBWMKeyDestroyFunc  destroy_func,
 				  void               *userdata);
diff --git a/src/core/mb-wm-layout.c b/matchbox/core/mb-wm-layout.c
index 7b00f48..7b00f48 100644
--- a/src/core/mb-wm-layout.c
+++ b/matchbox/core/mb-wm-layout.c
diff --git a/src/core/mb-wm-layout.h b/matchbox/core/mb-wm-layout.h
index b31a5dd..264edbb 100644
--- a/src/core/mb-wm-layout.h
+++ b/matchbox/core/mb-wm-layout.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_WM_LAYOUT_MANAGER_H
 #define _HAVE_MB_WM_LAYOUT_MANAGER_H
 
-#include "mb-wm.h"
+#include <matchbox/core/mb-wm.h>
 
 #define MB_WM_LAYOUT(c) ((MBWMLayout*)(c))
 #define MB_WM_LAYOUT_CLASS(c) ((MBWMLayoutClass*)(c))
diff --git a/src/core/mb-wm-macros.h b/matchbox/core/mb-wm-macros.h
index a46be08..a46be08 100644
--- a/src/core/mb-wm-macros.h
+++ b/matchbox/core/mb-wm-macros.h
diff --git a/src/core/mb-wm-main-context.c b/matchbox/core/mb-wm-main-context.c
index 160c9ea..160c9ea 100644
--- a/src/core/mb-wm-main-context.c
+++ b/matchbox/core/mb-wm-main-context.c
diff --git a/src/core/mb-wm-main-context.h b/matchbox/core/mb-wm-main-context.h
index 3b92c38..83191ec 100644
--- a/src/core/mb-wm-main-context.h
+++ b/matchbox/core/mb-wm-main-context.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MB_MAIN_CONTEXT_H
 #define _HAVE_MB_MAIN_CONTEXT_H
 
-#include "mb-wm.h"
+#include <matchbox/core/mb-wm.h>
 #include <poll.h>
 
 #define MB_WM_MAIN_CONTEXT(c) ((MBWMMainContext*)(c))
diff --git a/src/core/mb-wm-object-props.h b/matchbox/core/mb-wm-object-props.h
index 02af7a4..bc1f753 100644
--- a/src/core/mb-wm-object-props.h
+++ b/matchbox/core/mb-wm-object-props.h
@@ -2,7 +2,7 @@
 #ifndef _HAVE_MB_OBJECT_PROPS_H
 #define _HAVE_MB_OBJECT_PROPS_H
 
-#include "mb-wm-types.h"
+#include <matchbox/core/mb-wm-types.h>
 
 /*
  * MBWMObject construction properties
diff --git a/src/core/mb-wm-object.c b/matchbox/core/mb-wm-object.c
index 6b8ad4b..6b8ad4b 100644
--- a/src/core/mb-wm-object.c
+++ b/matchbox/core/mb-wm-object.c
diff --git a/src/core/mb-wm-object.h b/matchbox/core/mb-wm-object.h
index efa2ab5..f9e598f 100644
--- a/src/core/mb-wm-object.h
+++ b/matchbox/core/mb-wm-object.h
@@ -22,7 +22,7 @@
 #define _HAVE_MB_OBJECT_H
 
 #include <stdarg.h>
-#include "mb-wm-object-props.h"
+#include <matchbox/core/mb-wm-object-props.h>
 
 typedef struct MBWMObject       MBWMObject;
 typedef struct MBWMObjectClass  MBWMObjectClass;
diff --git a/src/core/mb-wm-props.c b/matchbox/core/mb-wm-props.c
index 01a74bb..01a74bb 100644
--- a/src/core/mb-wm-props.c
+++ b/matchbox/core/mb-wm-props.c
diff --git a/src/core/mb-wm-props.h b/matchbox/core/mb-wm-props.h
index 07418ca..07418ca 100644
--- a/src/core/mb-wm-props.h
+++ b/matchbox/core/mb-wm-props.h
diff --git a/src/core/mb-wm-root-window.c b/matchbox/core/mb-wm-root-window.c
index fea555d..fea555d 100644
--- a/src/core/mb-wm-root-window.c
+++ b/matchbox/core/mb-wm-root-window.c
diff --git a/src/core/mb-wm-root-window.h b/matchbox/core/mb-wm-root-window.h
index 7d3cdbe..7d3cdbe 100644
--- a/src/core/mb-wm-root-window.h
+++ b/matchbox/core/mb-wm-root-window.h
diff --git a/src/core/mb-wm-stack.c b/matchbox/core/mb-wm-stack.c
index d71f9c8..d71f9c8 100644
--- a/src/core/mb-wm-stack.c
+++ b/matchbox/core/mb-wm-stack.c
diff --git a/src/core/mb-wm-stack.h b/matchbox/core/mb-wm-stack.h
index 58afc45..58afc45 100644
--- a/src/core/mb-wm-stack.h
+++ b/matchbox/core/mb-wm-stack.h
diff --git a/src/core/mb-wm-types.h b/matchbox/core/mb-wm-types.h
index de846fd..fcc5b32 100644
--- a/src/core/mb-wm-types.h
+++ b/matchbox/core/mb-wm-types.h
@@ -21,12 +21,14 @@
 #ifndef _HAVE_MB_WM_TYPES_H
 #define _HAVE_MB_WM_TYPES_H
 
-#include <config.h>
+#include <matchbox/mb-wm-config.h>
 
 #ifdef USE_GLIB_MAINLOOP
 #include <glib.h>
 #endif
 
+#include <X11/Xlib.h>
+
 typedef struct MBWMFuncInfo
 {
   void *func;
diff --git a/src/core/mb-wm-util.c b/matchbox/core/mb-wm-util.c
index 2018bf2..2018bf2 100644
--- a/src/core/mb-wm-util.c
+++ b/matchbox/core/mb-wm-util.c
diff --git a/src/core/mb-wm-util.h b/matchbox/core/mb-wm-util.h
index 9137f27..9b9496c 100644
--- a/src/core/mb-wm-util.h
+++ b/matchbox/core/mb-wm-util.h
@@ -1,7 +1,7 @@
 #ifndef _MB_HAVE_UTIL_H
 #define _MB_HAVE_UTIL_H
 
-#include "mb-wm.h"
+#include <matchbox/core/mb-wm.h>
 
 /* See http://rlove.org/log/2005102601 */
 #if __GNUC__ >= 3
diff --git a/src/core/mb-wm.h b/matchbox/core/mb-wm.h
index 4655b0f..a524532 100644
--- a/src/core/mb-wm.h
+++ b/matchbox/core/mb-wm.h
@@ -31,7 +31,7 @@
 #include <X11/Xatom.h>          /* for XA_ATOM etc */
 #include <X11/keysym.h>         /* key mask defines */
 
-#include "xas.h"    		/* async stuff not needed for xlib on xcb */
+#include <matchbox/core/xas.h>    		/* async stuff not needed for xlib on xcb */
 
 #ifndef TRUE
 #define TRUE 1
@@ -41,21 +41,21 @@
 #define FALSE 0
 #endif
 
-#include "mb-wm-macros.h"
-#include "mb-wm-debug.h"
-#include "mb-wm-types.h"
-#include "mb-wm-util.h"
-#include "mb-wm-object.h"
-#include "mb-wm-atoms.h"
-#include "mb-wm-props.h"
-#include "mb-wm-keys.h"
-#include "mb-wm-decor.h"
-#include "mb-wm-client-window.h"
-#include "mb-wm-root-window.h"
-#include "mb-wm-client.h"
-#include "mb-wm-client-base.h"
-#include "mb-wm-layout.h"
-#include "mb-wm-stack.h"
-#include "mb-window-manager.h"
-#include "mb-wm-main-context.h"
+#include <mb-wm-macros.h>
+#include <mb-wm-debug.h>
+#include <mb-wm-types.h>
+#include <mb-wm-util.h>
+#include <mb-wm-object.h>
+#include <mb-wm-atoms.h>
+#include <mb-wm-props.h>
+#include <mb-wm-keys.h>
+#include <mb-wm-decor.h>
+#include <mb-wm-client-window.h>
+#include <mb-wm-root-window.h>
+#include <mb-wm-client.h>
+#include <mb-wm-client-base.h>
+#include <mb-wm-layout.h>
+#include <mb-wm-stack.h>
+#include <mb-window-manager.h>
+#include <mb-wm-main-context.h>
 #endif
diff --git a/src/core/xas.c b/matchbox/core/xas.c
index d0b8f8b..d0b8f8b 100644
--- a/src/core/xas.c
+++ b/matchbox/core/xas.c
diff --git a/src/core/xas.h b/matchbox/core/xas.h
index e9b7ca8..e9b7ca8 100644
--- a/src/core/xas.h
+++ b/matchbox/core/xas.h
diff --git a/src/managers/Makefile.am b/matchbox/managers/Makefile.am
index 07e2f28..07e2f28 100644
--- a/src/managers/Makefile.am
+++ b/matchbox/managers/Makefile.am
diff --git a/src/managers/maemo/Makefile.am b/matchbox/managers/maemo/Makefile.am
index a3a031a..a3a031a 100644
--- a/src/managers/maemo/Makefile.am
+++ b/matchbox/managers/maemo/Makefile.am
diff --git a/src/managers/maemo/maemo-input.c b/matchbox/managers/maemo/maemo-input.c
index 91bd14b..91bd14b 100644
--- a/src/managers/maemo/maemo-input.c
+++ b/matchbox/managers/maemo/maemo-input.c
diff --git a/src/managers/maemo/maemo-input.h b/matchbox/managers/maemo/maemo-input.h
index efeec20..cd4998c 100644
--- a/src/managers/maemo/maemo-input.h
+++ b/matchbox/managers/maemo/maemo-input.h
@@ -21,8 +21,8 @@
 #ifndef _HAVE_MAEMO_INPUT_H
 #define _HAVE_MAEMO_INPUT_H
 
-#include "mb-wm.h"
-#include "mb-wm-client-input.h"
+#include <matchbox/core/mb-wm.h>
+#include <matchbox/client-types/mb-wm-client-input.h>
 
 typedef struct MaemoInput      MaemoInput;
 typedef struct MaemoInputClass MaemoInputClass;
diff --git a/src/managers/maemo/maemo-toolbar.c b/matchbox/managers/maemo/maemo-toolbar.c
index ae14502..ae14502 100644
--- a/src/managers/maemo/maemo-toolbar.c
+++ b/matchbox/managers/maemo/maemo-toolbar.c
diff --git a/src/managers/maemo/maemo-toolbar.h b/matchbox/managers/maemo/maemo-toolbar.h
index f9c0be1..5aa9015 100644
--- a/src/managers/maemo/maemo-toolbar.h
+++ b/matchbox/managers/maemo/maemo-toolbar.h
@@ -21,8 +21,8 @@
 #ifndef _HAVE_MAEMO_TOOLBAR_H
 #define _HAVE_MAEMO_TOOLBAR_H
 
-#include "mb-wm.h"
-#include "mb-wm-client-panel.h"
+#include <matchbox/core/mb-wm.h>
+#include <matchbox/client-types/mb-wm-client-panel.h>
 
 typedef struct MaemoToolbar      MaemoToolbar;
 typedef struct MaemoToolbarClass MaemoToolbarClass;
diff --git a/src/managers/maemo/maemo-window-manager.c b/matchbox/managers/maemo/maemo-window-manager.c
index 9090dd9..9090dd9 100644
--- a/src/managers/maemo/maemo-window-manager.c
+++ b/matchbox/managers/maemo/maemo-window-manager.c
diff --git a/src/managers/maemo/maemo-window-manager.h b/matchbox/managers/maemo/maemo-window-manager.h
index 65b91f1..099bf79 100644
--- a/src/managers/maemo/maemo-window-manager.h
+++ b/matchbox/managers/maemo/maemo-window-manager.h
@@ -21,7 +21,7 @@
 #ifndef _HAVE_MAEMO_WINDOW_MANAGER_H
 #define _HAVE_MAEMO_WINDOW_MANAGER_H
 
-#include "mb-wm.h"
+#include <matchbox/core/mb-wm.h>
 
 typedef struct MaemoWindowManagerClass   MaemoWindowManagerClass;
 typedef struct MaemoWindowManagerPriv    MaemoWindowManagerPriv;
diff --git a/src/managers/maemo/matchbox-window-manager-2-maemo.c b/matchbox/managers/maemo/matchbox-window-manager-2-maemo.c
index 7d7e807..7d7e807 100644
--- a/src/managers/maemo/matchbox-window-manager-2-maemo.c
+++ b/matchbox/managers/maemo/matchbox-window-manager-2-maemo.c
diff --git a/src/managers/maemo/theme/Makefile.am b/matchbox/managers/maemo/theme/Makefile.am
index 6c11484..6c11484 100644
--- a/src/managers/maemo/theme/Makefile.am
+++ b/matchbox/managers/maemo/theme/Makefile.am
diff --git a/src/managers/maemo/theme/background.png b/matchbox/managers/maemo/theme/background.png
index 5ebb9be..5ebb9be 100644
--- a/src/managers/maemo/theme/background.png
+++ b/matchbox/managers/maemo/theme/background.png
diff --git a/src/managers/maemo/theme/theme.xml b/matchbox/managers/maemo/theme/theme.xml
index f752397..f752397 100644
--- a/src/managers/maemo/theme/theme.xml
+++ b/matchbox/managers/maemo/theme/theme.xml
diff --git a/src/managers/simple/Makefile.am b/matchbox/managers/simple/Makefile.am
index f8bc9c8..f8bc9c8 100644
--- a/src/managers/simple/Makefile.am
+++ b/matchbox/managers/simple/Makefile.am
diff --git a/src/managers/simple/matchbox-window-manager-2-simple.c b/matchbox/managers/simple/matchbox-window-manager-2-simple.c
index bfd8e1a..bfd8e1a 100644
--- a/src/managers/simple/matchbox-window-manager-2-simple.c
+++ b/matchbox/managers/simple/matchbox-window-manager-2-simple.c
diff --git a/src/theme-engines/Makefile.am b/matchbox/theme-engines/Makefile.am
index 7e019ad..2fe0dac 100644
--- a/src/theme-engines/Makefile.am
+++ b/matchbox/theme-engines/Makefile.am
@@ -12,9 +12,17 @@ endif
 
 COMMON_SRC = mb-wm-theme.h mb-wm-theme.c mb-wm-theme-xml.h mb-wm-theme-xml.c
 
-noinst_LIBRARIES = libmb-theme.a
+pkgincludedir = $(includedir)/@MBWM2_INCDIR@/theme-engines
 
+if ENABLE_LIBMATCHBOX
+pkginclude_HEADERS = *.h
+noinst_LTLIBRARIES = libmb-theme.la
+libmb_theme_la_SOURCES = $(COMMON_SRC) $(CAIRO_SRC) $(SIMPLE_SRC) $(PNG_SRC)
+libmb_theme_la_CFLAGS =
+else
+noinst_LIBRARIES = libmb-theme.a
 libmb_theme_a_SOURCES = $(COMMON_SRC) $(CAIRO_SRC) $(SIMPLE_SRC) $(PNG_SRC)
+endif
 
 INCLUDES = @MBWM_INCS@ @MBWM_CFLAGS@ -DDATADIR=\"$(datadir)\"
 
diff --git a/src/theme-engines/mb-wm-theme-cairo.c b/matchbox/theme-engines/mb-wm-theme-cairo.c
index b045e89..b045e89 100644
--- a/src/theme-engines/mb-wm-theme-cairo.c
+++ b/matchbox/theme-engines/mb-wm-theme-cairo.c
diff --git a/src/theme-engines/mb-wm-theme-cairo.h b/matchbox/theme-engines/mb-wm-theme-cairo.h
index 91317c0..ba6b6cb 100644
--- a/src/theme-engines/mb-wm-theme-cairo.h
+++ b/matchbox/theme-engines/mb-wm-theme-cairo.h
@@ -1,4 +1,4 @@
-/* 
+/*
  *  Matchbox Window Manager II - A lightweight window manager not for the
  *                               desktop.
  *
@@ -21,11 +21,8 @@
 #ifndef _HAVE_MB_WM_THEME_CAIRO_H
 #define _HAVE_MB_WM_THEME_CAIRO_H
 
-#include "mb-wm-theme.h"
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <matchbox/mb-wm-config.h>
+#include <matchbox/theme-engines/mb-wm-theme.h>
 
 struct MBWMThemeCairoClass
 {
diff --git a/src/theme-engines/mb-wm-theme-png.c b/matchbox/theme-engines/mb-wm-theme-png.c
index 4ab69ae..4ab69ae 100644
--- a/src/theme-engines/mb-wm-theme-png.c
+++ b/matchbox/theme-engines/mb-wm-theme-png.c
diff --git a/src/theme-engines/mb-wm-theme-png.h b/matchbox/theme-engines/mb-wm-theme-png.h
index 2cd1936..c40338d 100644
--- a/src/theme-engines/mb-wm-theme-png.h
+++ b/matchbox/theme-engines/mb-wm-theme-png.h
@@ -21,11 +21,8 @@
 #ifndef _HAVE_MB_WM_THEME_PNG_H
 #define _HAVE_MB_WM_THEME_PNG_H
 
-#include "mb-wm-theme.h"
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <matchbox/mb-wm-config.h>
+#include <matchbox/theme-engines/mb-wm-theme.h>
 
 #include <X11/extensions/Xrender.h>
 
diff --git a/src/theme-engines/mb-wm-theme-simple.c b/matchbox/theme-engines/mb-wm-theme-simple.c
index db4df7c..db4df7c 100644
--- a/src/theme-engines/mb-wm-theme-simple.c
+++ b/matchbox/theme-engines/mb-wm-theme-simple.c
diff --git a/src/theme-engines/mb-wm-theme-simple.h b/matchbox/theme-engines/mb-wm-theme-simple.h
index 20f49da..bcd2af2 100644
--- a/src/theme-engines/mb-wm-theme-simple.h
+++ b/matchbox/theme-engines/mb-wm-theme-simple.h
@@ -1,4 +1,4 @@
-/* 
+/*
  *  Matchbox Window Manager II - A lightweight window manager not for the
  *                               desktop.
  *
@@ -21,11 +21,8 @@
 #ifndef _HAVE_MB_WM_THEME_SIMPLE_H
 #define _HAVE_MB_WM_THEME_SIMPLE_H
 
-#include "mb-wm-theme.h"
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <matchbox/mb-wm-config.h>
+#include <matchbox/mb-wm-theme.h>
 
 struct MBWMThemeSimpleClass
 {
diff --git a/src/theme-engines/mb-wm-theme-xml.c b/matchbox/theme-engines/mb-wm-theme-xml.c
index 28963c9..28963c9 100644
--- a/src/theme-engines/mb-wm-theme-xml.c
+++ b/matchbox/theme-engines/mb-wm-theme-xml.c
diff --git a/src/theme-engines/mb-wm-theme-xml.h b/matchbox/theme-engines/mb-wm-theme-xml.h
index 53b20ce..161cee5 100644
--- a/src/theme-engines/mb-wm-theme-xml.h
+++ b/matchbox/theme-engines/mb-wm-theme-xml.h
@@ -1,7 +1,7 @@
 #ifndef _HAVE_MB_WM_THEME_PRIVATE_H
 #define _HAVE_MB_WM_THEME_PRIVATE_H
 
-#include "mb-wm.h"
+#include <matchbox/core/mb-wm.h>
 
 /*
  * Helper structs for xml theme
diff --git a/src/theme-engines/mb-wm-theme.c b/matchbox/theme-engines/mb-wm-theme.c
index 75eac06..75eac06 100644
--- a/src/theme-engines/mb-wm-theme.c
+++ b/matchbox/theme-engines/mb-wm-theme.c
diff --git a/src/theme-engines/mb-wm-theme.h b/matchbox/theme-engines/mb-wm-theme.h
index 497ed59..455b132 100644
--- a/src/theme-engines/mb-wm-theme.h
+++ b/matchbox/theme-engines/mb-wm-theme.h
@@ -21,11 +21,8 @@
 #ifndef _HAVE_MB_WM_THEME_H
 #define _HAVE_MB_WM_THEME_H
 
-#include "mb-wm.h"
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <matchbox/mb-wm-config.h>
+#include <matchbox/core/mb-wm.h>
 
 #define MB_WM_THEME(c) ((MBWMTheme*)(c))
 #define MB_WM_THEME_CLASS(c) ((MBWMThemeClass*)(c))
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index a46ed99..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-
-if ENABLE_COMPOSITE
-comp=comp-mgr
-endif
-
-SUBDIRS = core client-types theme-engines $(comp) managers
-
-MAINTAINERCLEANFILES = Makefile.in
\ No newline at end of file
diff --git a/src/client-types/Makefile.am b/src/client-types/Makefile.am
deleted file mode 100644
index 6db3dff..0000000
--- a/src/client-types/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-if ENABLE_COMPOSITE
-compmgr_libs = libmb-wm-client-override.a
-endif
-
-noinst_LIBRARIES = libmb-wm-client-app.a 	\
-	           libmb-wm-client-panel.a	\
-	           libmb-wm-client-dialog.a	\
-	           libmb-wm-client-note.a	\
-		   libmb-wm-client-input.a	\
-		   libmb-wm-client-desktop.a    \
-		   libmb-wm-client-menu.a	\
-		   $(compmgr_libs)
-
-THEME_LIBS = @MBWM_THEME_LIBS@/libmb-theme.a
-
-INCLUDES     = @MBWM_INCS@ @MBWM_CFLAGS@
-LDADD        =$(THEME_LIBS)
-DEPENDENCIES = $(THEME_LIBS)
-
-libmb_wm_client_app_a_SOURCES     = mb-wm-client-app.c mb-wm-client-app.h
-libmb_wm_client_panel_a_SOURCES   = mb-wm-client-panel.c mb-wm-client-panel.h
-libmb_wm_client_dialog_a_SOURCES  = mb-wm-client-dialog.c mb-wm-client-dialog.h
-libmb_wm_client_note_a_SOURCES    = mb-wm-client-note.c mb-wm-client-note.h
-libmb_wm_client_input_a_SOURCES   = mb-wm-client-input.c mb-wm-client-input.h
-libmb_wm_client_desktop_a_SOURCES = mb-wm-client-desktop.c mb-wm-client-desktop.h
-libmb_wm_client_menu_a_SOURCES    = mb-wm-client-menu.c mb-wm-client-menu.h
-libmb_wm_client_override_a_SOURCES= mb-wm-client-override.c \
-				    mb-wm-client-override.h
-
-
-MAINTAINERCLEANFILES = config.h.in Makefile.in