diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 4bfaa80106b9d8d257b79a3596d39ddb1f87bff3..bc8ee821f2ec03da22ec800cb0ccecc5d80bb680 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -99,7 +99,8 @@ codec_LTLIBRARIES += $(LTLIBwma_fixed)
 libcdg_plugin_la_SOURCES = codec/cdg.c
 codec_LTLIBRARIES += libcdg_plugin.la
 
-liblibmpeg2_plugin_la_SOURCES = codec/libmpeg2.c
+liblibmpeg2_plugin_la_SOURCES = codec/libmpeg2.c \
+	codec/synchro.c codec/synchro.h
 liblibmpeg2_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_libmpeg2)
 liblibmpeg2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
 liblibmpeg2_plugin_la_LIBADD = $(LIBS_libmpeg2)
diff --git a/modules/codec/libmpeg2.c b/modules/codec/libmpeg2.c
index 52972288c66faa961ad2acbb6bfcd209e3b8af6d..9e4269a7c5f7915f75436578a07cef610476385a 100644
--- a/modules/codec/libmpeg2.c
+++ b/modules/codec/libmpeg2.c
@@ -43,12 +43,11 @@
 #include <vlc_codec.h>
 #include <vlc_block_helper.h>
 #include <vlc_cpu.h>
-#include "../codec/cc.h"
+#include "cc.h"
+#include "synchro.h"
 
 #include <mpeg2.h>
 
-#include <vlc_codec_synchro.h>
-
 /*****************************************************************************
  * decoder_sys_t : libmpeg2 decoder descriptor
  *****************************************************************************/
diff --git a/src/input/decoder_synchro.c b/modules/codec/synchro.c
similarity index 99%
rename from src/input/decoder_synchro.c
rename to modules/codec/synchro.c
index 00b3e0fd6d7b14a6dca8e15a89cd6b20b75a2cd2..1d4ee96a969296760e612fae1bc65b385fafcf1a 100644
--- a/src/input/decoder_synchro.c
+++ b/modules/codec/synchro.c
@@ -101,7 +101,7 @@
 #include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_codec.h>
-#include <vlc_codec_synchro.h>
+#include "synchro.h"
 
 /*
  * Local prototypes
diff --git a/include/vlc_codec_synchro.h b/modules/codec/synchro.h
similarity index 75%
rename from include/vlc_codec_synchro.h
rename to modules/codec/synchro.h
index ee6c86af8dc8baaac7c2a9068a9dc8fa6cf7fe64..13180e6fea9943b1023fefe7e26584afb5fdc639 100644
--- a/include/vlc_codec_synchro.h
+++ b/modules/codec/synchro.h
@@ -37,13 +37,13 @@
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-VLC_API decoder_synchro_t * decoder_SynchroInit( decoder_t *, int ) VLC_USED;
-VLC_API void decoder_SynchroRelease( decoder_synchro_t * );
-VLC_API void decoder_SynchroReset( decoder_synchro_t * );
-VLC_API bool decoder_SynchroChoose( decoder_synchro_t *, int, int, bool );
-VLC_API void decoder_SynchroTrash( decoder_synchro_t * );
-VLC_API void decoder_SynchroDecode( decoder_synchro_t * );
-VLC_API void decoder_SynchroEnd( decoder_synchro_t *, int, bool );
-VLC_API mtime_t decoder_SynchroDate( decoder_synchro_t * ) VLC_USED;
-VLC_API void decoder_SynchroNewPicture( decoder_synchro_t *, int, int, mtime_t, mtime_t, bool );
+decoder_synchro_t * decoder_SynchroInit( decoder_t *, int ) VLC_USED;
+void decoder_SynchroRelease( decoder_synchro_t * );
+void decoder_SynchroReset( decoder_synchro_t * );
+bool decoder_SynchroChoose( decoder_synchro_t *, int, int, bool );
+void decoder_SynchroTrash( decoder_synchro_t * );
+void decoder_SynchroDecode( decoder_synchro_t * );
+void decoder_SynchroEnd( decoder_synchro_t *, int, bool );
+mtime_t decoder_SynchroDate( decoder_synchro_t * ) VLC_USED;
+void decoder_SynchroNewPicture( decoder_synchro_t *, int, int, mtime_t, mtime_t, bool );
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a07b215bb12a74962e1a05593454857061e19878..379e281f01f3d9f5dc16edb42ac66e00e1f473df 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,7 +8,6 @@ include/vlc_block_helper.h
 include/vlc_charset.h
 include/vlc_codec.h
 include/vlc_codecs.h
-include/vlc_codec_synchro.h
 include/vlc_common.h
 include/vlc_config_cat.h
 include/vlc_config.h
@@ -81,7 +80,6 @@ src/input/clock.h
 src/input/control.c
 src/input/decoder.c
 src/input/decoder.h
-src/input/decoder_synchro.c
 src/input/demux.c
 src/input/demux.h
 src/input/es_out.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 954322b7f4dd9d460ba241fb94a23bda7f681aa0..5f3726c3e6ca82ecdff761b3eade9177347b6939 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,7 +107,6 @@ pluginsinclude_HEADERS = \
 nodist_pluginsinclude_HEADERS = ../include/vlc_about.h
 
 noinst_HEADERS = \
-	../include/vlc_codec_synchro.h \
 	../include/vlc_codecs.h \
 	../include/vlc_extensions.h \
 	../include/vlc_fixups.h \
@@ -231,7 +230,6 @@ libvlccore_la_SOURCES = \
 	input/clock.c \
 	input/control.c \
 	input/decoder.c \
-	input/decoder_synchro.c \
 	input/demux.c \
 	input/demux_chained.c \
 	input/es_out.c \
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index b282c3483c7b8d1ebe6f6ae424de2afc4e3b3c63..aa957ff26d1614a99c3ebb29d4beaf5bb0eab16f 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -82,15 +82,6 @@ decoder_GetDisplayRate
 decoder_GetInputAttachments
 decoder_NewAudioBuffer
 decoder_NewSubpicture
-decoder_SynchroChoose
-decoder_SynchroDate
-decoder_SynchroDecode
-decoder_SynchroEnd
-decoder_SynchroInit
-decoder_SynchroNewPicture
-decoder_SynchroRelease
-decoder_SynchroReset
-decoder_SynchroTrash
 demux_Delete
 demux_PacketizerDestroy
 demux_PacketizerNew