Index: uspace/lib/pcut/src/report/report.c
===================================================================
--- uspace/lib/pcut/src/report/report.c	(revision 134ac5d540e7a16b331b62d90010680153d6fbd6)
+++ uspace/lib/pcut/src/report/report.c	(revision bf45993c05fbff161c55a858a73b7488e832d63c)
@@ -44,7 +44,15 @@
  *
  * @param op Operation to be called on the pcut_report_ops_t.
+ * @param ... Arguments to the operation.
  */
 #define REPORT_CALL(op, ...) \
 	if ((report_ops != NULL) && (report_ops->op != NULL)) report_ops->op(__VA_ARGS__)
+
+/** Call a report function if it is available.
+ *
+ * @param op Operation to be called on the pcut_report_ops_t.
+ */
+#define REPORT_CALL_NO_ARGS(op) \
+		if ((report_ops != NULL) && (report_ops->op != NULL)) report_ops->op()
 
 /** Print error message.
@@ -94,9 +102,11 @@
 	/* Ensure that we do not read past the full_output. */
 	if (full_output[full_output_size - 1] != 0) {
-		// FIXME: can this happen?
+		/* FIXME: can this happen? */
 		return;
 	}
 
 	while (1) {
+		size_t message_length;
+
 		/* First of all, count number of zero bytes before the text. */
 		size_t cont_zeros_count = 0;
@@ -111,10 +121,10 @@
 
 		/* Determine the length of the text after the zeros. */
-		size_t message_length = pcut_str_size(full_output);
+		message_length = pcut_str_size(full_output);
 
 		if (cont_zeros_count < 2) {
 			/* Okay, standard I/O. */
 			if (message_length > stdio_buffer_size) {
-				// TODO: handle gracefully
+				/* TODO: handle gracefully */
 				return;
 			}
@@ -125,5 +135,5 @@
 			/* Error message. */
 			if (message_length > error_buffer_size) {
-				// TODO: handle gracefully
+				/* TODO: handle gracefully */
 				return;
 			}
@@ -213,6 +223,6 @@
  *
  */
-void pcut_report_done() {
-	REPORT_CALL(done);
-}
-
+void pcut_report_done(void) {
+	REPORT_CALL_NO_ARGS(done);
+}
+
Index: uspace/lib/pcut/src/report/tap.c
===================================================================
--- uspace/lib/pcut/src/report/tap.c	(revision 134ac5d540e7a16b331b62d90010680153d6fbd6)
+++ uspace/lib/pcut/src/report/tap.c	(revision bf45993c05fbff161c55a858a73b7488e832d63c)
@@ -67,5 +67,5 @@
 	failed_tests_in_suite = 0;
 
-	printf("#> Starting suite %s.\n", suite->suite.name);
+	printf("#> Starting suite %s.\n", suite->name);
 }
 
@@ -76,5 +76,5 @@
 static void tap_suite_done(pcut_item_t *suite) {
 	printf("#> Finished suite %s (failed %d of %d).\n",
-			suite->suite.name, failed_tests_in_suite, tests_in_suite);
+			suite->name, failed_tests_in_suite, tests_in_suite);
 }
 
@@ -98,8 +98,9 @@
  */
 static void print_by_lines(const char *message, const char *prefix) {
+	char *next_line_start;
 	if ((message == NULL) || (message[0] == 0)) {
 		return;
 	}
-	char *next_line_start = pcut_str_find_char(message, '\n');
+	next_line_start = pcut_str_find_char(message, '\n');
 	while (next_line_start != NULL) {
 		next_line_start[0] = 0;
@@ -124,5 +125,7 @@
 		const char *error_message, const char *teardown_error_message,
 		const char *extra_output) {
-	const char *test_name = test->test.name;
+	const char *test_name = test->name;
+	const char *status_str = NULL;
+	const char *fail_error_str = NULL;
 
 	if (outcome != TEST_OUTCOME_PASS) {
@@ -130,6 +133,4 @@
 	}
 
-	const char *status_str = NULL;
-	const char *fail_error_str = NULL;
 	switch (outcome) {
 	case TEST_OUTCOME_PASS:
@@ -158,14 +159,11 @@
 
 /** Report testing done. */
-static void tap_done() {
+static void tap_done(void) {
 }
 
 
 pcut_report_ops_t pcut_report_tap = {
-	.init = tap_init,
-	.done = tap_done,
-	.suite_start = tap_suite_start,
-	.suite_done = tap_suite_done,
-	.test_start = tap_test_start,
-	.test_done = tap_test_done
+	tap_init, tap_done,
+	tap_suite_start, tap_suite_done,
+	tap_test_start, tap_test_done
 };
Index: uspace/lib/pcut/src/report/xml.c
===================================================================
--- uspace/lib/pcut/src/report/xml.c	(revision 134ac5d540e7a16b331b62d90010680153d6fbd6)
+++ uspace/lib/pcut/src/report/xml.c	(revision bf45993c05fbff161c55a858a73b7488e832d63c)
@@ -53,9 +53,8 @@
  */
 static void xml_init(pcut_item_t *all_items) {
-	printf("<?xml version=\"1.0\"?>\n");
-
 	int tests_total = pcut_count_tests(all_items);
 	test_counter = 0;
 
+	printf("<?xml version=\"1.0\"?>\n");
 	printf("<report tests-total=\"%d\">\n", tests_total);
 }
@@ -69,5 +68,5 @@
 	failed_tests_in_suite = 0;
 
-	printf("\t<suite name=\"%s\">\n", suite->suite.name);
+	printf("\t<suite name=\"%s\">\n", suite->name);
 }
 
@@ -77,5 +76,5 @@
  */
 static void xml_suite_done(pcut_item_t *suite) {
-	printf("\t</suite><!-- %s: %d / %d -->\n", suite->suite.name,
+	printf("\t</suite><!-- %s: %d / %d -->\n", suite->name,
 		failed_tests_in_suite, tests_in_suite);
 }
@@ -100,4 +99,6 @@
  */
 static void print_by_lines(const char *message, const char *element_name) {
+	char *next_line_start;
+
 	if ((message == NULL) || (message[0] == 0)) {
 		return;
@@ -106,5 +107,5 @@
 	printf("\t\t\t<%s><![CDATA[", element_name);
 
-	char *next_line_start = pcut_str_find_char(message, '\n');
+	next_line_start = pcut_str_find_char(message, '\n');
 	while (next_line_start != NULL) {
 		next_line_start[0] = 0;
@@ -131,5 +132,6 @@
 		const char *error_message, const char *teardown_error_message,
 		const char *extra_output) {
-	const char *test_name = test->test.name;
+	const char *test_name = test->name;
+	const char *status_str = NULL;
 
 	if (outcome != TEST_OUTCOME_PASS) {
@@ -137,5 +139,4 @@
 	}
 
-	const char *status_str = NULL;
 	switch (outcome) {
 	case TEST_OUTCOME_PASS:
@@ -165,5 +166,5 @@
 
 /** Report testing done. */
-static void xml_done() {
+static void xml_done(void) {
 	printf("</report>\n");
 }
@@ -171,9 +172,6 @@
 
 pcut_report_ops_t pcut_report_xml = {
-	.init = xml_init,
-	.done = xml_done,
-	.suite_start = xml_suite_start,
-	.suite_done = xml_suite_done,
-	.test_start = xml_test_start,
-	.test_done = xml_test_done
+	xml_init, xml_done,
+	xml_suite_start, xml_suite_done,
+	xml_test_start, xml_test_done
 };