diff --git a/src/avrdude.h b/src/avrdude.h
index c679a654..6b777d30 100644
--- a/src/avrdude.h
+++ b/src/avrdude.h
@@ -44,6 +44,7 @@ extern const char *pgmid;    // Programmer -c string
 #define mmt_strdup(s) cfg_strdup(__func__, s)
 #define mmt_malloc(n) cfg_malloc(__func__, n)
 #define mmt_realloc(p, n) cfg_realloc(__func__, p, n)
+#define mmt_free(p) free(p)
 
 int avrdude_message2(FILE *fp, int lno, const char *file, const char *func, int msgmode, int msglvl, const char *format, ...);
 
diff --git a/src/buspirate.c b/src/buspirate.c
index e2f2b9ad..e81499b7 100644
--- a/src/buspirate.c
+++ b/src/buspirate.c
@@ -1115,16 +1115,13 @@ static int buspirate_chip_erase(const PROGRAMMER *pgm, const AVRPART *p) {
 }
 
 /* Interface - management */
-static void buspirate_setup(PROGRAMMER *pgm)
-{
-	/* Allocate private data */
+static void buspirate_setup(PROGRAMMER *pgm) {
 	pgm->cookie = mmt_malloc(sizeof(struct pdata));
 	PDATA(pgm)->serial_recv_timeout = 100;
 }
 
-static void buspirate_teardown(PROGRAMMER *pgm)
-{
-	free(pgm->cookie);
+static void buspirate_teardown(PROGRAMMER *pgm) {
+	mmt_free(pgm->cookie);
 }
 
 const char buspirate_desc[] = "Using the Bus Pirate's SPI interface for programming";