diff --git a/src/Makefile b/src/Makefile
index 5f681e3a..207c2b27 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -233,6 +233,7 @@ CXX = icc
 CCARCH += -march=i386 -mcpu=i686
 CFLAGS_OUTPUT = -o $@
 LINK_EXE_OUTPUT = -o $@
+LDLIBS += -lz
 
 DEFS += '-DUPX_CONFIG_H="config_h/linux.h"'
 CFLAGS  = $(CFLAGS_WERROR)
diff --git a/src/stdcxx.h b/src/stdcxx.h
index 6c5ed40a..9e9d15f4 100644
--- a/src/stdcxx.h
+++ b/src/stdcxx.h
@@ -51,8 +51,6 @@
 #  if 1
 #    define DISABLE_NEW_DELETE_PLACEMENT_NEW \
         static void *operator new(size_t, void *);
-#  else
-#    define DISABLE_NEW_DELETE_PLACEMENT_NEW
 #  endif
 #  if defined(__GNUC__) && (__GNUC__ >= 3)
 #    define DISABLE_NEW_DELETE_PLACEMENT_DELETE \
@@ -63,7 +61,13 @@
 #  elif defined(_MSC_VER) && (_MSC_VER >= 1200)
 #    define DISABLE_NEW_DELETE_PLACEMENT_DELETE \
         static void operator delete(void *, void *) NOTHROW { }
-#  else
+#  endif
+
+#  if !defined(DISABLE_NEW_DELETE_PLACEMENT_NEW)
+#    define DISABLE_NEW_DELETE_PLACEMENT_NEW
+#    undef DISABLE_NEW_DELETE_PLACEMENT_DELETE
+#  endif
+#  if !defined(DISABLE_NEW_DELETE_PLACEMENT_DELETE)
 #    define DISABLE_NEW_DELETE_PLACEMENT_DELETE
 #  endif