diff --git a/include/osmocom/core/bits.h b/include/osmocom/core/bits.h
index b541b9c..4c68532 100644
--- a/include/osmocom/core/bits.h
+++ b/include/osmocom/core/bits.h
@@ -73,6 +73,6 @@
 /* \brief reverse the bits of each byte in a given buffer */
 void osmo_revbytebits_buf(uint8_t *buf, int len);
 
-/*! }@ */
+/*! @} */
 
 #endif /* _OSMO_BITS_H */
diff --git a/include/osmocom/core/bitvec.h b/include/osmocom/core/bitvec.h
index c2422e6..9c000d0 100644
--- a/include/osmocom/core/bitvec.h
+++ b/include/osmocom/core/bitvec.h
@@ -65,6 +65,6 @@
 int bitvec_find_bit_pos(const struct bitvec *bv, unsigned int n, enum bit_value val);
 int bitvec_spare_padding(struct bitvec *bv, unsigned int up_to_bit);
 
-/*! }@ */
+/*! @} */
 
 #endif /* _BITVEC_H */
diff --git a/include/osmocom/core/conv.h b/include/osmocom/core/conv.h
index e76a5c6..e5b2a97 100644
--- a/include/osmocom/core/conv.h
+++ b/include/osmocom/core/conv.h
@@ -141,6 +141,6 @@
                      const sbit_t *input, ubit_t *output);
 
 
-/*! }@ */
+/*! @} */
 
 #endif /* __OSMO_CONV_H__ */
diff --git a/include/osmocom/core/crcXXgen.h.tpl b/include/osmocom/core/crcXXgen.h.tpl
index b411276..89d083a 100644
--- a/include/osmocom/core/crcXXgen.h.tpl
+++ b/include/osmocom/core/crcXXgen.h.tpl
@@ -52,7 +52,7 @@
                             const ubit_t *in, int len, ubit_t *crc_bits);
 
 
-/*! }@ */
+/*! @} */
 
 #endif /* __OSMO_CRCXXGEN_H__ */
 
diff --git a/include/osmocom/core/crcgen.h b/include/osmocom/core/crcgen.h
index cd916c7..8e208a7 100644
--- a/include/osmocom/core/crcgen.h
+++ b/include/osmocom/core/crcgen.h
@@ -36,6 +36,6 @@
 #include <osmocom/core/crc32gen.h>
 #include <osmocom/core/crc64gen.h>
 
-/*! }@ */
+/*! @} */
 
 #endif /* __OSMO_CRCGEN_H__ */
diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h
index 043a850..76be100 100644
--- a/include/osmocom/core/logging.h
+++ b/include/osmocom/core/logging.h
@@ -206,6 +206,6 @@
 struct log_target *log_target_find(int type, const char *fname);
 extern struct llist_head osmo_log_target_list;
 
-/*! }@ */
+/*! @} */
 
 #endif /* _OSMOCORE_LOGGING_H */
diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h
index e465ec2..5457a07 100644
--- a/include/osmocom/core/msgb.h
+++ b/include/osmocom/core/msgb.h
@@ -365,6 +365,6 @@
 uint16_t msgb_length(const struct msgb *msg);
 void msgb_set_talloc_ctx(void *ctx);
 
-/*! }@ */
+/*! @} */
 
 #endif /* _MSGB_H */
diff --git a/include/osmocom/core/rate_ctr.h b/include/osmocom/core/rate_ctr.h
index c38e5f9..24577fd 100644
--- a/include/osmocom/core/rate_ctr.h
+++ b/include/osmocom/core/rate_ctr.h
@@ -84,5 +84,5 @@
 struct rate_ctr_group *rate_ctr_get_group_by_name_idx(const char *name, const unsigned int idx);
 const struct rate_ctr *rate_ctr_get_by_name(const struct rate_ctr_group *ctrg, const char *name);
 
-/*! }@ */
+/*! @} */
 #endif /* RATE_CTR_H */
diff --git a/include/osmocom/core/select.h b/include/osmocom/core/select.h
index 18aad35..efdd716 100644
--- a/include/osmocom/core/select.h
+++ b/include/osmocom/core/select.h
@@ -40,6 +40,6 @@
 void osmo_fd_unregister(struct osmo_fd *fd);
 int osmo_select_main(int polling);
 
