diff --git a/clients/lcdproc/machine.h b/clients/lcdproc/machine.h
index 7618c39..86c3fc9 100644
--- a/clients/lcdproc/machine.h
+++ b/clients/lcdproc/machine.h
@@ -12,6 +12,7 @@
 #ifndef _lcdproc_machine_h_
 #define _lcdproc_machine_h_
 
+#include <time.h>
 #include "shared/LL.h"
 
 #ifndef LOADAVG_NSTATS
diff --git a/server/drivers/hd44780-rpi.c b/server/drivers/hd44780-rpi.c
index 5ef9d18..53388eb 100644
--- a/server/drivers/hd44780-rpi.c
+++ b/server/drivers/hd44780-rpi.c
@@ -285,7 +285,7 @@ lcdrpi_HD44780_close(PrivateData *p)
 
 	/* Unmap and free memory */
 	if (gpio_map != NULL)
-		munmap((caddr_t) gpio_map, GPIO_BLOCK_SIZE);
+		munmap((void *) gpio_map, GPIO_BLOCK_SIZE);
 	if (p->rpi_gpio != NULL)
 		free(p->rpi_gpio);
 	p->rpi_gpio = NULL;
diff --git a/server/drivers/mtc_s16209x.c b/server/drivers/mtc_s16209x.c
index 55e48e7..fda30f8 100644
--- a/server/drivers/mtc_s16209x.c
+++ b/server/drivers/mtc_s16209x.c
@@ -49,6 +49,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
+#include <sys/file.h>
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/server/drivers/rawserial.c b/server/drivers/rawserial.c
index 433273a..e05ffb4 100644
--- a/server/drivers/rawserial.c
+++ b/server/drivers/rawserial.c
@@ -60,13 +60,13 @@ typedef struct rawserial_private_data {
 	/** \name Event loop timing. refresh_time and refresh_delta form the
 	 * event loop timing mechanism for configurable update rates.
 	 *@{*/
-	uint refresh_time;		/**< time at the last screen update */
-	uint refresh_delta;		/**< time step to next screen update */
+	unsigned int refresh_time;	/**< time at the last screen update */
+	unsigned int refresh_delta;	/**< time step to next screen update */
 	/**@}*/
 } PrivateData;
 
 /* Local prototypes */
-static uint get_millisecond_time(void);
+static unsigned int get_millisecond_time(void);
 
 
 /* Vars for the server core */
@@ -303,7 +303,7 @@ rawserial_flush(Driver *drvthis)
 	PrivateData *p = drvthis->private_data;
 	char out[LCD_MAX_WIDTH * LCD_MAX_HEIGHT];
 
-	uint currentTime = get_millisecond_time();
+	unsigned int currentTime = get_millisecond_time();
 	int t_delta = currentTime - p->refresh_time;
 
 	/*
@@ -415,7 +415,7 @@ rawserial_get_info(Driver *drvthis)
  *
  * \return  int with current millisecond time.
  */
-static uint
+static unsigned
 get_millisecond_time(void)
 {
 	struct timeval ts;