Index: uspace/drv/audio/hdaudio/spec/regs.h
===================================================================
--- uspace/drv/audio/hdaudio/spec/regs.h	(revision 5a6cc679876514e29ac7899053554db66db754d9)
+++ uspace/drv/audio/hdaudio/spec/regs.h	(revision 55958412df6b000da41325bf219018aabc44bde9)
@@ -64,5 +64,5 @@
 	/** Buffer Descriptor List Pointer - Lower */
 	uint32_t bdpl;
-	/** Buffer Descriptor List Pointer - Upper */ 
+	/** Buffer Descriptor List Pointer - Upper */
 	uint32_t bdpu;
 } hda_sdesc_regs_t;
Index: uspace/drv/audio/sb16/dsp.h
===================================================================
--- uspace/drv/audio/sb16/dsp.h	(revision 5a6cc679876514e29ac7899053554db66db754d9)
+++ uspace/drv/audio/sb16/dsp.h	(revision 55958412df6b000da41325bf219018aabc44bde9)
@@ -82,8 +82,8 @@
 errno_t sb_dsp_get_buffer_position(sb_dsp_t *dsp, size_t *size);
 errno_t sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate,
-  pcm_sample_format_t *format);
+    pcm_sample_format_t *format);
 errno_t sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size);
 errno_t sb_dsp_set_event_session(sb_dsp_t *dsp, async_sess_t *session);
-async_sess_t * sb_dsp_get_event_session(sb_dsp_t *dsp);
+async_sess_t *sb_dsp_get_event_session(sb_dsp_t *dsp);
 errno_t sb_dsp_release_buffer(sb_dsp_t *dsp);
 errno_t sb_dsp_start_playback(sb_dsp_t *dsp, unsigned frames,
Index: uspace/drv/audio/sb16/mixer.h
===================================================================
--- uspace/drv/audio/sb16/mixer.h	(revision 5a6cc679876514e29ac7899053554db66db754d9)
+++ uspace/drv/audio/sb16/mixer.h	(revision 55958412df6b000da41325bf219018aabc44bde9)
@@ -50,5 +50,5 @@
 } sb_mixer_t;
 
-const char * sb_mixer_type_str(sb_mixer_type_t type);
+const char *sb_mixer_type_str(sb_mixer_type_t type);
 errno_t sb_mixer_init(sb_mixer_t *mixer, sb16_regs_t *regs, sb_mixer_type_t type);
 int sb_mixer_get_control_item_count(const sb_mixer_t *mixer);
Index: uspace/drv/bus/isa/isa.c
===================================================================
--- uspace/drv/bus/isa/isa.c	(revision 5a6cc679876514e29ac7899053554db66db754d9)
+++ uspace/drv/bus/isa/isa.c	(revision 55958412df6b000da41325bf219018aabc44bde9)
@@ -279,5 +279,5 @@
 	errno_t rc;
 	size_t nread;
-	struct stat st;
+	vfs_stat_t st;
 
 	rc = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ, &fd);
Index: uspace/drv/bus/usb/vhc/hub/virthub.c
===================================================================
--- uspace/drv/bus/usb/vhc/hub/virthub.c	(revision 5a6cc679876514e29ac7899053554db66db754d9)
+++ uspace/drv/bus/usb/vhc/hub/virthub.c	(revision 55958412df6b000da41325bf219018aabc44bde9)
@@ -42,4 +42,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 #include <ddf/driver.h>
 
@@ -155,14 +156,16 @@
 	dev->descriptors = &descriptors;
 	dev->address = 0;
-	dev->name = str_dup(name);
-	if (!dev->name)
+
+	char *n = str_dup(name);
+	if (!n)
 		return ENOMEM;
 
 	hub_t *hub = malloc(sizeof(hub_t));
 	if (hub == NULL) {
-		free(dev->name);
+		free(n);
 		return ENOMEM;
 	}
 
+	dev->name = n;
 	hub_init(hub);
 	dev->device_data = hub;
Index: uspace/drv/hid/atkbd/atkbd.h
===================================================================
--- uspace/drv/hid/atkbd/atkbd.h	(revision 5a6cc679876514e29ac7899053554db66db754d9)
+++ uspace/drv/hid/atkbd/atkbd.h	(revision 55958412df6b000da41325bf219018aabc44bde9)
@@ -49,5 +49,5 @@
 	chardev_t *chardev;
 	/** Callback connection to client */
-	async_sess_t *client_sess; 
+	async_sess_t *client_sess;
 	/** Fibril retrieving and parsing data */
 	fid_t polling_fibril;
Index: uspace/drv/platform/amdm37x/main.c
===================================================================
--- uspace/drv/platform/amdm37x/main.c	(revision 5a6cc679876514e29ac7899053554db66db754d9)
+++ uspace/drv/platform/amdm37x/main.c	(revision 55958412df6b000da41325bf219018aabc44bde9)
@@ -49,5 +49,6 @@
 typedef struct {
 	const char *name;
-	match_id_t match_id;
+	const char *id;
+	int score;
 	hw_resource_list_t hw_resources;
 } amdm37x_fun_t;
@@ -133,15 +134,18 @@
 {
 	.name = "ohci",
-	.match_id = { .id = "usb/host=ohci", .score = 90 },
+	.id = "usb/host=ohci",
+	.score = 90,
 	.hw_resources = { .resources = ohci_res, .count = ARRAY_SIZE(ohci_res) }
 },
 {
 	.name = "ehci",
-	.match_id = { .id = "usb/host=ehci", .score = 90 },
+	.id = "usb/host=ehci",
+	.score = 90,
 	.hw_resources = { .resources = ehci_res, .count = ARRAY_SIZE(ehci_res) }
 },
 {
 	.name = "fb",
-	.match_id = { .id = "amdm37x&dispc", .score = 90 },
+	.id = "amdm37x&dispc",
+	.score = 90,
 	.hw_resources = { .resources = disp_res, .count = ARRAY_SIZE(disp_res) }
 },
@@ -174,6 +178,5 @@
 	
 	/* Add match id */
-	errno_t ret = ddf_fun_add_match_id(fnode,
-	    fun->match_id.id, fun->match_id.score);
+	errno_t ret = ddf_fun_add_match_id(fnode, fun->id, fun->score);
 	if (ret != EOK) {
 		ddf_fun_destroy(fnode);
Index: uspace/drv/test/test1/test1.c
===================================================================
--- uspace/drv/test/test1/test1.c	(revision 5a6cc679876514e29ac7899053554db66db754d9)
+++ uspace/drv/test/test1/test1.c	(revision 55958412df6b000da41325bf219018aabc44bde9)
@@ -37,4 +37,5 @@
 #include <ddf/driver.h>
 #include <ddf/log.h>
+#include <str.h>
 
 #include "test1.h"
Index: uspace/drv/test/test2/test2.c
===================================================================
--- uspace/drv/test/test2/test2.c	(revision 5a6cc679876514e29ac7899053554db66db754d9)
+++ uspace/drv/test/test2/test2.c	(revision 55958412df6b000da41325bf219018aabc44bde9)
@@ -34,4 +34,5 @@
 #include <stdio.h>
 #include <errno.h>
+#include <str.h>
 #include <str_error.h>
 #include <ddf/driver.h>