diff --git a/lib/ipc_int.h b/lib/ipc_int.h
index ed36ca8..0676989 100644
--- a/lib/ipc_int.h
+++ b/lib/ipc_int.h
@@ -106,7 +106,7 @@ struct qb_ipcc_connection {
 	struct qb_ipc_one_way response;
 	struct qb_ipc_one_way event;
 	struct qb_ipcc_funcs funcs;
-	char *receive_buf;
+	struct qb_ipc_request_header *receive_buf;
 };
 
 int32_t qb_ipcc_us_setup_connect(struct qb_ipcc_connection *c,
@@ -175,7 +175,7 @@ struct qb_ipcs_connection {
 	struct qb_ipc_one_way event;
 	struct qb_ipcs_service *service;
 	struct qb_list_head list;
-	char *receive_buf;
+	struct qb_ipc_request_header *receive_buf;
 	void *context;
 	int32_t fc_enabled;
 	int32_t poll_events;
diff --git a/lib/ipcs.c b/lib/ipcs.c
index a086fbe..454b19f 100644
--- a/lib/ipcs.c
+++ b/lib/ipcs.c
@@ -482,7 +482,7 @@ static int32_t _process_request_(struct qb_ipcs_connection *c,
 		size = c->service->funcs.peek(&c->request, (void**)&hdr,
 					      ms_timeout);
 	} else {
-		hdr = (struct qb_ipc_request_header *)c->receive_buf;
+		hdr = c->receive_buf;
 		size = c->service->funcs.recv(&c->request, hdr, c->request.max_msg_size,
 					      ms_timeout);
 	}