diff --git a/src/http/message.c b/src/http/message.c
index 5786b76..2ee7db4 100644
--- a/src/http/message.c
+++ b/src/http/message.c
@@ -43,7 +43,7 @@ httpMessageCtor(void * _this, va_list * params)
 	HttpMessage this    = _this;
 	char *      version = va_arg(* params, char *);
 
-	this->version = calloc(1, strlen(version)+1);
+	this->version = memCalloc(1, strlen(version)+1);
 	strcpy(this->version, version);
 
 	this->header = new(Hash);
@@ -59,11 +59,11 @@ httpMessageDtor(void * _this)
 
 	delete(this->header);
 
-	FREE(this->version);
+	MEM_FREE(this->version);
 
 	switch (this->type) {
 		case HTTP_MESSAGE_BUFFERED:
-			FREE(this->body);
+			MEM_FREE(this->body);
 			break;
 
 		case HTTP_MESSAGE_PIPED:
diff --git a/src/http/parser/p_header.c b/src/http/parser/p_header.c
index 8fce76c..abc8c51 100644
--- a/src/http/parser/p_header.c
+++ b/src/http/parser/p_header.c
@@ -31,6 +31,8 @@
 #include "http/request.h"
 #include "hash.h"
 
+#include "utils/memory.h"
+
 void
 httpParserHeader(
 		HttpParser   this,
@@ -55,7 +57,7 @@ httpParserHeader(
 	if (0 == strncasecmp("content-length", name, nname-1)) {
 		current->nbody = strtoul(value, NULL, 10);
 		if (0 < this->current->nbody) {
-			current->body  = malloc(current->nbody);
+			current->body  = memMalloc(current->nbody);
 		}
 		current->dbody = 0;
 	}
diff --git a/src/http/response/404.c b/src/http/response/404.c
index 1947de1..cab83ad 100644
--- a/src/http/response/404.c
+++ b/src/http/response/404.c
@@ -57,7 +57,7 @@ httpResponse404()
 
 	message->type  = HTTP_MESSAGE_BUFFERED;
 	message->nbody = sizeof(RESP_DATA) - 1;
-	message->body  = malloc(sizeof(RESP_DATA));
+	message->body  = memMalloc(sizeof(RESP_DATA));
 	memcpy(message->body, RESP_DATA, sizeof(RESP_DATA));
 
 	return response;
diff --git a/src/http/response/login_form.c b/src/http/response/login_form.c
index f01063d..e136e28 100644
--- a/src/http/response/login_form.c
+++ b/src/http/response/login_form.c
@@ -55,7 +55,7 @@ httpResponseLoginForm()
 	message->type  = HTTP_MESSAGE_BUFFERED;
 
 	message->nbody = sizeof(RESP_DATA)-1;
-	message->body  = malloc(message->nbody);
+	message->body  = memMalloc(message->nbody);
 	memcpy(message->body, RESP_DATA, message->nbody);
 
 	return response;
diff --git a/src/http/response/randval.c b/src/http/response/randval.c
index b98449e..39fff37 100644
--- a/src/http/response/randval.c
+++ b/src/http/response/randval.c
@@ -59,7 +59,7 @@ httpResponseRandval(time_t ctime, int value)
 	nbuf = sprintf(buffer, RESP_DATA, ctime, remaining, value);
 
 	message->nbody = nbuf;
-	message->body  = malloc(nbuf);
+	message->body  = memMalloc(nbuf);
 	memcpy(message->body, buffer, nbuf);
 
 	return response;
diff --git a/src/http/response/session.c b/src/http/response/session.c
index 396b6a6..4d2941e 100644
--- a/src/http/response/session.c
+++ b/src/http/response/session.c
@@ -61,7 +61,7 @@ httpResponseSession(Session session)
 			(NULL != session)? session->username : "");
 
 	message->nbody = nbuf;
-	message->body  = malloc(nbuf);
+	message->body  = memMalloc(nbuf);
 	memcpy(message->body, buffer, nbuf);
 
 	return response;