GNOME.org
 

[mutter] Move the installed includes to a subdir

commit c84da3ce1babdf9620179aa8f75a515428169e5b
Author: Dan Winship <danw gnome org>
Date:   Sat Mar 5 19:29:12 2011 -0500

    Move the installed includes to a subdir
    
    If mutter is going to be a "real" library, then it should install its
    includes so that users can do
    
        #include <meta/display.h>
    
    rather than
    
        #include <display.h>
    
    So rename the includedir accordingly, move src/include to src/meta,
    and fix up all internal references.
    
    There were a handful of header files in src/include that were not
    installed; this appears to have been part of a plan to keep core/,
    ui/, and compositor/ from looking at each others' private includes,
    but that wasn't really working anyway. So move all non-installed
    headers back into core/ or ui/.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=643959

 po/POTFILES.in                               |    2 +-
 src/Makefile.am                              |  113 +++++++++++++-------------
 src/compositor/compositor-private.h          |    4 +-
 src/compositor/compositor.c                  |   16 ++--
 src/compositor/meta-background-actor.c       |    2 +-
 src/compositor/meta-background-actor.h       |    2 +-
 src/compositor/meta-module.c                 |    2 +-
 src/compositor/meta-plugin-manager.c         |    8 +-
 src/compositor/meta-plugin-manager.h         |    6 +-
 src/compositor/meta-plugin.c                 |    6 +-
 src/compositor/meta-shadow-factory-private.h |    2 +-
 src/compositor/meta-window-actor-private.h   |    2 +-
 src/compositor/meta-window-actor.c           |    6 +-
 src/compositor/meta-window-group.h           |    2 +-
 src/compositor/plugins/Makefile.am           |    2 +-
 src/compositor/plugins/default.c             |    4 +-
 src/{include => core}/all-keybindings.h      |    0
 src/core/bell.c                              |    2 +-
 src/core/bell.h                              |    2 +-
 src/core/boxes-private.h                     |    4 +-
 src/core/boxes.c                             |    2 +-
 src/core/constraints.c                       |    2 +-
 src/core/constraints.h                       |    4 +-
 src/core/core.c                              |    6 +-
 src/{include => core}/core.h                 |    2 +-
 src/core/delete.c                            |    6 +-
 src/core/display-private.h                   |   10 +-
 src/core/display.c                           |   16 ++--
 src/core/errors.c                            |    2 +-
 src/core/frame.c                             |    4 +-
 src/core/{frame-private.h => frame.h}        |    4 +-
 src/core/group-private.h                     |    2 +-
 src/core/group-props.h                       |    2 +-
 src/core/group.c                             |    4 +-
 src/core/iconcache.c                         |    2 +-
 src/core/keybindings-private.h               |    2 +-
 src/core/keybindings.c                       |    8 +-
 src/core/main.c                              |   10 +-
 src/core/mutter.c                            |    6 +-
 src/core/place.c                             |    4 +-
 src/core/place.h                             |    2 +-
 src/core/prefs.c                             |    5 +-
 src/core/screen-private.h                    |    2 +-
 src/core/screen.c                            |   12 ++--
 src/core/session.c                           |    6 +-
 src/core/stack-tracker.c                     |    6 +-
 src/core/stack-tracker.h                     |    2 +-
 src/core/stack.c                             |   10 +-
 src/core/util.c                              |    6 +-
 src/core/window-private.h                    |    6 +-
 src/core/window-props.c                      |    6 +-
 src/core/window.c                            |   10 +-
 src/core/workspace-private.h                 |    2 +-
 src/core/workspace.c                         |    8 +-
 src/core/xprops.c                            |    4 +-
 src/{include => core}/xprops.h               |    2 +-
 src/include/frame.h                          |   31 -------
 src/libmutter-wm.pc.in                       |    2 +-
 src/{include => meta}/atomnames.h            |    0
 src/{include => meta}/boxes.h                |    2 +-
 src/{include => meta}/common.h               |    0
 src/{include => meta}/compositor-mutter.h    |    6 +-
 src/{include => meta}/compositor.h           |    8 +-
 src/{include => meta}/display.h              |    6 +-
 src/{include => meta}/errors.h               |    4 +-
 src/{ui => meta}/gradient.h                  |    0
 src/{include => meta}/group.h                |    2 +-
 src/{include => meta}/keybindings.h          |    4 +-
 src/{include => meta}/main.h                 |    0
 src/{include => meta}/meta-plugin.h          |    6 +-
 src/{include => meta}/meta-shadow-factory.h  |    0
 src/{include => meta}/meta-window-actor.h    |    2 +-
 src/{include => meta}/prefs.h                |    2 +-
 src/{ui => meta}/preview-widget.h            |    3 +-
 src/{include => meta}/screen.h               |    4 +-
 src/{ui => meta}/theme.h                     |    0
 src/{include => meta}/types.h                |    0
 src/{include => meta}/util.h                 |    2 +-
 src/{include => meta}/window.h               |    4 +-
 src/{include => meta}/workspace.h            |    6 +-
 src/ui/frames.c                              |    8 +-
 src/ui/frames.h                              |    2 +-
 src/ui/gradient.c                            |    4 +-
 src/ui/menu.c                                |    4 +-
 src/ui/metaaccellabel.c                      |    2 +-
 src/ui/metaaccellabel.h                      |    2 +-
 src/ui/preview-widget.c                      |    3 +-
 src/ui/resizepopup.c                         |    2 +-
 src/{include => ui}/resizepopup.h            |    4 +-
 src/ui/tabpopup.c                            |    6 +-
 src/{include => ui}/tabpopup.h               |    4 +-
 src/ui/testgradient.c                        |    2 +-
 src/ui/theme-parser.c                        |    2 +-
 src/ui/theme-private.h                       |    8 +-
 src/ui/theme-viewer.c                        |    7 +-
 src/ui/theme.c                               |    4 +-
 src/{include => ui}/tile-preview.h           |    2 +-
 src/ui/ui.c                                  |    4 +-
 src/{include => ui}/ui.h                     |    2 +-
 99 files changed, 257 insertions(+), 283 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4a683d9..ee40c1a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
+src/core/all-keybindings.h
 src/core/bell.c
 src/core/core.c
 src/core/delete.c
@@ -15,7 +16,6 @@ src/core/util.c
 src/core/window.c
 src/core/window-props.c
 src/core/xprops.c
-src/include/all-keybindings.h
 src/mutter.desktop.in
 src/mutter-wm.desktop.in
 src/mutter.schemas.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 3aa38ac..4e02816 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,9 @@ SUBDIRS=wm-tester tools compositor/plugins
 
 INCLUDES=								\
 	$(MUTTER_CFLAGS)						\
