4 files changed, 7 insertions, 4 deletions
diff --git a/gr-shd/CMakeLists.txt b/gr-shd/CMakeLists.txt
index 7dad30cd80..05008a7de4 100644
--- a/gr-shd/CMakeLists.txt
+++ b/gr-shd/CMakeLists.txt
@@ -53,11 +53,11 @@ GR_REGISTER_COMPONENT("gr-shd" ENABLE_GR_SHD
     Boost_FOUND
     SHD_FOUND
     ENABLE_GR_CORE
+    ENABLE_GR_ANALOG
 )
 
 GR_SET_GLOBAL(GR_SHD_INCLUDE_DIRS
     ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${SHD_INCLUDE_DIRS}
 )
 
 ########################################################################
diff --git a/gr-shd/apps/shd_siggen b/gr-shd/apps/shd_siggen
index 9629d80d29..ad44ef4a93 100755
--- a/gr-shd/apps/shd_siggen
+++ b/gr-shd/apps/shd_siggen
@@ -27,6 +27,7 @@ outputs single precision complex float values or complex short values
 """
 
 from gnuradio import gr, eng_notation
+from gnuradio import analog
 from gnuradio import shd
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
@@ -39,8 +40,9 @@ class shd_siggen(gr.top_block):
     def __init__(self, options):
         gr.top_block.__init__(self)
 
-        self._src = gr.sig_source_c(options.samp_rate, gr.GR_SIN_WAVE,
-                                    200, 1)
+        self._src = analog.sig_source_c(options.samp_rate,
+                                        analog.GR_SIN_WAVE,
+                                        200, 1)
 
         self._snk = shd.smini_sink(device_addr=options.address,
                                    io_type=shd.io_type.COMPLEX_FLOAT32,
diff --git a/gr-shd/lib/CMakeLists.txt b/gr-shd/lib/CMakeLists.txt
index 38154755c1..0aa698a37a 100644
--- a/gr-shd/lib/CMakeLists.txt
+++ b/gr-shd/lib/CMakeLists.txt
@@ -24,8 +24,8 @@ include_directories(
     ${GR_SHD_INCLUDE_DIRS}
     ${GNURADIO_CORE_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
-    ${SHD_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
+    ${SHD_INCLUDE_DIRS}
 }
 
 link_directories(${SHD_LIBRARY_DIRS})
diff --git a/gr-shd/swig/CMakeLists.txt b/gr-shd/swig/CMakeLists.txt
index 364656b866..8044c45e72 100644
--- a/gr-shd/swig/CMakeLists.txt
+++ b/gr-shd/swig/CMakeLists.txt
@@ -30,6 +30,7 @@ set(GR_SWIG_INCLUDE_DIRS
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
+    ${SHD_INCLUDE_DIRS}
 )
 
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/shd_swig_doc.i)