diff --git a/cmd/click/Makefile b/cmd/click/Makefile
index 05ded7de..7615121a 100644
--- a/cmd/click/Makefile
+++ b/cmd/click/Makefile
@@ -9,8 +9,8 @@ HFILES=	dat.h fns.h
 
 PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama
 
-LIB =	$(LIBIXP)
-LIBS += -lm -lXtst $(LIBS9)
+LIB =	$(LIBIXP) $(LIBS9)
+LIBS += -lm -lXtst
 CFLAGS += -DIXP_NEEDAPI=86
 OBJ =	main
 
diff --git a/cmd/menu/Makefile b/cmd/menu/Makefile
index 854f25cb..7350f04e 100644
--- a/cmd/menu/Makefile
+++ b/cmd/menu/Makefile
@@ -14,7 +14,8 @@ HFILES=	dat.h fns.h
 
 PACKAGES += $(X11PACKAGES)
 
-LIBS += -lm $(LIBS9) $(LIBIXP)
+LIB = $(LIBS9) $(LIBIXP)
+LIBS += -lm
 CFLAGS += -DIXP_NEEDAPI=86
 OBJ =	main	\
 	caret	\
diff --git a/cmd/strut/Makefile b/cmd/strut/Makefile
index 30b193ac..c5bfb2ec 100644
--- a/cmd/strut/Makefile
+++ b/cmd/strut/Makefile
@@ -9,7 +9,8 @@ HFILES=	dat.h fns.h
 
 PACKAGES += $(X11PACKAGES)
 
-LIBS += -lm $(LIBS9)
+LIB = $(LIBS9)
+LIBS += -lm
 CFLAGS += -DIXP_NEEDAPI=86
 OBJ =	main	\
 	ewmh	\
diff --git a/cmd/tray/Makefile b/cmd/tray/Makefile
index 3ecba941..c60624eb 100644
--- a/cmd/tray/Makefile
+++ b/cmd/tray/Makefile
@@ -9,7 +9,8 @@ HFILES=	dat.h fns.h
 
 PACKAGES += $(X11PACKAGES)
 
-LIBS += -lm $(LIBS9) $(LIBIXP)
+LIB = $(LIBS9) $(LIBIXP)
+LIBS += -lm
 OBJ = \
 	client	\
 	ewmh	\
diff --git a/cmd/tray/dat.h b/cmd/tray/dat.h
index 6579ad9e..e543ae2d 100644
--- a/cmd/tray/dat.h
+++ b/cmd/tray/dat.h
@@ -71,6 +71,7 @@ EXTERN struct {
 	Client*		clients;
 	Selection*	selection;
 	char*		tags;
+	Rectangle	r;
 	ulong		iconsize;
 	ulong		padding;
 	long		edge;
diff --git a/cmd/wmii/Makefile b/cmd/wmii/Makefile
index 05a494f5..c141ea00 100644
--- a/cmd/wmii/Makefile
+++ b/cmd/wmii/Makefile
@@ -9,8 +9,8 @@ HFILES=	dat.h fns.h
 
 PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama
 
-LIB =	$(LIBIXP)
-LIBS += -lm $(LIBS9)
+LIB = $(LIBIXP) $(LIBS9)
+LIBS += -lm
 
 CFLAGS += $(INCICONV) -DIXP_NEEDAPI=97
 OBJ =	area	\