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

101 files changed, 143 insertions, 120 deletions

diff --git a/ChangeLog b/ChangeLog
index 7685d84d..27bb4826 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+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
+
 2007-12-19  Thomas Thurman  <thomas@thurman.org.uk>
 
         * configure.in: Post-release bump to 2.21.8.
diff --git a/autogen.sh b/autogen.sh
index eff8b964..b6b4cc76 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,7 +5,7 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="metacity"
-REQUIRED_AUTOMAKE_VERSION=1.7
+REQUIRED_AUTOMAKE_VERSION=1.10
 
 (test -f $srcdir/configure.in \
   && test -d $srcdir/src) || {
diff --git a/configure.in b/configure.in
index 576f7408..7c04379a 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ m4_define([metacity_version],
 AC_INIT([metacity], [metacity_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=metacity])
 
-AC_CONFIG_SRCDIR(src/display.c)
+AC_CONFIG_SRCDIR(src/core/display.c)
 AC_CONFIG_HEADERS(config.h)
 
 AM_INIT_AUTOMAKE
diff --git a/src/Makefile.am b/src/Makefile.am
index 0f1bb953..22217f82 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 fb5484c1..fb5484c1 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 e11ca131..e11ca131 100644
--- a/src/async-getprop.h
+++ b/src/core/async-getprop.h
diff --git a/src/bell.c b/src/core/bell.c
index 6e1f701d..6e1f701d 100644
--- a/src/bell.c
+++ b/src/core/bell.c
diff --git a/src/bell.h b/src/core/bell.h
index 7c1e3afc..7c1e3afc 100644
--- a/src/bell.h
+++ b/src/core/bell.h
diff --git a/src/boxes.c b/src/core/boxes.c
index c7bf8cdb..c7bf8cdb 100644
--- a/src/boxes.c
+++ b/src/core/boxes.c
diff --git a/src/c-screen.c b/src/core/c-screen.c
index e69de29b..e69de29b 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 e69de29b..e69de29b 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 e69de29b..e69de29b 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 e69de29b..e69de29b 100644
--- a/src/c-window.h
+++ b/src/core/c-window.h
diff --git a/src/compositor.c b/src/core/compositor.c
index 1ced8bca..1ced8bca 100644
--- a/src/compositor.c
+++ b/src/core/compositor.c
diff --git a/src/compositor.h b/src/core/compositor.h
index 0f65dc47..0f65dc47 100644
--- a/src/compositor.h
+++ b/src/core/compositor.h
diff --git a/src/constraints.c b/src/core/constraints.c
index 8cba3bfb..8cba3bfb 100644
--- a/src/constraints.c
+++ b/src/core/constraints.c
diff --git a/src/constraints.h b/src/core/constraints.h
index 8ce332e7..8ce332e7 100644
--- a/src/constraints.h
+++ b/src/core/constraints.h
diff --git a/src/core.c b/src/core/core.c
index 1454105e..1454105e 100644
--- a/src/core.c
+++ b/src/core/core.c
diff --git a/src/delete.c b/src/core/delete.c
index 9d5c8e42..9d5c8e42 100644
--- a/src/delete.c
+++ b/src/core/delete.c
diff --git a/src/display.c b/src/core/display.c
index b0df9823..b0df9823 100644
--- a/src/display.c
+++ b/src/core/display.c
diff --git a/src/display.h b/src/core/display.h
index ed889923..ed889923 100644
--- a/src/display.h
+++ b/src/core/display.h
diff --git a/src/edge-resistance.c b/src/core/edge-resistance.c
index d5c60112..d5c60112 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 6d0dbe0b..6d0dbe0b 100644
--- a/src/edge-resistance.h
+++ b/src/core/edge-resistance.h
diff --git a/src/effects.c b/src/core/effects.c
index 45032d9f..45032d9f 100644
--- a/src/effects.c
+++ b/src/core/effects.c
diff --git a/src/effects.h b/src/core/effects.h
index 5ae7bcb5..5ae7bcb5 100644
--- a/src/effects.h
+++ b/src/core/effects.h
diff --git a/src/errors.c b/src/core/errors.c
index 854ef46b..854ef46b 100644
--- a/src/errors.c
+++ b/src/core/errors.c
diff --git a/src/errors.h b/src/core/errors.h
index c18eaa72..c18eaa72 100644
--- a/src/errors.h
+++ b/src/core/errors.h
diff --git a/src/eventqueue.c b/src/core/eventqueue.c
index 4ce3e46a..4ce3e46a 100644
--- a/src/eventqueue.c
+++ b/src/core/eventqueue.c
diff --git a/src/eventqueue.h b/src/core/eventqueue.h
index cd115bdb..cd115bdb 100644
--- a/src/eventqueue.h
+++ b/src/core/eventqueue.h
diff --git a/src/frame.c b/src/core/frame.c
index f4f81892..f4f81892 100644
--- a/src/frame.c
+++ b/src/core/frame.c
diff --git a/src/frame.h b/src/core/frame.h
index 859e25af..859e25af 100644
--- a/src/frame.h
+++ b/src/core/frame.h
diff --git a/src/group-private.h b/src/core/group-private.h
index 25b05c77..25b05c77 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 9d5af05e..9d5af05e 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 ffde0901..ffde0901 100644
--- a/src/group-props.h
+++ b/src/core/group-props.h
diff --git a/src/group.c b/src/core/group.c
index 1e721a95..1e721a95 100644
--- a/src/group.c
+++ b/src/core/group.c
diff --git a/src/group.h b/src/core/group.h
index 84133827..84133827 100644
--- a/src/group.h
+++ b/src/core/group.h
diff --git a/src/iconcache.c b/src/core/iconcache.c
index 939a0895..88eca535 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 7a2ad7f3..7a2ad7f3 100644
--- a/src/iconcache.h
+++ b/src/core/iconcache.h
diff --git a/src/keybindings.c b/src/core/keybindings.c
index 6b39ac16..6b39ac16 100644
--- a/src/keybindings.c
+++ b/src/core/keybindings.c
diff --git a/src/keybindings.h b/src/core/keybindings.h
index 0f5e4d58..0f5e4d58 100644
--- a/src/keybindings.h
+++ b/src/core/keybindings.h
diff --git a/src/main.c b/src/core/main.c
index 8319fba7..8319fba7 100644
--- a/src/main.c
+++ b/src/core/main.c
diff --git a/src/metacity-Xatomtype.h b/src/core/metacity-Xatomtype.h
index ff33cbe0..ff33cbe0 100644
--- a/src/metacity-Xatomtype.h
+++ b/src/core/metacity-Xatomtype.h
diff --git a/src/place.c b/src/core/place.c
index 20972a33..20972a33 100644
--- a/src/place.c
+++ b/src/core/place.c
diff --git a/src/place.h b/src/core/place.h
index 2948fe7a..2948fe7a 100644
--- a/src/place.h
+++ b/src/core/place.h
diff --git a/src/prefs.c b/src/core/prefs.c
index 46d05b92..46d05b92 100644
--- a/src/prefs.c
+++ b/src/core/prefs.c
diff --git a/src/screen.c b/src/core/screen.c
index 9d965ac1..9d965ac1 100644
--- a/src/screen.c
+++ b/src/core/screen.c
diff --git a/src/screen.h b/src/core/screen.h
index c4bc85a0..c4bc85a0 100644
--- a/src/screen.h
+++ b/src/core/screen.h
diff --git a/src/session.c b/src/core/session.c
index 51faed97..51faed97 100644
--- a/src/session.c
+++ b/src/core/session.c
diff --git a/src/session.h b/src/core/session.h
index cc88fd50..cc88fd50 100644
--- a/src/session.h
+++ b/src/core/session.h
diff --git a/src/spring-model.c b/src/core/spring-model.c
index 60e2ad88..60e2ad88 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 83ee1dad..83ee1dad 100644
--- a/src/spring-model.h
+++ b/src/core/spring-model.h
diff --git a/src/stack.c b/src/core/stack.c
index de3402ea..de3402ea 100644
--- a/src/stack.c
+++ b/src/core/stack.c
diff --git a/src/stack.h b/src/core/stack.h
index 5760de24..5760de24 100644
--- a/src/stack.h
+++ b/src/core/stack.h
diff --git a/src/testasyncgetprop.c b/src/core/testasyncgetprop.c
index 267f16a5..267f16a5 100644
--- a/src/testasyncgetprop.c
+++ b/src/core/testasyncgetprop.c
diff --git a/src/testboxes.c b/src/core/testboxes.c
index 0da29750..0da29750 100644
--- a/src/testboxes.c
+++ b/src/core/testboxes.c
diff --git a/src/util.c b/src/core/util.c
index ca2452f3..ca2452f3 100644
--- a/src/util.c
+++ b/src/core/util.c
diff --git a/src/window-props.c b/src/core/window-props.c
index 48c5371d..48c5371d 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 de3aca94..de3aca94 100644
--- a/src/window-props.h
+++ b/src/core/window-props.h
diff --git a/src/window.c b/src/core/window.c
index bcedd84e..bcedd84e 100644
--- a/src/window.c
+++ b/src/core/window.c
diff --git a/src/window.h b/src/core/window.h
index 0d5c5683..0d5c5683 100644
--- a/src/window.h
+++ b/src/core/window.h
diff --git a/src/workspace.c b/src/core/workspace.c
index 41bb8048..41bb8048 100644
--- a/src/workspace.c
+++ b/src/core/workspace.c
diff --git a/src/workspace.h b/src/core/workspace.h
index 61aa8e71..61aa8e71 100644
--- a/src/workspace.h
+++ b/src/core/workspace.h
diff --git a/src/xprops.c b/src/core/xprops.c
index 7a428295..7a428295 100644
--- a/src/xprops.c
+++ b/src/core/xprops.c
diff --git a/src/xprops.h b/src/core/xprops.h
index e5cb97bb..e5cb97bb 100644
--- a/src/xprops.h
+++ b/src/core/xprops.h
diff --git a/src/boxes.h b/src/include/boxes.h
index 145dbb05..145dbb05 100644
--- a/src/boxes.h
+++ b/src/include/boxes.h
diff --git a/src/common.h b/src/include/common.h
index 8bdce9d3..8bdce9d3 100644
--- a/src/common.h
+++ b/src/include/common.h
diff --git a/src/core.h b/src/include/core.h
index c374429f..c374429f 100644
--- a/src/core.h
+++ b/src/include/core.h
diff --git a/src/main.h b/src/include/main.h
index 1eada677..1eada677 100644
--- a/src/main.h
+++ b/src/include/main.h
diff --git a/src/prefs.h b/src/include/prefs.h
index 4f2deef2..4f2deef2 100644
--- a/src/prefs.h
+++ b/src/include/prefs.h
diff --git a/src/resizepopup.h b/src/include/resizepopup.h
index a861ff38..a861ff38 100644
--- a/src/resizepopup.h
+++ b/src/include/resizepopup.h
diff --git a/src/tabpopup.h b/src/include/tabpopup.h
index c210a191..c210a191 100644
--- a/src/tabpopup.h
+++ b/src/include/tabpopup.h
diff --git a/src/ui.h b/src/include/ui.h
index a4d7fea7..a4d7fea7 100644
--- a/src/ui.h
+++ b/src/include/ui.h
diff --git a/src/util.h b/src/include/util.h
index 161ae938..161ae938 100644
--- a/src/util.h
+++ b/src/include/util.h
diff --git a/src/colors.c b/src/ui/colors.c
index 2110590a..2110590a 100644
--- a/src/colors.c
+++ b/src/ui/colors.c
diff --git a/src/colors.h b/src/ui/colors.h
index 1bf47355..1bf47355 100644
--- a/src/colors.h
+++ b/src/ui/colors.h
diff --git a/src/draw-workspace.c b/src/ui/draw-workspace.c
index f7c98b68..f7c98b68 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 de60550d..de60550d 100644
--- a/src/draw-workspace.h
+++ b/src/ui/draw-workspace.h
diff --git a/src/fixedtip.c b/src/ui/fixedtip.c
index a1470224..a1470224 100644
--- a/src/fixedtip.c
+++ b/src/ui/fixedtip.c
diff --git a/src/fixedtip.h b/src/ui/fixedtip.h
index 3b3e6fff..3b3e6fff 100644
--- a/src/fixedtip.h
+++ b/src/ui/fixedtip.h
diff --git a/src/frames.c b/src/ui/frames.c
index e762fea9..ef7e0099 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 c4ad8bfb..c4ad8bfb 100644
--- a/src/frames.h
+++ b/src/ui/frames.h
diff --git a/src/gradient.c b/src/ui/gradient.c
index 67906231..67906231 100644
--- a/src/gradient.c
+++ b/src/ui/gradient.c
diff --git a/src/gradient.h b/src/ui/gradient.h
index 58d6d40e..58d6d40e 100644
--- a/src/gradient.h
+++ b/src/ui/gradient.h
diff --git a/src/menu.c b/src/ui/menu.c
index 41f603dd..41f603dd 100644
--- a/src/menu.c
+++ b/src/ui/menu.c
diff --git a/src/menu.h b/src/ui/menu.h
index 39bb7fa3..39bb7fa3 100644
--- a/src/menu.h
+++ b/src/ui/menu.h
diff --git a/src/metaaccellabel.c b/src/ui/metaaccellabel.c
index cdc86369..cdc86369 100644
--- a/src/metaaccellabel.c
+++ b/src/ui/metaaccellabel.c
diff --git a/src/metaaccellabel.h b/src/ui/metaaccellabel.h
index 22823276..22823276 100644
--- a/src/metaaccellabel.h
+++ b/src/ui/metaaccellabel.h
diff --git a/src/metacity-dialog.c b/src/ui/metacity-dialog.c
index d47a9b3e..d47a9b3e 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 08048e7b..08048e7b 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 bfa964b3..bfa964b3 100644
--- a/src/preview-widget.h
+++ b/src/ui/preview-widget.h
diff --git a/src/resizepopup.c b/src/ui/resizepopup.c
index f68e3c31..f68e3c31 100644
--- a/src/resizepopup.c
+++ b/src/ui/resizepopup.c
diff --git a/src/tabpopup.c b/src/ui/tabpopup.c
index 5a04e449..3d4e863a 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 28de317d..28de317d 100644
--- a/src/testgradient.c
+++ b/src/ui/testgradient.c
diff --git a/src/theme-parser.c b/src/ui/theme-parser.c
index 2a98b814..2a98b814 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 035d7005..035d7005 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 4b97de66..4b97de66 100644
--- a/src/theme-viewer.c
+++ b/src/ui/theme-viewer.c
diff --git a/src/theme.c b/src/ui/theme.c
index 51f88d6e..51f88d6e 100644
--- a/src/theme.c
+++ b/src/ui/theme.c
diff --git a/src/theme.h b/src/ui/theme.h
index 58a16c42..58a16c42 100644
--- a/src/theme.h
+++ b/src/ui/theme.h
diff --git a/src/themewidget.c b/src/ui/themewidget.c
index 1cbcb8e2..1cbcb8e2 100644
--- a/src/themewidget.c
+++ b/src/ui/themewidget.c
diff --git a/src/themewidget.h b/src/ui/themewidget.h
index 5f044ce2..5f044ce2 100644
--- a/src/themewidget.h
+++ b/src/ui/themewidget.h
diff --git a/src/ui.c b/src/ui/ui.c
index 5d35febb..597d9459 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"