10 files changed, 37 insertions, 51 deletions
diff --git a/gnuradio-runtime/include/gnuradio/py_feval.h b/gnuradio-runtime/include/gnuradio/py_feval.h
index cef168c8f0..89491af0b4 100644
--- a/gnuradio-runtime/include/gnuradio/py_feval.h
+++ b/gnuradio-runtime/include/gnuradio/py_feval.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_PY_FEVAL_H
 #define INCLUDED_GR_PY_FEVAL_H
 
+#include <Python.h>
 #include <pmt/pmt.h>
 #include <gnuradio/feval.h>
 
diff --git a/gnuradio-runtime/include/gnuradio/sys_pri.h b/gnuradio-runtime/include/gnuradio/sys_pri.h
index adceb91b9d..d251455a11 100644
--- a/gnuradio-runtime/include/gnuradio/sys_pri.h
+++ b/gnuradio-runtime/include/gnuradio/sys_pri.h
@@ -23,7 +23,7 @@
 #define INCLUDED_GNURADIO_SYS_PRI_H
 
 #include <gnuradio/api.h>
-#include <realtime.h>
+#include <gnuradio/realtime.h>
 
 /*
  * A single place to define real-time priorities used by the system itself
@@ -31,10 +31,10 @@
 namespace gr {
 
   struct GR_RUNTIME_API sys_pri {
-    static rt_sched_param python();		  // python code
-    static rt_sched_param normal();		  // normal blocks
-    static rt_sched_param gcell_event_handler();
-    static rt_sched_param usrp2_backend();	  // thread that services the ethernet
+    static struct GR_RUNTIME_API rt_sched_param python();		  // python code
+    static struct GR_RUNTIME_API rt_sched_param normal();		  // normal blocks
+    static struct GR_RUNTIME_API rt_sched_param gcell_event_handler();
+    static struct GR_RUNTIME_API rt_sched_param usrp2_backend();	  // thread that services the ethernet
   };
 
 } /* namespace gr */