-	-I$(srcdir)/include						\
+	-I$(srcdir)							\
+	-I$(srcdir)/core						\
+	-I$(srcdir)/ui							\
 	-I$(srcdir)/compositor						\
 	-DMUTTER_LIBEXECDIR=\"$(libexecdir)\"				\
 	-DHOST_ALIAS=\"@HOST_ALIAS \"					\
@@ -37,7 +39,7 @@ libmutter_wm_la_SOURCES =			\
 	core/bell.h				\
 	core/boxes.c				\
 	core/boxes-private.h			\
-	include/boxes.h				\
+	meta/boxes.h				\
 	compositor/cogl-utils.c			\
 	compositor/cogl-utils.h			\
 	compositor/compositor.c			\
@@ -63,11 +65,11 @@ libmutter_wm_la_SOURCES =			\
 	compositor/meta-window-shape.h		\
 	compositor/region-utils.c		\
 	compositor/region-utils.h		\
-	include/compositor.h			\
-	include/meta-plugin.h			\
-	include/meta-shadow-factory.h		\
-	include/meta-window-actor.h		\
-	include/compositor-mutter.h 		\
+	meta/compositor.h			\
+	meta/meta-plugin.h			\
+	meta/meta-shadow-factory.h		\
+	meta/meta-window-actor.h		\
+	meta/compositor-mutter.h 		\
 	core/above-tab-keycode.c		\
 	core/constraints.c			\
 	core/constraints.h			\
@@ -75,25 +77,24 @@ libmutter_wm_la_SOURCES =			\
 	core/delete.c				\
 	core/display.c				\
 	core/display-private.h			\
-	include/display.h			\
+	meta/display.h				\
 	ui/draw-workspace.c			\
 	ui/draw-workspace.h			\
 	core/edge-resistance.c			\
 	core/edge-resistance.h			\
 	core/errors.c				\
-	include/errors.h			\
+	meta/errors.h				\
 	core/eventqueue.c			\
 	core/eventqueue.h			\
 	core/frame.c				\
-	core/frame-private.h			\
-	include/frame.h				\
+	core/frame.h				\
 	ui/gradient.c				\
-	ui/gradient.h				\
+	meta/gradient.h				\
 	core/group-private.h			\
 	core/group-props.c			\
 	core/group-props.h			\
 	core/group.c				\
-	include/group.h				\
+	meta/group.h				\
 	core/iconcache.c			\
 	core/iconcache.h			\
 	core/keybindings.c			\
@@ -103,11 +104,11 @@ libmutter_wm_la_SOURCES =			\
 	core/place.c				\
 	core/place.h				\
 	core/prefs.c				\
-	include/prefs.h				\
+	meta/prefs.h				\
 	core/screen.c				\
 	core/screen-private.h			\
-	include/screen.h			\
-	include/types.h                         \
+	meta/screen.h				\
+	meta/types.h				\
 	core/session.c				\
 	core/session.h				\
 	core/stack.c				\
@@ -115,19 +116,19 @@ libmutter_wm_la_SOURCES =			\
 	core/stack-tracker.c			\
 	core/stack-tracker.h			\
 	core/util.c				\
-	include/util.h				\
+	meta/util.h				\
 	core/window-props.c			\
 	core/window-props.h			\
 	core/window.c				\
 	core/window-private.h			\
-	include/window.h			\
+	meta/window.h				\
 	core/workspace.c			\
 	core/workspace-private.h		\
 	core/xprops.c				\
-	include/xprops.h			\
-	include/common.h			\
-	include/core.h				\
-	include/ui.h				\
+	core/xprops.h				\
+	meta/common.h				\
+	core/core.h				\
+	ui/ui.h					\
 	inlinepixbufs.h				\
 	ui/fixedtip.c				\
 	ui/fixedtip.h				\
@@ -138,17 +139,17 @@ libmutter_wm_la_SOURCES =			\
 	ui/metaaccellabel.c			\
 	ui/metaaccellabel.h			\
 	ui/resizepopup.c			\
-	include/resizepopup.h			\
+	ui/resizepopup.h			\
 	ui/tabpopup.c				\
-	include/tabpopup.h				\
+	ui/tabpopup.h				\
 	ui/tile-preview.c			\
-	include/tile-preview.h			\
+	ui/tile-preview.h			\
 	ui/theme-parser.c			\
 	ui/theme.c				\
-	ui/theme.h				\
+	meta/theme.h				\
 	ui/theme-private.h			\
 	ui/ui.c					\
-	include/all-keybindings.h               \
+	core/all-keybindings.h			\
 	$(mutter_built_sources)
 
 libmutter_wm_la_LDFLAGS = -no-undefined
@@ -159,17 +160,17 @@ libmutter_wm_la_LIBADD  = $(MUTTER_LIBS)
 libmutter_private_la_CFLAGS =
 libmutter_private_la_SOURCES=			\
 	core/boxes.c				\
-	include/boxes.h				\
+	meta/boxes.h				\
 	ui/gradient.c				\
-	ui/gradient.h				\
+	meta/gradient.h				\
 	core/util.c				\
-	include/util.h				\
-	include/common.h			\
+	meta/util.h				\
+	meta/common.h				\
 	ui/preview-widget.c			\
-	ui/preview-widget.h			\
+	meta/preview-widget.h			\
 	ui/theme-parser.c			\
 	ui/theme.c				\
-	ui/theme.h
+	meta/theme.h
 
 libmutter_private_la_LDFLAGS = -no-undefined
 libmutter_private_la_LIBADD  = $(MUTTER_LIBS)
@@ -177,35 +178,35 @@ libmutter_private_la_LIBADD  = $(MUTTER_LIBS)
 # Headers installed for plugins; introspected information will
 # be extracted into Mutter-<version>.gir
 libmutterinclude_base_headers =		\
-	include/boxes.h				\
-	ui/gradient.h				\
-	include/main.h				\
-	include/util.h				\
-	include/common.h			\
-	ui/theme.h				\
-	include/prefs.h				\
-	include/window.h			\
-	include/workspace.h			\
-	include/compositor.h			\
-	include/compositor-mutter.h		\
-	include/types.h				\
-	include/errors.h			\
-	include/screen.h			\
-	include/display.h			\
-	include/group.h				\
-	include/keybindings.h			\
-	include/meta-plugin.h			\
-	include/meta-shadow-factory.h		\
-	include/meta-window-actor.h
+	meta/boxes.h				\
+	meta/common.h				\
+	meta/compositor-mutter.h		\
+	meta/compositor.h			\
+	meta/display.h				\
+	meta/errors.h				\
+	meta/gradient.h				\
+	meta/group.h				\
+	meta/keybindings.h			\
+	meta/main.h				\
+	meta/meta-plugin.h			\
+	meta/meta-shadow-factory.h		\
+	meta/meta-window-actor.h		\
+	meta/prefs.h				\
+	meta/screen.h				\
+	meta/theme.h				\
+	meta/types.h				\
+	meta/util.h				\
+	meta/window.h				\
+	meta/workspace.h
 
 # Excluded from scanning for introspection but installed
 # preview-widget.h: only part of libmutter-private
 # atomnames.h: macros cause problems for scanning process
 libmutterinclude_extra_headers =		\
-	ui/preview-widget.h			\
-	include/atomnames.h
+	meta/preview-widget.h			\
+	meta/atomnames.h
 
-libmutterincludedir = $(includedir)/mutter/mutter-private
+libmutterincludedir = $(includedir)/mutter/meta
 
 libmutterinclude_HEADERS =			\
 	$(libmutterinclude_base_headers)	\
diff --git a/src/compositor/compositor-private.h b/src/compositor/compositor-private.h
index 03d218c..90dc63b 100644
--- a/src/compositor/compositor-private.h
+++ b/src/compositor/compositor-private.h
@@ -5,8 +5,8 @@
 
 #include <X11/extensions/Xfixes.h>
 
-#include "compositor.h"
-#include "display.h"
+#include <meta/compositor.h>
+#include <meta/display.h>
 #include "meta-plugin-manager.h"
 #include <clutter/clutter.h>
 
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index c31f623..4617ed8 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -4,19 +4,19 @@
 
 #include <clutter/x11/clutter-x11.h>
 
-#include "screen.h"
-#include "errors.h"
-#include "window.h"
+#include <meta/screen.h>
+#include <meta/errors.h>
+#include <meta/window.h>
 #include "compositor-private.h"
-#include "compositor-mutter.h"
+#include <meta/compositor-mutter.h>
 #include "xprops.h"
-#include "prefs.h"
-#include "meta-shadow-factory.h"
+#include <meta/prefs.h>
+#include <meta/meta-shadow-factory.h>
 #include "meta-window-actor-private.h"
 #include "meta-window-group.h"
 #include "meta-background-actor.h"
-#include "../core/window-private.h" /* to check window->hidden */
-#include "../core/display-private.h" /* for meta_display_lookup_x_window() */
+#include "window-private.h" /* to check window->hidden */
+#include "display-private.h" /* for meta_display_lookup_x_window() */
 #include <X11/extensions/shape.h>
 #include <X11/extensions/Xcomposite.h>
 
diff --git a/src/compositor/meta-background-actor.c b/src/compositor/meta-background-actor.c
index 7d980a1..7af8d62 100644
--- a/src/compositor/meta-background-actor.c
+++ b/src/compositor/meta-background-actor.c
@@ -32,7 +32,7 @@
 
 #include "cogl-utils.h"
 #include "compositor-private.h"
-#include "errors.h"
+#include <meta/errors.h>
 #include "meta-background-actor.h"
 
 struct _MetaBackgroundActorClass
diff --git a/src/compositor/meta-background-actor.h b/src/compositor/meta-background-actor.h
index 448171a..d16a0f9 100644
--- a/src/compositor/meta-background-actor.h
+++ b/src/compositor/meta-background-actor.h
@@ -25,7 +25,7 @@
 
 #include <clutter/clutter.h>
 
-#include "screen.h"
+#include <meta/screen.h>
 
 /**
  * MetaBackgroundActor:
diff --git a/src/compositor/meta-module.c b/src/compositor/meta-module.c
index 0b7680e..9c8cb16 100644
--- a/src/compositor/meta-module.c
+++ b/src/compositor/meta-module.c
@@ -21,7 +21,7 @@
  * 02111-1307, USA.
  */
 
-#include "meta-plugin.h"
+#include <meta/meta-plugin.h>
 #include "meta-module.h"
 
 #include <gmodule.h>
diff --git a/src/compositor/meta-plugin-manager.c b/src/compositor/meta-plugin-manager.c
index 1001a01..bc4b9c7 100644
--- a/src/compositor/meta-plugin-manager.c
+++ b/src/compositor/meta-plugin-manager.c
@@ -24,11 +24,11 @@
 #include "config.h"
 #include "compositor-private.h"
 #include "meta-plugin-manager.h"
-#include "prefs.h"
-#include "errors.h"
-#include "workspace.h"
+#include <meta/prefs.h>
+#include <meta/errors.h>
+#include <meta/workspace.h>
 #include "meta-module.h"
-#include "../core/window-private.h"
+#include "window-private.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/compositor/meta-plugin-manager.h b/src/compositor/meta-plugin-manager.h
index ec09bdd..59a7d02 100644
--- a/src/compositor/meta-plugin-manager.h
+++ b/src/compositor/meta-plugin-manager.h
@@ -24,11 +24,11 @@
 #ifndef META_PLUGIN_MANAGER_H_
 #define META_PLUGIN_MANAGER_H_
 
-#include "types.h"
-#include "screen.h"
+#include <meta/types.h>
+#include <meta/screen.h>
 
 #define  META_PLUGIN_FROM_MANAGER_
-#include "meta-plugin.h"
+#include <meta/meta-plugin.h>
 #undef   META_PLUGIN_FROM_MANAGER_
 
 #define META_PLUGIN_MINIMIZE         (1<<0)
diff --git a/src/compositor/meta-plugin.c b/src/compositor/meta-plugin.c
index b8af442..055b1b0 100644
--- a/src/compositor/meta-plugin.c
+++ b/src/compositor/meta-plugin.c
@@ -21,10 +21,10 @@
  * 02111-1307, USA.
  */
 
-#include "meta-plugin.h"
+#include <meta/meta-plugin.h>
 #include "meta-plugin-manager.h"
-#include "screen.h"
-#include "display.h"
+#include <meta/screen.h>
+#include <meta/display.h>
 
 #include <string.h>
 #include <X11/Xlib.h>
diff --git a/src/compositor/meta-shadow-factory-private.h b/src/compositor/meta-shadow-factory-private.h
index cd1492c..3d51cbb 100644
--- a/src/compositor/meta-shadow-factory-private.h
+++ b/src/compositor/meta-shadow-factory-private.h
@@ -28,7 +28,7 @@
 #include <cairo.h>
 #include <clutter/clutter.h>
 #include "meta-window-shape.h"
-#include "meta-shadow-factory.h"
+#include <meta/meta-shadow-factory.h>
 
 /**
  * MetaShadow:
diff --git a/src/compositor/meta-window-actor-private.h b/src/compositor/meta-window-actor-private.h
index 23d52f8..068bfb9 100644
--- a/src/compositor/meta-window-actor-private.h
+++ b/src/compositor/meta-window-actor-private.h
@@ -6,7 +6,7 @@
 #include <config.h>
 
 #include <X11/extensions/Xdamage.h>
-#include "compositor-mutter.h"
+#include <meta/compositor-mutter.h>
 
 MetaWindowActor *meta_window_actor_new (MetaWindow *window);
 
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index 1d75555..ddffae3 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -13,10 +13,10 @@
 #include <clutter/x11/clutter-x11.h>
 #include <gdk/gdk.h> /* for gdk_rectangle_union() */
 
-#include "display.h"
-#include "errors.h"
+#include <meta/display.h>
+#include <meta/errors.h>
 #include "frame.h"
-#include "window.h"
+#include <meta/window.h>
 #include "xprops.h"
 
 #include "compositor-private.h"
diff --git a/src/compositor/meta-window-group.h b/src/compositor/meta-window-group.h
index 4aa3dd0..0e0dc18 100644
--- a/src/compositor/meta-window-group.h
+++ b/src/compositor/meta-window-group.h
@@ -5,7 +5,7 @@
 
 #include <clutter/clutter.h>
 
-#include "screen.h"
+#include <meta/screen.h>
 
 /**
  * MetaWindowGroup:
diff --git a/src/compositor/plugins/Makefile.am b/src/compositor/plugins/Makefile.am
index 0c9d4bd..ac7d23c 100644
--- a/src/compositor/plugins/Makefile.am
+++ b/src/compositor/plugins/Makefile.am
@@ -1,7 +1,7 @@
 
 pkglibdir= MUTTER_PLUGIN_DIR@
 
-INCLUDES= MUTTER_CFLAGS@ -I $(top_srcdir)/src/include -DMUTTER_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS \" -DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMUTTER_PKGDATADIR=\"$(pkgdatadir)\" -DMUTTER_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"mutter\" -DSN_API_NOT_YET_FROZEN=1 -DMUTTER_MAJOR_VERSION=$(MUTTER_MAJOR_VERSION) -DMUTTER_MINOR_VERSION=$(MUTTER_MINOR_VERSION) -DMUTTER_MICRO_VERSION=$(MUTTER_MICRO_VERSION) -DMUTTER_PLUGIN_API_VERSION=$(MUTTER_PLUGIN_API_VERSION) -DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR \"
+INCLUDES= MUTTER_CFLAGS@ -I $(top_srcdir)/src -DMUTTER_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS \" -DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMUTTER_PKGDATADIR=\"$(pkgdatadir)\" -DMUTTER_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"mutter\" -DSN_API_NOT_YET_FROZEN=1 -DMUTTER_MAJOR_VERSION=$(MUTTER_MAJOR_VERSION) -DMUTTER_MINOR_VERSION=$(MUTTER_MINOR_VERSION) -DMUTTER_MICRO_VERSION=$(MUTTER_MICRO_VERSION) -DMUTTER_PLUGIN_API_VERSION=$(MUTTER_PLUGIN_API_VERSION) -DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR \"
 
 default_la_CFLAGS   = -fPIC
 default_la_SOURCES  = default.c
diff --git a/src/compositor/plugins/default.c b/src/compositor/plugins/default.c
index 89e2648..791715d 100644
--- a/src/compositor/plugins/default.c
+++ b/src/compositor/plugins/default.c
@@ -21,8 +21,8 @@
  * 02111-1307, USA.
  */
 
-#include "meta-plugin.h"
-#include "window.h"
+#include <meta/meta-plugin.h>
+#include <meta/window.h>
 
 #include <libintl.h>
 #define _(x) dgettext (GETTEXT_PACKAGE, x)
diff --git a/src/include/all-keybindings.h b/src/core/all-keybindings.h
similarity index 100%
rename from src/include/all-keybindings.h
rename to src/core/all-keybindings.h
diff --git a/src/core/bell.c b/src/core/bell.c
index ef6eb16..81103a4 100644
--- a/src/core/bell.c
+++ b/src/core/bell.c
@@ -51,7 +51,7 @@
 #include <config.h>
 #include "bell.h"
 #include "screen-private.h"
-#include "prefs.h"
+#include <meta/prefs.h>
 #ifdef HAVE_LIBCANBERRA
 #include <canberra-gtk.h>
 #endif
diff --git a/src/core/bell.h b/src/core/bell.h
index 930f3a0..50f059f 100644
--- a/src/core/bell.h
+++ b/src/core/bell.h
@@ -36,7 +36,7 @@
 #include <X11/XKBlib.h>
 #endif
 #include "display-private.h"
