diff --git a/headers/private/kernel/boot/net/RemoteDiskDefs.h b/headers/private/kernel/boot/net/RemoteDiskDefs.h
index dfdd36d590..03fe2c014e 100644
--- a/headers/private/kernel/boot/net/RemoteDiskDefs.h
+++ b/headers/private/kernel/boot/net/RemoteDiskDefs.h
@@ -1,12 +1,13 @@
 /*
- * Copyright 2005, Ingo Weinhold <bonefish@cs.tu-berlin.de>.
+ * Copyright 2005-2007, Ingo Weinhold <bonefish@cs.tu-berlin.de>.
  * All rights reserved. Distributed under the terms of the MIT License.
  */
-
 #ifndef _BOOT_REMOTE_DISK_DEFS_H
 #define _BOOT_REMOTE_DISK_DEFS_H
 
-#include <stdint.h>
+
+#include <inttypes.h>
+
 
 enum {
 	REMOTE_DISK_SERVER_PORT	= 8765,
diff --git a/src/tools/remote_disk_server/remote_disk_server.cpp b/src/tools/remote_disk_server/remote_disk_server.cpp
index 408f8175fb..a2da192ab6 100644
--- a/src/tools/remote_disk_server/remote_disk_server.cpp
+++ b/src/tools/remote_disk_server/remote_disk_server.cpp
@@ -6,6 +6,7 @@
 #include <endian.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -16,11 +17,9 @@
 
 #include <boot/net/RemoteDiskDefs.h>
 
+
 #if defined(__BEOS__) && !defined(__HAIKU__)
-#	include <limits.h>
 typedef int socklen_t;
-#else
-#	include <stdint.h>
 #endif
 
 
@@ -91,7 +90,7 @@ public:
 			// short package?
 			if (bytesRead < (ssize_t)sizeof(remote_disk_header)) {
 				fprintf(stderr, "Dropping short request package (%d bytes).\n",
-					bytesRead);
+					(int)bytesRead);
 				continue;
 			}