diff --git a/ctrtool/Makefile b/ctrtool/Makefile
index 165afc5..73bd205 100644
--- a/ctrtool/Makefile
+++ b/ctrtool/Makefile
@@ -5,7 +5,7 @@ OBJS = $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c))) $(foreach
 # Compiler Settings
 LIBS = -static-libgcc -static-libstdc++
 CXXFLAGS = -I. 
-CFLAGS = -O2 -flto -Wall -Wno-unused-variable -Wno-unused-but-set-variable -I.
+CFLAGS = -O2 -flto -Wall -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-result -I.
 OUTPUT = ctrtool
 CC = gcc
 CXX = g++
diff --git a/ctrtool/oschar.c b/ctrtool/oschar.c
index 1ef05dd..715eab3 100644
--- a/ctrtool/oschar.c
+++ b/ctrtool/oschar.c
@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #ifndef _WIN32
+#define LIBICONV_PLUG
 #include <iconv.h>
 #endif
 #include "oschar.h"
diff --git a/makerom/Makefile b/makerom/Makefile
index e68a81c..19d0505 100644
--- a/makerom/Makefile
+++ b/makerom/Makefile
@@ -5,7 +5,7 @@ OBJS = $(foreach dir,$(SRC_DIR),$(subst .c,.o,$(wildcard $(dir)/*.c)))
 # Compiler Settings
 LIBS = -static-libgcc
 CXXFLAGS = -I.
-CFLAGS = --std=c99 -O2 -flto -Wall -Wno-unused-but-set-variable -Wno-unused-value -I. $(MAKEROM_BUILD_FLAGS)
+CFLAGS = --std=c99 -O2 -flto -Wall -Wno-unused-but-set-variable -Wno-unused-value -Wno-unused-result -I. $(MAKEROM_BUILD_FLAGS)
 CC = gcc
 CXX = g++
 
diff --git a/makerom/oschar.c b/makerom/oschar.c
index 1ef05dd..f850ef3 100644
--- a/makerom/oschar.c
+++ b/makerom/oschar.c
@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #ifndef _WIN32
+#define LIBICONV_PLUG
 #include <iconv.h>
 #endif
 #include "oschar.h"
@@ -134,6 +135,7 @@ utf16char_t* strcopy_UTF8toUTF16(const char *src)
 
 	iconv_t cd = iconv_open("UTF-16LE", "UTF-8");
 	iconv(cd, &in, &in_bytes, &out, &out_bytes);
+	iconv_close(cd);
 	return dst;
 }
 
@@ -162,6 +164,7 @@ char* strcopy_UTF16toUTF8(const utf16char_t *src)
 
 	iconv_t cd = iconv_open("UTF-8", "UTF-16LE");
 	iconv(cd, &in, &in_bytes, &out, &out_bytes);
+	iconv_close(cd);
 	return dst;
 }
 #endif