-#include "frame-private.h"
+#include "frame.h"
 
 #ifdef HAVE_XKB
 /**
diff --git a/src/core/boxes-private.h b/src/core/boxes-private.h
index a185bf1..8e402b0 100644
--- a/src/core/boxes-private.h
+++ b/src/core/boxes-private.h
@@ -25,8 +25,8 @@
 #define META_BOXES_PRIVATE_H
 
 #include <glib-object.h>
-#include "common.h"
-#include "boxes.h"
+#include <meta/common.h>
+#include <meta/boxes.h>
 
 #define BOX_LEFT(box)    ((box).x)                /* Leftmost pixel of rect */
 #define BOX_RIGHT(box)   ((box).x + (box).width)  /* One pixel past right   */
diff --git a/src/core/boxes.c b/src/core/boxes.c
index 57df284..8cfd5f5 100644
--- a/src/core/boxes.c
+++ b/src/core/boxes.c
@@ -27,7 +27,7 @@
  */
 
 #include "boxes-private.h"
-#include "util.h"
+#include <meta/util.h>
 #include <X11/Xutil.h>  /* Just for the definition of the various gravities */
 
 /* It would make sense to use GSlice here, but until we clean up the
diff --git a/src/core/constraints.c b/src/core/constraints.c
index 404028c..dbdf840 100644
--- a/src/core/constraints.c
+++ b/src/core/constraints.c
@@ -28,7 +28,7 @@
 #include "constraints.h"
 #include "workspace-private.h"
 #include "place.h"
-#include "prefs.h"
+#include <meta/prefs.h>
 
 #include <stdlib.h>
 #include <math.h>
diff --git a/src/core/constraints.h b/src/core/constraints.h
index fa3f039..0e50aa7 100644
--- a/src/core/constraints.h
+++ b/src/core/constraints.h
@@ -25,9 +25,9 @@
 #ifndef META_CONSTRAINTS_H
 #define META_CONSTRAINTS_H
 
-#include "util.h"
+#include <meta/util.h>
 #include "window-private.h"
-#include "frame-private.h"
+#include "frame.h"
 
 typedef enum
 {
diff --git a/src/core/core.c b/src/core/core.c
index 7fee2fc..5434572 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -25,10 +25,10 @@
 
 #include <config.h>
 #include "core.h"
-#include "frame-private.h"
+#include "frame.h"
 #include "workspace-private.h"
-#include "prefs.h"
-#include "errors.h"
+#include <meta/prefs.h>
+#include <meta/errors.h>
 
 /* Looks up the MetaWindow representing the frame of the given X window.
  * Used as a helper function by a bunch of the functions below.
diff --git a/src/include/core.h b/src/core/core.h
similarity index 99%
rename from src/include/core.h
rename to src/core/core.h
index 045d9c5..a2feb23 100644
--- a/src/include/core.h
+++ b/src/core/core.h
@@ -27,7 +27,7 @@
 
 /* Don't include core headers here */
 #include <gdk/gdkx.h>
