diff --git a/archivers/innoextract/Makefile b/archivers/innoextract/Makefile
index 8ae2548c285..320d62c7286 100644
--- a/archivers/innoextract/Makefile
+++ b/archivers/innoextract/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2016/04/28 10:43:19 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.4 2016/09/12 22:44:08 naddy Exp $
 
 COMMENT=	unpack Inno Setup installers
 
@@ -15,14 +15,15 @@ MAINTAINER=	Donovan Watteau <tsoomi@gmail.com>
 PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	boost_filesystem-mt boost_iostreams-mt boost_program_options-mt
-WANTLIB+=	boost_system-mt c lzma m pthread stdc++
+WANTLIB+=	boost_system-mt c iconv lzma m pthread stdc++
 
 LIB_DEPENDS=	archivers/xz \
+		converters/libiconv \
 		devel/boost>=1.53.0p6
 
 RUN_DEPENDS=	archivers/unrar
 
-MODULES=	converters/libiconv devel/cmake
+MODULES=	devel/cmake
 
 SEPARATE_BUILD=	Yes
 
diff --git a/converters/wv2/Makefile b/converters/wv2/Makefile
index 9b9362da4c8..0556f33eb19 100644
--- a/converters/wv2/Makefile
+++ b/converters/wv2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2015/03/16 18:07:38 naddy Exp $
+# $OpenBSD: Makefile,v 1.33 2016/09/12 22:44:08 naddy Exp $
 
 COMMENT=	library functions to access Microsoft Word/Excel files
 
@@ -14,12 +14,12 @@ HOMEPAGE=	http://wvware.sourceforge.net/
 # LGPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += glib-2.0 gsf-1 m stdc++ z
+WANTLIB += glib-2.0 gsf-1 iconv m stdc++ z
 
-MODULES=	converters/libiconv \
-		devel/cmake
+MODULES=	devel/cmake
 
-LIB_DEPENDS+=	devel/glib2 \
+LIB_DEPENDS+=	converters/libiconv \
+		devel/glib2 \
 		devel/libgsf
 
 CONFIGURE_ARGS +=-DLIBwv2_VERSION=${LIBwv2_VERSION}
diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile
index c46746d3635..686b91525fe 100644
--- a/editors/nvi/Makefile
+++ b/editors/nvi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2016/09/10 13:03:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2016/09/12 22:44:08 naddy Exp $
 
 COMMENT=	ex/vi text editor with wide character support
 
@@ -29,7 +29,8 @@ FLAVORS=	iconv
 FLAVOR?=
 
 .if ${FLAVOR:Miconv}
-MODULES+=	converters/libiconv
+LIB_DEPENDS+=	converters/libiconv
+WANTLIB+=	iconv
 .else
 CONFIGURE_ARGS=	-DUSE_ICONV:Bool=False
 .endif
diff --git a/games/easyrpg/Makefile b/games/easyrpg/Makefile
index 5c173d386b6..1309b4fd38b 100644
--- a/games/easyrpg/Makefile
+++ b/games/easyrpg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2015/08/25 13:18:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2016/09/12 22:44:08 naddy Exp $
 
 V =		0.1.2
 COMMENT =	free interpreter for RPG Maker 2000/2003 and EasyRPG games
@@ -13,14 +13,13 @@ HOMEPAGE =	https://easy-rpg.org/
 # GPLv3+
 PERMIT_PACKAGE_CDROM =		Yes
 
-WANTLIB += FLAC SDL SDL_mixer c expat freetype jpeg m ogg openal
+WANTLIB += FLAC SDL SDL_mixer c expat freetype iconv jpeg m ogg openal
 WANTLIB += pixman-1 png pthread sndfile stdc++ vorbis vorbisenc z
 
 MASTER_SITES0 =	https://github.com/EasyRPG/Player/archive/
 MASTER_SITES1 =	http://mirrors.nycbug.org/pub/distfiles/
 
-MODULES +=	converters/libiconv \
-		devel/cmake \
+MODULES +=	devel/cmake \
 		lang/python \
 		lang/ruby
 
@@ -32,6 +31,7 @@ BUILD_DEPENDS =	devel/boost \
 
 LIB_DEPENDS =	audio/libsndfile \
 		audio/openal \
+		converters/libiconv \
 		devel/sdl-mixer \
 		graphics/jpeg \
 		graphics/png
diff --git a/games/instead/Makefile b/games/instead/Makefile
index 5fb5211b01b..ebd94fb0c6e 100644
--- a/games/instead/Makefile
+++ b/games/instead/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2015/10/24 16:52:03 zhuk Exp $
+# $OpenBSD: Makefile,v 1.4 2016/09/12 22:44:08 naddy Exp $
 
 COMMENT =		simple text adventure interpreter
 V =			2.3.0
@@ -13,16 +13,17 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += SDL SDL_image SDL_mixer SDL_ttf atk-1.0 c cairo gdk-x11-2.0
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
+WANTLIB += gthread-2.0 gtk-x11-2.0 iconv m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pangoxft-1.0 pthread z
 WANTLIB += ${MODLUA_WANTLIB}
 
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=instead/} \
 			http://ifhub.ru/instead/${V}/
 
-MODULES	=		devel/cmake converters/libiconv lang/lua
+MODULES	=		devel/cmake lang/lua
 RUN_DEPENDS =		devel/desktop-file-utils
-LIB_DEPENDS =		devel/sdl-mixer \
+LIB_DEPENDS =		converters/libiconv \
+			devel/sdl-mixer \
 			devel/sdl-ttf \
 			devel/sdl-image \
 			x11/gtk+2
diff --git a/graphics/zxing/Makefile b/graphics/zxing/Makefile
index 2e900e56170..ccfa91a888d 100644
--- a/graphics/zxing/Makefile
+++ b/graphics/zxing/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2016/05/20 19:06:57 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2016/09/12 22:44:09 naddy Exp $
 
 COMMENT =	barcode image processing library
 
@@ -13,9 +13,10 @@ CATEGORIES =	graphics
 # Apache 2.0
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += c m stdc++
+WANTLIB += c iconv m stdc++
 
-MODULES =	converters/libiconv devel/cmake
+MODULES =	devel/cmake
+LIB_DEPENDS =	converters/libiconv
 BUILD_DEPENDS =	devel/cppunit
 
 do-test: