--- ucspi-proxy-0.99.orig/auth-lib.c
+++ ucspi-proxy-0.99/auth-lib.c
@@ -4,8 +4,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <msg/msg.h>
-#include <str/str.h>
+#include <bglibs/msg.h>
+#include <bglibs/str.h>
 #include "auth-lib.h"
 #include "ucspi-proxy.h"
 
--- ucspi-proxy-0.99.orig/base64.c
+++ ucspi-proxy-0.99/base64.c
@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include <base64/base64.h>
-#include <msg/msg.h>
-#include <str/str.h>
+#include <bglibs/base64.h>
+#include <bglibs/msg.h>
+#include <bglibs/str.h>
 
 #include "ucspi-proxy.h"
 
--- ucspi-proxy-0.99.orig/imap-filter.c
+++ ucspi-proxy-0.99/imap-filter.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <str/str.h>
+#include <bglibs/str.h>
 #include "auth-lib.h"
 #include "ucspi-proxy.h"
 
--- ucspi-proxy-0.99.orig/pop3-filter.c
+++ ucspi-proxy-0.99/pop3-filter.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <str/str.h>
+#include <bglibs/str.h>
 #include "auth-lib.h"
 #include "ucspi-proxy.h"
 
--- ucspi-proxy-0.99.orig/relay-filter.c
+++ ucspi-proxy-0.99/relay-filter.c
@@ -5,8 +5,8 @@
 #include <string.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <msg/msg.h>
-#include <unix/sig.h>
+#include <bglibs/msg.h>
+#include <bglibs/sig.h>
 #include "ucspi-proxy.h"
 
 static unsigned relay_rerun_delay;
--- ucspi-proxy-0.99.orig/tcp-connect.c
+++ ucspi-proxy-0.99/tcp-connect.c
@@ -2,10 +2,10 @@
 #include <netdb.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <msg/msg.h>
-#include <net/resolve.h>
-#include <net/socket.h>
-#include <unix/nonblock.h>
+#include <bglibs/msg.h>
+#include <bglibs/resolve.h>
+#include <bglibs/socket.h>
+#include <bglibs/unix.h>
 #include "ucspi-proxy.h"
 
 static ipv4addr addr;
--- ucspi-proxy-0.99.orig/ucspi-proxy.c
+++ ucspi-proxy-0.99/ucspi-proxy.c
@@ -6,10 +6,10 @@
 #include <string.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <fmt/number.h>
-#include <iobuf/iobuf.h>
-#include <msg/msg.h>
-#include <str/str.h>
+#include <bglibs/fmt.h>
+#include <bglibs/iobuf.h>
+#include <bglibs/msg.h>
+#include <bglibs/str.h>
 #include "ucspi-proxy.h"
 
 const int msg_show_pid = 1;