diff --git a/.travis.yml b/.travis.yml
index c0e7c022..291271c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,25 +12,25 @@ compiler:
 
 install:
  - ./autogen.sh
- - env CC=tcc CFLAGS='-w' ./configure --prefix=/tmp --disable-dependency-tracking --disable-shared || cat config.log
+ - env CC=tcc CFLAGS='-w' CPPFLAGS="-DDEV_MODE=1" ./configure --prefix=/tmp --disable-dependency-tracking --disable-shared || cat config.log
  - make -j $(nproc) && make check && make install
  - env CC=tcc CPPFLAGS='-I/tmp/include' LDFLAGS='-L/tmp/lib' LD_LIBRARY_PATH='/tmp/lib' ./test/constcheck.sh
  - make uninstall
  - make distclean
 
 script:
- - ./configure --disable-dependency-tracking
+ - env CPPFLAGS="-DDEV_MODE=1" ./configure --disable-dependency-tracking
  - if [ "$TRAVIS_OS_NAME" = 'linux' -a "$CC" = 'gcc' ]; then make -j $(nproc) CFLAGS='-g0' > /dev/null && cp src/libsodium/.libs/libsodium.so lib.so && make clean > /dev/null && make CFLAGS='-g0' CPPFLAGS='-DSODIUM_C99\(X\)=' > /dev/null && cp src/libsodium/.libs/libsodium.so lib-oldc.so && cmp lib.so lib-oldc.so && echo No binary changes && make clean > /dev/null ; fi
  - make distcheck
  - make distclean > /dev/null
- - ./configure --disable-dependency-tracking --enable-minimal
+ - CPPFLAGS="-DDEV_MODE=1" ./configure --disable-dependency-tracking --enable-minimal
  - make -j $(nproc)
  - make check
  - ( echo '#include <sodium.h>' ; echo 'int main(void) { return sodium_init(); }' ) > /tmp/main.c && gcc -Isrc/libsodium/include -Isrc/libsodium/include/sodium $(find src -name '*.c' -o -name '*.S') /tmp/main.c
  - make distclean > /dev/null
 
 after_success:
- - ./configure --disable-dependency-tracking --host=powerpc-linux-gnu
+ - CPPFLAGS="-DDEV_MODE=1" ./configure --disable-dependency-tracking --host=powerpc-linux-gnu
  - make -j $(nproc)
  - env QEMU_LD_PREFIX=/usr/powerpc-linux-gnu make check
  - make clean > /dev/null
diff --git a/src/libsodium/include/sodium/private/common.h b/src/libsodium/include/sodium/private/common.h
index f87d682e..dd95f0fa 100644
--- a/src/libsodium/include/sodium/private/common.h
+++ b/src/libsodium/include/sodium/private/common.h
@@ -1,7 +1,7 @@
 #ifndef common_H
 #define common_H 1
 
-#if !defined(_MSC_VER) && 1
+#if !defined(_MSC_VER) && !defined(DEV_MODE) && 1
 # warning *** This is unstable, untested, development code.
 # warning It might not compile. It might not work as expected.
 # warning It might be totally insecure.