configure.in           |    2 +-
 include/libircclient.h |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 7bb5def..26d9207 100644
--- a/configure.in
+++ b/configure.in
@@ -63,7 +63,7 @@ AC_CHECK_LIB(socket, socket, AC_DEFINE(HAVE_SOCKET) LIBS="$LIBS -lsocket")
 if test "$use_debug" = "yes"; then
 	CFLAGS="${CFLAGS} -g -DENABLE_DEBUG"
 else
-	CFLAGS="${CFLAGS} -O3"
+	CFLAGS="${CFLAGS:--O3}"
 fi
 
 # Choosing the target
diff --git a/include/libircclient.h b/include/libircclient.h
index 2dcd44c..250a0d1 100644
--- a/include/libircclient.h
+++ b/include/libircclient.h
@@ -44,6 +44,8 @@
 #ifndef INCLUDE_LIBIRC_H
 #define INCLUDE_LIBIRC_H
 
+#include <stdlib.h>
+
 #if !defined (WIN32)
 	#include <sys/select.h>	/* fd_set */
 #else