diff --git a/ChangeLog b/ChangeLog
index c221d1381..361c2a5d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
+
+	* backend/hp5400_internal.c backend/canon630u-common.c
+	  backend/epson_scsi.c: Minor compilation fixes for MacOS X and OS/2.
+
 2003-04-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
 	* README.netbsd: Some additions concerning uscanner driver.
diff --git a/backend/canon630u-common.c b/backend/canon630u-common.c
index 6aaa3a141..18b3dffc3 100644
--- a/backend/canon630u-common.c
+++ b/backend/canon630u-common.c
@@ -61,6 +61,7 @@
 #ifdef HAVE_OS2_H
 #include <sys/types.h> 		/* mode_t */
 #endif
+#include <sys/stat.h>
 #include "lm9830.h"
 
 #define USB_TYPE_VENDOR                 (0x02 << 5)
diff --git a/backend/epson_scsi.c b/backend/epson_scsi.c
index 44516ee5f..ec882c134 100644
--- a/backend/epson_scsi.c
+++ b/backend/epson_scsi.c
@@ -21,6 +21,7 @@
 #endif
 
 #include <stdio.h>
+#include <string.h>
 
 /*
  * sense handler for the sanei_scsi_XXX comands
diff --git a/backend/hp5400_internal.c b/backend/hp5400_internal.c
index 92b077c08..864b7f3a1 100644
--- a/backend/hp5400_internal.c
+++ b/backend/hp5400_internal.c
@@ -1223,7 +1223,7 @@ InitScan2 (enum ScanType scantype, struct ScanRequest *req,
     float pixels = ((float) htons (req->lenx) * (float) htons (req->leny)) *
       ((float) htons (req->dpix) * (float) htons (req->dpiy)) /
       ((float) HW_LPI * (float) HW_LPI);
-    int bpp = rintf ((float) htonl (res.transfersize) / pixels);
+    int bpp = (int) ((float) htonl (res.transfersize) / pixels + 0.5);
     int planes = (bpp == 1) ? 1 : 3;
     bpp /= planes;