diff --git a/src/osmo-bts-litecell15/lc15_l1_hw.c b/src/osmo-bts-litecell15/lc15_l1_hw.c
index 051dc5ca..41dd72da 100644
--- a/src/osmo-bts-litecell15/lc15_l1_hw.c
+++ b/src/osmo-bts-litecell15/lc15_l1_hw.c
@@ -157,7 +157,7 @@ int l1if_transport_open(int q, struct lc15l1_hdl *hdl)
 	read_ofd->priv_nr = q;
 	read_ofd->data = hdl;
 	read_ofd->cb = l1if_fd_cb;
-	read_ofd->when = BSC_FD_READ;
+	read_ofd->when = OSMO_FD_READ;
 	rc = osmo_fd_register(read_ofd);
 	if (rc < 0) {
 		close(read_ofd->fd);
@@ -179,7 +179,7 @@ int l1if_transport_open(int q, struct lc15l1_hdl *hdl)
 	write_ofd->fd = rc;
 	write_ofd->priv_nr = q;
 	write_ofd->data = hdl;
-	write_ofd->when = BSC_FD_WRITE;
+	write_ofd->when = OSMO_FD_WRITE;
 	rc = osmo_fd_register(write_ofd);
 	if (rc < 0) {
 		close(write_ofd->fd);
diff --git a/src/osmo-bts-oc2g/oc2g_l1_hw.c b/src/osmo-bts-oc2g/oc2g_l1_hw.c
index e96df893..b23282a9 100644
--- a/src/osmo-bts-oc2g/oc2g_l1_hw.c
+++ b/src/osmo-bts-oc2g/oc2g_l1_hw.c
@@ -157,7 +157,7 @@ int l1if_transport_open(int q, struct oc2gl1_hdl *hdl)
 	read_ofd->priv_nr = q;
 	read_ofd->data = hdl;
 	read_ofd->cb = l1if_fd_cb;
-	read_ofd->when = BSC_FD_READ;
+	read_ofd->when = OSMO_FD_READ;
 	rc = osmo_fd_register(read_ofd);
 	if (rc < 0) {
 		close(read_ofd->fd);
@@ -179,7 +179,7 @@ int l1if_transport_open(int q, struct oc2gl1_hdl *hdl)
 	write_ofd->fd = rc;
 	write_ofd->priv_nr = q;
 	write_ofd->data = hdl;
-	write_ofd->when = BSC_FD_WRITE;
+	write_ofd->when = OSMO_FD_WRITE;
 	rc = osmo_fd_register(write_ofd);
 	if (rc < 0) {
 		close(write_ofd->fd);
diff --git a/src/osmo-bts-sysmo/sysmo_l1_fwd.c b/src/osmo-bts-sysmo/sysmo_l1_fwd.c
index 535a7f00..cfb2b955 100644
--- a/src/osmo-bts-sysmo/sysmo_l1_fwd.c
+++ b/src/osmo-bts-sysmo/sysmo_l1_fwd.c
@@ -121,7 +121,7 @@ int l1if_transport_open(int q, struct femtol1_hdl *fl1h)
 
 	ofd->data = fl1h;
 	ofd->priv_nr = q;
-	ofd->when |= BSC_FD_READ;
+	ofd->when |= OSMO_FD_READ;
 
 	rc = osmo_sock_init_ofd(ofd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP,
 				bts_host, fwd_udp_ports[q],
diff --git a/src/osmo-bts-sysmo/sysmo_l1_hw.c b/src/osmo-bts-sysmo/sysmo_l1_hw.c
index 8351d68c..a67e875f 100644
--- a/src/osmo-bts-sysmo/sysmo_l1_hw.c
+++ b/src/osmo-bts-sysmo/sysmo_l1_hw.c
@@ -163,7 +163,7 @@ int l1if_transport_open(int q, struct femtol1_hdl *hdl)
 	read_ofd->priv_nr = q;
 	read_ofd->data = hdl;
 	read_ofd->cb = l1if_fd_cb;
-	read_ofd->when = BSC_FD_READ;
+	read_ofd->when = OSMO_FD_READ;
 	rc = osmo_fd_register(read_ofd);
 	if (rc < 0) {
 		close(read_ofd->fd);
@@ -182,7 +182,7 @@ int l1if_transport_open(int q, struct femtol1_hdl *hdl)
 	write_ofd->fd = rc;
 	write_ofd->priv_nr = q;
 	write_ofd->data = hdl;
-	write_ofd->when = BSC_FD_WRITE;
+	write_ofd->when = OSMO_FD_WRITE;
 	rc = osmo_fd_register(write_ofd);
 	if (rc < 0) {
 		close(write_ofd->fd);
diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp
index a139011f..8d3d26fc 100644
--- a/src/osmobts_sock.cpp
+++ b/src/osmobts_sock.cpp
@@ -82,7 +82,7 @@ int pcu_sock_send(struct msgb *msg)
 		return -EIO;
 	}
 	msgb_enqueue(&pcu_sock_state.upqueue, msg);
-	conn_bfd->when |= BSC_FD_WRITE;
+	conn_bfd->when |= OSMO_FD_WRITE;
 
 	return 0;
 }
@@ -153,7 +153,7 @@ static int pcu_sock_write(struct osmo_fd *bfd)
 		msg = llist_entry(pcu_sock_state.upqueue.next, struct msgb, list);
 		pcu_prim = (struct gsm_pcu_if *)msg->data;
 
-		bfd->when &= ~BSC_FD_WRITE;
+		bfd->when &= ~OSMO_FD_WRITE;
 
 		/* bug hunter 8-): maybe someone forgot msgb_put(...) ? */
 		if (!msgb_length(msg)) {
@@ -168,7 +168,7 @@ static int pcu_sock_write(struct osmo_fd *bfd)
 			goto close;
 		if (rc < 0) {
 			if (errno == EAGAIN) {
-				bfd->when |= BSC_FD_WRITE;
+				bfd->when |= OSMO_FD_WRITE;
 				break;
 			}
 			goto close;
@@ -192,12 +192,12 @@ static int pcu_sock_cb(struct osmo_fd *bfd, unsigned int flags)
 {
 	int rc = 0;
 
-	if (flags & BSC_FD_READ)
+	if (flags & OSMO_FD_READ)
 		rc = pcu_sock_read(bfd);
 	if (rc < 0)
 		return rc;
 
-	if (flags & BSC_FD_WRITE)
+	if (flags & OSMO_FD_WRITE)
 		rc = pcu_sock_write(bfd);
 
 	return rc;