diff --git a/lib/birdlib.h b/lib/birdlib.h
index 8dc393bb..77d03a8b 100644
--- a/lib/birdlib.h
+++ b/lib/birdlib.h
@@ -12,6 +12,7 @@
 #include "timer.h"
 #include "alloca.h"
 #include "lib/null.h"
+#include "sysdep/config.h"
 
 /* Ugly structure offset handling macros */
 
diff --git a/lib/lists.h b/lib/lists.h
index 80a4dc93..d4aeccbb 100644
--- a/lib/lists.h
+++ b/lib/lists.h
@@ -51,6 +51,7 @@ typedef struct list {			/* In fact two overlayed nodes */
 #define EMPTY_LIST(list) (!(list).head->next)
 
 
+
 #ifndef _BIRD_LISTS_C_
 #define LIST_INLINE static inline
 #include "lib/lists.c"
diff --git a/lib/string.h b/lib/string.h
index 528a1a19..d23c1d94 100644
--- a/lib/string.h
+++ b/lib/string.h
@@ -13,6 +13,8 @@
 #include <string.h>
 #include <strings.h>
 
+#include "lib/birdlib.h"
+
 int bsprintf(char *str, const char *fmt, ...);
 int bvsprintf(char *str, const char *fmt, va_list args);
 int bsnprintf(char *str, int size, const char *fmt, ...);
diff --git a/nest/iface.h b/nest/iface.h
index 56710e4a..57d72b0d 100644
--- a/nest/iface.h
+++ b/nest/iface.h
@@ -10,6 +10,7 @@
 #define _BIRD_IFACE_H_
 
 #include "lib/lists.h"
+#include "lib/ip.h"
 
 extern list iface_list;
 
diff --git a/proto/rip/rip.h b/proto/rip/rip.h
index 2a327260..968e7372 100644
--- a/proto/rip/rip.h
+++ b/proto/rip/rip.h
@@ -4,9 +4,12 @@
    FIXME: in V6, they insert additional entry whenever next hop differs. Such entry is identified by 0xff in metric.
  */
 
+#include "nest/bird.h"
 #include "nest/route.h"
 #include "nest/password.h"
 #include "nest/locks.h"
+#include "nest/iface.h"
+#include "lib/socket.h"
 
 #define EA_RIP_TAG	EA_CODE(EAP_RIP, 0)
 #define EA_RIP_METRIC	EA_CODE(EAP_RIP, 1)