-#include "common.h"
+#include <meta/common.h>
 
 typedef enum
 {
diff --git a/src/core/delete.c b/src/core/delete.c
index 81f6c8c..0ae1676 100644
--- a/src/core/delete.c
+++ b/src/core/delete.c
@@ -25,10 +25,10 @@
 #define _XOPEN_SOURCE /* for kill() */
 
 #include <config.h>
-#include "util.h"
+#include <meta/util.h>
 #include "window-private.h"
-#include "errors.h"
-#include "workspace.h"
+#include <meta/errors.h>
+#include <meta/workspace.h>
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/src/core/display-private.h b/src/core/display-private.h
index a233b4d..cccc04e 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -34,11 +34,11 @@
 #include <glib.h>
 #include <X11/Xlib.h>
 #include "eventqueue.h"
-#include "common.h"
-#include "boxes.h"
-#include "display.h"
+#include <meta/common.h>
+#include <meta/boxes.h>
+#include <meta/display.h>
 #include "keybindings-private.h"
-#include "prefs.h"
+#include <meta/prefs.h>
 
 #ifdef HAVE_STARTUP_NOTIFICATION
 #include <libsn/sn.h>
@@ -99,7 +99,7 @@ struct _MetaDisplay
    * class is constructed.
    */
 #define item(x)  Atom atom_##x;
-#include "atomnames.h"
+#include <meta/atomnames.h>
 #undef item
 
   /* This is the actual window from focus events,
diff --git a/src/core/display.c b/src/core/display.c
index 5ee3e3a..a21838d 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -34,21 +34,21 @@
 
 #include <config.h>
 #include "display-private.h"
-#include "util.h"
-#include "main.h"
+#include <meta/util.h>
+#include <meta/main.h>
 #include "screen-private.h"
 #include "window-private.h"
 #include "window-props.h"
 #include "group-props.h"
-#include "frame-private.h"
-#include "errors.h"
+#include "frame.h"
+#include <meta/errors.h>
 #include "keybindings-private.h"
-#include "prefs.h"
+#include <meta/prefs.h>
 #include "resizepopup.h"
 #include "xprops.h"
 #include "workspace-private.h"
 #include "bell.h"
-#include "compositor.h"
+#include <meta/compositor.h>
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
 #ifdef HAVE_SOLARIS_XINERAMA
@@ -417,7 +417,7 @@ meta_display_open (void)
   /* A list of all atom names, so that we can intern them in one go. */
   char *atom_names[] = {
 #define item(x) #x,
-#include "atomnames.h"
+#include <meta/atomnames.h>
 #undef item
   };
   Atom atoms[G_N_ELEMENTS(atom_names)];
@@ -490,7 +490,7 @@ meta_display_open (void)
   {
     int i = 0;    
 #define item(x) the_display->atom_##x = atoms[i++];
-#include "atomnames.h"
+#include <meta/atomnames.h>
 #undef item
   }
 
diff --git a/src/core/errors.c b/src/core/errors.c
index f5a95d7..df44cb2 100644
--- a/src/core/errors.c
+++ b/src/core/errors.c
@@ -23,7 +23,7 @@
  */
 
 #include <config.h>
-#include "errors.h"
+#include <meta/errors.h>
 #include "display-private.h"
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/core/frame.c b/src/core/frame.c
index 2951aa4..c533f56 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -24,9 +24,9 @@
  */
 
 #include <config.h>
-#include "frame-private.h"
+#include "frame.h"
 #include "bell.h"
-#include "errors.h"
+#include <meta/errors.h>
 #include "keybindings-private.h"
 
 #include <X11/extensions/Xrender.h>
diff --git a/src/core/frame-private.h b/src/core/frame.h
similarity index 95%
rename from src/core/frame-private.h
rename to src/core/frame.h
index 89c3d42..019d6b3 100644
--- a/src/core/frame-private.h
+++ b/src/core/frame.h
@@ -24,7 +24,6 @@
 #ifndef META_FRAME_PRIVATE_H
 #define META_FRAME_PRIVATE_H
 
-#include "frame.h"
 #include "window-private.h"
 
 typedef struct _MetaFrameGeometry MetaFrameGeometry;
@@ -68,7 +67,8 @@ void     meta_window_ensure_frame           (MetaWindow *window);
 void     meta_window_destroy_frame          (MetaWindow *window);
 void     meta_frame_queue_draw              (MetaFrame  *frame);
 
-MetaFrameFlags meta_frame_get_flags (MetaFrame *frame);
+MetaFrameFlags meta_frame_get_flags   (MetaFrame *frame);
+Window         meta_frame_get_xwindow (MetaFrame *frame);
 
 /* These should ONLY be called from meta_window_move_resize_internal */
 void meta_frame_calc_geometry      (MetaFrame         *frame,
diff --git a/src/core/group-private.h b/src/core/group-private.h
index ad4ce39..6f56b1b 100644
--- a/src/core/group-private.h
+++ b/src/core/group-private.h
@@ -24,7 +24,7 @@
 #ifndef META_GROUP_PRIVATE_H
 #define META_GROUP_PRIVATE_H
 
-#include "group.h"
+#include <meta/group.h>
 
 struct _MetaGroup
 {
diff --git a/src/core/group-props.h b/src/core/group-props.h
index a663e3a..a0fb70f 100644
--- a/src/core/group-props.h
+++ b/src/core/group-props.h
@@ -24,7 +24,7 @@
 #ifndef META_GROUP_PROPS_H
 #define META_GROUP_PROPS_H
 
-#include "group.h"
+#include <meta/group.h>
 #include "window-private.h"
 
 void meta_group_reload_property         (MetaGroup   *group,
diff --git a/src/core/group.c b/src/core/group.c
index fcf01ac..f6b839a 100644
--- a/src/core/group.c
+++ b/src/core/group.c
@@ -23,11 +23,11 @@
  */
 
 #include <config.h>
-#include "util.h"
+#include <meta/util.h>
 #include "group-private.h"
 #include "group-props.h"
 #include "window-private.h"
-#include "window.h"
+#include <meta/window.h>
 
 static MetaGroup*
 meta_group_new (MetaDisplay *display,
diff --git a/src/core/iconcache.c b/src/core/iconcache.c
index 18ec9d9..df9b8dc 100644
--- a/src/core/iconcache.c
+++ b/src/core/iconcache.c
@@ -24,7 +24,7 @@
 #include <config.h>
 #include "iconcache.h"
 #include "ui.h"
-#include "errors.h"
+#include <meta/errors.h>
 
 #include <X11/Xatom.h>
 
diff --git a/src/core/keybindings-private.h b/src/core/keybindings-private.h
index 01f6447..9571100 100644
--- a/src/core/keybindings-private.h
+++ b/src/core/keybindings-private.h
@@ -29,7 +29,7 @@
 #ifndef META_KEYBINDINGS_PRIVATE_H
 #define META_KEYBINDINGS_PRIVATE_H
 
-#include "keybindings.h"
+#include <meta/keybindings.h>
 
 void     meta_display_init_keys             (MetaDisplay *display);
 void     meta_display_shutdown_keys         (MetaDisplay *display);
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 303bec8..f52b140 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -29,13 +29,13 @@
 #include <config.h>
 #include "keybindings-private.h"
 #include "workspace-private.h"
-#include "errors.h"
+#include <meta/errors.h>
 #include "edge-resistance.h"
 #include "ui.h"
-#include "frame-private.h"
+#include "frame.h"
 #include "place.h"
-#include "prefs.h"
-#include "util.h"
+#include <meta/prefs.h>
+#include <meta/util.h>
 
 #include <X11/keysym.h>
 #include <string.h>
diff --git a/src/core/main.c b/src/core/main.c
index 3fb8c4e..d0d40ea 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -45,14 +45,14 @@
 #define _SVID_SOURCE /* for putenv() and some signal-related functions */
 
 #include <config.h>
-#include "main.h"
-#include "util.h"
+#include <meta/main.h>
+#include <meta/util.h>
 #include "display-private.h"
-#include "errors.h"
+#include <meta/errors.h>
 #include "ui.h"
 #include "session.h"
-#include "prefs.h"
-#include "compositor.h"
+#include <meta/prefs.h>
+#include <meta/compositor.h>
 
 #include <glib-object.h>
 #include <gdk/gdkx.h>
diff --git a/src/core/mutter.c b/src/core/mutter.c
index 64085c2..159bbf3 100644
--- a/src/core/mutter.c
+++ b/src/core/mutter.c
@@ -23,10 +23,10 @@
 
 #include <stdlib.h>
 
-#include "main.h"
-#include "util.h"
+#include <meta/main.h>
+#include <meta/util.h>
 #ifdef HAVE_INTROSPECTION
-#include "compositor/meta-plugin-manager.h"
+#include "meta-plugin-manager.h"
 #endif
 
 #include <glib.h>
diff --git a/src/core/place.c b/src/core/place.c
index 9d7a9f2..fa94186 100644
--- a/src/core/place.c
+++ b/src/core/place.c
@@ -28,8 +28,8 @@
 
 #include "boxes-private.h"
 #include "place.h"
-#include "workspace.h"
-#include "prefs.h"
+#include <meta/workspace.h>
+#include <meta/prefs.h>
 #include <gdk/gdk.h>
 #include <math.h>
 #include <stdlib.h>
diff --git a/src/core/place.h b/src/core/place.h
index be825b1..438ee02 100644
--- a/src/core/place.h
+++ b/src/core/place.h
@@ -25,7 +25,7 @@
 #define META_PLACE_H
 
 #include "window-private.h"
-#include "frame-private.h"
+#include "frame.h"
 
 void meta_window_place (MetaWindow *window,
                         MetaFrameGeometry *fgeom,
diff --git a/src/core/prefs.c b/src/core/prefs.c
index 2530631..1d0c118 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -24,9 +24,10 @@
  */
 
 #include <config.h>
-#include "prefs.h"
+#include <meta/prefs.h>
 #include "ui.h"
-#include "util.h"
+#include <meta/util.h>
+#include "meta-plugin-manager.h"
 #ifdef HAVE_GCONF
 #include <gconf/gconf-client.h>
 #endif
diff --git a/src/core/screen-private.h b/src/core/screen-private.h
index c7373e2..8a2dea7 100644
--- a/src/core/screen-private.h
+++ b/src/core/screen-private.h
@@ -34,7 +34,7 @@
 #define META_SCREEN_PRIVATE_H
 
 #include "display-private.h"
-#include "screen.h"
+#include <meta/screen.h>
 #include <X11/Xutil.h>
 #include "stack-tracker.h"
 #include "ui.h"
diff --git a/src/core/screen.c b/src/core/screen.c
index b656c25..2f42ac2 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -28,16 +28,16 @@
 
 #include <config.h>
 #include "screen-private.h"
-#include "util.h"
-#include "errors.h"
+#include <meta/util.h>
+#include <meta/errors.h>
 #include "window-private.h"
-#include "frame-private.h"
-#include "prefs.h"
+#include "frame.h"
+#include <meta/prefs.h>
 #include "workspace-private.h"
 #include "keybindings-private.h"
 #include "stack.h"
 #include "xprops.h"
-#include "compositor.h"
+#include <meta/compositor.h>
 #include "mutter-marshal.h"
 #include "mutter-enum-types.h"
 
@@ -277,7 +277,7 @@ set_supported_hint (MetaScreen *screen)
   Atom atoms[] = {
 #define EWMH_ATOMS_ONLY
 #define item(x)  screen->display->atom_##x,
-#include "atomnames.h"
+#include <meta/atomnames.h>
 #undef item
 #undef EWMH_ATOMS_ONLY
   };
diff --git a/src/core/session.c b/src/core/session.c
index ccc570f..2ebf1f7 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -69,10 +69,10 @@ meta_window_release_saved_state (const MetaWindowSessionInfo *info)
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "main.h"
-#include "util.h"
+#include <meta/main.h>
+#include <meta/util.h>
 #include "display-private.h"
-#include "workspace.h"
+#include <meta/workspace.h>
 
 static void ice_io_error_handler (IceConn connection);
 
diff --git a/src/core/stack-tracker.c b/src/core/stack-tracker.c
index 9415807..585aa6c 100644
--- a/src/core/stack-tracker.c
+++ b/src/core/stack-tracker.c
@@ -23,12 +23,12 @@
 
 #include <string.h>
 
-#include "frame-private.h"
+#include "frame.h"
 #include "screen-private.h"
 #include "stack-tracker.h"
-#include "util.h"
+#include <meta/util.h>
 
-#include "compositor.h"
+#include <meta/compositor.h>
 
 /* The complexity here comes from resolving two competing factors:
  *
diff --git a/src/core/stack-tracker.h b/src/core/stack-tracker.h
index 557c459..cb12dcd 100644
--- a/src/core/stack-tracker.h
+++ b/src/core/stack-tracker.h
@@ -36,7 +36,7 @@
 #ifndef META_STACK_TRACKER_H
 #define META_STACK_TRACKER_H
 
-#include "screen.h"
+#include <meta/screen.h>
 
 typedef struct _MetaStackTracker MetaStackTracker;
 
diff --git a/src/core/stack.c b/src/core/stack.c
index 1aecc37..c3917c6 100644
--- a/src/core/stack.c
+++ b/src/core/stack.c
@@ -29,11 +29,11 @@
 #include <config.h>
 #include "stack.h"
 #include "window-private.h"
-#include "errors.h"
-#include "frame-private.h"
-#include "group.h"
-#include "prefs.h"
-#include "workspace.h"
+#include <meta/errors.h>
+#include "frame.h"
+#include <meta/group.h>
+#include <meta/prefs.h>
+#include <meta/workspace.h>
 
 #include <X11/Xatom.h>
 
diff --git a/src/core/util.c b/src/core/util.c
index 1aadc2e..2ea5eb5 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -26,9 +26,9 @@
 #define _POSIX_C_SOURCE 200112L /* for fdopen() */
 
 #include <config.h>
-#include "common.h"
-#include "util.h"
-#include "main.h"
+#include <meta/common.h>
+#include <meta/util.h>
+#include <meta/main.h>
 
 #include <clutter/clutter.h> /* For clutter_threads_add_repaint_func() */
 
diff --git a/src/core/window-private.h b/src/core/window-private.h
index 6538db8..e75f13a 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -35,10 +35,10 @@
 #define META_WINDOW_PRIVATE_H
 
 #include <config.h>
-#include "compositor.h"
-#include "window.h"
+#include <meta/compositor.h>
+#include <meta/window.h>
 #include "screen-private.h"
-#include "util.h"
+#include <meta/util.h>
 #include "stack.h"
 #include "iconcache.h"
 #include <X11/Xutil.h>
diff --git a/src/core/window-props.c b/src/core/window-props.c
index ce578ff..5828eb1 100644
--- a/src/core/window-props.c
+++ b/src/core/window-props.c
@@ -40,10 +40,10 @@
 
 #include <config.h>
 #include "window-props.h"
-#include "errors.h"
+#include <meta/errors.h>
 #include "xprops.h"
-#include "frame-private.h"
-#include "group.h"
+#include "frame.h"
+#include <meta/group.h>
 #include <X11/Xatom.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/src/core/window.c b/src/core/window.c
index 945920e..b63352e 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -28,19 +28,19 @@
 #include "window-private.h"
 #include "boxes-private.h"
 #include "edge-resistance.h"
-#include "util.h"
-#include "frame-private.h"
-#include "errors.h"
+#include <meta/util.h>
+#include "frame.h"
+#include <meta/errors.h>
 #include "workspace-private.h"
 #include "stack.h"
 #include "keybindings-private.h"
 #include "ui.h"
 #include "place.h"
 #include "session.h"
-#include "prefs.h"
+#include <meta/prefs.h>
 #include "resizepopup.h"
 #include "xprops.h"
-#include "group.h"
+#include <meta/group.h>
 #include "window-props.h"
 #include "constraints.h"
 #include "mutter-enum-types.h"
diff --git a/src/core/workspace-private.h b/src/core/workspace-private.h
index 1a8b977..f1391d0 100644
--- a/src/core/workspace-private.h
+++ b/src/core/workspace-private.h
@@ -33,7 +33,7 @@
 #ifndef META_WORKSPACE_PRIVATE_H
 #define META_WORKSPACE_PRIVATE_H
 
-#include "workspace.h"
+#include <meta/workspace.h>
 #include "window-private.h"
 
 struct _MetaWorkspace
diff --git a/src/core/workspace.c b/src/core/workspace.c
index 51a3de7..66f9dd0 100644
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -25,13 +25,13 @@
 
 #include <config.h>
 #include "screen-private.h"
-#include "workspace.h"
+#include <meta/workspace.h>
 #include "workspace-private.h"
 #include "boxes-private.h"
-#include "errors.h"
-#include "prefs.h"
+#include <meta/errors.h>
+#include <meta/prefs.h>
 
-#include "compositor.h"
+#include <meta/compositor.h>
 
 #include <X11/Xatom.h>
 #include <string.h>
diff --git a/src/core/xprops.c b/src/core/xprops.c
index 306f0f1..afff775 100644
--- a/src/core/xprops.c
+++ b/src/core/xprops.c
@@ -82,8 +82,8 @@ from The Open Group.
 
 #include <config.h>
 #include "xprops.h"
-#include "errors.h"
-#include "util.h"
+#include <meta/errors.h>
+#include <meta/util.h>
 #include "async-getprop.h"
 #include "ui.h"
 #include "mutter-Xatomtype.h"
diff --git a/src/include/xprops.h b/src/core/xprops.h
similarity index 99%
rename from src/include/xprops.h
rename to src/core/xprops.h
index b8d0f07..928e46b 100644
--- a/src/include/xprops.h
+++ b/src/core/xprops.h
@@ -26,7 +26,7 @@
 
 #include <config.h>
 
-#include "display.h"
+#include <meta/display.h>
 #include <X11/Xutil.h>
 
 #ifdef HAVE_XSYNC
diff --git a/src/libmutter-wm.pc.in b/src/libmutter-wm.pc.in
index e76d559..d3982b5 100644
--- a/src/libmutter-wm.pc.in
+++ b/src/libmutter-wm.pc.in
@@ -15,4 +15,4 @@ Description: Mutter window manager library
 Requires: gtk+-3.0 @CLUTTER_PACKAGE@ x11
 Version: @VERSION@
 Libs: -L${libdir} -lmutter-wm
-Cflags: -I${includedir}/mutter/mutter-private -DMUTTER_MAJOR_VERSION=${mutter_major_version} -DMUTTER_MINOR_VERSION=${mutter_minor_version} -DMUTTER_MICRO_VERSION=${mutter_micro_version} -DMUTTER_PLUGIN_API_VERSION=${mutter_plugin_api_version}
+Cflags: -I${includedir}/mutter -DMUTTER_MAJOR_VERSION=${mutter_major_version} -DMUTTER_MINOR_VERSION=${mutter_minor_version} -DMUTTER_MICRO_VERSION=${mutter_micro_version} -DMUTTER_PLUGIN_API_VERSION=${mutter_plugin_api_version}
diff --git a/src/include/atomnames.h b/src/meta/atomnames.h
similarity index 100%
rename from src/include/atomnames.h
rename to src/meta/atomnames.h
diff --git a/src/include/boxes.h b/src/meta/boxes.h
similarity index 99%
rename from src/include/boxes.h
rename to src/meta/boxes.h
index 3fabe2a..4503c30 100644
--- a/src/include/boxes.h
+++ b/src/meta/boxes.h
@@ -25,7 +25,7 @@
 #define META_BOXES_H
 
 #include <glib-object.h>
-#include "common.h"
+#include <meta/common.h>
 
 #define META_TYPE_RECTANGLE            (meta_rectangle_get_type ())
 
diff --git a/src/include/common.h b/src/meta/common.h
similarity index 100%
rename from src/include/common.h
rename to src/meta/common.h
diff --git a/src/include/compositor-mutter.h b/src/meta/compositor-mutter.h
similarity index 94%
rename from src/include/compositor-mutter.h
rename to src/meta/compositor-mutter.h
index b893106..4b7b784 100644
--- a/src/include/compositor-mutter.h
+++ b/src/meta/compositor-mutter.h
@@ -28,9 +28,9 @@
 #include <clutter/clutter.h>
 #include <X11/Xlib.h>
 
-#include "types.h"
-#include "compositor.h"
-#include "meta-window-actor.h"
+#include <meta/types.h>
+#include <meta/compositor.h>
+#include <meta/meta-window-actor.h>
 
 /* Public compositor API */
 ClutterActor *meta_get_stage_for_screen         (MetaScreen *screen);
diff --git a/src/include/compositor.h b/src/meta/compositor.h
similarity index 98%
rename from src/include/compositor.h
rename to src/meta/compositor.h
index 7edacd0..c36546b 100644
--- a/src/include/compositor.h
+++ b/src/meta/compositor.h
@@ -25,10 +25,10 @@
 #include <glib.h>
 #include <X11/Xlib.h>
 
-#include "types.h"
-#include "boxes.h"
-#include "window.h"
-#include "workspace.h"
+#include <meta/types.h>
+#include <meta/boxes.h>
+#include <meta/window.h>
+#include <meta/workspace.h>
 
 /**
  * MetaCompEffect:
diff --git a/src/include/display.h b/src/meta/display.h
similarity index 98%
rename from src/include/display.h
rename to src/meta/display.h
index d7b88f8..f4ac20f 100644
--- a/src/include/display.h
+++ b/src/meta/display.h
@@ -25,9 +25,9 @@
 #include <glib-object.h>
 #include <X11/Xlib.h>
 
-#include "types.h"
-#include "prefs.h"
-#include "common.h"
+#include <meta/types.h>
+#include <meta/prefs.h>
+#include <meta/common.h>
 
 typedef enum
 {
diff --git a/src/include/errors.h b/src/meta/errors.h
similarity index 96%
rename from src/include/errors.h
rename to src/meta/errors.h
index 6aa57ec..6ac1417 100644
--- a/src/include/errors.h
+++ b/src/meta/errors.h
@@ -26,8 +26,8 @@
 
 #include <X11/Xlib.h>
 
-#include "util.h"
-#include "display.h"
+#include <meta/util.h>
+#include <meta/display.h>
 
 void      meta_error_trap_push (MetaDisplay *display);
 void      meta_error_trap_pop  (MetaDisplay *display);
diff --git a/src/ui/gradient.h b/src/meta/gradient.h
similarity index 100%
rename from src/ui/gradient.h
rename to src/meta/gradient.h
diff --git a/src/include/group.h b/src/meta/group.h
similarity index 98%
rename from src/include/group.h
rename to src/meta/group.h
index 9e20951..3f16edd 100644
--- a/src/include/group.h
+++ b/src/meta/group.h
@@ -26,7 +26,7 @@
 
 #include <X11/Xlib.h>
 #include <glib.h>
-#include "types.h"
+#include <meta/types.h>
 
 /* note, can return NULL */
 MetaGroup* meta_window_get_group       (MetaWindow *window);
diff --git a/src/include/keybindings.h b/src/meta/keybindings.h
similarity index 97%
rename from src/include/keybindings.h
rename to src/meta/keybindings.h
index 66c1f17..cf93aed 100644
--- a/src/include/keybindings.h
+++ b/src/meta/keybindings.h
@@ -20,8 +20,8 @@
 #ifndef META_KEYBINDINGS_H
 #define META_KEYBINDINGS_H
 
-#include "display.h"
-#include "common.h"
+#include <meta/display.h>
+#include <meta/common.h>
 
 /**
  * MetaKeyHandlerFunc: (skip)
diff --git a/src/include/main.h b/src/meta/main.h
similarity index 100%
rename from src/include/main.h
rename to src/meta/main.h
diff --git a/src/include/meta-plugin.h b/src/meta/meta-plugin.h
similarity index 99%
rename from src/include/meta-plugin.h
rename to src/meta/meta-plugin.h
index 80d5312..a7f87dc 100644
--- a/src/include/meta-plugin.h
+++ b/src/meta/meta-plugin.h
@@ -24,9 +24,9 @@
 #ifndef META_PLUGIN_H_
 #define META_PLUGIN_H_
 
-#include "types.h"
-#include "compositor.h"
-#include "compositor-mutter.h"
+#include <meta/types.h>
+#include <meta/compositor.h>
+#include <meta/compositor-mutter.h>
 
 #include <clutter/clutter.h>
 #include <X11/extensions/Xfixes.h>
diff --git a/src/include/meta-shadow-factory.h b/src/meta/meta-shadow-factory.h
similarity index 100%
rename from src/include/meta-shadow-factory.h
rename to src/meta/meta-shadow-factory.h
diff --git a/src/include/meta-window-actor.h b/src/meta/meta-window-actor.h
similarity index 98%
rename from src/include/meta-window-actor.h
rename to src/meta/meta-window-actor.h
index c6894e9..d32c029 100644
--- a/src/include/meta-window-actor.h
+++ b/src/meta/meta-window-actor.h
@@ -28,7 +28,7 @@
 #include <clutter/clutter.h>
 #include <X11/Xlib.h>
 
-#include "compositor.h"
+#include <meta/compositor.h>
 
 /*
  * MetaWindowActor object (ClutterGroup sub-class)
diff --git a/src/include/prefs.h b/src/meta/prefs.h
similarity index 99%
rename from src/include/prefs.h
rename to src/meta/prefs.h
index f01e49b..672a305 100644
--- a/src/include/prefs.h
+++ b/src/meta/prefs.h
@@ -26,7 +26,7 @@
 #define META_PREFS_H
 
 /* This header is a "common" one between the UI and core side */
-#include "common.h"
+#include <meta/common.h>
 #include <pango/pango-font.h>
 
 typedef enum
diff --git a/src/ui/preview-widget.h b/src/meta/preview-widget.h
similarity index 98%
rename from src/ui/preview-widget.h
rename to src/meta/preview-widget.h
index 0faff98..7da2821 100644
--- a/src/ui/preview-widget.h
+++ b/src/meta/preview-widget.h
@@ -23,7 +23,8 @@
 
 #include <config.h>
 
-#include "theme-private.h"
+#include <meta/common.h>
+#include <meta/theme.h>
 #include <gtk/gtk.h>
 
 #ifndef META_PREVIEW_WIDGET_H
diff --git a/src/include/screen.h b/src/meta/screen.h
similarity index 98%
rename from src/include/screen.h
rename to src/meta/screen.h
index 9b5de83..ddb29a9 100644
--- a/src/include/screen.h
+++ b/src/meta/screen.h
@@ -24,8 +24,8 @@
 
 #include <X11/Xlib.h>
 #include <glib-object.h>
-#include "types.h"
-#include "workspace.h"
+#include <meta/types.h>
+#include <meta/workspace.h>
 
 #define META_TYPE_SCREEN            (meta_screen_get_type ())
 #define META_SCREEN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_SCREEN, MetaScreen))
diff --git a/src/ui/theme.h b/src/meta/theme.h
similarity index 100%
rename from src/ui/theme.h
rename to src/meta/theme.h
diff --git a/src/include/types.h b/src/meta/types.h
similarity index 100%
rename from src/include/types.h
rename to src/meta/types.h
diff --git a/src/include/util.h b/src/meta/util.h
similarity index 99%
rename from src/include/util.h
rename to src/meta/util.h
index f9176f4..815ced5 100644
--- a/src/include/util.h
+++ b/src/meta/util.h
@@ -28,7 +28,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "common.h"
+#include <meta/common.h>
 
 gboolean meta_is_verbose  (void);
 void     meta_set_verbose (gboolean setting);
diff --git a/src/include/window.h b/src/meta/window.h
similarity index 99%
rename from src/include/window.h
rename to src/meta/window.h
index 8819242..1eac457 100644
--- a/src/include/window.h
+++ b/src/meta/window.h
@@ -25,8 +25,8 @@
 #include <glib-object.h>
 #include <X11/Xlib.h>
 
-#include "boxes.h"
-#include "types.h"
+#include <meta/boxes.h>
+#include <meta/types.h>
 
 typedef enum
 {
diff --git a/src/include/workspace.h b/src/meta/workspace.h
similarity index 97%
rename from src/include/workspace.h
rename to src/meta/workspace.h
index 21ebf9e..12fe4ba 100644
--- a/src/include/workspace.h
+++ b/src/meta/workspace.h
@@ -33,9 +33,9 @@
 #ifndef META_WORKSPACE_H
 #define META_WORKSPACE_H
 
-#include "types.h"
-#include "boxes.h"
-#include "screen.h"
+#include <meta/types.h>
+#include <meta/boxes.h>
+#include <meta/screen.h>
 
 #define META_TYPE_WORKSPACE            (meta_workspace_get_type ())
 #define META_WORKSPACE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_WORKSPACE, MetaWorkspace))
diff --git a/src/ui/frames.c b/src/ui/frames.c
index 0c4cb9f..9c4782e 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -25,14 +25,14 @@
 
 #include <config.h>
 #include <math.h>
-#include "boxes.h"
+#include <meta/boxes.h>
 #include "frames.h"
-#include "util.h"
+#include <meta/util.h>
 #include "core.h"
 #include "menu.h"
 #include "fixedtip.h"
-#include "theme.h"
-#include "prefs.h"
+#include <meta/theme.h>
+#include <meta/prefs.h>
 #include "ui.h"
 
 #include <cairo-xlib.h>
diff --git a/src/ui/frames.h b/src/ui/frames.h
index 6ab3a60..5fdba63 100644
--- a/src/ui/frames.h
+++ b/src/ui/frames.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
-#include "common.h"
+#include <meta/common.h>
 #include "theme-private.h"
 
 typedef enum
diff --git a/src/ui/gradient.c b/src/ui/gradient.c
index 9b1c079..ef1f061 100644
--- a/src/ui/gradient.c
+++ b/src/ui/gradient.c
@@ -22,8 +22,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.  */
 
-#include "gradient.h"
-#include "util.h"
+#include <meta/gradient.h>
+#include <meta/util.h>
 #include <string.h>
 
 /* This is all Alfredo's and Dan's usual very nice WindowMaker code,
diff --git a/src/ui/menu.c b/src/ui/menu.c
index 18324cb..eef421a 100644
--- a/src/ui/menu.c
+++ b/src/ui/menu.c
@@ -27,8 +27,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "menu.h"
-#include "main.h"
-#include "util.h"
+#include <meta/main.h>
+#include <meta/util.h>
 #include "core.h"
 #include "metaaccellabel.h"
 #include "ui.h"
diff --git a/src/ui/metaaccellabel.c b/src/ui/metaaccellabel.c
index 18b659f..2f9cb62 100644
--- a/src/ui/metaaccellabel.c
+++ b/src/ui/metaaccellabel.c
@@ -35,7 +35,7 @@
 #include "metaaccellabel.h"
 #include <gtk/gtk.h>
 #include <string.h>
-#include "util.h"
+#include <meta/util.h>
 
 static void     meta_accel_label_destroy      (GtkWidget           *object);
 static void     meta_accel_label_finalize     (GObject             *object);
diff --git a/src/ui/metaaccellabel.h b/src/ui/metaaccellabel.h
index 0a3b563..c90c47a 100644
--- a/src/ui/metaaccellabel.h
+++ b/src/ui/metaaccellabel.h
@@ -35,7 +35,7 @@
 #define __META_ACCEL_LABEL_H__
 
 #include <gtk/gtk.h>
-#include "common.h"
+#include <meta/common.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/ui/preview-widget.c b/src/ui/preview-widget.c
index 7f807fc..26a106e 100644
--- a/src/ui/preview-widget.c
+++ b/src/ui/preview-widget.c
@@ -26,7 +26,8 @@
 
 #include <math.h>
 #include <gtk/gtk.h>
-#include "preview-widget.h"
+#include <meta/preview-widget.h>
+#include "theme-private.h"
 
 static void     meta_preview_get_preferred_width  (GtkWidget *widget,
                                                    gint      *minimum,
diff --git a/src/ui/resizepopup.c b/src/ui/resizepopup.c
index c9e69fc..133285c 100644
--- a/src/ui/resizepopup.c
+++ b/src/ui/resizepopup.c
@@ -23,7 +23,7 @@
 
 #include <config.h>
 #include "resizepopup.h"
-#include "util.h"
+#include <meta/util.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
diff --git a/src/include/resizepopup.h b/src/ui/resizepopup.h
similarity index 97%
rename from src/include/resizepopup.h
rename to src/ui/resizepopup.h
index 2446786..0e307da 100644
--- a/src/include/resizepopup.h
+++ b/src/ui/resizepopup.h
@@ -25,8 +25,8 @@
 #define META_RESIZEPOPUP_H
 
 /* Don't include gtk.h or gdk.h here */
-#include "boxes.h"
-#include "common.h"
+#include <meta/boxes.h>
+#include <meta/common.h>
 #include <X11/Xlib.h>
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/src/ui/tabpopup.c b/src/ui/tabpopup.c
index 2fe8101..8c8c23d 100644
--- a/src/ui/tabpopup.c
+++ b/src/ui/tabpopup.c
@@ -25,13 +25,13 @@
 
 #include <config.h>
 
-#include "util.h"
+#include <meta/util.h>
 #include "core.h"
 #include "tabpopup.h"
 /* FIXME these two includes are 100% broken ...
  */
-#include "../core/workspace-private.h"
-#include "../core/frame-private.h"
+#include "workspace-private.h"
+#include "frame.h"
 #include "draw-workspace.h"
 #include <gtk/gtk.h>
 #include <math.h>
diff --git a/src/include/tabpopup.h b/src/ui/tabpopup.h
similarity index 98%
rename from src/include/tabpopup.h
rename to src/ui/tabpopup.h
index 1c90fc7..ee609d9 100644
--- a/src/include/tabpopup.h
+++ b/src/ui/tabpopup.h
@@ -26,8 +26,8 @@
 #define META_TABPOPUP_H
 
 /* Don't include gtk.h or gdk.h here */
-#include "common.h"
-#include "boxes.h"
+#include <meta/common.h>
+#include <meta/boxes.h>
 #include <X11/Xlib.h>
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/src/ui/testgradient.c b/src/ui/testgradient.c
index bf3b4e4..29c3acb 100644
--- a/src/ui/testgradient.c
+++ b/src/ui/testgradient.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.  */
 
-#include "gradient.h"
+#include <meta/gradient.h>
 #include <gtk/gtk.h>
 
 typedef void (* RenderGradientFunc) (cairo_t     *cr,
diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c
index 559aafd..8b1c83b 100644
--- a/src/ui/theme-parser.c
+++ b/src/ui/theme-parser.c
@@ -23,7 +23,7 @@
 
 #include <config.h>
 #include "theme-private.h"
-#include "util.h"
+#include <meta/util.h>
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/src/ui/theme-private.h b/src/ui/theme-private.h
index a942056..d4a2166 100644
--- a/src/ui/theme-private.h
+++ b/src/ui/theme-private.h
@@ -24,10 +24,10 @@
 #ifndef META_THEME_PRIVATE_H
 #define META_THEME_PRIVATE_H
 
-#include "boxes.h"
-#include "gradient.h"
-#include "theme.h"
-#include "common.h"
+#include <meta/boxes.h>
+#include <meta/gradient.h>
+#include <meta/theme.h>
+#include <meta/common.h>
 #include <gtk/gtk.h>
 
 /**
diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c
index c2addb1..6aed2d3 100644
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
@@ -22,9 +22,10 @@
  */
 
 #include <config.h>
-#include "util.h"
-#include "theme.h"
-#include "preview-widget.h"
+#include <meta/util.h>
+#include <meta/theme.h>
+#include "theme-private.h"
+#include <meta/preview-widget.h>
 #include <gtk/gtk.h>
 #include <time.h>
 #include <stdlib.h>
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 589d749..0077388 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -54,8 +54,8 @@
 
 #include <config.h>
 #include "theme-private.h"
-#include "util.h"
-#include "gradient.h"
+#include <meta/util.h>
+#include <meta/gradient.h>
 #include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/include/tile-preview.h b/src/ui/tile-preview.h
similarity index 98%
rename from src/include/tile-preview.h
rename to src/ui/tile-preview.h
index 24b4f02..740f41f 100644
--- a/src/include/tile-preview.h
+++ b/src/ui/tile-preview.h
@@ -23,7 +23,7 @@
 #ifndef META_TILE_PREVIEW_H
 #define META_TILE_PREVIEW_H
 
-#include "boxes.h"
+#include <meta/boxes.h>
 
 typedef struct _MetaTilePreview MetaTilePreview;
 
diff --git a/src/ui/ui.c b/src/ui/ui.c
index d115ae3..575f2ae 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -23,10 +23,10 @@
  */
 
 #include <config.h>
-#include "prefs.h"
+#include <meta/prefs.h>
 #include "ui.h"
 #include "frames.h"
-#include "util.h"
+#include <meta/util.h>
 #include "menu.h"
 #include "core.h"
 #include "theme-private.h"
diff --git a/src/include/ui.h b/src/ui/ui.h
similarity index 99%
rename from src/include/ui.h
rename to src/ui/ui.h
index 2914133..cc449bd 100644
--- a/src/include/ui.h
+++ b/src/ui/ui.h
@@ -25,7 +25,7 @@
 #define META_UI_H
 
 /* Don't include gtk.h or gdk.h here */
-#include "common.h"
+#include <meta/common.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <glib.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]