diff --git a/gr-vocoder/include/vocoder/CMakeLists.txt b/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt
index ea0562f36f..ea0562f36f 100644
--- a/gr-vocoder/include/vocoder/CMakeLists.txt
+++ b/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt

diff --git a/gr-vocoder/include/vocoder/alaw_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h
index f1860c6f77..431859762c 100644
--- a/gr-vocoder/include/vocoder/alaw_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h

diff --git a/gr-vocoder/include/vocoder/alaw_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h
index dc09c072af..c81018ee5f 100644
--- a/gr-vocoder/include/vocoder/alaw_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h

diff --git a/gr-vocoder/include/vocoder/api.h b/gr-vocoder/include/gnuradio/vocoder/api.h
index 425e397b9d..425e397b9d 100644
--- a/gr-vocoder/include/vocoder/api.h
+++ b/gr-vocoder/include/gnuradio/vocoder/api.h

diff --git a/gr-vocoder/include/vocoder/codec2_decode_ps.h b/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h
index 471e7add81..e90e7b9560 100644
--- a/gr-vocoder/include/vocoder/codec2_decode_ps.h
+++ b/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h

diff --git a/gr-vocoder/include/vocoder/codec2_encode_sp.h b/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h
index 525fee5daf..9fe1c2dd43 100644
--- a/gr-vocoder/include/vocoder/codec2_encode_sp.h
+++ b/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h

diff --git a/gr-vocoder/include/vocoder/cvsd_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h
index 882e5e7ddc..324dcea1a1 100644
--- a/gr-vocoder/include/vocoder/cvsd_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h

diff --git a/gr-vocoder/include/vocoder/cvsd_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h
index 40f2eb2a6c..7b7cea712e 100644
--- a/gr-vocoder/include/vocoder/cvsd_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h

diff --git a/gr-vocoder/include/vocoder/g721_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h
index ab72240df1..46444d569a 100644
--- a/gr-vocoder/include/vocoder/g721_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h

diff --git a/gr-vocoder/include/vocoder/g721_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h
index 1445a36c60..2ae717d4b7 100644
--- a/gr-vocoder/include/vocoder/g721_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h

diff --git a/gr-vocoder/include/vocoder/g723_24_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h
index 0d64946058..74acd57a40 100644
--- a/gr-vocoder/include/vocoder/g723_24_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h

diff --git a/gr-vocoder/include/vocoder/g723_24_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h
index 4528a4a6ea..9a08eafed3 100644
--- a/gr-vocoder/include/vocoder/g723_24_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h

diff --git a/gr-vocoder/include/vocoder/g723_40_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h
index 39d58413e7..b1d9f6fe3c 100644
--- a/gr-vocoder/include/vocoder/g723_40_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h

diff --git a/gr-vocoder/include/vocoder/g723_40_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h
index c3aa78345c..05ddfed552 100644
--- a/gr-vocoder/include/vocoder/g723_40_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h

diff --git a/gr-vocoder/include/vocoder/gsm_fr_decode_ps.h b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h
index 2068a02645..9979763e60 100644
--- a/gr-vocoder/include/vocoder/gsm_fr_decode_ps.h
+++ b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h

diff --git a/gr-vocoder/include/vocoder/gsm_fr_encode_sp.h b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h
index 2c9c73d611..98d88bba1f 100644
--- a/gr-vocoder/include/vocoder/gsm_fr_encode_sp.h
+++ b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h

diff --git a/gr-vocoder/include/vocoder/ulaw_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h
index d9fa106705..83c328c326 100644
--- a/gr-vocoder/include/vocoder/ulaw_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h

diff --git a/gr-vocoder/include/vocoder/ulaw_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h
index f9ce9c8a8a..fe1dba79b3 100644
--- a/gr-vocoder/include/vocoder/ulaw_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h