aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2010-08-18 02:25:49 +0100
committerRobert Bragg <robert@linux.intel.com>2010-12-09 22:38:47 +0000
commit7d2876023f9825f0dc743a6841c1d91e083a5afa (patch)
tree6999d19f874072b43e02752d58723c3d7473863f
parent1356ae017f9569ab69068e1834a73c38d5e486c8 (diff)
downloadlibmatchboxwm2-7d2876023f9825f0dc743a6841c1d91e083a5afa.tar.gz
libmatchboxwm2-7d2876023f9825f0dc743a6841c1d91e083a5afa.tar.bz2
libmatchboxwm2-7d2876023f9825f0dc743a6841c1d91e083a5afa.zip
build: Another pass at overhauling the naming schemes
There currently lots of inconsistent ways we refer to matchbox 2; it can be mbwm2, matchbox-wm-2, matchbox2, matchbox-window-manager-2 and things are also confusing when considering the naming of pkg-config files and for choosing the directory name for installing headers. The approach I'm starting to settle on (this goes back on some of the renaming changes I made recently, so sorry for the churn) is to consider the canonical name of the project just "matchbox" and then we use the package/library versioning to define it as "2.0". Headers now get installed in $prefix/include/matchbox-2.0/matchbox and the top level header has been renamed from mb-wm.h to matchbox.h. The pkg-config file will be installed as matchbox-2.0.pc
-rw-r--r--Makefile.am11
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac66
-rw-r--r--data/Makefile.am10
-rw-r--r--data/libmatchbox2.pc.in14
-rw-r--r--doc/reference/Makefile.am2
-rw-r--r--doc/reference/matchbox/Makefile.am (renamed from doc/reference/matchbox2/Makefile.am)14
-rw-r--r--doc/reference/matchbox/matchbox2-docs.sgml (renamed from doc/reference/matchbox2/matchbox2-docs.sgml)0
-rw-r--r--doc/reference/matchbox/matchbox2-sections.txt (renamed from doc/reference/matchbox2/matchbox2-sections.txt)0
-rw-r--r--doc/reference/matchbox/version.xml.in1
-rw-r--r--doc/reference/matchbox2/version.xml.in1
-rw-r--r--managers/maemo/Makefile.am2
-rw-r--r--managers/maemo/maemo-input.h2
-rw-r--r--managers/maemo/maemo-toolbar.h2
-rw-r--r--managers/maemo/maemo-window-manager.c2
-rw-r--r--managers/maemo/maemo-window-manager.h2
-rw-r--r--managers/maemo/matchbox-window-manager-2-maemo.c2
-rw-r--r--managers/simple/Makefile.am2
-rw-r--r--managers/simple/matchbox-window-manager-2-simple.c2
-rw-r--r--matchbox.pc.in14
-rw-r--r--matchbox/Makefile.am (renamed from matchbox2/Makefile.am)10
-rw-r--r--matchbox/matchbox.h (renamed from matchbox2/matchbox.h)54
-rw-r--r--matchbox/mb-window-manager.c (renamed from matchbox2/mb-window-manager.c)0
-rw-r--r--matchbox/mb-window-manager.h (renamed from matchbox2/mb-window-manager.h)18
-rw-r--r--matchbox/mb-wm-atoms.c (renamed from matchbox2/mb-wm-atoms.c)0
-rw-r--r--matchbox/mb-wm-atoms.h (renamed from matchbox2/mb-wm-atoms.h)2
-rw-r--r--matchbox/mb-wm-client-app.c (renamed from matchbox2/mb-wm-client-app.c)0
-rw-r--r--matchbox/mb-wm-client-app.h (renamed from matchbox2/mb-wm-client-app.h)2
-rw-r--r--matchbox/mb-wm-client-base.c (renamed from matchbox2/mb-wm-client-base.c)0
-rw-r--r--matchbox/mb-wm-client-base.h (renamed from matchbox2/mb-wm-client-base.h)2
-rw-r--r--matchbox/mb-wm-client-desktop.c (renamed from matchbox2/mb-wm-client-desktop.c)0
-rw-r--r--matchbox/mb-wm-client-desktop.h (renamed from matchbox2/mb-wm-client-desktop.h)2
-rw-r--r--matchbox/mb-wm-client-dialog.c (renamed from matchbox2/mb-wm-client-dialog.c)0
-rw-r--r--matchbox/mb-wm-client-dialog.h (renamed from matchbox2/mb-wm-client-dialog.h)4
-rw-r--r--matchbox/mb-wm-client-input.c (renamed from matchbox2/mb-wm-client-input.c)0
-rw-r--r--matchbox/mb-wm-client-input.h (renamed from matchbox2/mb-wm-client-input.h)2
-rw-r--r--matchbox/mb-wm-client-menu.c (renamed from matchbox2/mb-wm-client-menu.c)0
-rw-r--r--matchbox/mb-wm-client-menu.h (renamed from matchbox2/mb-wm-client-menu.h)2
-rw-r--r--matchbox/mb-wm-client-note.c (renamed from matchbox2/mb-wm-client-note.c)0
-rw-r--r--matchbox/mb-wm-client-note.h (renamed from matchbox2/mb-wm-client-note.h)4
-rw-r--r--matchbox/mb-wm-client-override.c (renamed from matchbox2/mb-wm-client-override.c)0
-rw-r--r--matchbox/mb-wm-client-override.h (renamed from matchbox2/mb-wm-client-override.h)2
-rw-r--r--matchbox/mb-wm-client-panel.c (renamed from matchbox2/mb-wm-client-panel.c)0
-rw-r--r--matchbox/mb-wm-client-panel.h (renamed from matchbox2/mb-wm-client-panel.h)2
-rw-r--r--matchbox/mb-wm-client-window.c (renamed from matchbox2/mb-wm-client-window.c)0
-rw-r--r--matchbox/mb-wm-client-window.h (renamed from matchbox2/mb-wm-client-window.h)4
-rw-r--r--matchbox/mb-wm-client.c (renamed from matchbox2/mb-wm-client.c)0
-rw-r--r--matchbox/mb-wm-client.h (renamed from matchbox2/mb-wm-client.h)6
-rw-r--r--matchbox/mb-wm-comp-mgr-clutter.c (renamed from matchbox2/mb-wm-comp-mgr-clutter.c)0
-rw-r--r--matchbox/mb-wm-comp-mgr-clutter.h (renamed from matchbox2/mb-wm-comp-mgr-clutter.h)2
-rw-r--r--matchbox/mb-wm-comp-mgr-xrender.c (renamed from matchbox2/mb-wm-comp-mgr-xrender.c)0
-rw-r--r--matchbox/mb-wm-comp-mgr-xrender.h (renamed from matchbox2/mb-wm-comp-mgr-xrender.h)2
-rw-r--r--matchbox/mb-wm-comp-mgr.c (renamed from matchbox2/mb-wm-comp-mgr.c)0
-rw-r--r--matchbox/mb-wm-comp-mgr.h (renamed from matchbox2/mb-wm-comp-mgr.h)2
-rw-r--r--matchbox/mb-wm-config.h.in (renamed from matchbox2/mb-wm-config.h.in)0
-rw-r--r--matchbox/mb-wm-debug.c (renamed from matchbox2/mb-wm-debug.c)0
-rw-r--r--matchbox/mb-wm-debug.h (renamed from matchbox2/mb-wm-debug.h)0
-rw-r--r--matchbox/mb-wm-decor.c (renamed from matchbox2/mb-wm-decor.c)0
-rw-r--r--matchbox/mb-wm-decor.h (renamed from matchbox2/mb-wm-decor.h)2
-rw-r--r--matchbox/mb-wm-keys.c (renamed from matchbox2/mb-wm-keys.c)0
-rw-r--r--matchbox/mb-wm-keys.h (renamed from matchbox2/mb-wm-keys.h)2
-rw-r--r--matchbox/mb-wm-layout.c (renamed from matchbox2/mb-wm-layout.c)0
-rw-r--r--matchbox/mb-wm-layout.h (renamed from matchbox2/mb-wm-layout.h)4
-rw-r--r--matchbox/mb-wm-macros.h (renamed from matchbox2/mb-wm-macros.h)0
-rw-r--r--matchbox/mb-wm-main-context.c (renamed from matchbox2/mb-wm-main-context.c)0
-rw-r--r--matchbox/mb-wm-main-context.h (renamed from matchbox2/mb-wm-main-context.h)4
-rw-r--r--matchbox/mb-wm-object-props.h (renamed from matchbox2/mb-wm-object-props.h)2
-rw-r--r--matchbox/mb-wm-object.c (renamed from matchbox2/mb-wm-object.c)0
-rw-r--r--matchbox/mb-wm-object.h (renamed from matchbox2/mb-wm-object.h)2
-rw-r--r--matchbox/mb-wm-props.c (renamed from matchbox2/mb-wm-props.c)0
-rw-r--r--matchbox/mb-wm-props.h (renamed from matchbox2/mb-wm-props.h)0
-rw-r--r--matchbox/mb-wm-root-window.c (renamed from matchbox2/mb-wm-root-window.c)0
-rw-r--r--matchbox/mb-wm-root-window.h (renamed from matchbox2/mb-wm-root-window.h)4
-rw-r--r--matchbox/mb-wm-stack.c (renamed from matchbox2/mb-wm-stack.c)0
-rw-r--r--matchbox/mb-wm-stack.h (renamed from matchbox2/mb-wm-stack.h)0
-rw-r--r--matchbox/mb-wm-theme-png.c (renamed from matchbox2/mb-wm-theme-png.c)0
-rw-r--r--matchbox/mb-wm-theme-png.h (renamed from matchbox2/mb-wm-theme-png.h)4
-rw-r--r--matchbox/mb-wm-theme-xml.c (renamed from matchbox2/mb-wm-theme-xml.c)0
-rw-r--r--matchbox/mb-wm-theme-xml.h (renamed from matchbox2/mb-wm-theme-xml.h)4
-rw-r--r--matchbox/mb-wm-theme.c (renamed from matchbox2/mb-wm-theme.c)0
-rw-r--r--matchbox/mb-wm-theme.h (renamed from matchbox2/mb-wm-theme.h)6
-rw-r--r--matchbox/mb-wm-types.h (renamed from matchbox2/mb-wm-types.h)2
-rw-r--r--matchbox/mb-wm-util.c (renamed from matchbox2/mb-wm-util.c)0
-rw-r--r--matchbox/mb-wm-util.h (renamed from matchbox2/mb-wm-util.h)4
-rw-r--r--matchbox/tidy/tidy-texture-frame.c (renamed from matchbox2/tidy/tidy-texture-frame.c)0
-rw-r--r--matchbox/tidy/tidy-texture-frame.h (renamed from matchbox2/tidy/tidy-texture-frame.h)0
-rw-r--r--matchbox/xas.c (renamed from matchbox2/xas.c)0
-rw-r--r--matchbox/xas.h (renamed from matchbox2/xas.h)0
88 files changed, 149 insertions, 164 deletions
diff --git a/Makefile.am b/Makefile.am
index 09cd46c..f568da1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,13 @@
-SUBDIRS = matchbox2 managers data doc util
+SUBDIRS = matchbox managers data doc util
+
+pcfiles = matchbox-$(MBWM_API_VERSION).pc
+
+pkgconfig_DATA = $(pcfiles)
+pkgconfigdir = $(libdir)/pkgconfig
+
+EXTRA_DIST = matchbox.pc.in
+
+CLEANFILES = $(pcfiles)
# Extra clean files so that maintainer-clean removes *everything*
diff --git a/autogen.sh b/autogen.sh
index 719ff5d..63c4860 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,7 +5,7 @@ test -z "$srcdir" && srcdir=.
PROJECT=Matchbox2
TEST_TYPE=-d
-FILE=matchbox2
+FILE=matchbox
test $TEST_TYPE $FILE || {
echo "You must run this script in the top-level $PROJECT directory"
diff --git a/configure.ac b/configure.ac
index 8495912..90f9160 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,34 +1,28 @@
-# mbwm2 package version number, (as distinct from shared library version)
-# An odd minor number indicates in-progress development, (eg. from svn)
+# mbwm package version number, (as distinct from shared library version)
+# An odd minor number indicates in-progress development, (eg. from Git)
# 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([mbwm_major_version], [1])
+m4_define([mbwm_minor_version], [9999])
+m4_define([mbwm_micro_version], [0])
-m4_define([mbwm2_version],
- [mbwm2_major_version.mbwm2_minor_version.mbwm2_micro_version])
+m4_define([mbwm_version],
+ [mbwm_major_version.mbwm_minor_version.mbwm_micro_version])
-m4_define([mbwm2_api_version],
- [mbwm2_major_version.mbwm2_minor_version])
+# Change this only when breaking the API
+m4_define([mbwm_api_version], [2.0])
AC_PREREQ(2.63)
-AC_INIT([matchbox-window-manager-2], mbwm2_version, [mallum@handhelds.org])
-AC_CONFIG_SRCDIR([matchbox2/mb-window-manager.c])
+AC_INIT([matchbox], mbwm_version, [mallum@handhelds.org])
+AC_CONFIG_SRCDIR([matchbox/mb-window-manager.c])
AM_INIT_AUTOMAKE(1.11 foreign dist-bzip2)
AM_SILENT_RULES([yes])
-MBWM2_VERSION=mbwm2_version
-AC_SUBST(MBWM2_VERSION)
+MBWM_VERSION=mbwm_version
+AC_SUBST(MBWM_VERSION)
-MBWM2_API_VERSION=mbwm2_api_version
-AC_SUBST(MBWM2_API_VERSION)
-
-MBWM2_INCDIR=matchbox-wm-2/$MBWM2_API_VERSION/matchbox
-AC_SUBST(MBWM2_INCDIR)
-
-MBWM2_PKGINCDIR=matchbox-wm-2/$MBWM2_API_VERSION/
-AC_SUBST(MBWM2_PKGINCDIR)
+MBWM_API_VERSION=mbwm_api_version
+AC_SUBST(MBWM_API_VERSION)
clutter_package="clutter-1.0 >= 1.5.6"
@@ -206,8 +200,8 @@ fi
AC_SUBST(USE_GTK)
PKG_CHECK_MODULES(MBWM, $needed_pkgs)
-MBWM2_PKGREQUIRES="$MBWM2_PKGREQUIRES $needed_pkgs"
-AC_SUBST(MBWM2_PKGREQUIRES)
+MBWM_PKGREQUIRES="$MBWM_PKGREQUIRES $needed_pkgs"
+AC_SUBST(MBWM_PKGREQUIRES)
COMP_MGR_BACKEND=0
ENABLE_COMPOSITE=0
@@ -249,7 +243,7 @@ AC_ARG_ENABLE(simple-manager,
[ --disable-simple-manager Do not build simple window manager],
[simple_manager=$enableval],
[
- if test "x$libmatchbox2" = "xyes"; then
+ if test "x$libmatchbox" = "xyes"; then
simple_manager=no
else
simple_manager=yes
@@ -273,14 +267,14 @@ PKG_CHECK_MODULES(XFIXES, xfixes >= 4.0, have_xfixes=yes, have_xfixes=no)
if test x$have_xfixes = xyes; then
AC_DEFINE(HAVE_XFIXES, [1], [Use XFixes ext to really hide cursor])
- MBWM2_PKGREQUIRES="$MBWM2_PKGREQUIRES xfixes >= 0.4"
+ MBWM_PKGREQUIRES="$MBWM_PKGREQUIRES xfixes >= 0.4"
fi
PKG_CHECK_MODULES(XEXT, xext, have_xext=yes, have_xext=no)
if test x$have_xext = xyes; then
AC_DEFINE(HAVE_XEXT, [1], [Use Xext ext])
- MBWM2_PKGREQUIRES="$MBWM2_PKGREQUIRES xext"
+ MBWM_PKGREQUIRES="$MBWM_PKGREQUIRES xext"
fi
PKG_CHECK_MODULES(XCURSOR, xcursor, have_xcursor=yes, have_xcursor=no)
@@ -289,28 +283,21 @@ if test x$have_xcursor = xyes; then
AC_DEFINE(HAVE_XCURSOR, [1], [Use XCursor to sync pointer themes])
fi
-MBWM_INCS='-I$(top_srcdir) -I$(top_srcdir)/matchbox2/core -I$(top_srcdir)/matchbox2/client-types -I$(top_srcdir)/matchbox2/theme-engines -I$(top_srcdir)/matchbox2/comp-mgr -I$(top_builddir)'
-MBWM_CORE_LIB='$(top_builddir)/matchbox2/core/libmatchbox-window-manager-2-core.la'
-MBWM_CLIENT_BUILDDIR='$(top_builddir)/matchbox2/client-types'
-MBWM_THEME_BUILDDIR='$(top_builddir)/matchbox2/theme-engines'
-MBWM_COMPMGR_BUILDDIR='$(top_builddir)/matchbox2/comp-mgr'
+MBWM_INCS='-I$(top_srcdir) -I$(top_srcdir)/matchbox -I$(top_builddir)'
MBWM_CFLAGS="$MBWM_CFLAGS $MBWM_DEBUG_CFLAGS $XFIXES_CFLAGS $XEXT_CFLAGS $XCURSOR_CFLAGS"
MBWM_LIBS="$MBWM_LIBS $XFIXES_LIBS $XEXT_LIBS $XCURSOR_LIBS $MBWM_EXTRA_LIBS"
AC_SUBST([MBWM_CFLAGS])
AC_SUBST([MBWM_LIBS])
-AC_SUBST([MBWM_CORE_LIB])
AC_SUBST([MBWM_INCS])
-AC_SUBST([MBWM_CLIENT_BUILDDIR])
-AC_SUBST([MBWM_THEME_BUILDDIR])
-AC_SUBST([MBWM_COMPMGR_BUILDDIR])
AC_SUBST([MBWM_DEBUG_CFLAGS])
AC_SUBST([MBWM_DEBUG_LDFLAGS])
AC_OUTPUT([
Makefile
-matchbox2/Makefile
-matchbox2/mb-wm-config.h
+matchbox-$MBWM_API_VERSION.pc:matchbox.pc.in
+matchbox/Makefile
+matchbox/mb-wm-config.h
managers/Makefile
managers/simple/Makefile
managers/maemo/Makefile
@@ -319,11 +306,10 @@ data/Makefile
data/themes/Makefile
data/themes/Default/Makefile
data/themes/PngSample/Makefile
-data/libmatchbox2.pc
doc/Makefile
doc/reference/Makefile
-doc/reference/matchbox2/Makefile
-doc/reference/matchbox2/version.xml
+doc/reference/matchbox/Makefile
+doc/reference/matchbox/version.xml
util/Makefile
])
diff --git a/data/Makefile.am b/data/Makefile.am
index 9b2138b..c94959d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,11 +1 @@
SUBDIRS=themes
-
-pcfiles = libmatchbox2-@MBWM2_API_VERSION@.pc \
- libmatchbox2.pc
-
-# clutter-<major>.<minor>.pc - for generic dependencies
-libmatchbox2-@MBWM2_API_VERSION@.pc: libmatchbox2.pc
- @cp $< $@
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(pcfiles)
diff --git a/data/libmatchbox2.pc.in b/data/libmatchbox2.pc.in
deleted file mode 100644
index 17b4f2c..0000000
--- a/data/libmatchbox2.pc.in
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/@MBWM2_PKGINCDIR@
-localedir=@localedir@
-apiversion=@MBWM2_API_VERSION@
-requires=@MBWM2_PKGREQUIRES@
-
-Name: libmatchbox
-Description: Framework to build window managers not on the Desktop.
-Requires: ${requires}
-Version: @VERSION@
-Libs: -L${libdir} -lmatchbox2-${apiversion}
-Cflags: -I${includedir}
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index e8bc530..76b77b3 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -1 +1 @@
-SUBDIRS=matchbox2
+SUBDIRS=matchbox
diff --git a/doc/reference/matchbox2/Makefile.am b/doc/reference/matchbox/Makefile.am
index f3987d6..8649c74 100644
--- a/doc/reference/matchbox2/Makefile.am
+++ b/doc/reference/matchbox/Makefile.am
@@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = 1.6
# of using the various options.
# The name of the module, e.g. 'glib'.
-DOC_MODULE=matchbox2
+DOC_MODULE=matchbox
# The top-level SGML file. You can change this if you want to.
DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
@@ -18,14 +18,14 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
# gtk-doc will search all .c & .h files beneath here for inline comments
# documenting the functions and macros.
# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../../matchbox2
+DOC_SOURCE_DIR=../../../matchbox
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
SCANGOBJ_OPTIONS=
# Extra options to supply to gtkdoc-scan.
# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=--deprecated-guards="MATCHBOX2_DISABLE_DEPRECATED"
+SCAN_OPTIONS=--deprecated-guards="MATCHBOX_DISABLE_DEPRECATED"
# Extra options to supply to gtkdoc-mkdb.
# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
@@ -44,12 +44,12 @@ FIXXREF_OPTIONS=\
# Used for dependencies. The docs will be rebuilt if any of these change.
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/matchbox2/*.h
+HFILE_GLOB=$(top_srcdir)/matchbox/*.h
CFILE_GLOB=
# Header files to ignore when scanning.
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=$(top_srcdir)/matchbox2/*-private.h
+IGNORE_HFILES=$(top_srcdir)/matchbox/*-private.h
EXTRA_HFILES=
@@ -74,10 +74,10 @@ expand_content_files=
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
INCLUDES=\
- @MBWM_INCS@
+ $(MBWM_INCS) $(MBWM_CFLAGS)
GTKDOC_LIBS=\
@MBWM_LIBS@ \
- $(top_builddir)/matchbox2/libmatchbox2-@MBWM2_API_VERSION@.la
+ $(top_builddir)/matchbox/libmatchbox-@MBWM_API_VERSION@.la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make
diff --git a/doc/reference/matchbox2/matchbox2-docs.sgml b/doc/reference/matchbox/matchbox2-docs.sgml
index 51933f7..51933f7 100644
--- a/doc/reference/matchbox2/matchbox2-docs.sgml
+++ b/doc/reference/matchbox/matchbox2-docs.sgml
diff --git a/doc/reference/matchbox2/matchbox2-sections.txt b/doc/reference/matchbox/matchbox2-sections.txt
index eaa3e15..eaa3e15 100644
--- a/doc/reference/matchbox2/matchbox2-sections.txt
+++ b/doc/reference/matchbox/matchbox2-sections.txt
diff --git a/doc/reference/matchbox/version.xml.in b/doc/reference/matchbox/version.xml.in
new file mode 100644
index 0000000..4314820
--- /dev/null
+++ b/doc/reference/matchbox/version.xml.in
@@ -0,0 +1 @@
+@MBW2_VERSION@
diff --git a/doc/reference/matchbox2/version.xml.in b/doc/reference/matchbox2/version.xml.in
deleted file mode 100644
index 557b997..0000000
--- a/doc/reference/matchbox2/version.xml.in
+++ /dev/null
@@ -1 +0,0 @@
-@MBWM2_VERSION@
diff --git a/managers/maemo/Makefile.am b/managers/maemo/Makefile.am
index 45967b5..dc698d6 100644
--- a/managers/maemo/Makefile.am
+++ b/managers/maemo/Makefile.am
@@ -17,5 +17,5 @@ matchbox_window_manager_2_maemo_LDFLAGS = \
$(LDFLAGS)
matchbox_window_manager_2_maemo_LDADD = \
- $(top_builddir)/matchbox2/libmatchbox2-@MBWM2_API_VERSION@.la \
+ $(top_builddir)/matchbox/libmatchbox-@MBWM_API_VERSION@.la \
$(MBWM_LIBS)
diff --git a/managers/maemo/maemo-input.h b/managers/maemo/maemo-input.h
index 079467f..73ea2a2 100644
--- a/managers/maemo/maemo-input.h
+++ b/managers/maemo/maemo-input.h
@@ -21,7 +21,7 @@
#ifndef _HAVE_MAEMO_INPUT_H
#define _HAVE_MAEMO_INPUT_H
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
typedef struct MaemoInput MaemoInput;
typedef struct MaemoInputClass MaemoInputClass;
diff --git a/managers/maemo/maemo-toolbar.h b/managers/maemo/maemo-toolbar.h
index 9bfd788..c5267c1 100644
--- a/managers/maemo/maemo-toolbar.h
+++ b/managers/maemo/maemo-toolbar.h
@@ -21,7 +21,7 @@
#ifndef _HAVE_MAEMO_TOOLBAR_H
#define _HAVE_MAEMO_TOOLBAR_H
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
typedef struct MaemoToolbar MaemoToolbar;
typedef struct MaemoToolbarClass MaemoToolbarClass;
diff --git a/managers/maemo/maemo-window-manager.c b/managers/maemo/maemo-window-manager.c
index 5660237..62e0107 100644
--- a/managers/maemo/maemo-window-manager.c
+++ b/managers/maemo/maemo-window-manager.c
@@ -21,7 +21,7 @@
#include "maemo-window-manager.h"
#include "maemo-toolbar.h"
#include "maemo-input.h"
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
#include <stdarg.h>
diff --git a/managers/maemo/maemo-window-manager.h b/managers/maemo/maemo-window-manager.h
index c3ebe78..ce67597 100644
--- a/managers/maemo/maemo-window-manager.h
+++ b/managers/maemo/maemo-window-manager.h
@@ -21,7 +21,7 @@
#ifndef _HAVE_MAEMO_WINDOW_MANAGER_H
#define _HAVE_MAEMO_WINDOW_MANAGER_H
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
typedef struct MaemoWindowManager MaemoWindowManager;
typedef struct MaemoWindowManagerClass MaemoWindowManagerClass;
diff --git a/managers/maemo/matchbox-window-manager-2-maemo.c b/managers/maemo/matchbox-window-manager-2-maemo.c
index 6656e40..6998dd1 100644
--- a/managers/maemo/matchbox-window-manager-2-maemo.c
+++ b/managers/maemo/matchbox-window-manager-2-maemo.c
@@ -18,7 +18,7 @@
*
*/
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
#include <signal.h>
enum {
diff --git a/managers/simple/Makefile.am b/managers/simple/Makefile.am
index 745ba8c..f035108 100644
--- a/managers/simple/Makefile.am
+++ b/managers/simple/Makefile.am
@@ -12,6 +12,6 @@ matchbox_window_manager_2_simple_LDFLAGS = \
$(LDFLAGS)
matchbox_window_manager_2_simple_LDADD = \
- $(top_builddir)/matchbox2/libmatchbox2-@MBWM2_API_VERSION@.la \
+ $(top_builddir)/matchbox/libmatchbox-@MBWM_API_VERSION@.la \
$(MBWM_LIBS)
diff --git a/managers/simple/matchbox-window-manager-2-simple.c b/managers/simple/matchbox-window-manager-2-simple.c
index 9b4ce11..5b68cde 100644
--- a/managers/simple/matchbox-window-manager-2-simple.c
+++ b/managers/simple/matchbox-window-manager-2-simple.c
@@ -1,4 +1,4 @@
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
#include <signal.h>
#if ENABLE_CLUTTER_COMPOSITE_MANAGER
diff --git a/matchbox.pc.in b/matchbox.pc.in
new file mode 100644
index 0000000..273af79
--- /dev/null
+++ b/matchbox.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/matchbox-@MBWM_API_VERSION@/matchbox
+localedir=@localedir@
+apiversion=@MBWM_API_VERSION@
+requires=@MBWM_PKGREQUIRES@
+
+Name: Matchbox
+Description: Framework to build window and composite managers.
+Requires: ${requires}
+Version: @VERSION@
+Libs: -L${libdir} -lmatchbox-${apiversion}
+Cflags: -I${includedir}
diff --git a/matchbox2/Makefile.am b/matchbox/Makefile.am
index 488acb5..b0098f6 100644
--- a/matchbox2/Makefile.am
+++ b/matchbox/Makefile.am
@@ -1,5 +1,5 @@
-lib_LTLIBRARIES = libmatchbox2-@MBWM2_API_VERSION@.la
+lib_LTLIBRARIES = libmatchbox-@MBWM_API_VERSION@.la
source_public_h = \
matchbox.h
@@ -92,10 +92,10 @@ if THEME_PNG
source += mb-wm-theme-png.c mb-wm-theme-png.h
endif
-pkgincludedir = $(includedir)/matchbox2-$(MBWM2_API_VERSION)/matchbox2
+pkgincludedir = $(includedir)/matchbox-$(MBWM_API_VERSION)/matchbox
pkginclude_HEADERS = $(source_public_h)
-libmatchbox2_@MBWM2_API_VERSION@_la_SOURCES = $(source_public_h) $(source)
-libmatchbox2_@MBWM2_API_VERSION@_la_CFLAGS = $(MBWM_INCS) $(MBWM_CFLAGS) -DDATADIR=\"$(datadir)\"
-libmatchbox2_@MBWM2_API_VERSION@_la_LIBADD = $(MBWM_LIBS)
+libmatchbox_@MBWM_API_VERSION@_la_SOURCES = $(source_public_h) $(source)
+libmatchbox_@MBWM_API_VERSION@_la_CFLAGS = $(MBWM_INCS) $(MBWM_CFLAGS) -DDATADIR=\"$(datadir)\"
+libmatchbox_@MBWM_API_VERSION@_la_LIBADD = $(MBWM_LIBS)
diff --git a/matchbox2/matchbox.h b/matchbox/matchbox.h
index 89a7f3a..f59d0e7 100644
--- a/matchbox2/matchbox.h
+++ b/matchbox/matchbox.h
@@ -31,8 +31,8 @@
#include <X11/Xatom.h> /* for XA_ATOM etc */
#include <X11/keysym.h> /* key mask defines */
-#include <matchbox2/mb-wm-config.h>
-#include <matchbox2/xas.h> /* async stuff not needed for xlib on xcb */
+#include <matchbox/mb-wm-config.h>
+#include <matchbox/xas.h> /* async stuff not needed for xlib on xcb */
#ifndef TRUE
#define TRUE 1
@@ -42,29 +42,29 @@
#define FALSE 0
#endif
-#include <matchbox2/mb-wm-macros.h>
-#include <matchbox2/mb-wm-debug.h>
-#include <matchbox2/mb-wm-types.h>
-#include <matchbox2/mb-wm-util.h>
-#include <matchbox2/mb-wm-object.h>
-#include <matchbox2/mb-wm-atoms.h>
-#include <matchbox2/mb-wm-props.h>
-#include <matchbox2/mb-wm-keys.h>
-#include <matchbox2/mb-wm-decor.h>
-#include <matchbox2/mb-wm-client-window.h>
-#include <matchbox2/mb-wm-root-window.h>
-#include <matchbox2/mb-wm-client.h>
-#include <matchbox2/mb-wm-client-base.h>
-#include <matchbox2/mb-wm-client-app.h>
-#include <matchbox2/mb-wm-client-desktop.h>
-#include <matchbox2/mb-wm-client-dialog.h>
-#include <matchbox2/mb-wm-client-input.h>
-#include <matchbox2/mb-wm-client-menu.h>
-#include <matchbox2/mb-wm-client-note.h>
-#include <matchbox2/mb-wm-client-override.h>
-#include <matchbox2/mb-wm-client-panel.h>
-#include <matchbox2/mb-wm-layout.h>
-#include <matchbox2/mb-wm-stack.h>
-#include <matchbox2/mb-window-manager.h>
-#include <matchbox2/mb-wm-main-context.h>
+#include <matchbox/mb-wm-macros.h>
+#include <matchbox/mb-wm-debug.h>
+#include <matchbox/mb-wm-types.h>
+#include <matchbox/mb-wm-util.h>
+#include <matchbox/mb-wm-object.h>
+#include <matchbox/mb-wm-atoms.h>
+#include <matchbox/mb-wm-props.h>
+#include <matchbox/mb-wm-keys.h>
+#include <matchbox/mb-wm-decor.h>
+#include <matchbox/mb-wm-client-window.h>
+#include <matchbox/mb-wm-root-window.h>
+#include <matchbox/mb-wm-client.h>
+#include <matchbox/mb-wm-client-base.h>
+#include <matchbox/mb-wm-client-app.h>
+#include <matchbox/mb-wm-client-desktop.h>
+#include <matchbox/mb-wm-client-dialog.h>
+#include <matchbox/mb-wm-client-input.h>
+#include <matchbox/mb-wm-client-menu.h>
+#include <matchbox/mb-wm-client-note.h>
+#include <matchbox/mb-wm-client-override.h>
+#include <matchbox/mb-wm-client-panel.h>
+#include <matchbox/mb-wm-layout.h>
+#include <matchbox/mb-wm-stack.h>
+#include <matchbox/mb-window-manager.h>
+#include <matchbox/mb-wm-main-context.h>
#endif
diff --git a/matchbox2/mb-window-manager.c b/matchbox/mb-window-manager.c
index 7d1a201..7d1a201 100644
--- a/matchbox2/mb-window-manager.c
+++ b/matchbox/mb-window-manager.c
diff --git a/matchbox2/mb-window-manager.h b/matchbox/mb-window-manager.h
index 7f9643f..5c72845 100644
--- a/matchbox2/mb-window-manager.h
+++ b/matchbox/mb-window-manager.h
@@ -21,17 +21,17 @@
#ifndef _HAVE_MB_WM_WINDOW_MANAGER_H
#define _HAVE_MB_WM_WINDOW_MANAGER_H
-#include <matchbox2/mb-wm-config.h>
-#include <matchbox2/mb-wm-object.h>
-#include <matchbox2/mb-wm-keys.h>
-#include <matchbox2/mb-wm-root-window.h>
-#include <matchbox2/mb-wm-theme.h>
-#include <matchbox2/mb-wm-layout.h>
-#include <matchbox2/mb-wm-main-context.h>
+#include <matchbox/mb-wm-config.h>
+#include <matchbox/mb-wm-object.h>
+#include <matchbox/mb-wm-keys.h>
+#include <matchbox/mb-wm-root-window.h>
+#include <matchbox/mb-wm-theme.h>
+#include <matchbox/mb-wm-layout.h>
+#include <matchbox/mb-wm-main-context.h>
#if ENABLE_COMPOSITE
-#include <matchbox2/mb-wm-comp-mgr.h>
+#include <matchbox/mb-wm-comp-mgr.h>
#endif
-#include <matchbox2/xas.h>
+#include <matchbox/xas.h>
/* XXX: we have a circular dependency between mb-wm-main-context.h
* and mb-window-manager.h */
diff --git a/matchbox2/mb-wm-atoms.c b/matchbox/mb-wm-atoms.c
index 4b270a8..4b270a8 100644
--- a/matchbox2/mb-wm-atoms.c
+++ b/matchbox/mb-wm-atoms.c
diff --git a/matchbox2/mb-wm-atoms.h b/matchbox/mb-wm-atoms.h
index 1ccca4f..2007acc 100644
--- a/matchbox2/mb-wm-atoms.h
+++ b/matchbox/mb-wm-atoms.h
@@ -21,7 +21,7 @@
#ifndef _HAVE_MB_WM_ATOMS_H
#define _HAVE_MB_WM_ATOMS_H
-#include <matchbox2/mb-window-manager.h>
+#include <matchbox/mb-window-manager.h>
void
mb_wm_atoms_init(MBWindowManager *wm);
diff --git a/matchbox2/mb-wm-client-app.c b/matchbox/mb-wm-client-app.c
index 3aa9d2e..3aa9d2e 100644
--- a/matchbox2/mb-wm-client-app.c
+++ b/matchbox/mb-wm-client-app.c
diff --git a/matchbox2/mb-wm-client-app.h b/matchbox/mb-wm-client-app.h
index d6ae20d..1f33a7e 100644
--- a/matchbox2/mb-wm-client-app.h
+++ b/matchbox/mb-wm-client-app.h
@@ -21,7 +21,7 @@
#ifndef _HAVE_MB_CLIENT_APP_H
#define _HAVE_MB_CLIENT_APP_H
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
typedef struct MBWMClientApp MBWMClientApp;
typedef struct MBWMClientAppClass MBWMClientAppClass;
diff --git a/matchbox2/mb-wm-client-base.c b/matchbox/mb-wm-client-base.c
index d9b0446..d9b0446 100644
--- a/matchbox2/mb-wm-client-base.c
+++ b/matchbox/mb-wm-client-base.c
diff --git a/matchbox2/mb-wm-client-base.h b/matchbox/mb-wm-client-base.h
index 9d61934..26ebd63 100644
--- a/matchbox2/mb-wm-client-base.h
+++ b/matchbox/mb-wm-client-base.h
@@ -21,7 +21,7 @@
#ifndef _HAVE_MB_WM_CLIENT_BASE_H
#define _HAVE_MB_WM_CLIENT_BASE_H
-#include <matchbox2/mb-wm-client.h>
+#include <matchbox/mb-wm-client.h>
#define MB_WM_CLIENT_BASE(c) ((MBWMClientBase*)(c))
#define MB_WM_CLIENT_BASE_CLASS(c) ((MBWMClientBaseClass*)(c))
diff --git a/matchbox2/mb-wm-client-desktop.c b/matchbox/mb-wm-client-desktop.c
index 81ce628..81ce628 100644
--- a/matchbox2/mb-wm-client-desktop.c
+++ b/matchbox/mb-wm-client-desktop.c
diff --git a/matchbox2/mb-wm-client-desktop.h b/matchbox/mb-wm-client-desktop.h
index bde40f3..3484fa6 100644
--- a/matchbox2/mb-wm-client-desktop.h
+++ b/matchbox/mb-wm-client-desktop.h
@@ -21,7 +21,7 @@
#ifndef _HAVE_MB_CLIENT_DESKTOP_H
#define _HAVE_MB_CLIENT_DESKTOP_H
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
typedef struct MBWMClientDesktop MBWMClientDesktop;
typedef struct MBWMClientDesktopClass MBWMClientDesktopClass;
diff --git a/matchbox2/mb-wm-client-dialog.c b/matchbox/mb-wm-client-dialog.c
index b854c7c..b854c7c 100644
--- a/matchbox2/mb-wm-client-dialog.c
+++ b/matchbox/mb-wm-client-dialog.c
diff --git a/matchbox2/mb-wm-client-dialog.h b/matchbox/mb-wm-client-dialog.h
index b7c2ec1..c22ec2c 100644
--- a/matchbox2/mb-wm-client-dialog.h
+++ b/matchbox/mb-wm-client-dialog.h
@@ -21,8 +21,8 @@
#ifndef _HAVE_MB_CLIENT_DIALOG_H
#define _HAVE_MB_CLIENT_DIALOG_H
-#include <matchbox2/mb-wm-client-base.h>
-#include <matchbox2/mb-wm-decor.h>
+#include <matchbox/mb-wm-client-base.h>
+#include <matchbox/mb-wm-decor.h>
#define MB_WM_CLIENT_DIALOG(c) ((MBWMClientDialog*)(c))
#define MB_WM_CLIENT_DIALOG_CLASS(c) ((MBWMClientDialogClass*)(c))
diff --git a/matchbox2/mb-wm-client-input.c b/matchbox/mb-wm-client-input.c
index 3a63d40..3a63d40 100644
--- a/matchbox2/mb-wm-client-input.c
+++ b/matchbox/mb-wm-client-input.c
diff --git a/matchbox2/mb-wm-client-input.h b/matchbox/mb-wm-client-input.h
index 0495845..ed15a56 100644
--- a/matchbox2/mb-wm-client-input.h
+++ b/matchbox/mb-wm-client-input.h
@@ -21,7 +21,7 @@
#ifndef _HAVE_MB_CLIENT_INPUT_H
#define _HAVE_MB_CLIENT_INPUT_H
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
typedef struct MBWMClientInput MBWMClientInput;
typedef struct MBWMClientInputClass MBWMClientInputClass;
diff --git a/matchbox2/mb-wm-client-menu.c b/matchbox/mb-wm-client-menu.c
index b68f771..b68f771 100644
--- a/matchbox2/mb-wm-client-menu.c
+++ b/matchbox/mb-wm-client-menu.c
diff --git a/matchbox2/mb-wm-client-menu.h b/matchbox/mb-wm-client-menu.h
index b12178e..8d2f1c6 100644
--- a/matchbox2/mb-wm-client-menu.h
+++ b/matchbox/mb-wm-client-menu.h
@@ -21,7 +21,7 @@
#ifndef _HAVE_MB_CLIENT_MENU_H
#define _HAVE_MB_CLIENT_MENU_H
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
typedef struct MBWMClientMenu MBWMClientMenu;
typedef struct MBWMClientMenuClass MBWMClientMenuClass;
diff --git a/matchbox2/mb-wm-client-note.c b/matchbox/mb-wm-client-note.c
index d0bb770..d0bb770 100644
--- a/matchbox2/mb-wm-client-note.c
+++ b/matchbox/mb-wm-client-note.c
diff --git a/matchbox2/mb-wm-client-note.h b/matchbox/mb-wm-client-note.h
index 2871bc1..2b12cb9 100644
--- a/matchbox2/mb-wm-client-note.h
+++ b/matchbox/mb-wm-client-note.h
@@ -21,8 +21,8 @@
#ifndef _HAVE_MB_CLIENT_NOTE_H
#define _HAVE_MB_CLIENT_NOTE_H
-#include <matchbox2/matchbox.h>
-#include <matchbox2/mb-wm-client-dialog.h>
+#include <matchbox/matchbox.h>
+#include <matchbox/mb-wm-client-dialog.h>
typedef struct MBWMClientNote MBWMClientNote;
typedef struct MBWMClientNoteClass MBWMClientNoteClass;
diff --git a/matchbox2/mb-wm-client-override.c b/matchbox/mb-wm-client-override.c
index 238ce73..238ce73 100644
--- a/matchbox2/mb-wm-client-override.c
+++ b/matchbox/mb-wm-client-override.c
diff --git a/matchbox2/mb-wm-client-override.h b/matchbox/mb-wm-client-override.h
index 26d5897..2f155b4 100644
--- a/matchbox2/mb-wm-client-override.h
+++ b/matchbox/mb-wm-client-override.h
@@ -21,7 +21,7 @@
#ifndef _HAVE_MB_CLIENT_OVERRIDE_H
#define _HAVE_MB_CLIENT_OVERRIDE_H
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
typedef struct MBWMClientOverride MBWMClientOverride;
typedef struct MBWMClientOverrideClass MBWMClientOverrideClass;
diff --git a/matchbox2/mb-wm-client-panel.c b/matchbox/mb-wm-client-panel.c
index c915d6b..c915d6b 100644
--- a/matchbox2/mb-wm-client-panel.c
+++ b/matchbox/mb-wm-client-panel.c
diff --git a/matchbox2/mb-wm-client-panel.h b/matchbox/mb-wm-client-panel.h
index 0907e5f..42096be 100644
--- a/matchbox2/mb-wm-client-panel.h
+++ b/matchbox/mb-wm-client-panel.h
@@ -21,7 +21,7 @@
#ifndef _HAVE_MB_CLIENT_PANEL_H
#define _HAVE_MB_CLIENT_PANEL_H
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
typedef struct MBWMClientPanel MBWMClientPanel;
typedef struct MBWMClientPanelClass MBWMClientPanelClass;
diff --git a/matchbox2/mb-wm-client-window.c b/matchbox/mb-wm-client-window.c
index 8e8b67d..8e8b67d 100644
--- a/matchbox2/mb-wm-client-window.c
+++ b/matchbox/mb-wm-client-window.c
diff --git a/matchbox2/mb-wm-client-window.h b/matchbox/mb-wm-client-window.h
index b26c001..af7c7a4 100644
--- a/matchbox2/mb-wm-client-window.h
+++ b/matchbox/mb-wm-client-window.h
@@ -21,8 +21,8 @@
#ifndef _HAVE_MB_WM_CLIENT_WINDOW_H
#define _HAVE_MB_WM_CLIENT_WINDOW_H
-#include <matchbox2/mb-wm-object.h>
-#include <matchbox2/mb-wm-types.h>
+#include <matchbox/mb-wm-object.h>
+#include <matchbox/mb-wm-types.h>
/* FIXME: below limits to 32 props */
diff --git a/matchbox2/mb-wm-client.c b/matchbox/mb-wm-client.c
index 6deeb13..6deeb13 100644
--- a/matchbox2/mb-wm-client.c
+++ b/matchbox/mb-wm-client.c
diff --git a/matchbox2/mb-wm-client.h b/matchbox/mb-wm-client.h
index 4e01dd9..57c2c49 100644
--- a/matchbox2/mb-wm-client.h
+++ b/matchbox/mb-wm-client.h
@@ -21,10 +21,10 @@
#ifndef _HAVE_MB_CLIENT_H
#define _HAVE_MB_CLIENT_H
-#include <matchbox2/mb-wm-client-window.h>
-#include <matchbox2/mb-wm-config.h>
+#include <matchbox/mb-wm-client-window.h>
+#include <matchbox/mb-wm-config.h>
#if ENABLE_COMPOSITE
-#include <matchbox2/mb-wm-comp-mgr.h>
+#include <matchbox/mb-wm-comp-mgr.h>
#endif
/* XXX: We have a circular dependency between mb-wm-comp-mgr.h
diff --git a/matchbox2/mb-wm-comp-mgr-clutter.c b/matchbox/mb-wm-comp-mgr-clutter.c
index 91163df..91163df 100644
--- a/matchbox2/mb-wm-comp-mgr-clutter.c
+++ b/matchbox/mb-wm-comp-mgr-clutter.c
diff --git a/matchbox2/mb-wm-comp-mgr-clutter.h b/matchbox/mb-wm-comp-mgr-clutter.h
index 8c719d9..f67f46c 100644
--- a/matchbox2/mb-wm-comp-mgr-clutter.h
+++ b/matchbox/mb-wm-comp-mgr-clutter.h
@@ -21,7 +21,7 @@
#ifndef _HAVE_MB_WM_COMP_MGR_CLUTTER_H
#define _HAVE_MB_WM_COMP_MGR_CLUTTER_H
-#include <matchbox2/mb-wm-config.h>
+#include <matchbox/mb-wm-config.h>
#include <clutter/clutter.h>
#define MB_WM_COMP_MGR_CLUTTER(c) ((MBWMCompMgrClutter*)(c))
diff --git a/matchbox2/mb-wm-comp-mgr-xrender.c b/matchbox/mb-wm-comp-mgr-xrender.c
index b3ae255..b3ae255 100644
--- a/matchbox2/mb-wm-comp-mgr-xrender.c
+++ b/matchbox/mb-wm-comp-mgr-xrender.c
diff --git a/matchbox2/mb-wm-comp-mgr-xrender.h b/matchbox/mb-wm-comp-mgr-xrender.h
index 0d8afaf..15e52bd 100644
--- a/matchbox2/mb-wm-comp-mgr-xrender.h
+++ b/matchbox/mb-wm-comp-mgr-xrender.h
@@ -22,7 +22,7 @@
#ifndef _HAVE_MB_WM_COMP_MGR_DEFAULT_H
#define _HAVE_MB_WM_COMP_MGR_DEFAULT_H
-#include <matchbox2/mb-wm-config.h>
+#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/matchbox2/mb-wm-comp-mgr.c b/matchbox/mb-wm-comp-mgr.c
index 5aa6d6b..5aa6d6b 100644
--- a/matchbox2/mb-wm-comp-mgr.c
+++ b/matchbox/mb-wm-comp-mgr.c
diff --git a/matchbox2/mb-wm-comp-mgr.h b/matchbox/mb-wm-comp-mgr.h
index 6e09043..9e7224c 100644
--- a/matchbox2/mb-wm-comp-mgr.h
+++ b/matchbox/mb-wm-comp-mgr.h
@@ -21,7 +21,7 @@
#ifndef _HAVE_MB_WM_COMP_MGR_H
#define _HAVE_MB_WM_COMP_MGR_H
-#include <matchbox2/mb-wm-client.h>
+#include <matchbox/mb-wm-client.h>
#include <X11/extensions/Xdamage.h>
diff --git a/matchbox2/mb-wm-config.h.in b/matchbox/mb-wm-config.h.in
index 8c8de50..8c8de50 100644
--- a/matchbox2/mb-wm-config.h.in
+++ b/matchbox/mb-wm-config.h.in
diff --git a/matchbox2/mb-wm-debug.c b/matchbox/mb-wm-debug.c
index 834ed30..834ed30 100644
--- a/matchbox2/mb-wm-debug.c
+++ b/matchbox/mb-wm-debug.c
diff --git a/matchbox2/mb-wm-debug.h b/matchbox/mb-wm-debug.h
index 4c10be4..4c10be4 100644
--- a/matchbox2/mb-wm-debug.h
+++ b/matchbox/mb-wm-debug.h
diff --git a/matchbox2/mb-wm-decor.c b/matchbox/mb-wm-decor.c
index 17a3ece..17a3ece 100644
--- a/matchbox2/mb-wm-decor.c
+++ b/matchbox/mb-wm-decor.c
diff --git a/matchbox2/mb-wm-decor.h b/matchbox/mb-wm-decor.h
index b3f2365..99d1347 100644
--- a/matchbox2/mb-wm-decor.h
+++ b/matchbox/mb-wm-decor.h
@@ -21,7 +21,7 @@
#ifndef _HAVE_MB_WM_DECOR_H
#define _HAVE_MB_WM_DECOR_H
-#include <matchbox2/mb-wm-client.h>
+#include <matchbox/mb-wm-client.h>
#define MB_WM_DECOR(c) ((MBWMDecor*)(c))
#define MB_WM_DECOR_CLASS(c) ((MBWMDecorClass*)(c))
diff --git a/matchbox2/mb-wm-keys.c b/matchbox/mb-wm-keys.c
index 41d416c..41d416c 100644
--- a/matchbox2/mb-wm-keys.c
+++ b/matchbox/mb-wm-keys.c
diff --git a/matchbox2/mb-wm-keys.h b/matchbox/mb-wm-keys.h
index b960e9f..eb5608c 100644
--- a/matchbox2/mb-wm-keys.h
+++ b/matchbox/mb-wm-keys.h
@@ -21,7 +21,7 @@
#ifndef _HAVE_MB_WM_KEYS_H
#define _HAVE_MB_WM_KEYS_H
-#include <matchbox2/matchbox.h>
+#include <matchbox/matchbox.h>
typedef struct MBWMKeys MBWMKeys;
typedef struct MBWMKeyBinding MBWMKeyBinding;
diff --git a/matchbox2/mb-wm-layout.c b/matchbox/mb-wm-layout.c
index 7e92998..7e92998 100644
--- a/matchbox2/mb-wm-layout.c
+++ b/matchbox/mb-wm-layout.c
diff --git a/matchbox2/mb-wm-layout.h b/matchbox/mb-wm-layout.h
index ade8740..1fe97de 100644
--- a/matchbox2/mb-wm-layout.h
+++ b/matchbox/mb-wm-layout.h
@@ -21,8 +21,8 @@
#ifndef _HAVE_MB_WM_LAYOUT_MANAGER_H
#define _HAVE_MB_WM_LAYOUT_MANAGER_H
-#include <matchbox2/mb-wm-object.h>
-#include <matchbox2/mb-wm-types.h>
+#include <matchbox/mb-wm-object.h>
+#include <matchbox/mb-wm-types.h>
#define MB_WM_LAYOUT(c) ((MBWMLayout*)(c))
#define MB_WM_LAYOUT_CLASS(c) ((MBWMLayoutClass*)(c))
diff --git a/matchbox2/mb-wm-macros.h b/matchbox/mb-wm-macros.h
index 5c8ab4b..5c8ab4b 100644
--- a/matchbox2/mb-wm-macros.h
+++ b/matchbox/mb-wm-macros.h
diff --git a/matchbox2/mb-wm-main-context.c b/matchbox/mb-wm-main-context.c
index 71d5d6c..71d5d6c 100644
--- a/matchbox2/mb-wm-main-context.c
+++ b/matchbox/mb-wm-main-context.c
diff --git a/matchbox2/mb-wm-main-context.h b/matchbox/mb-wm-main-context.h
index 1f83fa5..f022f81 100644
--- a/matchbox2/mb-wm-main-context.h
+++ b/matchbox/mb-wm-main-context.h
@@ -21,8 +21,8 @@
#ifndef _HAVE_MB_MAIN_CONTEXT_H
#define _HAVE_MB_MAIN_CONTEXT_H
-#include <matchbox2/mb-wm-object.h>
-#include <matchbox2/mb-window-manager.h>
+#include <matchbox/mb-wm-object.h>
+#include <matchbox/mb-window-manager.h>
#include <poll.h>
#define MB_WM_MAIN_CONTEXT(c) ((MBWMMainContext*)(c))
diff --git a/matchbox2/mb-wm-object-props.h b/matchbox/mb-wm-object-props.h
index 44b3d98..c0c46ac 100644
--- a/matchbox2/mb-wm-object-props.h
+++ b/matchbox/mb-wm-object-props.h
@@ -2,7 +2,7 @@
#ifndef _HAVE_MB_OBJECT_PROPS_H
#define _HAVE_MB_OBJECT_PROPS_H
-#include <matchbox2/mb-wm-types.h>
+#include <matchbox/mb-wm-types.h>
/*
* MBWMObject construction properties
diff --git a/matchbox2/mb-wm-object.c b/matchbox/mb-wm-object.c
index 63f4ffc..63f4ffc 100644
--- a/matchbox2/mb-wm-object.c
+++ b/matchbox/mb-wm-object.c
diff --git a/matchbox2/mb-wm-object.h b/matchbox/mb-wm-object.h
index 6fa0cdc..336558f 100644
--- a/matchbox2/mb-wm-object.h
+++ b/matchbox/mb-wm-object.h
@@ -22,7 +22,7 @@
#define _HAVE_MB_OBJECT_H
#include <stdarg.h>
-#include <matchbox2/mb-wm-object-props.h>
+#include <matchbox/mb-wm-object-props.h>
typedef struct MBWMObject MBWMObject;
typedef struct MBWMObjectClass MBWMObjectClass;
diff --git a/matchbox2/mb-wm-props.c b/matchbox/mb-wm-props.c
index fbf538a..fbf538a 100644
--- a/matchbox2/mb-wm-props.c
+++ b/matchbox/mb-wm-props.c
diff --git a/matchbox2/mb-wm-props.h b/matchbox/mb-wm-props.h
index 07418ca..07418ca 100644
--- a/matchbox2/mb-wm-props.h
+++ b/matchbox/mb-wm-props.h
diff --git a/matchbox2/mb-wm-root-window.c b/matchbox/mb-wm-root-window.c
index 21b8617..21b8617 100644
--- a/matchbox2/mb-wm-root-window.c
+++ b/matchbox/mb-wm-root-window.c
diff --git a/matchbox2/mb-wm-root-window.h b/matchbox/mb-wm-root-window.h
index ace9c42..3d98006 100644
--- a/matchbox2/mb-wm-root-window.h
+++ b/matchbox/mb-wm-root-window.h
@@ -21,8 +21,8 @@
#ifndef _HAVE_MB_WM_ROOT_WINDOW_H
#define _HAVE_MB_WM_ROOT_WINDOW_H
-#include <matchbox2/mb-wm-object.h>
-#include <matchbox2/mb-window-manager.h>
+#include <matchbox/mb-wm-object.h>
+#include <matchbox/mb-window-manager.h>
typedef struct MBWMRootWindow MBWMRootWindow;
typedef struct MBWMRootWindowClass MBWMRootWindowClass;
diff --git a/matchbox2/mb-wm-stack.c b/matchbox/mb-wm-stack.c
index af5c4a3..af5c4a3 100644
--- a/matchbox2/mb-wm-stack.c
+++ b/matchbox/mb-wm-stack.c
diff --git a/matchbox2/mb-wm-stack.h b/matchbox/mb-wm-stack.h
index 58afc45..58afc45 100644
--- a/matchbox2/mb-wm-stack.h
+++ b/matchbox/mb-wm-stack.h
diff --git a/matchbox2/mb-wm-theme-png.c b/matchbox/mb-wm-theme-png.c
index a747691..a747691 100644
--- a/matchbox2/mb-wm-theme-png.c
+++ b/matchbox/mb-wm-theme-png.c
diff --git a/matchbox2/mb-wm-theme-png.h b/matchbox/mb-wm-theme-png.h
index e134c9b..e97e538 100644
--- a/matchbox2/mb-wm-theme-png.h
+++ b/matchbox/mb-wm-theme-png.h
@@ -21,8 +21,8 @@
#ifndef _HAVE_MB_WM_THEME_PNG_H
#define _HAVE_MB_WM_THEME_PNG_H
-#include <matchbox2/mb-wm-config.h>
-#include <matchbox2/mb-wm-theme.h>
+#include <matchbox/mb-wm-config.h>
+#include <matchbox/mb-wm-theme.h>
#include <X11/extensions/Xrender.h>
diff --git a/matchbox2/mb-wm-theme-xml.c b/matchbox/mb-wm-theme-xml.c
index e075b7b..e075b7b 100644
--- a/matchbox2/mb-wm-theme-xml.c
+++ b/matchbox/mb-wm-theme-xml.c
diff --git a/matchbox2/mb-wm-theme-xml.h b/matchbox/mb-wm-theme-xml.h
index 8362146..26a38fc 100644
--- a/matchbox2/mb-wm-theme-xml.h
+++ b/matchbox/mb-wm-theme-xml.h
@@ -1,8 +1,8 @@
#ifndef _HAVE_MB_WM_THEME_PRIVATE_H
#define _HAVE_MB_WM_THEME_PRIVATE_H
-#include <matchbox2/matchbox.h>
-#include <matchbox2/mb-wm-theme.h>
+#include <matchbox/matchbox.h>
+#include <matchbox/mb-wm-theme.h>
/*
* Helper structs for xml theme
*/
diff --git a/matchbox2/mb-wm-theme.c b/matchbox/mb-wm-theme.c
index 93e8fe7..93e8fe7 100644
--- a/matchbox2/mb-wm-theme.c
+++ b/matchbox/mb-wm-theme.c
diff --git a/matchbox2/mb-wm-theme.h b/matchbox/mb-wm-theme.h
index 4b6a78e..b0ce109 100644
--- a/matchbox2/mb-wm-theme.h
+++ b/matchbox/mb-wm-theme.h
@@ -21,9 +21,9 @@
#ifndef _HAVE_MB_WM_THEME_H
#define _HAVE_MB_WM_THEME_H
-#include <matchbox2/mb-wm-config.h>
-#include <matchbox2/mb-wm-object.h>
-#include <matchbox2/mb-wm-decor.h>
+#include <matchbox/mb-wm-config.h>
+#include <matchbox/mb-wm-object.h>
+#include <matchbox/mb-wm-decor.h>
#define MB_WM_THEME(c) ((MBWMTheme*)(c))
#define MB_WM_THEME_CLASS(c) ((MBWMThemeClass*)(c))
diff --git a/matchbox2/mb-wm-types.h b/matchbox/mb-wm-types.h
index 26272db..61121e7 100644
--- a/matchbox2/mb-wm-types.h
+++ b/matchbox/mb-wm-types.h
@@ -21,7 +21,7 @@
#ifndef _HAVE_MB_WM_TYPES_H
#define _HAVE_MB_WM_TYPES_H
-#include <matchbox2/mb-wm-config.h>
+#include <matchbox/mb-wm-config.h>
#if USE_GLIB_MAINLOOP
#include <glib.h>
diff --git a/matchbox2/mb-wm-util.c b/matchbox/mb-wm-util.c
index f99777c..f99777c 100644
--- a/matchbox2/mb-wm-util.c
+++ b/matchbox/mb-wm-util.c
diff --git a/matchbox2/mb-wm-util.h b/matchbox/mb-wm-util.h
index 7ccc975..817cd74 100644
--- a/matchbox2/mb-wm-util.h
+++ b/matchbox/mb-wm-util.h
@@ -1,8 +1,8 @@
#ifndef _MB_HAVE_UTIL_H
#define _MB_HAVE_UTIL_H
-#include <matchbox2/mb-wm-config.h>
-#include <matchbox2/mb-wm-types.h>
+#include <matchbox/mb-wm-config.h>
+#include <matchbox/mb-wm-types.h>
/* See http://rlove.org/log/2005102601 */
#if __GNUC__ >= 3
diff --git a/matchbox2/tidy/tidy-texture-frame.c b/matchbox/tidy/tidy-texture-frame.c
index 7ba4671..7ba4671 100644
--- a/matchbox2/tidy/tidy-texture-frame.c
+++ b/matchbox/tidy/tidy-texture-frame.c
diff --git a/matchbox2/tidy/tidy-texture-frame.h b/matchbox/tidy/tidy-texture-frame.h
index 71dd40c..71dd40c 100644
--- a/matchbox2/tidy/tidy-texture-frame.h
+++ b/matchbox/tidy/tidy-texture-frame.h
diff --git a/matchbox2/xas.c b/matchbox/xas.c
index 47329dc..47329dc 100644
--- a/matchbox2/xas.c
+++ b/matchbox/xas.c
diff --git a/matchbox2/xas.h b/matchbox/xas.h
index e9b7ca8..e9b7ca8 100644
--- a/matchbox2/xas.h
+++ b/matchbox/xas.h