diff --git a/include/iso_lang.h b/include/vlc_iso_lang.h
similarity index 100%
rename from include/iso_lang.h
rename to include/vlc_iso_lang.h
diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 763ceea60c397ee03212d9e67e652f6655d1af9f..48ea51300623ba6bfd6dce9222494712446602f4 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -52,7 +52,7 @@
 #endif
 
 #include "vlc_keys.h"
-#include "iso_lang.h"
+#include "vlc_iso_lang.h"
 
 /* FIXME we should find a better way than including that */
 #include "../../src/text/iso-639_def.h"
diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index dc7d93970b0ebf599a44f3ec8fcad227d479f508..43bd24734f3abae4b1e0beb7e717cf771ebf57a2 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -38,7 +38,7 @@
 
 #include <vlc_interface.h>
 
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 
 #include "../demux/ps.h"
 
diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index c4d399e05ad91589e9bac9b034a8e5499d6abf90..9820a2f6e2e8f1d86b93d123aba96c9784edd293 100644
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -43,7 +43,7 @@
 
 
 #include <vlc_codecs.h>               /* BITMAPINFOHEADER, WAVEFORMATEX */
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 #include "vlc_meta.h"
 #include <vlc_charset.h>
 #include <vlc_input.h>
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 2ada05222db80d28805a5ca62392ec56c8470bf3..826c088d5cec423cb0cc761c2dd907cf9a23b7a4 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -36,7 +36,7 @@
 #include <vlc_playlist.h>
 #include <vlc_md5.h>
 #include <vlc_charset.h>
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 #include <vlc_meta.h>
 
 #include "libmp4.h"
diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index c7c14470afc136ad69ee230899a87ccb76d4170b..68a61c5925add1d497d47ce6c1ba17c4403da161 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -40,7 +40,7 @@
 #include <vlc_meta.h>
 #include <vlc_epg.h>
 
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 #include <vlc_network.h>
 #include <vlc_charset.h>
 
diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index 84f0a2e26070f06798c32360ff36134bf6264d7f..22322db090b8e7c5ef9830a1c7e45c7c323e2fda 100644
--- a/modules/mux/mp4.c
+++ b/modules/mux/mp4.c
@@ -39,7 +39,7 @@
 #include <time.h>
 #endif
 
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 #include "vlc_meta.h"
 
 /*****************************************************************************
diff --git a/modules/mux/mpeg/ps.c b/modules/mux/mpeg/ps.c
index 44a2eaca9fad6e8035aa4498087d254135e8fd08..2cbd5cf88495fd22c1aeb54ed11fbdd52da3c302 100644
--- a/modules/mux/mpeg/ps.c
+++ b/modules/mux/mpeg/ps.c
@@ -41,7 +41,7 @@
 #include "bits.h"
 #include "pes.h"
 
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 
 /*****************************************************************************
  * Module descriptor
diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index c46a718317a67071ff9f17f87bd43d99103a5dd7..bd4b70b68bec65c2d635732075e88982158aa3ab 100644
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -38,7 +38,7 @@
 #include <vlc_codecs.h>
 #include <vlc_block.h>
 
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 
 #include "bits.h"
 #include "pes.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 3ebc47945f5f4f96bd132b2851147253a80f7612..4e66c44d9b30f4ad6d96970fad6efb3d4b74c072 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -70,7 +70,6 @@ pluginsinclude_HEADERS = \
 	$(NULL)
 
 noinst_HEADERS = \
-	../include/iso_lang.h \
 	../include/mmx.h \
 	../include/vlc_aout.h \
 	../include/vlc_codec_synchro.h \
@@ -84,6 +83,7 @@ noinst_HEADERS = \
 	../include/vlc_input.h \
 	../include/vlc_interface.h \
 	../include/vlc_intf_strings.h \
+	../include/vlc_iso_lang.h \
 	../include/vlc_keys.h \
 	../include/vlc_network.h \
 	../include/vlc_osd.h \
diff --git a/src/input/es_out.c b/src/input/es_out.c
index 509c42c8b7ff27cf98dda4d2a5338970092db787..bbafad2aa65c191f5a2ea609f64a2c3813610c68 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -41,7 +41,7 @@
 #include "input_internal.h"
 
 #include "vlc_playlist.h"
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 /* FIXME we should find a better way than including that */
 #include "../text/iso-639_def.h"
 
diff --git a/src/text/iso_lang.c b/src/text/iso_lang.c
index 00f2915754887e7e6bd5f10cb58cfaf909cf0d28..a6bacb6aec4d7370e72c2765d8b9e339cfc12446 100644
--- a/src/text/iso_lang.c
+++ b/src/text/iso_lang.c
@@ -33,7 +33,7 @@
 
 #include <vlc/vlc.h>
 
-#include "iso_lang.h"
+#include "vlc_iso_lang.h"
 
 /*****************************************************************************
  * Local tables