summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2007-12-19 21:17:50 +0000
committerHavoc Pennington <hp@src.gnome.org>2007-12-19 21:17:50 +0000
commit72b08c82b16a850fd4f0cd52d58812b4180fe969 (patch)
tree587cf32237864f2ff6241c1cbf1045074eed130d /src
parent3880951458910982807fc20ee9f11e22e947ddd2 (diff)
downloadmetacity-72b08c82b16a850fd4f0cd52d58812b4180fe969.tar.gz
metacity-72b08c82b16a850fd4f0cd52d58812b4180fe969.tar.bz2
sort source files into these directories according to which part of the WM
2007-12-19 Havoc Pennington <hp@redhat.com> * src/ui, src/core, src/include: sort source files into these directories according to which part of the WM they are supposed to be in. In an eventual plan, we should also create src/compositor/render, src/compositor/fallback and move some of the compositor stuff into that. * autogen.sh: require a newer automake, so we don't have to use a recursive build * src/ui/tabpopup.c: put in a hack to make the build temporarily work, want to commit the large rearrangement before fixing this not to include workspace.h or frame.h * src/core/iconcache.c (meta_read_icons): temporarily break this to get the build to work, want to commit the large rearrangement before fixing this file not to include theme.h svn path=/trunk/; revision=3491
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am226
-rw-r--r--src/core/async-getprop.c (renamed from src/async-getprop.c)0
-rw-r--r--src/core/async-getprop.h (renamed from src/async-getprop.h)0
-rw-r--r--src/core/bell.c (renamed from src/bell.c)0
-rw-r--r--src/core/bell.h (renamed from src/bell.h)0
-rw-r--r--src/core/boxes.c (renamed from src/boxes.c)0
-rw-r--r--src/core/c-screen.c (renamed from src/c-screen.c)0
-rw-r--r--src/core/c-screen.h (renamed from src/c-screen.h)0
-rw-r--r--src/core/c-window.c (renamed from src/c-window.c)0
-rw-r--r--src/core/c-window.h (renamed from src/c-window.h)0
-rw-r--r--src/core/compositor.c (renamed from src/compositor.c)0
-rw-r--r--src/core/compositor.h (renamed from src/compositor.h)0
-rw-r--r--src/core/constraints.c (renamed from src/constraints.c)0
-rw-r--r--src/core/constraints.h (renamed from src/constraints.h)0
-rw-r--r--src/core/core.c (renamed from src/core.c)0
-rw-r--r--src/core/delete.c (renamed from src/delete.c)0
-rw-r--r--src/core/display.c (renamed from src/display.c)0
-rw-r--r--src/core/display.h (renamed from src/display.h)0
-rw-r--r--src/core/edge-resistance.c (renamed from src/edge-resistance.c)0
-rw-r--r--src/core/edge-resistance.h (renamed from src/edge-resistance.h)0
-rw-r--r--src/core/effects.c (renamed from src/effects.c)0
-rw-r--r--src/core/effects.h (renamed from src/effects.h)0
-rw-r--r--src/core/errors.c (renamed from src/errors.c)0
-rw-r--r--src/core/errors.h (renamed from src/errors.h)0
-rw-r--r--src/core/eventqueue.c (renamed from src/eventqueue.c)0
-rw-r--r--src/core/eventqueue.h (renamed from src/eventqueue.h)0
-rw-r--r--src/core/frame.c (renamed from src/frame.c)0
-rw-r--r--src/core/frame.h (renamed from src/frame.h)0
-rw-r--r--src/core/group-private.h (renamed from src/group-private.h)0
-rw-r--r--src/core/group-props.c (renamed from src/group-props.c)0
-rw-r--r--src/core/group-props.h (renamed from src/group-props.h)0
-rw-r--r--src/core/group.c (renamed from src/group.c)0
-rw-r--r--src/core/group.h (renamed from src/group.h)0
-rw-r--r--src/core/iconcache.c (renamed from src/iconcache.c)6
-rw-r--r--src/core/iconcache.h (renamed from src/iconcache.h)0
-rw-r--r--src/core/keybindings.c (renamed from src/keybindings.c)0
-rw-r--r--src/core/keybindings.h (renamed from src/keybindings.h)0
-rw-r--r--src/core/main.c (renamed from src/main.c)0
-rw-r--r--src/core/metacity-Xatomtype.h (renamed from src/metacity-Xatomtype.h)0
-rw-r--r--src/core/place.c (renamed from src/place.c)0
-rw-r--r--src/core/place.h (renamed from src/place.h)0
-rw-r--r--src/core/prefs.c (renamed from src/prefs.c)0
-rw-r--r--src/core/screen.c (renamed from src/screen.c)0
-rw-r--r--src/core/screen.h (renamed from src/screen.h)0
-rw-r--r--src/core/session.c (renamed from src/session.c)0
-rw-r--r--src/core/session.h (renamed from src/session.h)0
-rw-r--r--src/core/spring-model.c (renamed from src/spring-model.c)0
-rw-r--r--src/core/spring-model.h (renamed from src/spring-model.h)0
-rw-r--r--src/core/stack.c (renamed from src/stack.c)0
-rw-r--r--src/core/stack.h (renamed from src/stack.h)0
-rw-r--r--src/core/testasyncgetprop.c (renamed from src/testasyncgetprop.c)0
-rw-r--r--src/core/testboxes.c (renamed from src/testboxes.c)0
-rw-r--r--src/core/util.c (renamed from src/util.c)0
-rw-r--r--src/core/window-props.c (renamed from src/window-props.c)0
-rw-r--r--src/core/window-props.h (renamed from src/window-props.h)0
-rw-r--r--src/core/window.c (renamed from src/window.c)0
-rw-r--r--src/core/window.h (renamed from src/window.h)0
-rw-r--r--src/core/workspace.c (renamed from src/workspace.c)0
-rw-r--r--src/core/workspace.h (renamed from src/workspace.h)0
-rw-r--r--src/core/xprops.c (renamed from src/xprops.c)0
-rw-r--r--src/core/xprops.h (renamed from src/xprops.h)0
-rw-r--r--src/include/boxes.h (renamed from src/boxes.h)0
-rw-r--r--src/include/common.h (renamed from src/common.h)0
-rw-r--r--src/include/core.h (renamed from src/core.h)0
-rw-r--r--src/include/main.h (renamed from src/main.h)0
-rw-r--r--src/include/prefs.h (renamed from src/prefs.h)0
-rw-r--r--src/include/resizepopup.h (renamed from src/resizepopup.h)0
-rw-r--r--src/include/tabpopup.h (renamed from src/tabpopup.h)0
-rw-r--r--src/include/ui.h (renamed from src/ui.h)0
-rw-r--r--src/include/util.h (renamed from src/util.h)0
-rw-r--r--src/ui/colors.c (renamed from src/colors.c)0
-rw-r--r--src/ui/colors.h (renamed from src/colors.h)0
-rw-r--r--src/ui/draw-workspace.c (renamed from src/draw-workspace.c)0
-rw-r--r--src/ui/draw-workspace.h (renamed from src/draw-workspace.h)0
-rw-r--r--src/ui/fixedtip.c (renamed from src/fixedtip.c)0
-rw-r--r--src/ui/fixedtip.h (renamed from src/fixedtip.h)0
-rw-r--r--src/ui/frames.c (renamed from src/frames.c)1
-rw-r--r--src/ui/frames.h (renamed from src/frames.h)0
-rw-r--r--src/ui/gradient.c (renamed from src/gradient.c)0
-rw-r--r--src/ui/gradient.h (renamed from src/gradient.h)0
-rw-r--r--src/ui/menu.c (renamed from src/menu.c)0
-rw-r--r--src/ui/menu.h (renamed from src/menu.h)0
-rw-r--r--src/ui/metaaccellabel.c (renamed from src/metaaccellabel.c)0
-rw-r--r--src/ui/metaaccellabel.h (renamed from src/metaaccellabel.h)0
-rw-r--r--src/ui/metacity-dialog.c (renamed from src/metacity-dialog.c)0
-rw-r--r--src/ui/preview-widget.c (renamed from src/preview-widget.c)0
-rw-r--r--src/ui/preview-widget.h (renamed from src/preview-widget.h)0
-rw-r--r--src/ui/resizepopup.c (renamed from src/resizepopup.c)0
-rw-r--r--src/ui/tabpopup.c (renamed from src/tabpopup.c)6
-rw-r--r--src/ui/testgradient.c (renamed from src/testgradient.c)0
-rw-r--r--src/ui/theme-parser.c (renamed from src/theme-parser.c)0
-rw-r--r--src/ui/theme-parser.h (renamed from src/theme-parser.h)0
-rw-r--r--src/ui/theme-viewer.c (renamed from src/theme-viewer.c)0
-rw-r--r--src/ui/theme.c (renamed from src/theme.c)0
-rw-r--r--src/ui/theme.h (renamed from src/theme.h)0
-rw-r--r--src/ui/themewidget.c (renamed from src/themewidget.c)0
-rw-r--r--src/ui/themewidget.h (renamed from src/themewidget.h)0
-rw-r--r--src/ui/ui.c (renamed from src/ui.c)1
98 files changed, 122 insertions, 118 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 0f1bb95..22217f8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,132 +2,132 @@ lib_LTLIBRARIES = libmetacity-private.la
SUBDIRS=wm-tester tools themes
-INCLUDES=@METACITY_CFLAGS@ -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1
+INCLUDES=@METACITY_CFLAGS@ -I $(srcdir)/include -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1
metacity_SOURCES= \
- async-getprop.c \
- async-getprop.h \
- bell.h \
- bell.c \
- boxes.h \
- boxes.c \
- common.h \
- compositor.c \
- compositor.h \
- constraints.c \
- constraints.h \
- core.c \
- core.h \
- delete.c \
- display.c \
- display.h \
- draw-workspace.c \
- draw-workspace.h \
- edge-resistance.c \
- edge-resistance.h \
- effects.c \
- effects.h \
- errors.c \
- errors.h \
- eventqueue.c \
- eventqueue.h \
- fixedtip.c \
- fixedtip.h \
- frame.c \
- frame.h \
- frames.c \
- frames.h \
- gradient.c \
- gradient.h \
- group.c \
- group.h \
- group-private.h \
- group-props.c \
- group-props.h \
- iconcache.c \
- iconcache.h \
+ core/async-getprop.c \
+ core/async-getprop.h \
+ core/bell.c \
+ core/bell.h \
+ core/boxes.c \
+ include/boxes.h \
+ core/compositor.c \
+ core/compositor.h \
+ core/constraints.c \
+ core/constraints.h \
+ core/core.c \
+ core/delete.c \
+ core/display.c \
+ core/display.h \
+ ui/draw-workspace.c \
+ core/draw-workspace.h \
+ core/edge-resistance.c \
+ core/edge-resistance.h \
+ core/effects.c \
+ core/effects.h \
+ core/errors.c \
+ core/errors.h \
+ core/eventqueue.c \
+ core/eventqueue.h \
+ core/frame.c \
+ core/frame.h \
+ ui/gradient.c \
+ ui/gradient.h \
+ core/group-private.h \
+ core/group-props.c \
+ core/group-props.h \
+ core/group.c \
+ core/group.h \
+ core/iconcache.c \
+ core/iconcache.h \
+ core/keybindings.c \
+ core/keybindings.h \
+ core/main.c \
+ core/main.h \
+ core/metacity-Xatomtype.h \
+ core/place.c \
+ core/place.h \
+ core/prefs.c \
+ core/prefs.h \
+ core/screen.c \
+ core/screen.h \
+ core/session.c \
+ core/session.h \
+ core/spring-model.c \
+ core/spring-model.h \
+ core/stack.c \
+ core/stack.h \
+ core/util.c \
+ include/util.h \
+ core/window-props.c \
+ core/window-props.h \
+ core/window.c \
+ core/window.h \
+ core/workspace.c \
+ core/workspace.h \
+ core/xprops.c \
+ core/xprops.h \
+ include/common.h \
+ include/core.h \
+ include/ui.h \
inlinepixbufs.h \
- keybindings.c \
- keybindings.h \
- main.c \
- main.h \
- menu.c \
- menu.h \
- metaaccellabel.c \
- metaaccellabel.h \
- metacity-Xatomtype.h \
- place.c \
- place.h \
- prefs.c \
- prefs.h \
- resizepopup.c \
- resizepopup.h \
- screen.c \
- screen.h \
- session.c \
- session.h \
- spring-model.c \
- spring-model.h \
- stack.c \
- stack.h \
- tabpopup.c \
- tabpopup.h \
- theme.c \
- theme.h \
- theme-parser.c \
- theme-parser.h \
- themewidget.c \
- themewidget.h \
- ui.c \
- ui.h \
- util.c \
- util.h \
- window.c \
- window.h \
- window-props.c \
- window-props.h \
- workspace.c \
- workspace.h \
- xprops.c \
- xprops.h
+ ui/fixedtip.c \
+ ui/fixedtip.h \
+ ui/frames.c \
+ ui/frames.h \
+ ui/menu.c \
+ ui/menu.h \
+ ui/metaaccellabel.c \
+ ui/metaaccellabel.h \
+ ui/resizepopup.c \
+ include/resizepopup.h \
+ ui/tabpopup.c \
+ include/tabpopup.h \
+ ui/theme-parser.c \
+ ui/theme-parser.h \
+ ui/theme.c \
+ ui/theme.h \
+ ui/themewidget.c \
+ ui/themewidget.h \
+ ui/ui.c
# by setting libmetacity_private_la_CFLAGS, the files shared with
# metacity proper will be compiled with different names.
libmetacity_private_la_CFLAGS =
-libmetacity_private_la_SOURCES= \
- boxes.c \
- boxes.h \
- gradient.c \
- gradient.h \
- preview-widget.c \
- preview-widget.h \
- theme.c \
- theme.h \
- theme-parser.c \
- theme-parser.h \
- util.c \
- util.h \
- common.h
+libmetacity_private_la_SOURCES= \
+ core/boxes.c \
+ include/boxes.h \
+ ui/gradient.c \
+ ui/gradient.h \
+ core/util.c \
+ include/util.h \
+ include/common.h \
+ ui/preview-widget.c \
+ ui/preview-widget.h \
+ ui/theme-parser.c \
+ ui/theme-parser.h \
+ ui/theme.c \
+ ui/theme.h
libmetacity_private_la_LDFLAGS = -no-undefined
libmetacity_private_la_LIBADD = @METACITY_LIBS@
libmetacityincludedir = $(includedir)/metacity-1/metacity-private
-libmetacityinclude_HEADERS = \
- boxes.h \
- common.h \
- gradient.h \
- preview-widget.h \
- theme.h \
- theme-parser.h \
- util.h
+libmetacityinclude_HEADERS = \
+ include/boxes.h \
+ ui/gradient.h \
+ include/util.h \
+ include/common.h \
+ ui/preview-widget.h \
+ ui/theme-parser.h \
+ ui/theme.h
metacity_theme_viewer_SOURCES= \
- theme-viewer.c
+ ui/theme-viewer.c
metacity_dialog_SOURCES= \
- metacity-dialog.c
+ ui/metacity-dialog.c
bin_PROGRAMS=metacity metacity-theme-viewer
libexec_PROGRAMS=metacity-dialog
@@ -137,9 +137,9 @@ metacity_LDADD=@METACITY_LIBS@ $(EFENCE)
metacity_theme_viewer_LDADD= @METACITY_LIBS@ libmetacity-private.la
metacity_dialog_LDADD=@METACITY_LIBS@
-testboxes_SOURCES=util.h util.c boxes.h boxes.c testboxes.c
-testgradient_SOURCES=gradient.h gradient.c testgradient.c
-testasyncgetprop_SOURCES=async-getprop.h async-getprop.c testasyncgetprop.c
+testboxes_SOURCES=include/util.h core/util.c include/boxes.h core/boxes.c core/testboxes.c
+testgradient_SOURCES=ui/gradient.h ui/gradient.c ui/testgradient.c
+testasyncgetprop_SOURCES=core/async-getprop.h core/async-getprop.c core/testasyncgetprop.c
noinst_PROGRAMS=testboxes testgradient testasyncgetprop
@@ -182,7 +182,7 @@ BUILT_SOURCES = inlinepixbufs.h
CLEANFILES = inlinepixbufs.h metacity.desktop metacity.schemas 50-metacity-desktop-key.xml 50-metacity-key.xml
inlinepixbufs.h: $(IMAGES)
- $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
+ $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/src/async-getprop.c b/src/core/async-getprop.c
index fb5484c..fb5484c 100644
--- a/src/async-getprop.c
+++ b/src/core/async-getprop.c
diff --git a/src/async-getprop.h b/src/core/async-getprop.h
index e11ca13..e11ca13 100644
--- a/src/async-getprop.h
+++ b/src/core/async-getprop.h
diff --git a/src/bell.c b/src/core/bell.c
index 6e1f701..6e1f701 100644
--- a/src/bell.c
+++ b/src/core/bell.c
diff --git a/src/bell.h b/src/core/bell.h
index 7c1e3af..7c1e3af 100644
--- a/src/bell.h
+++ b/src/core/bell.h
diff --git a/src/boxes.c b/src/core/boxes.c
index c7bf8cd..c7bf8cd 100644
--- a/src/boxes.c
+++ b/src/core/boxes.c
diff --git a/src/c-screen.c b/src/core/c-screen.c
index e69de29..e69de29 100644
--- a/src/c-screen.c
+++ b/src/core/c-screen.c
diff --git a/src/c-screen.h b/src/core/c-screen.h
index e69de29..e69de29 100644
--- a/src/c-screen.h
+++ b/src/core/c-screen.h
diff --git a/src/c-window.c b/src/core/c-window.c
index e69de29..e69de29 100644
--- a/src/c-window.c
+++ b/src/core/c-window.c
diff --git a/src/c-window.h b/src/core/c-window.h
index e69de29..e69de29 100644
--- a/src/c-window.h
+++ b/src/core/c-window.h
diff --git a/src/compositor.c b/src/core/compositor.c
index 1ced8bc..1ced8bc 100644
--- a/src/compositor.c
+++ b/src/core/compositor.c
diff --git a/src/compositor.h b/src/core/compositor.h
index 0f65dc4..0f65dc4 100644
--- a/src/compositor.h
+++ b/src/core/compositor.h
diff --git a/src/constraints.c b/src/core/constraints.c
index 8cba3bf..8cba3bf 100644
--- a/src/constraints.c
+++ b/src/core/constraints.c
diff --git a/src/constraints.h b/src/core/constraints.h
index 8ce332e..8ce332e 100644
--- a/src/constraints.h
+++ b/src/core/constraints.h
diff --git a/src/core.c b/src/core/core.c
index 1454105..1454105 100644
--- a/src/core.c
+++ b/src/core/core.c
diff --git a/src/delete.c b/src/core/delete.c
index 9d5c8e4..9d5c8e4 100644
--- a/src/delete.c
+++ b/src/core/delete.c
diff --git a/src/display.c b/src/core/display.c
index b0df982..b0df982 100644
--- a/src/display.c
+++ b/src/core/display.c
diff --git a/src/display.h b/src/core/display.h
index ed88992..ed88992 100644
--- a/src/display.h
+++ b/src/core/display.h
diff --git a/src/edge-resistance.c b/src/core/edge-resistance.c
index d5c6011..d5c6011 100644
--- a/src/edge-resistance.c
+++ b/src/core/edge-resistance.c
diff --git a/src/edge-resistance.h b/src/core/edge-resistance.h
index 6d0dbe0..6d0dbe0 100644
--- a/src/edge-resistance.h
+++ b/src/core/edge-resistance.h
diff --git a/src/effects.c b/src/core/effects.c
index 45032d9..45032d9 100644
--- a/src/effects.c
+++ b/src/core/effects.c
diff --git a/src/effects.h b/src/core/effects.h
index 5ae7bcb..5ae7bcb 100644
--- a/src/effects.h
+++ b/src/core/effects.h
diff --git a/src/errors.c b/src/core/errors.c
index 854ef46..854ef46 100644
--- a/src/errors.c
+++ b/src/core/errors.c
diff --git a/src/errors.h b/src/core/errors.h
index c18eaa7..c18eaa7 100644
--- a/src/errors.h
+++ b/src/core/errors.h
diff --git a/src/eventqueue.c b/src/core/eventqueue.c
index 4ce3e46..4ce3e46 100644
--- a/src/eventqueue.c
+++ b/src/core/eventqueue.c
diff --git a/src/eventqueue.h b/src/core/eventqueue.h
index cd115bd..cd115bd 100644
--- a/src/eventqueue.h
+++ b/src/core/eventqueue.h
diff --git a/src/frame.c b/src/core/frame.c
index f4f8189..f4f8189 100644
--- a/src/frame.c
+++ b/src/core/frame.c
diff --git a/src/frame.h b/src/core/frame.h
index 859e25a..859e25a 100644
--- a/src/frame.h
+++ b/src/core/frame.h
diff --git a/src/group-private.h b/src/core/group-private.h
index 25b05c7..25b05c7 100644
--- a/src/group-private.h
+++ b/src/core/group-private.h
diff --git a/src/group-props.c b/src/core/group-props.c
index 9d5af05..9d5af05 100644
--- a/src/group-props.c
+++ b/src/core/group-props.c
diff --git a/src/group-props.h b/src/core/group-props.h
index ffde090..ffde090 100644
--- a/src/group-props.h
+++ b/src/core/group-props.h
diff --git a/src/group.c b/src/core/group.c
index 1e721a9..1e721a9 100644
--- a/src/group.c
+++ b/src/core/group.c
diff --git a/src/group.h b/src/core/group.h
index 8413382..8413382 100644
--- a/src/group.h
+++ b/src/core/group.h
diff --git a/src/iconcache.c b/src/core/iconcache.c
index 939a089..88eca53 100644
--- a/src/iconcache.c
+++ b/src/core/iconcache.c
@@ -25,7 +25,6 @@
#include "iconcache.h"
#include "ui.h"
#include "errors.h"
-#include "theme.h"
#include <X11/Xatom.h>
@@ -818,6 +817,8 @@ meta_read_icons (MetaScreen *screen,
if (icon_cache->want_fallback &&
icon_cache->origin < USING_FALLBACK_ICON)
{
+#if 0
+ /* FIXME this code requires GTK and thus does not belong here in core/ */
MetaTheme *theme = meta_theme_get_current ();
if (theme->fallback_icon == NULL || theme->fallback_mini_icon == NULL)
@@ -840,6 +841,9 @@ meta_read_icons (MetaScreen *screen,
*iconp, *mini_iconp);
return TRUE;
+#else
+ return FALSE;
+#endif
}
if (!icon_cache->want_fallback &&
diff --git a/src/iconcache.h b/src/core/iconcache.h
index 7a2ad7f..7a2ad7f 100644
--- a/src/iconcache.h
+++ b/src/core/iconcache.h
diff --git a/src/keybindings.c b/src/core/keybindings.c
index 6b39ac1..6b39ac1 100644
--- a/src/keybindings.c
+++ b/src/core/keybindings.c
diff --git a/src/keybindings.h b/src/core/keybindings.h
index 0f5e4d5..0f5e4d5 100644
--- a/src/keybindings.h
+++ b/src/core/keybindings.h
diff --git a/src/main.c b/src/core/main.c
index 8319fba..8319fba 100644
--- a/src/main.c
+++ b/src/core/main.c
diff --git a/src/metacity-Xatomtype.h b/src/core/metacity-Xatomtype.h
index ff33cbe..ff33cbe 100644
--- a/src/metacity-Xatomtype.h
+++ b/src/core/metacity-Xatomtype.h
diff --git a/src/place.c b/src/core/place.c
index 20972a3..20972a3 100644
--- a/src/place.c
+++ b/src/core/place.c
diff --git a/src/place.h b/src/core/place.h
index 2948fe7..2948fe7 100644
--- a/src/place.h
+++ b/src/core/place.h
diff --git a/src/prefs.c b/src/core/prefs.c
index 46d05b9..46d05b9 100644
--- a/src/prefs.c
+++ b/src/core/prefs.c
diff --git a/src/screen.c b/src/core/screen.c
index 9d965ac..9d965ac 100644
--- a/src/screen.c
+++ b/src/core/screen.c
diff --git a/src/screen.h b/src/core/screen.h
index c4bc85a..c4bc85a 100644
--- a/src/screen.h
+++ b/src/core/screen.h
diff --git a/src/session.c b/src/core/session.c
index 51faed9..51faed9 100644
--- a/src/session.c
+++ b/src/core/session.c
diff --git a/src/session.h b/src/core/session.h
index cc88fd5..cc88fd5 100644
--- a/src/session.h
+++ b/src/core/session.h
diff --git a/src/spring-model.c b/src/core/spring-model.c
index 60e2ad8..60e2ad8 100644
--- a/src/spring-model.c
+++ b/src/core/spring-model.c
diff --git a/src/spring-model.h b/src/core/spring-model.h
index 83ee1da..83ee1da 100644
--- a/src/spring-model.h
+++ b/src/core/spring-model.h
diff --git a/src/stack.c b/src/core/stack.c
index de3402e..de3402e 100644
--- a/src/stack.c
+++ b/src/core/stack.c
diff --git a/src/stack.h b/src/core/stack.h
index 5760de2..5760de2 100644
--- a/src/stack.h
+++ b/src/core/stack.h
diff --git a/src/testasyncgetprop.c b/src/core/testasyncgetprop.c
index 267f16a..267f16a 100644
--- a/src/testasyncgetprop.c
+++ b/src/core/testasyncgetprop.c
diff --git a/src/testboxes.c b/src/core/testboxes.c
index 0da2975..0da2975 100644
--- a/src/testboxes.c
+++ b/src/core/testboxes.c
diff --git a/src/util.c b/src/core/util.c
index ca2452f..ca2452f 100644
--- a/src/util.c
+++ b/src/core/util.c
diff --git a/src/window-props.c b/src/core/window-props.c
index 48c5371..48c5371 100644
--- a/src/window-props.c
+++ b/src/core/window-props.c
diff --git a/src/window-props.h b/src/core/window-props.h
index de3aca9..de3aca9 100644
--- a/src/window-props.h
+++ b/src/core/window-props.h
diff --git a/src/window.c b/src/core/window.c
index bcedd84..bcedd84 100644
--- a/src/window.c
+++ b/src/core/window.c
diff --git a/src/window.h b/src/core/window.h
index 0d5c568..0d5c568 100644
--- a/src/window.h
+++ b/src/core/window.h
diff --git a/src/workspace.c b/src/core/workspace.c
index 41bb804..41bb804 100644
--- a/src/workspace.c
+++ b/src/core/workspace.c
diff --git a/src/workspace.h b/src/core/workspace.h
index 61aa8e7..61aa8e7 100644
--- a/src/workspace.h
+++ b/src/core/workspace.h
diff --git a/src/xprops.c b/src/core/xprops.c
index 7a42829..7a42829 100644
--- a/src/xprops.c
+++ b/src/core/xprops.c
diff --git a/src/xprops.h b/src/core/xprops.h
index e5cb97b..e5cb97b 100644
--- a/src/xprops.h
+++ b/src/core/xprops.h
diff --git a/src/boxes.h b/src/include/boxes.h
index 145dbb0..145dbb0 100644
--- a/src/boxes.h
+++ b/src/include/boxes.h
diff --git a/src/common.h b/src/include/common.h
index 8bdce9d..8bdce9d 100644
--- a/src/common.h
+++ b/src/include/common.h
diff --git a/src/core.h b/src/include/core.h
index c374429..c374429 100644
--- a/src/core.h
+++ b/src/include/core.h
diff --git a/src/main.h b/src/include/main.h
index 1eada67..1eada67 100644
--- a/src/main.h
+++ b/src/include/main.h
diff --git a/src/prefs.h b/src/include/prefs.h
index 4f2deef..4f2deef 100644
--- a/src/prefs.h
+++ b/src/include/prefs.h
diff --git a/src/resizepopup.h b/src/include/resizepopup.h
index a861ff3..a861ff3 100644
--- a/src/resizepopup.h
+++ b/src/include/resizepopup.h
diff --git a/src/tabpopup.h b/src/include/tabpopup.h
index c210a19..c210a19 100644
--- a/src/tabpopup.h
+++ b/src/include/tabpopup.h
diff --git a/src/ui.h b/src/include/ui.h
index a4d7fea..a4d7fea 100644
--- a/src/ui.h
+++ b/src/include/ui.h
diff --git a/src/util.h b/src/include/util.h
index 161ae93..161ae93 100644
--- a/src/util.h
+++ b/src/include/util.h
diff --git a/src/colors.c b/src/ui/colors.c
index 2110590..2110590 100644
--- a/src/colors.c
+++ b/src/ui/colors.c
diff --git a/src/colors.h b/src/ui/colors.h
index 1bf4735..1bf4735 100644
--- a/src/colors.h
+++ b/src/ui/colors.h
diff --git a/src/draw-workspace.c b/src/ui/draw-workspace.c
index f7c98b6..f7c98b6 100644
--- a/src/draw-workspace.c
+++ b/src/ui/draw-workspace.c
diff --git a/src/draw-workspace.h b/src/ui/draw-workspace.h
index de60550..de60550 100644
--- a/src/draw-workspace.h
+++ b/src/ui/draw-workspace.h
diff --git a/src/fixedtip.c b/src/ui/fixedtip.c
index a147022..a147022 100644
--- a/src/fixedtip.c
+++ b/src/ui/fixedtip.c
diff --git a/src/fixedtip.h b/src/ui/fixedtip.h
index 3b3e6ff..3b3e6ff 100644
--- a/src/fixedtip.h
+++ b/src/ui/fixedtip.h
diff --git a/src/frames.c b/src/ui/frames.c
index e762fea..ef7e009 100644
--- a/src/frames.c
+++ b/src/ui/frames.c
@@ -33,7 +33,6 @@
#include "fixedtip.h"
#include "theme.h"
#include "prefs.h"
-#include "errors.h"
#include "ui.h"
#ifdef HAVE_SHAPE
diff --git a/src/frames.h b/src/ui/frames.h
index c4ad8bf..c4ad8bf 100644
--- a/src/frames.h
+++ b/src/ui/frames.h
diff --git a/src/gradient.c b/src/ui/gradient.c
index 6790623..6790623 100644
--- a/src/gradient.c
+++ b/src/ui/gradient.c
diff --git a/src/gradient.h b/src/ui/gradient.h
index 58d6d40..58d6d40 100644
--- a/src/gradient.h
+++ b/src/ui/gradient.h
diff --git a/src/menu.c b/src/ui/menu.c
index 41f603d..41f603d 100644
--- a/src/menu.c
+++ b/src/ui/menu.c
diff --git a/src/menu.h b/src/ui/menu.h
index 39bb7fa..39bb7fa 100644
--- a/src/menu.h
+++ b/src/ui/menu.h
diff --git a/src/metaaccellabel.c b/src/ui/metaaccellabel.c
index cdc8636..cdc8636 100644
--- a/src/metaaccellabel.c
+++ b/src/ui/metaaccellabel.c
diff --git a/src/metaaccellabel.h b/src/ui/metaaccellabel.h
index 2282327..2282327 100644
--- a/src/metaaccellabel.h
+++ b/src/ui/metaaccellabel.h
diff --git a/src/metacity-dialog.c b/src/ui/metacity-dialog.c
index d47a9b3..d47a9b3 100644
--- a/src/metacity-dialog.c
+++ b/src/ui/metacity-dialog.c
diff --git a/src/preview-widget.c b/src/ui/preview-widget.c
index 08048e7..08048e7 100644
--- a/src/preview-widget.c
+++ b/src/ui/preview-widget.c
diff --git a/src/preview-widget.h b/src/ui/preview-widget.h
index bfa964b..bfa964b 100644
--- a/src/preview-widget.h
+++ b/src/ui/preview-widget.h
diff --git a/src/resizepopup.c b/src/ui/resizepopup.c
index f68e3c3..f68e3c3 100644
--- a/src/resizepopup.c
+++ b/src/ui/resizepopup.c
diff --git a/src/tabpopup.c b/src/ui/tabpopup.c
index 5a04e44..3d4e863 100644
--- a/src/tabpopup.c
+++ b/src/ui/tabpopup.c
@@ -28,9 +28,11 @@
#include "util.h"
#include "core.h"
#include "tabpopup.h"
-#include "workspace.h" /* FIXME should not be included in this file */
+/* FIXME these two includes are 100% broken ...
+ */
+#include "../core/workspace.h"
+#include "../core/frame.h"
#include "draw-workspace.h"
-#include "frame.h"
#include <gtk/gtk.h>
#include <math.h>
diff --git a/src/testgradient.c b/src/ui/testgradient.c
index 28de317..28de317 100644
--- a/src/testgradient.c
+++ b/src/ui/testgradient.c
diff --git a/src/theme-parser.c b/src/ui/theme-parser.c
index 2a98b81..2a98b81 100644
--- a/src/theme-parser.c
+++ b/src/ui/theme-parser.c
diff --git a/src/theme-parser.h b/src/ui/theme-parser.h
index 035d700..035d700 100644
--- a/src/theme-parser.h
+++ b/src/ui/theme-parser.h
diff --git a/src/theme-viewer.c b/src/ui/theme-viewer.c
index 4b97de6..4b97de6 100644
--- a/src/theme-viewer.c
+++ b/src/ui/theme-viewer.c
diff --git a/src/theme.c b/src/ui/theme.c
index 51f88d6..51f88d6 100644
--- a/src/theme.c
+++ b/src/ui/theme.c
diff --git a/src/theme.h b/src/ui/theme.h
index 58a16c4..58a16c4 100644
--- a/src/theme.h
+++ b/src/ui/theme.h
diff --git a/src/themewidget.c b/src/ui/themewidget.c
index 1cbcb8e..1cbcb8e 100644
--- a/src/themewidget.c
+++ b/src/ui/themewidget.c
diff --git a/src/themewidget.h b/src/ui/themewidget.h
index 5f044ce..5f044ce 100644
--- a/src/themewidget.h
+++ b/src/ui/themewidget.h
diff --git a/src/ui.c b/src/ui/ui.c
index 5d35feb..597d945 100644
--- a/src/ui.c
+++ b/src/ui/ui.c
@@ -30,7 +30,6 @@
#include "menu.h"
#include "core.h"
#include "theme.h"
-#include "iconcache.h"
#include "inlinepixbufs.h"