diff --git a/include/mISDNif.h b/include/mISDNif.h
index a4ef7f6..8e065d2 100644
--- a/include/mISDNif.h
+++ b/include/mISDNif.h
@@ -19,9 +19,15 @@
 #define mISDNIF_H
 
 #include <stdarg.h>
+#ifdef linux
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/socket.h>
+#else
+#include <sys/types.h>
+#include <sys/errno.h>
+#include <sys/socket.h>
+#endif
 
 /*
  * ABI Version 32 bit
diff --git a/include/openbsc/paging.h b/include/openbsc/paging.h
index fd9dc02..de512d1 100644
--- a/include/openbsc/paging.h
+++ b/include/openbsc/paging.h
@@ -21,7 +21,7 @@
 #ifndef PAGING_H
 #define PAGING_H
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "linuxlist.h"
diff --git a/include/vty/buffer.h b/include/vty/buffer.h
index 87cb3fd..3151940 100644
--- a/include/vty/buffer.h
+++ b/include/vty/buffer.h
@@ -23,6 +23,8 @@
 #ifndef _ZEBRA_BUFFER_H
 #define _ZEBRA_BUFFER_H
 
+#include <sys/types.h>
+
 /* Create a new buffer.  Memory will be allocated in chunks of the given
    size.  If the argument is 0, the library will supply a reasonable
    default size suitable for buffering socket I/O. */
diff --git a/include/vty/command.h b/include/vty/command.h
index f72ea6c..26022cb 100644
--- a/include/vty/command.h
+++ b/include/vty/command.h
@@ -24,6 +24,7 @@
 #define _ZEBRA_COMMAND_H
 
 #include <stdio.h>
+#include <sys/types.h>
 #include "vector.h"
 #include "vty.h"
 
diff --git a/src/abis_nm.c b/src/abis_nm.c
index 9820d97..6909f78 100644
--- a/src/abis_nm.c
+++ b/src/abis_nm.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <libgen.h>
 #include <time.h>
 #include <limits.h>
diff --git a/src/gsm_utils.c b/src/gsm_utils.c
index b0594ae..0c25b28 100644
--- a/src/gsm_utils.c
+++ b/src/gsm_utils.c
@@ -22,7 +22,7 @@
  */
 
 #include <openbsc/gsm_utils.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 /* GSM 03.38 6.2.1 Charachter packing */
diff --git a/src/signal.c b/src/signal.c
index a7fc28e..4227c6d 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -19,7 +19,7 @@
  */
 
 #include <openbsc/signal.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 
diff --git a/src/telnet_interface.c b/src/telnet_interface.c
index 5ed9a0e..d812b17 100644
--- a/src/telnet_interface.c
+++ b/src/telnet_interface.c
@@ -20,7 +20,7 @@
 
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/tests/db/db_test.c b/tests/db/db_test.c
index 93bf152..bbca585 100644
--- a/tests/db/db_test.c
+++ b/tests/db/db_test.c
@@ -22,7 +22,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #define COMPARE(original, copy) \
 	if (original->id != copy->id) \