Index: uspace/srv/drivers/isa/Makefile
===================================================================
--- uspace/srv/drivers/isa/Makefile	(revision cf8cc3692ffb17058d5881b6bfdde3a4a5d050fd)
+++ uspace/srv/drivers/isa/Makefile	(revision c47e1a8fb8e2a2556518fd57f186595422ca4484)
@@ -27,12 +27,10 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBC_PREFIX)/libc.a
-
-OUTPUT = isa
+LIBS = $(LIBDRV_PREFIX)/libdrv.a
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
+BINARY = isa
 
 SOURCES = \
 	isa.c
 
-include ../../Makefile.common
-
-EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/srv/drivers/isa/isa.c
===================================================================
--- uspace/srv/drivers/isa/isa.c	(revision cf8cc3692ffb17058d5881b6bfdde3a4a5d050fd)
+++ uspace/srv/drivers/isa/isa.c	(revision c47e1a8fb8e2a2556518fd57f186595422ca4484)
@@ -42,5 +42,5 @@
 #include <fibril_synch.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <ctype.h>
 #include <macros.h>
@@ -136,5 +136,5 @@
 	bool opened = false;
 	int fd;		
-	off_t len = 0;
+	size_t len = 0;
 	
 	fd = open(conf_path, O_RDONLY);
@@ -458,5 +458,5 @@
 }
 
-static char * parse_dev_conf(char *conf, device_t *parent)
+static void parse_dev_conf(char *conf, device_t *parent)
 {
 	while (NULL != conf && 0 != *conf) {
Index: uspace/srv/drivers/ns8250/Makefile
===================================================================
--- uspace/srv/drivers/ns8250/Makefile	(revision cf8cc3692ffb17058d5881b6bfdde3a4a5d050fd)
+++ uspace/srv/drivers/ns8250/Makefile	(revision c47e1a8fb8e2a2556518fd57f186595422ca4484)
@@ -27,12 +27,10 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBC_PREFIX)/libc.a
-
-OUTPUT = ns8250
+LIBS = $(LIBDRV_PREFIX)/libdrv.a
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
+BINARY = ns8250
 
 SOURCES = \
 	ns8250.c
 
-include ../../Makefile.common
-
-EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/srv/drivers/ns8250/ns8250.c
===================================================================
--- uspace/srv/drivers/ns8250/ns8250.c	(revision cf8cc3692ffb17058d5881b6bfdde3a4a5d050fd)
+++ uspace/srv/drivers/ns8250/ns8250.c	(revision c47e1a8fb8e2a2556518fd57f186595422ca4484)
@@ -42,5 +42,5 @@
 #include <fibril_synch.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <ctype.h>
 #include <macros.h>
Index: uspace/srv/drivers/pciintel/Makefile
===================================================================
--- uspace/srv/drivers/pciintel/Makefile	(revision cf8cc3692ffb17058d5881b6bfdde3a4a5d050fd)
+++ uspace/srv/drivers/pciintel/Makefile	(revision c47e1a8fb8e2a2556518fd57f186595422ca4484)
@@ -27,12 +27,10 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBC_PREFIX)/libc.a
-
-OUTPUT = pciintel
+LIBS = $(LIBDRV_PREFIX)/libdrv.a
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
+BINARY = pciintel
 
 SOURCES = \
 	pci.c
 
-include ../../Makefile.common
-
-EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/srv/drivers/pciintel/pci.c
===================================================================
--- uspace/srv/drivers/pciintel/pci.c	(revision cf8cc3692ffb17058d5881b6bfdde3a4a5d050fd)
+++ uspace/srv/drivers/pciintel/pci.c	(revision c47e1a8fb8e2a2556518fd57f186595422ca4484)
@@ -41,5 +41,5 @@
 #include <bool.h>
 #include <fibril_synch.h>
-#include <string.h>
+#include <str.h>
 #include <ctype.h>
 #include <macros.h>
@@ -221,7 +221,9 @@
 	pci_dev_data_t *dev_data = (pci_dev_data_t *)dev->driver_data;
 	match_id_t *match_id = NULL;	
+	char *match_id_str;	
 	match_id = create_match_id();
 	if (NULL != match_id) {
-		asprintf(&match_id->id, "pci/ven=%04x&dev=%04x", dev_data->vendor_id, dev_data->device_id);
+		asprintf(&match_id_str, "pci/ven=%04x&dev=%04x", dev_data->vendor_id, dev_data->device_id);
+		match_id->id = match_id_str;
 		match_id->score = 90;
 		add_match_id(&dev->match_ids, match_id);
Index: uspace/srv/drivers/root/Makefile
===================================================================
--- uspace/srv/drivers/root/Makefile	(revision cf8cc3692ffb17058d5881b6bfdde3a4a5d050fd)
+++ uspace/srv/drivers/root/Makefile	(revision c47e1a8fb8e2a2556518fd57f186595422ca4484)
@@ -27,12 +27,10 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBC_PREFIX)/libc.a
-
-OUTPUT = root
+LIBS = $(LIBDRV_PREFIX)/libdrv.a
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
+BINARY = root
 
 SOURCES = \
 	root.c
 
-include ../../Makefile.common
-
-EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/srv/drivers/root/root.c
===================================================================
--- uspace/srv/drivers/root/root.c	(revision cf8cc3692ffb17058d5881b6bfdde3a4a5d050fd)
+++ uspace/srv/drivers/root/root.c	(revision c47e1a8fb8e2a2556518fd57f186595422ca4484)
@@ -42,5 +42,5 @@
 #include <fibril_synch.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <ctype.h>
 #include <macros.h>
Index: uspace/srv/drivers/rootia32/Makefile
===================================================================
--- uspace/srv/drivers/rootia32/Makefile	(revision cf8cc3692ffb17058d5881b6bfdde3a4a5d050fd)
+++ uspace/srv/drivers/rootia32/Makefile	(revision c47e1a8fb8e2a2556518fd57f186595422ca4484)
@@ -27,12 +27,10 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBC_PREFIX)/libc.a
-
-OUTPUT = rootia32
+LIBS = $(LIBDRV_PREFIX)/libdrv.a
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
+BINARY = rootia32
 
 SOURCES = \
 	rootia32.c
 
-include ../../Makefile.common
-
-EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
+include $(USPACE_PREFIX)/Makefile.common
Index: uspace/srv/drivers/rootia32/rootia32.c
===================================================================
--- uspace/srv/drivers/rootia32/rootia32.c	(revision cf8cc3692ffb17058d5881b6bfdde3a4a5d050fd)
+++ uspace/srv/drivers/rootia32/rootia32.c	(revision c47e1a8fb8e2a2556518fd57f186595422ca4484)
@@ -42,5 +42,5 @@
 #include <fibril_synch.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <ctype.h>
 #include <macros.h>
@@ -60,5 +60,5 @@
 
 static int rootia32_add_device(device_t *dev);
-static bool rootia32_init();
+static void root_ia32_init(void);
 
 /** The root device driver's standard operations.