diff --git a/Makefile.am b/Makefile.am
index 08af711b1..55c3f93fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,7 +74,6 @@ libmpd_a_SOURCES = \
 	src/check.h \
 	src/Compiler.h \
 	src/open.h \
-	src/poison.h \
 	src/notify.cxx src/notify.hxx \
 	src/protocol/Ack.cxx src/protocol/Ack.hxx \
 	src/protocol/ArgParser.cxx src/protocol/ArgParser.hxx \
diff --git a/configure.ac b/configure.ac
index 7e43fe7fe..9e406764c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -252,7 +252,6 @@ AC_SEARCH_LIBS([exp], [m],,
 	[AC_MSG_ERROR([exp() not found])])
 
 AC_CHECK_HEADERS(locale.h)
-AC_CHECK_HEADERS(valgrind/memcheck.h)
 
 AC_CHECK_HEADERS([sys/prctl.h], AC_CHECK_FUNCS([prctl]))
 
diff --git a/src/filter/plugins/ConvertFilterPlugin.cxx b/src/filter/plugins/ConvertFilterPlugin.cxx
index 8800d4b00..4e512d73d 100644
--- a/src/filter/plugins/ConvertFilterPlugin.cxx
+++ b/src/filter/plugins/ConvertFilterPlugin.cxx
@@ -24,7 +24,6 @@
 #include "util/Manual.hxx"
 #include "util/ConstBuffer.hxx"
 #include "AudioFormat.hxx"
-#include "poison.h"
 
 #include <stdexcept>
 #include <memory>
diff --git a/src/poison.h b/src/poison.h
deleted file mode 100644
index c4ef68373..000000000
--- a/src/poison.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2003-2017 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPD_POISON_H
-#define MPD_POISON_H
-
-#include "check.h"
-
-#ifndef NDEBUG
-
-#ifdef HAVE_VALGRIND_MEMCHECK_H
-#include <valgrind/memcheck.h>
-#endif
-
-#include <string.h>
-#endif
-
-/**
- * Poisons the specified memory area and marks it as "not accessible".
- *
- * @param p pointer to the memory area
- * @param length number of bytes to poison
- */
-static inline void
-poison_noaccess(void *p, size_t length)
-{
-#ifdef NDEBUG
-	(void)p;
-	(void)length;
-#else
-	memset(p, 0x01, length);
-
-#ifdef HAVE_VALGRIND_MEMCHECK_H
-	(void)VALGRIND_MAKE_MEM_NOACCESS(p, length);
-#endif
-#endif
-}
-
-/**
- * Poisons the specified memory area and marks it as "not defined".
- *
- * @param p pointer to the memory area
- * @param length number of bytes to poison
- */
-static inline void
-poison_undefined(void *p, size_t length)
-{
-#ifdef NDEBUG
-	(void)p;
-	(void)length;
-#else
-	memset(p, 0x02, length);
-
-#ifdef HAVE_VALGRIND_MEMCHECK_H
-	(void)VALGRIND_MAKE_MEM_UNDEFINED(p, length);
-#endif
-#endif
-}
-
-
-#endif