Index: uspace/srv/fb/ppm.c
===================================================================
--- uspace/srv/fb/ppm.c	(revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0)
+++ uspace/srv/fb/ppm.c	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -27,5 +27,5 @@
  */
 
-#include <types.h>
+#include <sys/types.h>
 #include <errno.h>
 
@@ -35,5 +35,6 @@
 {
 retry:
-	while (**data == ' ' || **data == '\t' || **data == '\n' || **data == '\r')
+	while (**data == ' ' || **data == '\t' || **data == '\n' ||
+	    **data == '\r')
 		(*data)++;
 	if (**data == '#') {
@@ -57,5 +58,6 @@
 }
 
-int ppm_get_data(unsigned char *data, size_t dtsz, unsigned int *width, unsigned int *height)
+int ppm_get_data(unsigned char *data, size_t dtsz, unsigned int *width,
+    unsigned int *height)
 {
 	/* Read magic */
@@ -82,8 +84,7 @@
  * @param putpixel Putpixel function used to print bitmap
  */
-int ppm_draw(unsigned char *data, size_t datasz, unsigned int sx, 
-	     unsigned int sy, 
-	     unsigned int maxwidth, unsigned int maxheight,
-	     putpixel_cb_t putpixel, void *vport)
+int ppm_draw(unsigned char *data, size_t datasz, unsigned int sx,
+    unsigned int sy, unsigned int maxwidth, unsigned int maxheight,
+    putpixel_cb_t putpixel, void *vport)
 {
 	unsigned int width, height;
@@ -106,20 +107,21 @@
 	data++;
 
-	if (maxcolor == 0 || maxcolor > 255 || width*height > datasz) {
+	if (maxcolor == 0 || maxcolor > 255 || width * height > datasz) {
 		return EINVAL;
 	}
-	coef = 255/maxcolor;
-	if (coef*maxcolor > 255)
+	coef = 255 / maxcolor;
+	if (coef * maxcolor > 255)
 		coef -= 1;
 	
-	for (i=0; i < width*height; i++) {
+	for (i = 0; i < width * height; i++) {
 		/* Crop picture if we don't fit into region */
-		if (i % width > maxwidth || i/width > maxheight) {
+		if (i % width > maxwidth || i / width > maxheight) {
 			data += 3;
 			continue;
 		}
-		color = ((data[0]*coef) << 16) + ((data[1]*coef) << 8) + data[2]*coef;
+		color = ((data[0] * coef) << 16) + ((data[1] * coef) << 8) +
+		    data[2] * coef;
 		
-		(*putpixel)(vport, sx+(i % width), sy+(i / width), color);
+		(*putpixel)(vport, sx + (i % width), sy + (i / width), color);
 		data += 3;
 	}
Index: uspace/srv/fb/ppm.h
===================================================================
--- uspace/srv/fb/ppm.h	(revision 00acd66d3981789b3f8b04cdd854d29343dd9aa0)
+++ uspace/srv/fb/ppm.h	(revision 5d4e90f0ebfd5bd2cbfa4358e49bfb1691a813f5)
@@ -31,4 +31,5 @@
 
 #include "fb.h"
+#include <sys/types.h>
 
 extern int ppm_draw(unsigned char *, size_t, unsigned int, unsigned int,