diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am
index b07a004..e4ac924 100644
--- a/include/osmocom/Makefile.am
+++ b/include/osmocom/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = \
 	msc \
 	smpp \
+	vlr \
 	$(NULL)
diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am
index a940056..b6901b9 100644
--- a/include/osmocom/msc/Makefile.am
+++ b/include/osmocom/msc/Makefile.am
@@ -53,8 +53,6 @@
 	sms_queue.h \
 	transaction.h \
 	transaction_cc.h \
-	vlr.h \
-	vlr_sgs.h \
 	vty.h \
 	asci_gcr.h \
 	asci_vty.h \
diff --git a/include/osmocom/msc/sgs_iface.h b/include/osmocom/msc/sgs_iface.h
index b5ff489..00e7ebc 100644
--- a/include/osmocom/msc/sgs_iface.h
+++ b/include/osmocom/msc/sgs_iface.h
@@ -22,8 +22,8 @@
 
 #include <osmocom/gsm/protocol/gsm_23_003.h>
 #include <osmocom/gsm/protocol/gsm_29_118.h>
-#include <osmocom/msc/vlr.h>
-#include <osmocom/msc/vlr_sgs.h>
+#include <osmocom/vlr/vlr.h>
+#include <osmocom/vlr/vlr_sgs.h>
 #include <osmocom/msc/paging.h>
 #include <osmocom/core/socket.h>
 
diff --git a/include/osmocom/msc/transaction_cc.h b/include/osmocom/msc/transaction_cc.h
index 963cb45..c19c033 100644
--- a/include/osmocom/msc/transaction_cc.h
+++ b/include/osmocom/msc/transaction_cc.h
@@ -28,7 +28,7 @@
 
 #include <osmocom/msc/codec_mapping.h>
 #include <osmocom/msc/transaction.h>
-#include <osmocom/msc/vlr.h>
+#include <osmocom/vlr/vlr.h>
 
 void trans_cc_filter_init(struct gsm_trans *trans);
 void trans_cc_filter_set_ran(struct gsm_trans *trans, enum osmo_rat_type ran_type);
diff --git a/include/osmocom/vlr/Makefile.am b/include/osmocom/vlr/Makefile.am
new file mode 100644
index 0000000..f47da40
--- /dev/null
+++ b/include/osmocom/vlr/Makefile.am
@@ -0,0 +1,4 @@
+noinst_HEADERS = \
+	vlr.h \
+	vlr_sgs.h \
+	$(NULL)
diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/vlr/vlr.h
similarity index 99%
rename from include/osmocom/msc/vlr.h
rename to include/osmocom/vlr/vlr.h
index 562b30f..8686020 100644
--- a/include/osmocom/msc/vlr.h
+++ b/include/osmocom/vlr/vlr.h
@@ -15,7 +15,7 @@
 #include <osmocom/gsm/ipa.h>
 #include <osmocom/msc/msc_common.h>
 #include <osmocom/gsupclient/gsup_client.h>
-#include <osmocom/msc/vlr_sgs.h>
+#include <osmocom/vlr/vlr_sgs.h>
 
 #define LOGGSUPP(level, gsup, fmt, args...)				\
 	LOGP(DVLR, level, "GSUP(%s) " fmt, (gsup)->imsi, ## args)
diff --git a/include/osmocom/msc/vlr_sgs.h b/include/osmocom/vlr/vlr_sgs.h
similarity index 100%
rename from include/osmocom/msc/vlr_sgs.h
rename to include/osmocom/vlr/vlr_sgs.h