-/*! }@ */
+/*! @} */
 
 #endif /* _BSC_SELECT_H */
diff --git a/include/osmocom/core/serial.h b/include/osmocom/core/serial.h
index 7385425..889bd8a 100644
--- a/include/osmocom/core/serial.h
+++ b/include/osmocom/core/serial.h
@@ -38,6 +38,6 @@
 int osmo_serial_set_custom_baudrate(int fd, int baudrate);
 int osmo_serial_clear_custom_baudrate(int fd);
 
-/*! }@ */
+/*! @} */
 
 #endif /* __OSMO_SERIAL_H__ */
diff --git a/include/osmocom/core/signal.h b/include/osmocom/core/signal.h
index 07d0e6f..cd56f68 100644
--- a/include/osmocom/core/signal.h
+++ b/include/osmocom/core/signal.h
@@ -40,6 +40,6 @@
 /* Dispatch */
 void osmo_signal_dispatch(unsigned int subsys, unsigned int signal, void *signal_data);
 
-/*! }@ */
+/*! @} */
 
 #endif /* OSMO_SIGNAL_H */
diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h
index 8821463..f15a03a 100644
--- a/include/osmocom/core/socket.h
+++ b/include/osmocom/core/socket.h
@@ -30,6 +30,6 @@
 
 int osmo_sockaddr_is_local(struct sockaddr *addr, unsigned int addrlen);
 
-/*! }@ */
+/*! @} */
 
 #endif /* _OSMOCORE_SOCKET_H */
diff --git a/include/osmocom/core/timer.h b/include/osmocom/core/timer.h
index 30f558b..ecb5001 100644
--- a/include/osmocom/core/timer.h
+++ b/include/osmocom/core/timer.h
@@ -82,6 +82,6 @@
 int osmo_timers_update(void);
 int osmo_timers_check(void);
 
-/*! }@ */
+/*! @} */
 
 #endif
diff --git a/include/osmocom/core/timer_compat.h b/include/osmocom/core/timer_compat.h
index 209e84a..d86c109 100644
--- a/include/osmocom/core/timer_compat.h
+++ b/include/osmocom/core/timer_compat.h
@@ -74,6 +74,6 @@
 #endif
 
 
-/*! }@ */
+/*! @} */
 
 #endif /* TIMER_COMPAT_H */
diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h
index f1843d9..78cf186 100644
--- a/include/osmocom/core/utils.h
+++ b/include/osmocom/core/utils.h
@@ -51,6 +51,6 @@
 	rem -= ret;						\
 } while (0)
 
-/*! }@ */
+/*! @} */
 
 #endif
diff --git a/include/osmocom/core/write_queue.h b/include/osmocom/core/write_queue.h
index 8b896d1..816c036 100644
--- a/include/osmocom/core/write_queue.h
+++ b/include/osmocom/core/write_queue.h
@@ -58,6 +58,6 @@
 int osmo_wqueue_enqueue(struct osmo_wqueue *queue, struct msgb *data);
 int osmo_wqueue_bfd_cb(struct osmo_fd *fd, unsigned int what);
 
-/*! }@ */
+/*! @} */
 
 #endif
diff --git a/include/osmocom/gsm/a5.h b/include/osmocom/gsm/a5.h
index 7e6a17c..649dbab 100644
--- a/include/osmocom/gsm/a5.h
+++ b/include/osmocom/gsm/a5.h
@@ -58,6 +58,6 @@
 void osmo_a5_1(const uint8_t *key, uint32_t fn, ubit_t *dl, ubit_t *ul);
 void osmo_a5_2(const uint8_t *key, uint32_t fn, ubit_t *dl, ubit_t *ul);
 
-/*! }@ */
+/*! @} */
 
 #endif /* __OSMO_A5_H__ */
