Index: uspace/app/wavplay/dplay.c
===================================================================
--- uspace/app/wavplay/dplay.c	(revision 66be0288c575096c5899a384ac8cd7949709bb0e)
+++ uspace/app/wavplay/dplay.c	(revision 89dcf93c3256fc08164f222f79051a1acaed5a2b)
@@ -41,5 +41,5 @@
 #include <fibril_synch.h>
 #include <pcm/format.h>
-#include <sys/mman.h>
+#include <as.h>
 #include <sys/time.h>
 #include <inttypes.h>
@@ -397,5 +397,5 @@
 cleanup:
 	fclose(pb.source);
-	munmap(pb.buffer.base, pb.buffer.size);
+	as_area_destroy(pb.buffer.base);
 	audio_pcm_release_buffer(pb.device);
 close_session:
Index: uspace/app/wavplay/drec.c
===================================================================
--- uspace/app/wavplay/drec.c	(revision 66be0288c575096c5899a384ac8cd7949709bb0e)
+++ uspace/app/wavplay/drec.c	(revision 89dcf93c3256fc08164f222f79051a1acaed5a2b)
@@ -40,5 +40,5 @@
 #include <pcm/format.h>
 #include <stdio.h>
-#include <sys/mman.h>
+#include <as.h>
 #include <inttypes.h>
 
@@ -229,5 +229,5 @@
 cleanup:
 	fclose(rec.file);
-	munmap(rec.buffer.base, rec.buffer.size);
+	as_area_destroy(rec.buffer.base);
 	audio_pcm_release_buffer(rec.device);
 close_session: