diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c
index 5b3ee28..8cdf9a4 100644
--- a/openbsc/src/gprs/gb_proxy.c
+++ b/openbsc/src/gprs/gb_proxy.c
@@ -34,6 +34,7 @@
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/select.h>
 #include <osmocom/core/rate_ctr.h>
+#include <osmocom/core/stats.h>
 
 #include <osmocom/gprs/gprs_ns.h>
 #include <osmocom/gprs/gprs_bssgp.h>
@@ -72,6 +73,7 @@
 	.group_description = "GBProxy Global Statistics",
 	.num_ctr = ARRAY_SIZE(global_ctr_description),
 	.ctr_desc = global_ctr_description,
+	.class_id = OSMO_STATS_CLASS_GLOBAL,
 };
 
 static int gbprox_relay2peer(struct msgb *old_msg, struct gbproxy_peer *peer,
diff --git a/openbsc/src/gprs/gb_proxy_peer.c b/openbsc/src/gprs/gb_proxy_peer.c
index ce6690e..b65fc17 100644
--- a/openbsc/src/gprs/gb_proxy_peer.c
+++ b/openbsc/src/gprs/gb_proxy_peer.c
@@ -29,6 +29,7 @@
 
 #include <osmocom/gprs/protocol/gsm_08_18.h>
 #include <osmocom/core/rate_ctr.h>
+#include <osmocom/core/stats.h>
 #include <osmocom/core/talloc.h>
 
 #include <string.h>
@@ -59,6 +60,7 @@
 	.group_description = "GBProxy Peer Statistics",
 	.num_ctr = ARRAY_SIZE(peer_ctr_description),
 	.ctr_desc = peer_ctr_description,
+	.class_id = OSMO_STATS_CLASS_PEER,
 };
 
 
diff --git a/openbsc/src/gprs/gprs_sgsn.c b/openbsc/src/gprs/gprs_sgsn.c
index 9b11c35..c4dc9d7 100644
--- a/openbsc/src/gprs/gprs_sgsn.c
+++ b/openbsc/src/gprs/gprs_sgsn.c
@@ -25,6 +25,7 @@
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/timer.h>
 #include <osmocom/core/rate_ctr.h>
+#include <osmocom/core/stats.h>
 #include <osmocom/core/backtrace.h>
 #include <osmocom/gprs/gprs_ns.h>
 #include <osmocom/gprs/gprs_bssgp.h>
@@ -71,6 +72,7 @@
 	.group_description = "SGSN MM Context Statistics",
 	.num_ctr = ARRAY_SIZE(mmctx_ctr_description),
 	.ctr_desc = mmctx_ctr_description,
+	.class_id = OSMO_STATS_CLASS_SUBSCRIBER,
 };
 
 static const struct rate_ctr_desc pdpctx_ctr_description[] = {
@@ -85,6 +87,7 @@
 	.group_description = "SGSN PDP Context Statistics",
 	.num_ctr = ARRAY_SIZE(pdpctx_ctr_description),
 	.ctr_desc = pdpctx_ctr_description,
+	.class_id = OSMO_STATS_CLASS_SUBSCRIBER,
 };
 
 static int ra_id_equals(const struct gprs_ra_id *id1,
diff --git a/openbsc/src/libfilter/bsc_msg_acc.c b/openbsc/src/libfilter/bsc_msg_acc.c
index 6258b35..bfc5bdd 100644
--- a/openbsc/src/libfilter/bsc_msg_acc.c
+++ b/openbsc/src/libfilter/bsc_msg_acc.c
@@ -22,6 +22,7 @@
 #include <openbsc/bsc_nat.h>
 
 #include <osmocom/core/rate_ctr.h>
+#include <osmocom/core/stats.h>
 
 #include <string.h>
 
@@ -35,6 +36,7 @@
 	.group_description = "NAT Access-List Statistics",
 	.num_ctr = ARRAY_SIZE(acc_list_ctr_description),
 	.ctr_desc = acc_list_ctr_description,
+	.class_id = OSMO_STATS_CLASS_GLOBAL,
 };
 
 
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
index d7ec545..cc7d442 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
@@ -32,6 +32,7 @@
 
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/talloc.h>
+#include <osmocom/core/stats.h>
 #include <osmocom/gsm/gsm0808.h>
 #include <osmocom/gsm/ipa.h>
 
@@ -65,6 +66,7 @@
 	.group_description = "NAT BSC Statistics",
 	.num_ctr = ARRAY_SIZE(bsc_cfg_ctr_description),
 	.ctr_desc = bsc_cfg_ctr_description,
+	.class_id = OSMO_STATS_CLASS_PEER,
 };
 
 struct bsc_nat *bsc_nat_alloc(void)