diff --git a/include/osmocom/gsm/abis_nm.h b/include/osmocom/gsm/abis_nm.h
index 5b5bff0..cc01765 100644
--- a/include/osmocom/gsm/abis_nm.h
+++ b/include/osmocom/gsm/abis_nm.h
@@ -35,6 +35,6 @@
 int abis_nm_chcomb4pchan(enum gsm_phys_chan_config pchan);
 enum abis_nm_chan_comb abis_nm_pchan4chcomb(uint8_t chcomb);
 
-/*! }@ */
+/*! @} */
 
 #endif /* _OSMO_GSM_ABIS_NM_H */
diff --git a/include/osmocom/gsm/lapdm.h b/include/osmocom/gsm/lapdm.h
index 52e8fc5..571fd46 100644
--- a/include/osmocom/gsm/lapdm.h
+++ b/include/osmocom/gsm/lapdm.h
@@ -157,6 +157,6 @@
 
 int lapdm_phsap_dequeue_prim(struct lapdm_entity *le, struct osmo_phsap_prim *pp);
 
-/*! }@ */
+/*! @} */
 
 #endif /* _OSMOCOM_LAPDM_H */
diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h
index b6a5dd8..10c201d 100644
--- a/include/osmocom/gsm/protocol/gsm_08_58.h
+++ b/include/osmocom/gsm/protocol/gsm_08_58.h
@@ -556,6 +556,6 @@
 	RSL_MRPCI_PHASE_2PLUS	= 3,
 };
 
-/*! }@ */
+/*! @} */
 
 #endif /* PROTO_GSM_08_58_H */
diff --git a/include/osmocom/gsm/protocol/gsm_12_21.h b/include/osmocom/gsm/protocol/gsm_12_21.h
index 061dcb6..694df93 100644
--- a/include/osmocom/gsm/protocol/gsm_12_21.h
+++ b/include/osmocom/gsm/protocol/gsm_12_21.h
@@ -743,6 +743,6 @@
 	IPAC_BINF_CELL_ALLOC		= (1 << 2),
 };
 
-/*! }@ */
+/*! @} */
 
 #endif /* PROTO_GSM_12_21_H */
diff --git a/include/osmocom/gsm/rsl.h b/include/osmocom/gsm/rsl.h
index 712d17b..b8e4157 100644
--- a/include/osmocom/gsm/rsl.h
+++ b/include/osmocom/gsm/rsl.h
@@ -50,6 +50,6 @@
 struct msgb *rsl_rll_simple(uint8_t msg_type, uint8_t chan_nr,
 			    uint8_t link_id, int transparent);
 
-/*! }@ */
+/*! @} */
 
 #endif /* _OSMOCORE_RSL_H */
diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h
index d2936d6..d1efc55 100644
--- a/include/osmocom/gsm/tlv.h
+++ b/include/osmocom/gsm/tlv.h
@@ -314,6 +314,6 @@
 #define TLVP_LEN(x, y)		(x)->lv[y].len
 #define TLVP_VAL(x, y)		(x)->lv[y].val
 
-/*! }@ */
+/*! @} */
 
 #endif /* _TLV_H */
diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h
index 79d0aec..664c83c 100644
--- a/include/osmocom/vty/command.h
+++ b/include/osmocom/vty/command.h
@@ -366,5 +366,5 @@
 
 extern void *tall_vty_cmd_ctx;
 
-/*! }@ */
+/*! @} */
 #endif				/* _ZEBRA_COMMAND_H */
diff --git a/include/osmocom/vty/telnet_interface.h b/include/osmocom/vty/telnet_interface.h
index 65a1dd9..3c22201 100644
--- a/include/osmocom/vty/telnet_interface.h
+++ b/include/osmocom/vty/telnet_interface.h
@@ -51,6 +51,6 @@
 
 void telnet_exit(void);
 
-/*! }@ */
+/*! @} */
 
 #endif /* TELNET_INTERFACE_H */
diff --git a/include/osmocom/vty/vty.h b/include/osmocom/vty/vty.h
index 83506c5..1518894 100644
--- a/include/osmocom/vty/vty.h
+++ b/include/osmocom/vty/vty.h
@@ -183,6 +183,6 @@
 extern struct cmd_element cfg_description_cmd;
 extern struct cmd_element cfg_no_description_cmd;
 
-/*! }@ */
+/*! @} */
 
 #endif