diff --git a/gr-atsc/include/gnuradio/atsc/CMakeLists.txt b/gr-atsc/include/gnuradio/atsc/CMakeLists.txt
index cdf818aab2..3955a628b6 100644
--- a/gr-atsc/include/gnuradio/atsc/CMakeLists.txt
+++ b/gr-atsc/include/gnuradio/atsc/CMakeLists.txt
@@ -41,7 +41,6 @@ install(FILES
     equalizer_lms2_impl.h
     equalizer_lms_impl.h
     equalizer_nop_impl.h
-    exp2_lp_impl.h
     fake_single_viterbi_impl.h
     field_sync_demux.h
     field_sync_mux.h
@@ -51,29 +50,6 @@ install(FILES
     fs_checker_naive_impl.h
     fs_correlator_impl.h
     fs_correlator_naive_impl.h
-    GrAtscBitTimingLoop2.h
-    GrAtscBitTimingLoop3.h
-    GrAtscBitTimingLoop.h
-    GrAtscConvert2xTo20.h
-    GrAtscDataSegToSoftDataSeg.h
-    GrAtscDeinterleaver.h
-    GrAtscDerandomizer.h
-    GrAtscEqualizer.h
-    GrAtscFieldSyncChecker.h
-    GrAtscFieldSyncCorrelator.h
-    GrAtscFieldSyncDemux.h
-    GrAtscFieldSyncMux.h
-    GrAtscFPLL.h
-    GrAtscInterleaver.h
-    GrAtscRandomizer.h
-    GrAtscRSDecoder.h
-    GrAtscRSEncoder.h
-    GrAtscSegSymSync.h
-    GrAtscSegSymSyncImpl_export.h
-    GrAtscSegSymSyncImpl.h
-    GrAtscSymbolMapper.h
-    GrAtscTrellisEncoder.h
-    GrAtscViterbiDecoder.h
     interleaver_fifo.h
     interleaver.h
     pad.h
@@ -81,12 +57,9 @@ install(FILES
     randomizer.h
     randomizer_impl.h
     reed_solomon_impl.h
-    root_raised_cosine_bandpass_impl.h
-    root_raised_cosine_impl.h
     rs_decoder.h
     rs_encoder.h
     single_viterbi_impl.h
-    slicer_agc_impl.h
     sliding_correlator_impl.h
     sssr_impl.h
     syminfo_impl.h
@@ -96,7 +69,6 @@ install(FILES
     types.h
     viterbi_decoder.h
     viterbi_decoder_impl.h
-    vsbtx_lp_impl.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/atsc
     COMPONENT "atsc_devel"
 )
diff --git a/gr-digital/grc/digital_corr_est_cc.xml b/gr-digital/grc/digital_corr_est_cc.xml
index cb345e933f..1a1c449efb 100644
--- a/gr-digital/grc/digital_corr_est_cc.xml
+++ b/gr-digital/grc/digital_corr_est_cc.xml
@@ -5,7 +5,7 @@
   <import>from gnuradio import digital</import>
   <make>digital.corr_est_cc($symbols, $sps, $mark_delay, $threshold)</make>
   <callback>set_mark_delay($mark_delay)</callback>
-  <callback>set_theshold($threshold)</callback>
+  <callback>set_threshold($threshold)</callback>
 
   <param>
     <name>Symbols</name>
diff --git a/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt
index 1e0c9f35f2..29022b63bf 100644
--- a/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt
+++ b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt
@@ -45,8 +45,6 @@ install(FILES
   qtgui_types.h
   sink_c.h
   sink_f.h
-  spectrumdisplayform.h
-  SpectrumGUIClass.h
   spectrumUpdateEvents.h
   timedisplayform.h
   timecontrolpanel.h
diff --git a/gr-vocoder/gnuradio-vocoder.pc.in b/gr-vocoder/gnuradio-vocoder.pc.in
index c5c860dc62..f9373196cc 100644
--- a/gr-vocoder/gnuradio-vocoder.pc.in
+++ b/gr-vocoder/gnuradio-vocoder.pc.in
@@ -8,4 +8,4 @@ Description: GNU Radio blocks implementing voice codecs
 Requires: gnuradio-runtime
 Version: @LIBVER@
 Libs: -L${libdir} -lgnuradio-vocoder
-Cflags: -I${includedir}
+Cflags: -I${includedir} @EMBEDDED_CODEC2_INCLUDE@
diff --git a/gr-vocoder/include/gnuradio/vocoder/codec2.h b/gr-vocoder/include/gnuradio/vocoder/codec2.h
index a3c2225208..871903fb22 100644
--- a/gr-vocoder/include/gnuradio/vocoder/codec2.h
+++ b/gr-vocoder/include/gnuradio/vocoder/codec2.h
@@ -26,7 +26,7 @@
 #include <gnuradio/vocoder/api.h>
 
 extern "C" {
-#include "../lib/codec2/codec2.h"
+#include <codec2/codec2.h>
 }
 
 namespace gr {
diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt
index a347cbf7fe..7e813de9a9 100644
--- a/gr-vocoder/lib/CMakeLists.txt
+++ b/gr-vocoder/lib/CMakeLists.txt
@@ -140,6 +140,9 @@ else (NOT DEFINED GR_USE_SYSTEM_LIBCODEC2)
  else (GR_USE_SYSTEM_LIBCODEC2)
     set(GR_USE_LOCAL_LIBCODEC2 TRUE)
     message(STATUS "Using gnuradio local copy of libcodec2.")
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+    set(EMBEDDED_CODEC2_INCLUDE "-I\${includedir}/gnuradio/vocoder" PARENT_SCOPE)
+    set(EMBEDDED_CODEC2_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/gr-vocoder/lib PARENT_SCOPE)
  endif (GR_USE_SYSTEM_LIBCODEC2)
 endif (NOT DEFINED GR_USE_SYSTEM_LIBCODEC2)
 
@@ -151,6 +154,7 @@ mark_as_advanced(LIBCODEC2_INCLUDE_DIR LIBCODEC2_LIBRARIES)
 ########################################################################
 include_directories(
     ${GR_VOCODER_INCLUDE_DIRS}
+    ${EMBEDDED_CODEC2_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${LOG4CXX_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
@@ -210,6 +214,9 @@ GR_INCLUDE_SUBDIRECTORY(g7xx)
 
 if(GR_USE_LOCAL_LIBCODEC2)
  GR_INCLUDE_SUBDIRECTORY(codec2)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/codec2/codec2.h
+   DESTINATION ${GR_INCLUDE_DIR}/gnuradio/vocoder/codec2/
+   COMPONENT "vocoder_devel")
 endif(GR_USE_LOCAL_LIBCODEC2)
 
 if(GR_USE_LOCAL_LIBGSM)
diff --git a/gr-vocoder/swig/CMakeLists.txt b/gr-vocoder/swig/CMakeLists.txt
index 26623969a7..4e15442c59 100644
--- a/gr-vocoder/swig/CMakeLists.txt
+++ b/gr-vocoder/swig/CMakeLists.txt
@@ -25,6 +25,7 @@ include(GrSwig)
 
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_VOCODER_INCLUDE_DIRS}
+    ${EMBEDDED_CODEC2_INCLUDE_DIRS}
     ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/grc/gui/Utils.py b/grc/gui/Utils.py
index 90ebde03b3..f20e3c0fa6 100644
--- a/grc/gui/Utils.py
+++ b/grc/gui/Utils.py
@@ -101,19 +101,26 @@ def encode(value):
     return gobject.markup_escape_text(valid_utf8)
 
 
-def parse_template(tmpl_str, **kwargs):
-    """
-    Parse the template string with the given args.
-    Pass in the xml encode method for pango escape chars.
-
-    Args:
-        tmpl_str: the template as a string
-
-    Returns:
-        a string of the parsed template
-    """
-    kwargs['encode'] = encode
-    return str(Template(tmpl_str, kwargs))
+class TemplateParser(object):
+    def __init__(self):
+        self.cache = {}
+
+    def __call__(self, tmpl_str, **kwargs):
+        """
+        Parse the template string with the given args.
+        Pass in the xml encode method for pango escape chars.
+
+        Args:
+            tmpl_str: the template as a string
+
+        Returns:
+            a string of the parsed template
+        """
+        kwargs['encode'] = encode
+        template = self.cache.setdefault(tmpl_str, Template.compile(tmpl_str))
+        return str(template(namespaces=kwargs))
+
+parse_template = TemplateParser()
 
 
 def align_to_grid(coor):