4 files changed, 12 insertions, 9 deletions
diff --git a/gr-uhd/apps/uhd_siggen_base.py b/gr-uhd/apps/uhd_siggen_base.py
index 2ac16ff7d4..6b51bfcb50 100644
--- a/gr-uhd/apps/uhd_siggen_base.py
+++ b/gr-uhd/apps/uhd_siggen_base.py
@@ -49,10 +49,10 @@ import math
 
 n2s = eng_notation.num_to_str
 
-waveforms = { gr.GR_SIN_WAVE   : "Complex Sinusoid",
-              gr.GR_CONST_WAVE : "Constant",
-              gr.GR_GAUSSIAN   : "Gaussian Noise",
-              gr.GR_UNIFORM    : "Uniform Noise",
+waveforms = { analog.GR_SIN_WAVE   : "Complex Sinusoid",
+              analog.GR_CONST_WAVE : "Constant",
+              analog.GR_GAUSSIAN   : "Gaussian Noise",
+              analog.GR_UNIFORM    : "Uniform Noise",
               "2tone"          : "Two Tone",
               "sweep"          : "Sweep" }
 
@@ -166,7 +166,7 @@ class top_block(gr.top_block, pubsub):
         self._u.set_samp_rate(sr)
         sr = self._u.get_samp_rate()
 
-        if self[TYPE_KEY] in (gr.GR_SIN_WAVE, gr.GR_CONST_WAVE):
+        if self[TYPE_KEY] in (analog.GR_SIN_WAVE, analog.GR_CONST_WAVE):
             self._src.set_sampling_freq(self[SAMP_RATE_KEY])
         elif self[TYPE_KEY] == "2tone":
             self._src1.set_sampling_freq(self[SAMP_RATE_KEY])
@@ -219,7 +219,7 @@ class top_block(gr.top_block, pubsub):
         return tr
 
     def set_waveform_freq(self, freq):
-        if self[TYPE_KEY] == gr.GR_SIN_WAVE:
+        if self[TYPE_KEY] == analog.GR_SIN_WAVE:
             self._src.set_frequency(freq)
         elif self[TYPE_KEY] == "2tone":
             self._src1.set_frequency(freq)
diff --git a/gr-uhd/apps/uhd_siggen_gui b/gr-uhd/apps/uhd_siggen_gui
index 70929b1825..80fcf8e673 100755
--- a/gr-uhd/apps/uhd_siggen_gui
+++ b/gr-uhd/apps/uhd_siggen_gui
@@ -22,6 +22,7 @@
 
 import wx
 from gnuradio import gr, uhd
+from gnuradio import analog
 from gnuradio.gr.pubsub import pubsub
 from gnuradio.wxgui import gui, forms
 from gnuradio.uhd import uhd_siggen_base as uhd_siggen
@@ -58,7 +59,7 @@ class app_gui(pubsub):
         self.vbox.AddStretchSpacer()
         #callback to show/hide forms
         def set_type(type):
-            sine_bb_hbox.ShowItems(type == gr.GR_SIN_WAVE)
+            sine_bb_hbox.ShowItems(type == analog.GR_SIN_WAVE)
             sweep_bb_hbox.ShowItems(type == 'sweep')
             tone_bb_hbox.ShowItems(type == '2tone')
             self.vbox.Layout()
diff --git a/gr-wxgui/src/python/fftsink_nongl.py b/gr-wxgui/src/python/fftsink_nongl.py
index 4e74588d0b..e9308fd354 100644
--- a/gr-wxgui/src/python/fftsink_nongl.py
+++ b/gr-wxgui/src/python/fftsink_nongl.py
@@ -20,10 +20,11 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gru, window, fft, filter
+from gnuradio import gr, gru, fft, filter
 from gnuradio import blocks
 from gnuradio import analog
 from gnuradio.wxgui import stdgui2
+from gnuradio.filter import window
 import wx
 import plot
 import numpy
diff --git a/gr-wxgui/src/python/waterfallsink_nongl.py b/gr-wxgui/src/python/waterfallsink_nongl.py
index f97c0e95c3..1ff44a88c6 100644
--- a/gr-wxgui/src/python/waterfallsink_nongl.py
+++ b/gr-wxgui/src/python/waterfallsink_nongl.py
@@ -20,10 +20,11 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gru, window, fft, filter
+from gnuradio import gr, gru, fft, filter
 from gnuradio import blocks
 from gnuradio import analog
 from gnuradio.wxgui import stdgui2
+from gnuradio.filter import window
 import wx
 import gnuradio.wxgui.plot as plot
 import numpy