diff --git a/audio/ksmp3play/Makefile b/audio/ksmp3play/Makefile
index 307de004bde..17f879e2167 100644
--- a/audio/ksmp3play/Makefile
+++ b/audio/ksmp3play/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2006/10/18 17:55:19 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.15 2006/10/19 00:35:03 pvalchev Exp $
 
 COMMENT=	"curses-based mp3 player"
 
@@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c curses iberty m pthread
+WANTLIB=		X11 Xext c curses iberty m pthread usbhid
 
 LIB_DEPENDS=	SDL::devel/sdl \
 		smpeg.>=1.3:smpeg-*:devel/smpeg
diff --git a/audio/tempest/Makefile b/audio/tempest/Makefile
index 285eed94cc0..8e9d9884394 100644
--- a/audio/tempest/Makefile
+++ b/audio/tempest/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2006/10/18 17:55:19 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.13 2006/10/19 00:35:03 pvalchev Exp $
 
 COMMENT=	"sends AM radio signals using a monitor"
 
@@ -13,7 +13,7 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-WANTLIB=		c m pthread stdc++
+WANTLIB=		X11 Xext c m pthread stdc++ usbhid
 
 MASTER_SITES=	${HOMEPAGE}
 
diff --git a/devel/gengameng/Makefile b/devel/gengameng/Makefile
index 0ae1c681ec1..d6ee2379927 100644
--- a/devel/gengameng/Makefile
+++ b/devel/gengameng/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2006/10/18 18:40:26 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.18 2006/10/19 00:35:04 pvalchev Exp $
 
 COMMENT=	"X11 game engine library"
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-WANTLIB=		X11 Xrandr Xrender Xext m usbhid iconv
+WANTLIB=		X11 Xext m usbhid
 
 MASTER_SITES=	http://www3.sympatico.ca/sarrazip/dev/
 
diff --git a/devel/gstreamer-plugins/Makefile b/devel/gstreamer-plugins/Makefile
index ac10d0dd3c9..8a698a6243a 100644
--- a/devel/gstreamer-plugins/Makefile
+++ b/devel/gstreamer-plugins/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2006/10/18 18:40:27 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.21 2006/10/19 00:35:04 pvalchev Exp $
 
 COMMENT=		"GStreamer Streaming-media framework plug-ins."
 
@@ -181,6 +181,7 @@ DEPENDS-ogg=		ogg::audio/libogg
 
 # sdlvideosink
 COMMENT-sdl=		"GStreamer plugin for using SDL to diplay video"
+WANTLIB-sdl=		Xext usbhid X11
 DEPENDS-sdl=		SDL::devel/sdl
 .if defined(PACKAGING) && ${SUBPACKAGE} == "-sdl"
 LIB_DEPENDS+= 		gstinterfaces-0.8.>=1.0::devel/gstreamer-plugins
diff --git a/devel/guilib/Makefile b/devel/guilib/Makefile
index 555f94e34a2..93a38c67fd1 100644
--- a/devel/guilib/Makefile
+++ b/devel/guilib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2006/10/18 18:40:27 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.17 2006/10/19 00:35:04 pvalchev Exp $
 
 COMMENT=	"SDL C++ GUI widget library"
 
@@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-WANTLIB=		X11 Xext Xrandr Xrender m usbhid iconv
+WANTLIB=		X11 Xext m usbhid
 
 LIB_DEPENDS=	SDL.::devel/sdl
 
diff --git a/devel/libuta/Makefile b/devel/libuta/Makefile
index 901a1eddffc..7227cfa8de9 100644
--- a/devel/libuta/Makefile
+++ b/devel/libuta/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2006/10/18 18:40:27 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.22 2006/10/19 00:35:04 pvalchev Exp $
 
 COMMENT=	"graphical user interface library for C++"
 
@@ -18,8 +18,8 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-WANTLIB=	SDL X11 Xext Xrender Xrandr m mikmod ogg pthread \
-		stdc++ usbhid vorbis vorbisfile iconv z
+WANTLIB=	SDL X11 Xext m mikmod ogg pthread stdc++ usbhid \
+		vorbis vorbisfile z
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libuta/}
 
diff --git a/devel/pygame/Makefile b/devel/pygame/Makefile
index 51b8d9c690d..ed99545f40c 100644
--- a/devel/pygame/Makefile
+++ b/devel/pygame/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2006/10/18 18:40:27 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.15 2006/10/19 00:35:04 pvalchev Exp $
 
 SHARED_ONLY=	Yes
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=               SDL smpeg
+WANTLIB=               SDL X11 Xext m smpeg usbhid
 
 MASTER_SITES=	${HOMEPAGE}ftp/
 
diff --git a/devel/sdl-image/Makefile b/devel/sdl-image/Makefile
index 0ec8180bbdc..98f90366a96 100644
--- a/devel/sdl-image/Makefile
+++ b/devel/sdl-image/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2006/10/18 18:07:19 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.22 2006/10/19 00:35:03 pvalchev Exp $
 
 COMMENT=	"SDL image library"
 DISTNAME=	SDL_image-1.2.4
@@ -24,7 +24,7 @@ LIB_DEPENDS=	SDL::devel/sdl \
 		tiff.>=35::graphics/tiff \
 		jpeg.>=62.::graphics/jpeg
 
-WANTLIB=	X11 Xext Xrandr Xrender iconv m usbhid z
+WANTLIB=	X11 Xext m usbhid z
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS+=--enable-tif \
diff --git a/devel/sdl-net/Makefile b/devel/sdl-net/Makefile
index 9a175da1a77..48ba7918d0d 100644
--- a/devel/sdl-net/Makefile
+++ b/devel/sdl-net/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2006/10/18 18:40:27 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.20 2006/10/19 00:35:04 pvalchev Exp $
 
 COMMENT=	"SDL cross-platform networking library"
 
@@ -17,7 +17,7 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-WANTLIB=		X11 Xext Xrandr Xrender usbhid m iconv
+WANTLIB=		X11 Xext usbhid m
 
 LIB_DEPENDS=	SDL::devel/sdl
 
diff --git a/devel/sdl-ttf/Makefile b/devel/sdl-ttf/Makefile
index 3ffb296ef40..6fc9d626621 100644
--- a/devel/sdl-ttf/Makefile
+++ b/devel/sdl-ttf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2006/10/18 18:40:27 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.24 2006/10/19 00:35:04 pvalchev Exp $
 
 COMMENT=	"SDL TrueType fonts library"
 
@@ -17,7 +17,7 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-WANTLIB=		X11 Xext Xrandr Xrender freetype usbhid m iconv
+WANTLIB=		X11 Xext freetype usbhid m
 
 LIB_DEPENDS=	SDL::devel/sdl