Index: uspace/srv/hid/isdv4_tablet/isdv4.c
===================================================================
--- uspace/srv/hid/isdv4_tablet/isdv4.c	(revision 57914494f0017d0618e3eaa16f2ae9c2fd1baefd)
+++ uspace/srv/hid/isdv4_tablet/isdv4.c	(revision c4c60250a236ed30397cd89ce5cea5eaf59cfba5)
@@ -29,4 +29,6 @@
 #include <char_dev_iface.h>
 #include <errno.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <mem.h>
Index: uspace/srv/hid/isdv4_tablet/isdv4.h
===================================================================
--- uspace/srv/hid/isdv4_tablet/isdv4.h	(revision 57914494f0017d0618e3eaa16f2ae9c2fd1baefd)
+++ uspace/srv/hid/isdv4_tablet/isdv4.h	(revision c4c60250a236ed30397cd89ce5cea5eaf59cfba5)
@@ -27,6 +27,8 @@
  */
 
-#ifndef __ISDV4_H__
-#define __ISDV4_H__
+#ifndef ISDV4_H_
+#define ISDV4_H_
+
+#include <async.h>
 
 typedef struct isdv4_event isdv4_event_t;
Index: uspace/srv/hid/isdv4_tablet/main.c
===================================================================
--- uspace/srv/hid/isdv4_tablet/main.c	(revision 57914494f0017d0618e3eaa16f2ae9c2fd1baefd)
+++ uspace/srv/hid/isdv4_tablet/main.c	(revision c4c60250a236ed30397cd89ce5cea5eaf59cfba5)
@@ -27,13 +27,12 @@
  */
 
-#include <char_dev_iface.h>
+#include <async.h>
 #include <errno.h>
-#include <ipc/serial_ctl.h>
+#include <fibril_synch.h>
+#include <io/serial.h>
+#include <ipc/mouseev.h>
 #include <loc.h>
+#include <stddef.h>
 #include <stdio.h>
-#include <fibril_synch.h>
-#include <abi/ipc/methods.h>
-#include <ipc/mouseev.h>
-#include <inttypes.h>
 #include <task.h>
 
@@ -179,4 +178,5 @@
 	sysarg_t baud = 38400;
 	service_id_t svc_id;
+	serial_t *serial;
 	char *serial_port_name = NULL;
 
@@ -268,11 +268,14 @@
 	if (!sess) {
 		fprintf(stderr, "Failed connecting to service\n");
-	}
-
-	async_exch_t *exch = async_exchange_begin(sess);
-	rc = async_req_4_0(exch, SERIAL_SET_COM_PROPS, baud,
-	    SERIAL_NO_PARITY, 8, 1);
-	async_exchange_end(exch);
-
+		return 2;
+	}
+
+	rc = serial_open(sess, &serial);
+	if (rc != EOK) {
+		fprintf(stderr, "Failed opening serial port\n");
+		return 2;
+	}
+
+	rc = serial_set_comm_props(serial, baud, SERIAL_NO_PARITY, 8, 1);
 	if (rc != EOK) {
 		fprintf(stderr, "Failed setting serial properties\n");