diff --git a/configure.ac b/configure.ac
index eb89c88d93be76c3452a8610dfae7c956c4487e4..aeb430a76069ea0b8881629bda997f5640f49b4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,12 +21,10 @@ AS_IF([test "x$enable_debug" = "xyes"],
       [CXXFLAGS="${CXXFLAGS} -g -Og -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -Wno-deprecated -pedantic-errors"],
       [CXXFLAGS="${CXXFLAGS} -O3 -Wno-deprecated -pedantic-errors -fvisibility=hidden"])
 
-save_CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS="${save_CPPFLAGS} -DOPENDHT_BUILD"
+CPPFLAGS="${CPPFLAGS} -DOPENDHT_BUILD"
 AM_CONDITIONAL([OPENDHT_SHARED], [test "x$enable_shared" != xno])
 AM_COND_IF(OPENDHT_SHARED, [
-    save_CPPFLAGS="${CPPFLAGS}"
-    CPPFLAGS="${save_CPPFLAGS} -Dopendht_EXPORTS"
+  CPPFLAGS="${CPPFLAGS} -Dopendht_EXPORTS"
 ])
 
 AM_PROG_AR
@@ -149,8 +147,7 @@ AS_IF([test "x$with_jsoncpp" != "xno"],
       [have_jsoncpp=no])
 AS_IF([test "x$have_jsoncpp" = "xyes"], [
     AC_MSG_NOTICE([Using JsonCpp])
-    save_CPPFLAGS="${CPPFLAGS}"
-    CPPFLAGS="${save_CPPFLAGS} -DOPENDHT_JSONCPP"
+    CPPFLAGS="${CPPFLAGS} -DOPENDHT_JSONCPP"
     AC_SUBST(jsoncpp_lib, [", jsoncpp"])
 ], [
     AC_MSG_NOTICE([Not using JsonCpp])
@@ -197,14 +194,8 @@ AM_COND_IF([ENABLE_TOOLS], [
 
 AM_COND_IF(ENABLE_PROXY_SERVER, AC_DEFINE([OPENDHT_PROXY_SERVER], [], [Building with proxy server]))
 AM_COND_IF(ENABLE_PROXY_CLIENT, AC_DEFINE([OPENDHT_PROXY_CLIENT], [], [Building with proxy client]))
-AM_COND_IF(ENABLE_PUSH_NOTIFICATIONS, [
-    save_CPPFLAGS="${CPPFLAGS}"
-    CPPFLAGS="${save_CPPFLAGS} -DOPENDHT_PUSH_NOTIFICATIONS"
-], [])
-AM_COND_IF(ENABLE_PROXY_SERVER_IDENTITY, [
-    save_CPPFLAGS="${CPPFLAGS}"
-    CPPFLAGS="${save_CPPFLAGS} -DOPENDHT_PROXY_SERVER_IDENTITY"
-], [])
+AM_COND_IF(ENABLE_PUSH_NOTIFICATIONS, [CPPFLAGS="${CPPFLAGS} -DOPENDHT_PUSH_NOTIFICATIONS"], [])
+AM_COND_IF(ENABLE_PROXY_SERVER_IDENTITY, [CPPFLAGS="${CPPFLAGS} -DOPENDHT_PROXY_SERVER_IDENTITY"], [])
 
 dnl Configure setup.py if we build the python module
 AC_SUBST(CURRENT_SOURCE_DIR, ".")