149 files changed, 354 insertions, 363 deletions

diff --git a/Makefile.common b/Makefile.common
index c0625c7cb..14cbe2692 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -81,10 +81,6 @@ GRUEL_LA = @gruel_LA@
 USRP_INCLUDES = @usrp_INCLUDES@
 USRP_LA = @usrp_LA@
 
-# How to link in usrp-inband library from inside the tree
-USRP_INBAND_INCLUDES = @usrp_inband_INCLUDES@
-USRP_INBAND_LA = @usrp_inband_LA@
-
 # How to link the PMT library from inside the tree
 PMT_INCLUDES = @pmt_INCLUDES@
 PMT_LA = @pmt_LA@
diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
index 3b8bb28f4..14c646081 100644
--- a/config/grc_usrp.m4
+++ b/config/grc_usrp.m4
@@ -20,12 +20,10 @@ dnl Boston, MA 02110-1301, USA.
 AC_DEFUN([GRC_USRP],[
     GRC_ENABLE(usrp)
 
-    GRC_WITH(usrp, [GRC_WITH_PKG_CONFIG_CHECK(usrp-inband)])
+    GRC_WITH(usrp)
 
-    dnl Don't do usrp if omnithread, mblock, or pmt skipped
+    dnl Don't do usrp if omnithread skipped
     GRC_CHECK_DEPENDENCY(usrp, omnithread)
-    GRC_CHECK_DEPENDENCY(usrp, mblock)
-    GRC_CHECK_DEPENDENCY(usrp, pmt)
 
     dnl Make sure the fast usb technique is set, OS dependent.
     dnl This is always performed, since it puts out CLI flags.
@@ -46,9 +44,6 @@ AC_DEFUN([GRC_USRP],[
         AC_CHECK_FUNCS([getrusage sched_setscheduler pthread_setschedparam])
         AC_CHECK_FUNCS([sigaction snprintf])
 
-	dnl Don't do usrp if guile not available (inband requires it)
-	GRC_CHECK_GUILE(usrp)
-
 	dnl Make sure libusb is installed; required for legacy USB
         USRP_LIBUSB([],[passed=no;AC_MSG_RESULT([Unable to find dependency libusb.])])
 
@@ -57,20 +52,14 @@ AC_DEFUN([GRC_USRP],[
     fi
     if test $passed != with; then
 	dnl how and where to find INCLUDES and LA
-	usrp_INCLUDES="-I\${abs_top_srcdir}/usrp/host/lib/legacy \
-		-I\${abs_top_srcdir}/usrp/firmware/include \
-		-I\${abs_top_builddir}/usrp/host/lib/legacy"
-        usrp_LA="\${abs_top_builddir}/usrp/host/lib/legacy/libusrp.la"
-	usrp_inband_INCLUDES="-I\${abs_top_srcdir}/usrp/host/lib/inband"
-	usrp_inband_LA="\${abs_top_builddir}/usrp/host/lib/inband/libusrp-inband.la"
+	usrp_INCLUDES=" \
+		-I\${abs_top_srcdir}/usrp/host/include \
+		-I\${abs_top_builddir}/usrp/host/include \
+		-I\${abs_top_srcdir}/usrp/firmware/include"
+        usrp_LA="\${abs_top_builddir}/usrp/host/lib/libusrp.la"
     fi
 
-    dnl Include the usrp-inband INCLUDES and LA
-    AC_SUBST(usrp_inband_INCLUDES)
-    AC_SUBST(usrp_inband_LA)
-
-    dnl There are 2 pkg-config files (usrp, and usrp-inband); the one
-    dnl for usrp requires omnithread for Darwin only.  Create a variable
+    dnl There pkg-config file for usrp requires omnithread for Darwin only.  Create a variable
     dnl for just the usrp.pc.in case.
     case "$host_os" in
       darwin*)
@@ -85,20 +74,18 @@ AC_DEFUN([GRC_USRP],[
     AC_CONFIG_FILES([ \
 	usrp/Makefile \
 	usrp/usrp.pc \
-	usrp/usrp-inband.pc \
         usrp/usrp.iss \
         usrp/doc/Doxyfile \
         usrp/doc/Makefile \
         usrp/doc/other/Makefile \
         usrp/host/Makefile \
+	usrp/host/include/Makefile \
+	usrp/host/include/usrp/Makefile \
         usrp/host/misc/Makefile \
         usrp/host/lib/Makefile \
-        usrp/host/lib/inband/Makefile \
-        usrp/host/lib/legacy/Makefile \
-        usrp/host/lib/legacy/std_paths.h \
+        usrp/host/lib/std_paths.h \
         usrp/host/swig/Makefile \
         usrp/host/apps/Makefile \
-        usrp/host/apps-inband/Makefile \
         usrp/firmware/Makefile \
         usrp/firmware/include/Makefile \
         usrp/firmware/lib/Makefile \
diff --git a/gnuradio-core/src/lib/io/gri_wavfile.cc b/gnuradio-core/src/lib/io/gri_wavfile.cc
index c1a2b7c73..b8375edc2 100644
--- a/gnuradio-core/src/lib/io/gri_wavfile.cc
+++ b/gnuradio-core/src/lib/io/gri_wavfile.cc
@@ -32,8 +32,7 @@
 
 // WAV files are always little-endian, so we need some byte switching macros
 
-// FIXME: These need to be refactored into a separate endianess header file
-// as they duplicate routines defined in usrp/host/lib/legacy/usrp_bytesex.h
+// FIXME: Use libgruel versions
 
 #ifdef WORDS_BIGENDIAN
 
diff --git a/gr-usrp/apps/Makefile.am b/gr-usrp/apps/Makefile.am
index 824a48974..92938061f 100644
--- a/gr-usrp/apps/Makefile.am
+++ b/gr-usrp/apps/Makefile.am
@@ -24,9 +24,7 @@ include $(top_srcdir)/Makefile.common
 # For compiling within the GNU Radio build tree
 AM_CPPFLAGS=$(STD_DEFINES_AND_INCLUDES) \
 	 -I$(top_srcdir)/gr-usrp/src \
-	 -I$(top_srcdir)/usrp/host/lib/legacy \
-	 -I\${abs_top_builddir}/usrp/host/lib/legacy \
-	 -I$(top_srcdir)/usrp/firmware/include \
+	 $(USRP_INCLUDES) \
 	 $(WITH_INCLUDES)
 
 GR_USRP_LA=$(top_builddir)/gr-usrp/src/libgnuradio-usrp.la
diff --git a/gr-usrp/src/usrp_base.cc b/gr-usrp/src/usrp_base.cc
index a4cf64ed7..1d632a567 100644
--- a/gr-usrp/src/usrp_base.cc
+++ b/gr-usrp/src/usrp_base.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 #include <usrp_base.h>
-#include <usrp_basic.h>
+#include <usrp/usrp_basic.h>
 
 class truth_table_element_t 
 {
diff --git a/gr-usrp/src/usrp_base.h b/gr-usrp/src/usrp_base.h
index a914159e6..7947723fb 100644
--- a/gr-usrp/src/usrp_base.h
+++ b/gr-usrp/src/usrp_base.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,8 +24,8 @@
 #include <gr_sync_block.h>
 #include <stdexcept>
 #include <boost/shared_ptr.hpp>
-#include <db_base.h>
-#include <usrp_subdev_spec.h>
+#include <usrp/db_base.h>
+#include <usrp/usrp_subdev_spec.h>
 
 class usrp_basic;
 
diff --git a/gr-usrp/src/usrp_sink_base.cc b/gr-usrp/src/usrp_sink_base.cc
index cb65e02cd..635d9345f 100644
--- a/gr-usrp/src/usrp_sink_base.cc
+++ b/gr-usrp/src/usrp_sink_base.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,7 +26,7 @@
 
 #include <usrp_sink_base.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
+#include <usrp/usrp_standard.h>
 #include <assert.h>
 #include <cstdio>
 
diff --git a/gr-usrp/src/usrp_sink_base.h b/gr-usrp/src/usrp_sink_base.h
index b27813a42..8d573af1b 100644
--- a/gr-usrp/src/usrp_sink_base.h
+++ b/gr-usrp/src/usrp_sink_base.h
@@ -1,7 +1,7 @@
 
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,8 +26,8 @@
 
 #include <usrp_base.h>
 #include <stdexcept>
-#include <usrp_tune_result.h>
-#include <usrp_dbid.h>
+#include <usrp/usrp_tune_result.h>
+#include <usrp/usrp_dbid.h>
 
 class usrp_standard_tx;
 
diff --git a/gr-usrp/src/usrp_sink_c.cc b/gr-usrp/src/usrp_sink_c.cc
index 363a113fc..40750b477 100644
--- a/gr-usrp/src/usrp_sink_c.cc
+++ b/gr-usrp/src/usrp_sink_c.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,8 +26,8 @@
 
 #include <usrp_sink_c.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
-#include <usrp_bytesex.h>
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 
 usrp_sink_c_sptr
 usrp_make_sink_c (int which_board,
diff --git a/gr-usrp/src/usrp_sink_s.cc b/gr-usrp/src/usrp_sink_s.cc
index adbf3acbd..1f51da24d 100644
--- a/gr-usrp/src/usrp_sink_s.cc
+++ b/gr-usrp/src/usrp_sink_s.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,8 +26,8 @@
 
 #include <usrp_sink_s.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
-#include <usrp_bytesex.h>
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 
 usrp_sink_s_sptr
 usrp_make_sink_s (int which_board,
diff --git a/gr-usrp/src/usrp_source_base.cc b/gr-usrp/src/usrp_source_base.cc
index 99efbcdda..85bd91715 100644
--- a/gr-usrp/src/usrp_source_base.cc
+++ b/gr-usrp/src/usrp_source_base.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,7 +26,7 @@
 
 #include <usrp_source_base.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
+#include <usrp/usrp_standard.h>
 #include <assert.h>
 #include <cstdio>
 
diff --git a/gr-usrp/src/usrp_source_base.h b/gr-usrp/src/usrp_source_base.h
index e1d091d89..4def48e24 100644
--- a/gr-usrp/src/usrp_source_base.h
+++ b/gr-usrp/src/usrp_source_base.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -25,8 +25,8 @@
 
 #include <usrp_base.h>
 #include <stdexcept>
-#include <usrp_tune_result.h>
-#include <usrp_dbid.h>
+#include <usrp/usrp_tune_result.h>
+#include <usrp/usrp_dbid.h>
 
 class usrp_standard_rx;
 
diff --git a/gr-usrp/src/usrp_source_c.cc b/gr-usrp/src/usrp_source_c.cc
index 71ca1e0d7..26d95dc1b 100644
--- a/gr-usrp/src/usrp_source_c.cc
+++ b/gr-usrp/src/usrp_source_c.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,8 +26,8 @@
 
 #include <usrp_source_c.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
-#include <usrp_bytesex.h>
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 
 static const int NBASIC_SAMPLES_PER_ITEM = 2;	// I & Q
 
diff --git a/gr-usrp/src/usrp_source_s.cc b/gr-usrp/src/usrp_source_s.cc
index f20384599..88b8495d3 100644
--- a/gr-usrp/src/usrp_source_s.cc
+++ b/gr-usrp/src/usrp_source_s.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,8 +26,8 @@
 
 #include <usrp_source_s.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
-#include <usrp_bytesex.h>
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 
 static const int NBASIC_SAMPLES_PER_ITEM = 1;
 
diff --git a/gr-usrp/src/usrp_standard.i b/gr-usrp/src/usrp_standard.i
index 7d32cdf81..61053bb3b 100644
--- a/gr-usrp/src/usrp_standard.i
+++ b/gr-usrp/src/usrp_standard.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,13 +23,13 @@
 // FIXME: move to usrp/usrpm component
 
 %{
-#include <usrp_standard.h>
+#include <usrp/usrp_standard.h>
 #include <usrp_spi_defs.h>
-#include <usrp_dbid.h>
+#include <usrp/usrp_dbid.h>
 %}
 
 %include <usrp_spi_defs.h>
-%include <usrp_dbid.h>
+%include <usrp/usrp_dbid.h>
 
 %constant int FPGA_MODE_NORMAL   = usrp_standard_rx::FPGA_MODE_NORMAL;
 %constant int FPGA_MODE_LOOPBACK = usrp_standard_rx::FPGA_MODE_LOOPBACK;
diff --git a/gr-usrp/src/usrp_swig.i b/gr-usrp/src/usrp_swig.i
index f5841985d..2a47877c3 100644
--- a/gr-usrp/src/usrp_swig.i
+++ b/gr-usrp/src/usrp_swig.i
@@ -26,8 +26,8 @@
 #include <vector>
 %}
 
-%include <usrp_subdev_spec.h>
-%include <db_base.i>
+%include <usrp/usrp_subdev_spec.h>
+%include <usrp/db_base.i>
 %include <fpga_regs_common.h>
 %include <fpga_regs_standard.h>
 %include "usrp_standard.i"
diff --git a/usrp/Makefile.am b/usrp/Makefile.am
index 6f5abbd5a..c3e529da9 100644
--- a/usrp/Makefile.am
+++ b/usrp/Makefile.am
@@ -21,7 +21,6 @@
 
 EXTRA_DIST = \
 	usrp.pc.in \
-	usrp-inband.pc.in \
 	usrp.iss.in \
 	usrp.inf
 
@@ -29,6 +28,4 @@ SUBDIRS = host firmware fpga doc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = \
-	usrp.pc \
-	usrp-inband.pc
-
+	usrp.pc
diff --git a/usrp/firmware/include/Makefile.am b/usrp/firmware/include/Makefile.am
index 97ca60bf2..e17726c07 100644
--- a/usrp/firmware/include/Makefile.am
+++ b/usrp/firmware/include/Makefile.am
@@ -19,7 +19,9 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-include_HEADERS = 		\
+usrpincludedir = $(includedir)/usrp
+
+usrpinclude_HEADERS = 		\
 	usrp_i2c_addr.h		\
 	usrp_spi_defs.h	        \
 	fpga_regs_common.h	\
diff --git a/usrp/host/Makefile.am b/usrp/host/Makefile.am
index 514b835a9..aa94fbd6e 100644
--- a/usrp/host/Makefile.am
+++ b/usrp/host/Makefile.am
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = misc lib apps apps-inband
+SUBDIRS = misc lib include apps
 
 if PYTHON
 SUBDIRS += swig
diff --git a/usrp/host/apps/test_usrp_standard_rx.cc b/usrp/host/apps/test_usrp_standard_rx.cc
index 4a47daa95..f6897ed23 100644
--- a/usrp/host/apps/test_usrp_standard_rx.cc
+++ b/usrp/host/apps/test_usrp_standard_rx.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003,2006,2008 Free Software Foundation, Inc.
+ * Copyright 2003,2006,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -33,8 +33,8 @@
 #include <assert.h>
 #include <math.h>
 #include "time_stuff.h"
-#include "usrp_standard.h"
-#include "usrp_bytesex.h"
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 #include "fpga_regs_common.h"
 #include "fpga_regs_standard.h"
 
diff --git a/usrp/host/apps/test_usrp_standard_tx.cc b/usrp/host/apps/test_usrp_standard_tx.cc
index 3cc20c447..3f8817373 100644
--- a/usrp/host/apps/test_usrp_standard_tx.cc
+++ b/usrp/host/apps/test_usrp_standard_tx.cc
@@ -34,8 +34,8 @@
 #include <assert.h>
 #include <math.h>
 #include "time_stuff.h"
-#include "usrp_standard.h"
-#include "usrp_bytesex.h"
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 #include <boost/program_options.hpp>
 
 enum {
diff --git a/usrp/host/apps/usrp_cal_dc_offset.cc b/usrp/host/apps/usrp_cal_dc_offset.cc
index 5ebac12a3..22d427dff 100644
--- a/usrp/host/apps/usrp_cal_dc_offset.cc
+++ b/usrp/host/apps/usrp_cal_dc_offset.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005,2008 Free Software Foundation, Inc.
+ * Copyright 2005,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -33,9 +33,9 @@
 #include <assert.h>
 #include <math.h>
 #include <boost/scoped_ptr.hpp>
-#include "usrp_local_sighandler.h"
-#include "usrp_standard.h"
-#include "usrp_bytesex.h"
+#include <usrp/usrp_local_sighandler.h>
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 
 char *prog_name;
 
diff --git a/usrp/host/apps/usrper.cc b/usrp/host/apps/usrper.cc
index 3740022e0..fe8ff90d2 100644
--- a/usrp/host/apps/usrper.cc
+++ b/usrp/host/apps/usrper.cc
@@ -2,7 +2,7 @@
 /*
  * USRP - Universal Software Radio Peripheral
  *
- * Copyright (C) 2003,2004 Free Software Foundation, Inc.
+ * Copyright (C) 2003,2004,2009 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "usrp_prims.h"
+#include "usrp/usrp_prims.h"
 #include "usrp_spi_defs.h"
 #include <string.h>
 
diff --git a/usrp/host/include/Makefile.am b/usrp/host/include/Makefile.am
new file mode 100644
index 000000000..5de5fe58e
--- /dev/null
+++ b/usrp/host/include/Makefile.am
@@ -0,0 +1,23 @@
+#
+# Copyright 2009 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+SUBDIRS = usrp
+
diff --git a/usrp/host/include/usrp/Makefile.am b/usrp/host/include/usrp/Makefile.am
new file mode 100644
index 000000000..91d439234
--- /dev/null
+++ b/usrp/host/include/usrp/Makefile.am
@@ -0,0 +1,49 @@
+#
+# Copyright 2009 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+usrpincludedir = $(includedir)/usrp
+
+usrpinclude_HEADERS = \
+	db_base.h \
+	db_basic.h \
+	db_dbs_rx.h \
+	db_dtt754.h \
+	db_dtt768.h \
+	db_flexrf.h \
+	db_flexrf_mimo.h \
+	db_tv_rx.h \
+	db_xcvr2450.h \
+	usrp_basic.h \
+	usrp_bytesex.h \
+	usrp_dbid.h \
+	usrp_local_sighandler.h \
+	usrp_prims.h \
+	usrp_slots.h \
+	usrp_standard.h \
+	usrp_subdev_spec.h \
+	usrp_tune_result.h
+
+if PYTHON
+swiginclude_HEADERS = \
+	db_base.i
+endif
diff --git a/usrp/host/lib/legacy/db_base.h b/usrp/host/include/usrp/db_base.h
index 35470891a..35470891a 100644
--- a/usrp/host/lib/legacy/db_base.h
+++ b/usrp/host/include/usrp/db_base.h
diff --git a/usrp/host/lib/legacy/db_base.i b/usrp/host/include/usrp/db_base.i
index bd5483aa8..78c72b8c3 100644
--- a/usrp/host/lib/legacy/db_base.i
+++ b/usrp/host/include/usrp/db_base.i
@@ -22,7 +22,7 @@
 
 
 %{
-#include "db_base.h"
+#include <usrp/db_base.h>
 %}
 
 %include <gr_shared_ptr.i>
diff --git a/usrp/host/lib/legacy/db_basic.h b/usrp/host/include/usrp/db_basic.h
index 4dd92b997..7f81733f4 100644
--- a/usrp/host/lib/legacy/db_basic.h
+++ b/usrp/host/include/usrp/db_basic.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 //
-// Copyright 2008 Free Software Foundation, Inc.
+// Copyright 2008,2009 Free Software Foundation, Inc.
 // 
 // This file is part of GNU Radio
 // 
@@ -22,7 +22,7 @@
 #ifndef DB_BASIC_H
 #define DB_BASIC_H
 
-#include <db_base.h>
+#include <usrp/db_base.h>
 
 
 /******************************************************************************/
diff --git a/usrp/host/lib/legacy/db_dbs_rx.h b/usrp/host/include/usrp/db_dbs_rx.h
index 723771f15..7f869637d 100644
--- a/usrp/host/lib/legacy/db_dbs_rx.h
+++ b/usrp/host/include/usrp/db_dbs_rx.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 //
-// Copyright 2008 Free Software Foundation, Inc.
+// Copyright 2008,2009 Free Software Foundation, Inc.
 // 
 // This file is part of GNU Radio
 // 
@@ -22,7 +22,7 @@
 #ifndef DB_DBS_RX_H
 #define DB_DBS_RX_H
 
-#include <db_base.h>
+#include <usrp/db_base.h>
 #include <vector>
 
 #if 0
diff --git a/usrp/host/lib/legacy/db_dtt754.h b/usrp/host/include/usrp/db_dtt754.h
index 0c104ac0c..4fb952824 100644
--- a/usrp/host/lib/legacy/db_dtt754.h
+++ b/usrp/host/include/usrp/db_dtt754.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 //
-// Copyright 2008 Free Software Foundation, Inc.
+// Copyright 2008,2009 Free Software Foundation, Inc.
 // 
 // This file is part of GNU Radio
 // 
@@ -22,7 +22,7 @@
 #ifndef DB_DTT754_H
 #define DB_DTT754_H
 
-#include <db_base.h>
+#include <usrp/db_base.h>
 #include <boost/shared_ptr.hpp>
 
 class db_dtt754 : public db_base
diff --git a/usrp/host/lib/legacy/db_dtt768.h b/usrp/host/include/usrp/db_dtt768.h
index dd5a59abd..78e157e79 100644
--- a/usrp/host/lib/legacy/db_dtt768.h
+++ b/usrp/host/include/usrp/db_dtt768.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 //
-// Copyright 2008 Free Software Foundation, Inc.
+// Copyright 2008,2009 Free Software Foundation, Inc.
 // 
 // This file is part of GNU Radio
 // 
@@ -22,7 +22,7 @@
 #ifndef DB_DTT768_H
 #define DB_DTT768_H
 
-#include <db_base.h>
+#include <usrp/db_base.h>
 #include <boost/shared_ptr.hpp>
 
 class db_dtt768 : public db_base
diff --git a/usrp/host/lib/legacy/db_flexrf.h b/usrp/host/include/usrp/db_flexrf.h
index b9ccfc3ac..3adad302d 100644
--- a/usrp/host/lib/legacy/db_flexrf.h
+++ b/usrp/host/include/usrp/db_flexrf.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 //
-// Copyright 2008 Free Software Foundation, Inc.
+// Copyright 2008,2009 Free Software Foundation, Inc.
 // 
 // This file is part of GNU Radio
 // 
@@ -22,7 +22,7 @@
 #ifndef DB_FLEXRF_H
 #define DB_FLEXRF_H
 
-#include <db_base.h>
+#include <usrp/db_base.h>
 #include <cmath>
 
 //debug_using_gui = true                // Must be set to True or False
diff --git a/usrp/host/lib/legacy/db_flexrf_mimo.h b/usrp/host/include/usrp/db_flexrf_mimo.h
index aeff53258..771f3b276 100644
--- a/usrp/host/lib/legacy/db_flexrf_mimo.h
+++ b/usrp/host/include/usrp/db_flexrf_mimo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -19,7 +19,7 @@
  * Boston, MA 02110-1301, USA.
  */ 
 
-#include <db_flexrf.h>
+#include <usrp/db_flexrf.h>
 
 class db_flexrf_2400_tx_mimo_a : public db_flexrf_2400_tx
 {
diff --git a/usrp/host/lib/legacy/db_tv_rx.h b/usrp/host/include/usrp/db_tv_rx.h
index ed9162637..ee3ed2bf6 100644
--- a/usrp/host/lib/legacy/db_tv_rx.h
+++ b/usrp/host/include/usrp/db_tv_rx.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 //
-// Copyright 2008 Free Software Foundation, Inc.
+// Copyright 2008,2009 Free Software Foundation, Inc.
 // 
 // This file is part of GNU Radio
 // 
@@ -22,7 +22,7 @@
 #ifndef DB_TV_RX_H
 #define DB_TV_RX_H
 
-#include <db_base.h>
+#include <usrp/db_base.h>
 
 class db_tv_rx : public db_base
 {
diff --git a/usrp/host/lib/legacy/db_xcvr2450.h b/usrp/host/include/usrp/db_xcvr2450.h
index 1f9dd7c2c..305c60d06 100644
--- a/usrp/host/lib/legacy/db_xcvr2450.h
+++ b/usrp/host/include/usrp/db_xcvr2450.h
@@ -22,7 +22,7 @@
 #ifndef DB_XCVR2450_H
 #define DB_XCVR2450_H
 
-#include <db_base.h>
+#include <usrp/db_base.h>
 #include <boost/shared_ptr.hpp>
 
 class xcvr2450;
diff --git a/usrp/host/lib/legacy/usrp_basic.h b/usrp/host/include/usrp/usrp_basic.h
index 86c48635a..fbbf49d57 100644
--- a/usrp/host/lib/legacy/usrp_basic.h
+++ b/usrp/host/include/usrp/usrp_basic.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003,2004,2008 Free Software Foundation, Inc.
+ * Copyright 2003,2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -39,12 +39,12 @@
 #ifndef INCLUDED_USRP_BASIC_H
 #define INCLUDED_USRP_BASIC_H
 
-#include <db_base.h>
-#include <usrp_slots.h>
+#include <usrp/db_base.h>
+#include <usrp/usrp_slots.h>
 #include <string>
 #include <vector>
 #include <boost/utility.hpp>
-#include <usrp_subdev_spec.h>
+#include <usrp/usrp_subdev_spec.h>
 
 struct usb_dev_handle;
 class  fusb_devhandle;
diff --git a/usrp/host/lib/legacy/usrp_bytesex.h b/usrp/host/include/usrp/usrp_bytesex.h
index 331db31c9..331db31c9 100644
--- a/usrp/host/lib/legacy/usrp_bytesex.h
+++ b/usrp/host/include/usrp/usrp_bytesex.h
diff --git a/usrp/host/lib/legacy/usrp_local_sighandler.h b/usrp/host/include/usrp/usrp_local_sighandler.h
index ee336750f..ee336750f 100644
--- a/usrp/host/lib/legacy/usrp_local_sighandler.h
+++ b/usrp/host/include/usrp/usrp_local_sighandler.h
diff --git a/usrp/host/lib/legacy/usrp_prims.h b/usrp/host/include/usrp/usrp_prims.h
index aa1347423..aa0887050 100644
--- a/usrp/host/lib/legacy/usrp_prims.h
+++ b/usrp/host/include/usrp/usrp_prims.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003,2004,2006 Free Software Foundation, Inc.
+ * Copyright 2003,2004,2006,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -34,7 +34,7 @@
 #ifndef _USRP_PRIMS_H_
 #define _USRP_PRIMS_H_
 
-#include <usrp_slots.h>
+#include <usrp/usrp_slots.h>
 #include <string>
 
 static const int USRP_HASH_SIZE = 16;
diff --git a/usrp/host/lib/legacy/usrp_slots.h b/usrp/host/include/usrp/usrp_slots.h
index d2c50fc47..d2c50fc47 100644
--- a/usrp/host/lib/legacy/usrp_slots.h
+++ b/usrp/host/include/usrp/usrp_slots.h
diff --git a/usrp/host/lib/legacy/usrp_standard.h b/usrp/host/include/usrp/usrp_standard.h
index 734fff4b5..a631f8b09 100644
--- a/usrp/host/lib/legacy/usrp_standard.h
+++ b/usrp/host/include/usrp/usrp_standard.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,9 +23,9 @@
 #ifndef INCLUDED_USRP_STANDARD_H
 #define INCLUDED_USRP_STANDARD_H
 
-#include <usrp_basic.h>
+#include <usrp/usrp_basic.h>
 #include <boost/shared_ptr.hpp>
-#include <usrp_tune_result.h>
+#include <usrp/usrp_tune_result.h>
 
 class usrp_standard_tx;
 class usrp_standard_rx;
diff --git a/usrp/host/lib/legacy/usrp_subdev_spec.h b/usrp/host/include/usrp/usrp_subdev_spec.h
index e841ff832..e841ff832 100644
--- a/usrp/host/lib/legacy/usrp_subdev_spec.h
+++ b/usrp/host/include/usrp/usrp_subdev_spec.h
diff --git a/usrp/host/lib/legacy/usrp_tune_result.h b/usrp/host/include/usrp/usrp_tune_result.h
index 200541a37..200541a37 100644
--- a/usrp/host/lib/legacy/usrp_tune_result.h
+++ b/usrp/host/include/usrp/usrp_tune_result.h
diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am
index 2062bda62..8482485f5 100644
--- a/usrp/host/lib/Makefile.am
+++ b/usrp/host/lib/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  USRP - Universal Software Radio Peripheral
 # 
-#  Copyright (C) 2003,2004,2006,2007 Free Software Foundation, Inc.
+#  Copyright (C) 2003,2004,2006,2007,2008,2009 Free Software Foundation, Inc.
 # 
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -20,5 +20,154 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = legacy inband
+common_INCLUDES = $(USRP_INCLUDES)
 
+lib_LTLIBRARIES = libusrp.la
+
+libusrp_la_common_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(BOOST_LDFLAGS)
+
+libusrp_la_common_LIBADD = 		\
+	$(USB_LIBS) 			\
+	$(BOOST_THREAD_LIB)		\
+	../misc/libmisc.la
+
+# darwin fusb requires omnithreads
+if FUSB_TECH_darwin
+AM_CPPFLAGS = $(common_INCLUDES) $(OMNITHREAD_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
+libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(OMNITHREAD_LA)
+libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) -framework CoreFoundation
+else
+AM_CPPFLAGS = $(common_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
+libusrp_la_LIBADD = $(libusrp_la_common_LIBADD)
+libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS)
+endif
+
+EXTRA_DIST = 				\
+	std_paths.h.in			\
+	usrp_dbid.dat			
+
+BUILT_SOURCES = 			\
+	$(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h
+
+BUILT_SOURCES += usrp_dbid.cc \
+	         usrp_dbid.py
+
+# ----------------------------------------------------------------
+# FUSB_TECH is set at configure time by way of
+#   usrp/config/usrp_fusb_tech.m4.
+#   It indicates which fast usb strategy we should be building.
+#   We currently implement "generic", "darwin", "win32" and "linux"
+
+
+generic_CODE = 				\
+	fusb_generic.cc			\
+	fusb_sysconfig_generic.cc
+
+darwin_CODE =				\
+	fusb_darwin.cc			\
+	fusb_sysconfig_darwin.cc 	\
+	README_OSX			\
+	circular_buffer.h		\
+	circular_linked_list.h		\
+	darwin_libusb.h			\
+	mld_threads.h			
+
+win32_CODE =				\
+	fusb_win32.cc			\
+	fusb_sysconfig_win32.cc 	
+
+linux_CODE =				\
+	fusb_linux.cc			\
+	fusb_sysconfig_linux.cc 	
+
+ra_wb_CODE =				\
+	fusb_ra_wb.cc			\
+	fusb_sysconfig_ra_wb.cc
+
+
+#
+# include each <foo>_CODE entry here...
+#
+EXTRA_libusrp_la_SOURCES =		\
+	$(generic_CODE)			\
+	$(darwin_CODE)			\
+	$(win32_CODE)			\
+	$(linux_CODE)			\
+	$(ra_wb_CODE)
+
+
+# work around automake deficiency
+libusrp_la_common_SOURCES = 		\
+	fusb.cc				\
+	md5.c				\
+	usrp_basic.cc			\
+	usrp_config.cc			\
+	usrp_dbid.cc			\
+	usrp_local_sighandler.cc	\
+	usrp_prims.cc			\
+	usrp_standard.cc		\
+	db_boards.cc			\
+	db_base.cc			\
+	db_basic.cc			\
+	db_tv_rx.cc			\
+	db_flexrf.cc			\
+	db_flexrf_mimo.cc		\
+	db_dbs_rx.cc			\
+	db_xcvr2450.cc			\
+	db_dtt754.cc			\
+	db_dtt768.cc			\
+	db_util.cc
+
+
+
+if FUSB_TECH_generic
+libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(generic_CODE)
+endif
+
+if FUSB_TECH_darwin
+libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(darwin_CODE)
+endif
+
+if FUSB_TECH_win32
+libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(win32_CODE)
+endif
+
+if FUSB_TECH_linux
+libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(linux_CODE)
+endif
+
+if FUSB_TECH_ra_wb
+libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(ra_wb_CODE)
+endif
+
+noinst_HEADERS =			\
+	ad9862.h			\
+	db_base_impl.h			\
+	db_boards.h			\
+	db_util.h			\
+	fusb.h				\
+	fusb_darwin.h			\
+	fusb_generic.h			\
+	fusb_linux.h			\
+	fusb_ra_wb.h			\
+	fusb_win32.h			\
+	md5.h				\
+	rate_to_regval.h		\
+	usrp_config.h
+
+if PYTHON
+usrppython_PYTHON =			\
+	usrp_dbid.py			
+
+noinst_PYTHON =				\
+	gen_usrp_dbid.py		\
+	check_data.py			\
+	dump_data.py
+endif
+
+# common way for generating sources from templates when using
+# BUILT_SOURCES, using parallel build protection.
+gen_sources = $(BUILT_SOURCES)
+gen_sources_deps = gen_usrp_dbid.py usrp_dbid.dat
+par_gen_command = PYTHONPATH=$(top_srcdir)/usrp/src srcdir=$(srcdir) $(PYTHON) $(srcdir)/gen_usrp_dbid.py $(srcdir)/usrp_dbid.dat
+include $(top_srcdir)/Makefile.par.gen
diff --git a/usrp/host/lib/legacy/README_OSX b/usrp/host/lib/README_OSX
index 37026f25a..37026f25a 100644
--- a/usrp/host/lib/legacy/README_OSX
+++ b/usrp/host/lib/README_OSX
diff --git a/usrp/host/lib/legacy/ad9862.h b/usrp/host/lib/ad9862.h
index 4375d93d8..4375d93d8 100644
--- a/usrp/host/lib/legacy/ad9862.h
+++ b/usrp/host/lib/ad9862.h
diff --git a/usrp/host/lib/legacy/check_data.py b/usrp/host/lib/check_data.py
index 100f0f6dd..100f0f6dd 100755
--- a/usrp/host/lib/legacy/check_data.py
+++ b/usrp/host/lib/check_data.py
diff --git a/usrp/host/lib/legacy/circular_buffer.h b/usrp/host/lib/circular_buffer.h
index 8898e4194..8898e4194 100644
--- a/usrp/host/lib/legacy/circular_buffer.h
+++ b/usrp/host/lib/circular_buffer.h
diff --git a/usrp/host/lib/legacy/circular_linked_list.h b/usrp/host/lib/circular_linked_list.h
index e495d609b..e495d609b 100644
--- a/usrp/host/lib/legacy/circular_linked_list.h
+++ b/usrp/host/lib/circular_linked_list.h
diff --git a/usrp/host/lib/legacy/darwin_libusb.h b/usrp/host/lib/darwin_libusb.h
index 063a2e9c6..063a2e9c6 100644
--- a/usrp/host/lib/legacy/darwin_libusb.h
+++ b/usrp/host/lib/darwin_libusb.h
diff --git a/usrp/host/lib/legacy/db_base.cc b/usrp/host/lib/db_base.cc
index 80c6d4665..102166a86 100644
--- a/usrp/host/lib/legacy/db_base.cc
+++ b/usrp/host/lib/db_base.cc
@@ -1,5 +1,5 @@
 //
-// Copyright 2008 Free Software Foundation, Inc.
+// Copyright 2008,2009 Free Software Foundation, Inc.
 // 
 // This file is part of GNU Radio
 // 
@@ -19,7 +19,7 @@
 // Boston, MA 02110-1301, USA.
 //
 
-#include <db_base.h>
+#include <usrp/db_base.h>
 #include <db_base_impl.h>
 
 #if 0
diff --git a/usrp/host/lib/legacy/db_base_impl.h b/usrp/host/lib/db_base_impl.h
index bb4d95d73..9d5ca4370 100644
--- a/usrp/host/lib/legacy/db_base_impl.h
+++ b/usrp/host/lib/db_base_impl.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,12 +21,12 @@
 #ifndef INCLUDED_DB_BASE_IMPL_H
 #define INCLUDED_DB_BASE_IMPL_H
 
-#include <db_base.h>
+#include <usrp/db_base.h>
 #include <db_util.h>
-#include <usrp_basic.h>
+#include <usrp/usrp_basic.h>
 #include <fpga_regs_standard.h>
 #include <fpga_regs_common.h>
-#include <usrp_prims.h>
+#include <usrp/usrp_prims.h>
 #include <usrp_spi_defs.h>
 #include <stdexcept>
 
diff --git a/usrp/host/lib/legacy/db_basic.cc b/usrp/host/lib/db_basic.cc
index 4bafc9396..0c6bedec4 100644
--- a/usrp/host/lib/legacy/db_basic.cc
+++ b/usrp/host/lib/db_basic.cc
@@ -1,5 +1,5 @@
 //
-// Copyright 2008 Free Software Foundation, Inc.
+// Copyright 2008,2009 Free Software Foundation, Inc.
 // 
 // This file is part of GNU Radio
 // 
@@ -18,10 +18,9 @@
 // the Free Software Foundation, Inc., 51 Franklin Street,
 // Boston, MA 02110-1301, USA.
 
-#include <db_basic.h>
+#include <usrp/db_basic.h>
 #include <db_base_impl.h>
 
-
 db_basic_tx::db_basic_tx(boost::shared_ptr<usrp_basic> usrp, int which)
   : db_base(usrp, which)
 {
diff --git a/usrp/host/lib/legacy/db_boards.cc b/usrp/host/lib/db_boards.cc
index b537698be..070b8dd4e 100644
--- a/usrp/host/lib/legacy/db_boards.cc
+++ b/usrp/host/lib/db_boards.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 //
-// Copyright 2008 Free Software Foundation, Inc.
+// Copyright 2008,2009 Free Software Foundation, Inc.
 // 
 // This file is part of GNU Radio
 // 
@@ -21,16 +21,15 @@
 //
 
 #include <db_boards.h>
-#include <usrp_dbid.h>
-#include <db_basic.h>
-#include <db_tv_rx.h>
-#include <db_dbs_rx.h>
-#include <db_flexrf.h>
-#include <db_flexrf_mimo.h>
-#include <db_xcvr2450.h>
-#include <db_wbx.h>
-#include <db_dtt754.h>
-#include <db_dtt768.h>
+#include <usrp/usrp_dbid.h>
+#include <usrp/db_basic.h>
+#include <usrp/db_tv_rx.h>
+#include <usrp/db_dbs_rx.h>
+#include <usrp/db_flexrf.h>
+#include <usrp/db_flexrf_mimo.h>
+#include <usrp/db_xcvr2450.h>
+#include <usrp/db_dtt754.h>
+#include <usrp/db_dtt768.h>
 #include <cstdio>
 
 std::vector<db_base_sptr>
diff --git a/usrp/host/lib/legacy/db_boards.h b/usrp/host/lib/db_boards.h
index 037c46037..136091c53 100644
--- a/usrp/host/lib/legacy/db_boards.h
+++ b/usrp/host/lib/db_boards.h
@@ -23,8 +23,8 @@
 #ifndef DB_BOARDS_H
 #define DB_BOARDS_H
 
-#include <db_base.h>
-#include <usrp_basic.h>
+#include <usrp/db_base.h>
+#include <usrp/usrp_basic.h>
 
 std::vector<db_base_sptr> instantiate_dbs(int dbid, usrp_basic_sptr usrp, int which_side);
 
diff --git a/usrp/host/lib/legacy/db_dbs_rx.cc b/usrp/host/lib/db_dbs_rx.cc
index 6094f9134..99f66c785 100644
--- a/usrp/host/lib/legacy/db_dbs_rx.cc
+++ b/usrp/host/lib/db_dbs_rx.cc
@@ -18,7 +18,7 @@
 // the Free Software Foundation, Inc., 51 Franklin Street,
 // Boston, MA 02110-1301, USA.
 
-#include <db_dbs_rx.h>
+#include <usrp/db_dbs_rx.h>
 #include <db_base_impl.h>
 #include <cmath>
 #include <cstdio>
diff --git a/usrp/host/lib/legacy/db_dtt754.cc b/usrp/host/lib/db_dtt754.cc
index 4a6a1a29b..d78c5b328 100644
--- a/usrp/host/lib/legacy/db_dtt754.cc
+++ b/usrp/host/lib/db_dtt754.cc
@@ -19,7 +19,7 @@
 // the Free Software Foundation, Inc., 51 Franklin Street,
 // Boston, MA 02110-1301, USA.
 
-#include <db_dtt754.h>
+#include <usrp/db_dtt754.h>
 #include <db_base_impl.h>
 
 int
diff --git a/usrp/host/lib/legacy/db_dtt768.cc b/usrp/host/lib/db_dtt768.cc
index cae8b7347..a520fdc60 100644
--- a/usrp/host/lib/legacy/db_dtt768.cc
+++ b/usrp/host/lib/db_dtt768.cc
@@ -19,7 +19,7 @@
 // the Free Software Foundation, Inc., 51 Franklin Street,
 // Boston, MA 02110-1301, USA.
 
-#include <db_dtt768.h>
+#include <usrp/db_dtt768.h>
 #include <db_base_impl.h>
 
 int
diff --git a/usrp/host/lib/legacy/db_flexrf.cc b/usrp/host/lib/db_flexrf.cc
index 662d9095c..a8f4684b5 100644
--- a/usrp/host/lib/legacy/db_flexrf.cc
+++ b/usrp/host/lib/db_flexrf.cc
@@ -18,7 +18,7 @@
 // the Free Software Foundation, Inc., 51 Franklin Street,
 // Boston, MA 02110-1301, USA.
 
-#include <db_flexrf.h>
+#include <usrp/db_flexrf.h>
 #include <db_base_impl.h>
 
 // d'board i/o pin defs
diff --git a/usrp/host/lib/legacy/db_flexrf_mimo.cc b/usrp/host/lib/db_flexrf_mimo.cc
index fd996bfa9..e2db5cd10 100644
--- a/usrp/host/lib/legacy/db_flexrf_mimo.cc
+++ b/usrp/host/lib/db_flexrf_mimo.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -19,10 +19,10 @@
  * Boston, MA 02110-1301, USA.
  */ 
 
-#include <db_flexrf_mimo.h>
+#include <usrp/db_flexrf_mimo.h>
 #include <fpga_regs_standard.h>
 #include <fpga_regs_common.h>
-#include <usrp_prims.h>
+#include <usrp/usrp_prims.h>
 #include <usrp_spi_defs.h>
 
 
diff --git a/usrp/host/lib/legacy/db_tv_rx.cc b/usrp/host/lib/db_tv_rx.cc
index 803ebf86d..494ee7a1a 100644
--- a/usrp/host/lib/legacy/db_tv_rx.cc
+++ b/usrp/host/lib/db_tv_rx.cc
@@ -18,7 +18,7 @@
 // the Free Software Foundation, Inc., 51 Franklin Street,
 // Boston, MA 02110-1301, USA.
 
-#include <db_tv_rx.h>
+#include <usrp/db_tv_rx.h>
 #include <db_base_impl.h>
 
 /*****************************************************************************/
diff --git a/usrp/host/lib/legacy/db_util.cc b/usrp/host/lib/db_util.cc
index 4b46383bb..4b46383bb 100644
--- a/usrp/host/lib/legacy/db_util.cc
+++ b/usrp/host/lib/db_util.cc
diff --git a/usrp/host/lib/legacy/db_util.h b/usrp/host/lib/db_util.h
index e07abb608..e07abb608 100644
--- a/usrp/host/lib/legacy/db_util.h
+++ b/usrp/host/lib/db_util.h
diff --git a/usrp/host/lib/legacy/db_xcvr2450.cc b/usrp/host/lib/db_xcvr2450.cc
index 9ce3168e2..408a05587 100644
--- a/usrp/host/lib/legacy/db_xcvr2450.cc
+++ b/usrp/host/lib/db_xcvr2450.cc
@@ -18,7 +18,7 @@
 // the Free Software Foundation, Inc., 51 Franklin Street,
 // Boston, MA 02110-1301, USA.
 
-#include <db_xcvr2450.h>
+#include <usrp/db_xcvr2450.h>
 #include <db_base_impl.h>
 #include <cmath>
 #include <boost/thread.hpp>
diff --git a/usrp/host/lib/legacy/dump_data.py b/usrp/host/lib/dump_data.py
index 034586d8a..034586d8a 100755
--- a/usrp/host/lib/legacy/dump_data.py
+++ b/usrp/host/lib/dump_data.py
diff --git a/usrp/host/lib/legacy/fusb.cc b/usrp/host/lib/fusb.cc
index 6e4358f5f..6e4358f5f 100644
--- a/usrp/host/lib/legacy/fusb.cc
+++ b/usrp/host/lib/fusb.cc
diff --git a/usrp/host/lib/legacy/fusb.h b/usrp/host/lib/fusb.h
index 769e51cca..769e51cca 100644
--- a/usrp/host/lib/legacy/fusb.h
+++ b/usrp/host/lib/fusb.h
diff --git a/usrp/host/lib/legacy/fusb_darwin.cc b/usrp/host/lib/fusb_darwin.cc
index 737387b87..737387b87 100644
--- a/usrp/host/lib/legacy/fusb_darwin.cc
+++ b/usrp/host/lib/fusb_darwin.cc
diff --git a/usrp/host/lib/legacy/fusb_darwin.h b/usrp/host/lib/fusb_darwin.h
index bb717b58c..bb717b58c 100644
--- a/usrp/host/lib/legacy/fusb_darwin.h
+++ b/usrp/host/lib/fusb_darwin.h
diff --git a/usrp/host/lib/legacy/fusb_generic.cc b/usrp/host/lib/fusb_generic.cc
index 0958716d9..0958716d9 100644
--- a/usrp/host/lib/legacy/fusb_generic.cc
+++ b/usrp/host/lib/fusb_generic.cc
diff --git a/usrp/host/lib/legacy/fusb_generic.h b/usrp/host/lib/fusb_generic.h
index b9aef2737..b9aef2737 100644
--- a/usrp/host/lib/legacy/fusb_generic.h
+++ b/usrp/host/lib/fusb_generic.h
diff --git a/usrp/host/lib/legacy/fusb_linux.cc b/usrp/host/lib/fusb_linux.cc
index 6c484569f..6c484569f 100644
--- a/usrp/host/lib/legacy/fusb_linux.cc
+++ b/usrp/host/lib/fusb_linux.cc
diff --git a/usrp/host/lib/legacy/fusb_linux.h b/usrp/host/lib/fusb_linux.h
index 107e1af70..107e1af70 100644
--- a/usrp/host/lib/legacy/fusb_linux.h
+++ b/usrp/host/lib/fusb_linux.h
diff --git a/usrp/host/lib/legacy/fusb_ra_wb.cc b/usrp/host/lib/fusb_ra_wb.cc
index 699a34b39..699a34b39 100644
--- a/usrp/host/lib/legacy/fusb_ra_wb.cc
+++ b/usrp/host/lib/fusb_ra_wb.cc
diff --git a/usrp/host/lib/legacy/fusb_ra_wb.h b/usrp/host/lib/fusb_ra_wb.h
index 233976abe..233976abe 100644
--- a/usrp/host/lib/legacy/fusb_ra_wb.h
+++ b/usrp/host/lib/fusb_ra_wb.h
diff --git a/usrp/host/lib/legacy/fusb_sysconfig_darwin.cc b/usrp/host/lib/fusb_sysconfig_darwin.cc
index 4d19d1292..4d19d1292 100644
--- a/usrp/host/lib/legacy/fusb_sysconfig_darwin.cc
+++ b/usrp/host/lib/fusb_sysconfig_darwin.cc
diff --git a/usrp/host/lib/legacy/fusb_sysconfig_generic.cc b/usrp/host/lib/fusb_sysconfig_generic.cc
index 58baba5a5..58baba5a5 100644
--- a/usrp/host/lib/legacy/fusb_sysconfig_generic.cc
+++ b/usrp/host/lib/fusb_sysconfig_generic.cc
diff --git a/usrp/host/lib/legacy/fusb_sysconfig_linux.cc b/usrp/host/lib/fusb_sysconfig_linux.cc
index 3c2f59375..3c2f59375 100644
--- a/usrp/host/lib/legacy/fusb_sysconfig_linux.cc
+++ b/usrp/host/lib/fusb_sysconfig_linux.cc
diff --git a/usrp/host/lib/legacy/fusb_sysconfig_ra_wb.cc b/usrp/host/lib/fusb_sysconfig_ra_wb.cc
index 9da831fd5..9da831fd5 100644
--- a/usrp/host/lib/legacy/fusb_sysconfig_ra_wb.cc
+++ b/usrp/host/lib/fusb_sysconfig_ra_wb.cc
diff --git a/usrp/host/lib/legacy/fusb_sysconfig_win32.cc b/usrp/host/lib/fusb_sysconfig_win32.cc
index 16eaaa645..16eaaa645 100644
--- a/usrp/host/lib/legacy/fusb_sysconfig_win32.cc
+++ b/usrp/host/lib/fusb_sysconfig_win32.cc
diff --git a/usrp/host/lib/legacy/fusb_win32.cc b/usrp/host/lib/fusb_win32.cc
index 8900576d9..8900576d9 100644
--- a/usrp/host/lib/legacy/fusb_win32.cc
+++ b/usrp/host/lib/fusb_win32.cc
diff --git a/usrp/host/lib/legacy/fusb_win32.h b/usrp/host/lib/fusb_win32.h
index 3ad2132f4..3ad2132f4 100644
--- a/usrp/host/lib/legacy/fusb_win32.h
+++ b/usrp/host/lib/fusb_win32.h
diff --git a/usrp/host/lib/legacy/gen_usrp_dbid.py b/usrp/host/lib/gen_usrp_dbid.py
index bbfdc7503..c7d3770c1 100755
--- a/usrp/host/lib/legacy/gen_usrp_dbid.py
+++ b/usrp/host/lib/gen_usrp_dbid.py
@@ -25,7 +25,7 @@ def gen_dbid_py(r):
         f.write('%-16s = %s\n' % (x[1], x[2]))
 
 def gen_dbid_h(r):
-    f = open('usrp_dbid.h', 'w')
+    f = open('../include/usrp/usrp_dbid.h', 'w')
     comment_char = '//'
     write_header(f, comment_char)
     f.write(comment_char); f.write('\n')
@@ -64,8 +64,8 @@ def gen_dbid_cc(r):
  * Boston, MA 02110-1301, USA.
  */
 
-#include <usrp_prims.h>
-#include <usrp_dbid.h>
+#include <usrp/usrp_prims.h>
+#include <usrp/usrp_dbid.h>
 #include <stdio.h>
 
 #define NELEM(x) sizeof(x)/sizeof(x[0])
diff --git a/usrp/host/lib/legacy/Makefile.am b/usrp/host/lib/legacy/Makefile.am
deleted file mode 100644
index e1b1b850a..000000000
--- a/usrp/host/lib/legacy/Makefile.am
+++ /dev/null
@@ -1,196 +0,0 @@
-#
-#  USRP - Universal Software Radio Peripheral
-# 
-#  Copyright (C) 2003,2004,2006,2007,2008,2009 Free Software Foundation, Inc.
-# 
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 3 of the License, or
-#  (at your option) any later version.
-# 
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-# 
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-# 
-
-include $(top_srcdir)/Makefile.common
-
-common_INCLUDES = $(USRP_INCLUDES)
-
-lib_LTLIBRARIES = libusrp.la
-
-libusrp_la_common_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(BOOST_LDFLAGS)
-
-libusrp_la_common_LIBADD = 		\
-	$(USB_LIBS) 			\
-	$(BOOST_THREAD_LIB)		\
-	../../misc/libmisc.la
-
-# darwin fusb requires omnithreads
-if FUSB_TECH_darwin
-AM_CPPFLAGS = $(common_INCLUDES) $(OMNITHREAD_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
-libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(OMNITHREAD_LA)
-libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) -framework CoreFoundation
-else
-AM_CPPFLAGS = $(common_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
-libusrp_la_LIBADD = $(libusrp_la_common_LIBADD)
-libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS)
-endif
-
-EXTRA_DIST = 				\
-	std_paths.h.in			\
-	usrp_dbid.dat			
-
-BUILT_SOURCES = 			\
-	usrp_dbid.h
-
-BUILT_SOURCES += usrp_dbid.cc \
-	         usrp_dbid.py
-
-# ----------------------------------------------------------------
-# FUSB_TECH is set at configure time by way of
-#   usrp/config/usrp_fusb_tech.m4.
-#   It indicates which fast usb strategy we should be building.
-#   We currently implement "generic", "darwin", "win32" and "linux"
-
-
-generic_CODE = 				\
-	fusb_generic.cc			\
-	fusb_sysconfig_generic.cc
-
-darwin_CODE =				\
-	fusb_darwin.cc			\
-	fusb_sysconfig_darwin.cc 	\
-	README_OSX			\
-	circular_buffer.h		\
-	circular_linked_list.h		\
-	darwin_libusb.h			\
-	mld_threads.h			
-
-win32_CODE =				\
-	fusb_win32.cc			\
-	fusb_sysconfig_win32.cc 	
-
-linux_CODE =				\
-	fusb_linux.cc			\
-	fusb_sysconfig_linux.cc 	
-
-ra_wb_CODE =				\
-	fusb_ra_wb.cc			\
-	fusb_sysconfig_ra_wb.cc
-
-
-#
-# include each <foo>_CODE entry here...
-#
-EXTRA_libusrp_la_SOURCES =		\
-	$(generic_CODE)			\
-	$(darwin_CODE)			\
-	$(win32_CODE)			\
-	$(linux_CODE)			\
-	$(ra_wb_CODE)
-
-
-# work around automake deficiency
-libusrp_la_common_SOURCES = 		\
-	fusb.cc				\
-	md5.c				\
-	usrp_basic.cc			\
-	usrp_config.cc			\
-	usrp_dbid.cc			\
-	usrp_local_sighandler.cc	\
-	usrp_prims.cc			\
-	usrp_standard.cc		\
-	db_boards.cc			\
-	db_base.cc			\
-	db_basic.cc			\
-	db_tv_rx.cc			\
-	db_flexrf.cc			\
-	db_flexrf_mimo.cc		\
-	db_dbs_rx.cc			\
-	db_xcvr2450.cc			\
-	db_dtt754.cc			\
-	db_dtt768.cc			\
-	db_util.cc
-
-
-
-if FUSB_TECH_generic
-libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(generic_CODE)
-endif
-
-if FUSB_TECH_darwin
-libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(darwin_CODE)
-endif
-
-if FUSB_TECH_win32
-libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(win32_CODE)
-endif
-
-if FUSB_TECH_linux
-libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(linux_CODE)
-endif
-
-if FUSB_TECH_ra_wb
-libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(ra_wb_CODE)
-endif
-
-include_HEADERS = 			\
-	db_base.h			\
-	db_basic.h			\
-	db_dbs_rx.h			\
-	db_dtt754.h			\
-	db_dtt768.h			\
-	db_flexrf.h			\
-	db_flexrf_mimo.h		\
-	db_tv_rx.h			\
-	db_util.h			\
-	db_xcvr2450.h			\
-	usrp_basic.h			\
-	usrp_bytesex.h			\
-	usrp_config.h			\
-	usrp_dbid.h			\
-	usrp_prims.h			\
-	usrp_slots.h			\
-	usrp_standard.h			\
-	usrp_subdev_spec.h		\
-	usrp_tune_result.h		
-
-noinst_HEADERS =			\
-	ad9862.h			\
-	db_base_impl.h			\
-	db_boards.h			\
-	db_wbx.h			\
-	fusb.h				\
-	fusb_darwin.h			\
-	fusb_generic.h			\
-	fusb_linux.h			\
-	fusb_ra_wb.h			\
-	fusb_win32.h			\
-	md5.h				\
-	rate_to_regval.h		\
-	usrp_local_sighandler.h		
-
-if PYTHON
-usrppython_PYTHON =			\
-	usrp_dbid.py			
-
-noinst_PYTHON =				\
-	gen_usrp_dbid.py		\
-	check_data.py			\
-	dump_data.py
-
-swiginclude_HEADERS = db_base.i
-endif
-
-# common way for generating sources from templates when using
-# BUILT_SOURCES, using parallel build protection.
-gen_sources = $(BUILT_SOURCES)
-gen_sources_deps = gen_usrp_dbid.py usrp_dbid.dat
-par_gen_command = PYTHONPATH=$(top_srcdir)/usrp/src srcdir=$(srcdir) $(PYTHON) $(srcdir)/gen_usrp_dbid.py $(srcdir)/usrp_dbid.dat
-include $(top_srcdir)/Makefile.par.gen
diff --git a/usrp/host/lib/legacy/db_wbx.cc b/usrp/host/lib/limbo/db_wbx.cc
index 9f1d72939..9f1d72939 100644
--- a/usrp/host/lib/legacy/db_wbx.cc
+++ b/usrp/host/lib/limbo/db_wbx.cc
diff --git a/usrp/host/lib/legacy/db_wbx.h b/usrp/host/lib/limbo/db_wbx.h
index 3202d368c..3202d368c 100644
--- a/usrp/host/lib/legacy/db_wbx.h
+++ b/usrp/host/lib/limbo/db_wbx.h
diff --git a/usrp/host/lib/legacy/md5.c b/usrp/host/lib/md5.c
index b15ab390f..b15ab390f 100644
--- a/usrp/host/lib/legacy/md5.c
+++ b/usrp/host/lib/md5.c
diff --git a/usrp/host/lib/legacy/md5.h b/usrp/host/lib/md5.h
index 4a4e790c1..4a4e790c1 100644
--- a/usrp/host/lib/legacy/md5.h
+++ b/usrp/host/lib/md5.h
diff --git a/usrp/host/lib/legacy/mld_threads.h b/usrp/host/lib/mld_threads.h
index 322f557b6..322f557b6 100644
--- a/usrp/host/lib/legacy/mld_threads.h
+++ b/usrp/host/lib/mld_threads.h
diff --git a/usrp/host/lib/legacy/rate_to_regval.h b/usrp/host/lib/rate_to_regval.h
index 1ffdc0f69..1ffdc0f69 100644
--- a/usrp/host/lib/legacy/rate_to_regval.h
+++ b/usrp/host/lib/rate_to_regval.h
diff --git a/usrp/host/lib/legacy/std_paths.h.in b/usrp/host/lib/std_paths.h.in
index e09499e0b..e09499e0b 100644
--- a/usrp/host/lib/legacy/std_paths.h.in
+++ b/usrp/host/lib/std_paths.h.in
diff --git a/usrp/host/lib/legacy/usrp_basic.cc b/usrp/host/lib/usrp_basic.cc
index 295c62f8c..4f3df5212 100644
--- a/usrp/host/lib/legacy/usrp_basic.cc
+++ b/usrp/host/lib/usrp_basic.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003,2004,2008 Free Software Foundation, Inc.
+ * Copyright 2003,2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include "usrp_basic.h"
-#include "usrp_prims.h"
+#include <usrp/usrp_basic.h>
+#include "usrp/usrp_prims.h"
 #include "usrp_interfaces.h"
 #include "fpga_regs_common.h"
 #include "fpga_regs_standard.h"
diff --git a/usrp/host/lib/legacy/usrp_config.cc b/usrp/host/lib/usrp_config.cc
index fcf207f68..fcf207f68 100644
--- a/usrp/host/lib/legacy/usrp_config.cc
+++ b/usrp/host/lib/usrp_config.cc
diff --git a/usrp/host/lib/legacy/usrp_config.h b/usrp/host/lib/usrp_config.h
index ee5cb63bd..ee5cb63bd 100644
--- a/usrp/host/lib/legacy/usrp_config.h
+++ b/usrp/host/lib/usrp_config.h
diff --git a/usrp/host/lib/legacy/usrp_dbid.dat b/usrp/host/lib/usrp_dbid.dat
index bd7fd7ecb..bd7fd7ecb 100644
--- a/usrp/host/lib/legacy/usrp_dbid.dat
+++ b/usrp/host/lib/usrp_dbid.dat
diff --git a/usrp/host/lib/legacy/usrp_local_sighandler.cc b/usrp/host/lib/usrp_local_sighandler.cc
index 69cde0b37..59013972e 100644
--- a/usrp/host/lib/legacy/usrp_local_sighandler.cc
+++ b/usrp/host/lib/usrp_local_sighandler.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include <usrp_local_sighandler.h>
+#include <usrp/usrp_local_sighandler.h>
 #include <stdexcept>
 #include <stdio.h>
 #include <string.h>
diff --git a/usrp/host/lib/legacy/usrp_prims.cc b/usrp/host/lib/usrp_prims.cc
index c2f74f5f1..3d87d2459 100644
--- a/usrp/host/lib/legacy/usrp_prims.cc
+++ b/usrp/host/lib/usrp_prims.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003,2004,2006 Free Software Foundation, Inc.
+ * Copyright 2003,2004,2006,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include "usrp_prims.h"
+#include "usrp/usrp_prims.h"
 #include "usrp_commands.h"
 #include "usrp_ids.h"
 #include "usrp_i2c_addr.h"
diff --git a/usrp/host/lib/legacy/usrp_standard.cc b/usrp/host/lib/usrp_standard.cc
index b810f99cd..b112dbe0c 100644
--- a/usrp/host/lib/legacy/usrp_standard.cc
+++ b/usrp/host/lib/usrp_standard.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2008 Free Software Foundation, Inc.
+ * Copyright 2004,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,9 +20,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <usrp_standard.h>
+#include <usrp/usrp_standard.h>
 
-#include "usrp_prims.h"
+#include "usrp/usrp_prims.h"
 #include "fpga_regs_common.h"
 #include "fpga_regs_standard.h"
 #include <stdexcept>
diff --git a/usrp/host/swig/usrp_prims.i b/usrp/host/swig/usrp_prims.i
index d973c6d78..78a775cf1 100644
--- a/usrp/host/swig/usrp_prims.i
+++ b/usrp/host/swig/usrp_prims.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003,2004 Free Software Foundation, Inc.
+ * Copyright 2003,2004,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -36,7 +36,7 @@
 
 
 %{
-#include <usrp_prims.h>
+#include <usrp/usrp_prims.h>
 %}
 
 
diff --git a/usrp/host/apps-inband/Makefile.am b/usrp/limbo/apps-inband/Makefile.am
index 0a44d8112..0a44d8112 100644
--- a/usrp/host/apps-inband/Makefile.am
+++ b/usrp/limbo/apps-inband/Makefile.am
diff --git a/usrp/host/apps-inband/read_packets.cc b/usrp/limbo/apps-inband/read_packets.cc
index 24a1e88b5..24a1e88b5 100644
--- a/usrp/host/apps-inband/read_packets.cc
+++ b/usrp/limbo/apps-inband/read_packets.cc
diff --git a/usrp/host/apps-inband/test_usrp_inband_2rx.cc b/usrp/limbo/apps-inband/test_usrp_inband_2rx.cc
index c210f196a..c210f196a 100644
--- a/usrp/host/apps-inband/test_usrp_inband_2rx.cc
+++ b/usrp/limbo/apps-inband/test_usrp_inband_2rx.cc
diff --git a/usrp/host/apps-inband/test_usrp_inband_2tx.cc b/usrp/limbo/apps-inband/test_usrp_inband_2tx.cc
index 11a1a491c..11a1a491c 100644
--- a/usrp/host/apps-inband/test_usrp_inband_2tx.cc
+++ b/usrp/limbo/apps-inband/test_usrp_inband_2tx.cc
diff --git a/usrp/host/apps-inband/test_usrp_inband_overrun.cc b/usrp/limbo/apps-inband/test_usrp_inband_overrun.cc
index cd0fa525a..cd0fa525a 100644
--- a/usrp/host/apps-inband/test_usrp_inband_overrun.cc
+++ b/usrp/limbo/apps-inband/test_usrp_inband_overrun.cc
diff --git a/usrp/host/apps-inband/test_usrp_inband_ping.cc b/usrp/limbo/apps-inband/test_usrp_inband_ping.cc
index d779c9a64..d779c9a64 100644
--- a/usrp/host/apps-inband/test_usrp_inband_ping.cc
+++ b/usrp/limbo/apps-inband/test_usrp_inband_ping.cc
diff --git a/usrp/host/apps-inband/test_usrp_inband_registers.cc b/usrp/limbo/apps-inband/test_usrp_inband_registers.cc
index d9bd2db17..d9bd2db17 100644
--- a/usrp/host/apps-inband/test_usrp_inband_registers.cc
+++ b/usrp/limbo/apps-inband/test_usrp_inband_registers.cc
diff --git a/usrp/host/apps-inband/test_usrp_inband_rx.cc b/usrp/limbo/apps-inband/test_usrp_inband_rx.cc
index 4f21e4afc..4f21e4afc 100644
--- a/usrp/host/apps-inband/test_usrp_inband_rx.cc
+++ b/usrp/limbo/apps-inband/test_usrp_inband_rx.cc
diff --git a/usrp/host/apps-inband/test_usrp_inband_timestamps.cc b/usrp/limbo/apps-inband/test_usrp_inband_timestamps.cc
index 3b874d1a5..3b874d1a5 100644
--- a/usrp/host/apps-inband/test_usrp_inband_timestamps.cc
+++ b/usrp/limbo/apps-inband/test_usrp_inband_timestamps.cc
diff --git a/usrp/host/apps-inband/test_usrp_inband_tx.cc b/usrp/limbo/apps-inband/test_usrp_inband_tx.cc
index 9f294e770..9f294e770 100644
--- a/usrp/host/apps-inband/test_usrp_inband_tx.cc
+++ b/usrp/limbo/apps-inband/test_usrp_inband_tx.cc
diff --git a/usrp/host/apps-inband/test_usrp_inband_underrun.cc b/usrp/limbo/apps-inband/test_usrp_inband_underrun.cc
index 11babb048..11babb048 100644
--- a/usrp/host/apps-inband/test_usrp_inband_underrun.cc
+++ b/usrp/limbo/apps-inband/test_usrp_inband_underrun.cc
diff --git a/usrp/host/apps-inband/ui_nco.h b/usrp/limbo/apps-inband/ui_nco.h
index e6d7814ab..e6d7814ab 100644
--- a/usrp/host/apps-inband/ui_nco.h
+++ b/usrp/limbo/apps-inband/ui_nco.h
diff --git a/usrp/host/apps-inband/ui_sincos.c b/usrp/limbo/apps-inband/ui_sincos.c
index 27841f010..27841f010 100644
--- a/usrp/host/apps-inband/ui_sincos.c
+++ b/usrp/limbo/apps-inband/ui_sincos.c
diff --git a/usrp/host/apps-inband/ui_sincos.h b/usrp/limbo/apps-inband/ui_sincos.h
index d2d6e4b76..d2d6e4b76 100644
--- a/usrp/host/apps-inband/ui_sincos.h
+++ b/usrp/limbo/apps-inband/ui_sincos.h
diff --git a/usrp/host/lib/inband/Makefile.am b/usrp/limbo/inband/Makefile.am
index 650a25ff9..650a25ff9 100644
--- a/usrp/host/lib/inband/Makefile.am
+++ b/usrp/limbo/inband/Makefile.am
diff --git a/usrp/host/lib/inband/dump_packets.py b/usrp/limbo/inband/dump_packets.py
index 237362406..237362406 100755
--- a/usrp/host/lib/inband/dump_packets.py
+++ b/usrp/limbo/inband/dump_packets.py
diff --git a/usrp/host/lib/inband/gen_test_packets.py b/usrp/limbo/inband/gen_test_packets.py
index 2ee646384..2ee646384 100755
--- a/usrp/host/lib/inband/gen_test_packets.py
+++ b/usrp/limbo/inband/gen_test_packets.py
diff --git a/usrp/host/lib/inband/qa_inband.cc b/usrp/limbo/inband/qa_inband.cc
index 6f33a6ead..6f33a6ead 100644
--- a/usrp/host/lib/inband/qa_inband.cc
+++ b/usrp/limbo/inband/qa_inband.cc
diff --git a/usrp/host/lib/inband/qa_inband.h b/usrp/limbo/inband/qa_inband.h
index ab8f7f250..ab8f7f250 100644
--- a/usrp/host/lib/inband/qa_inband.h
+++ b/usrp/limbo/inband/qa_inband.h
diff --git a/usrp/host/lib/inband/qa_inband_packet_prims.cc b/usrp/limbo/inband/qa_inband_packet_prims.cc
index d9bbbec22..d9bbbec22 100644
--- a/usrp/host/lib/inband/qa_inband_packet_prims.cc
+++ b/usrp/limbo/inband/qa_inband_packet_prims.cc
diff --git a/usrp/host/lib/inband/qa_inband_packet_prims.h b/usrp/limbo/inband/qa_inband_packet_prims.h
index 71c0d737d..71c0d737d 100644
--- a/usrp/host/lib/inband/qa_inband_packet_prims.h
+++ b/usrp/limbo/inband/qa_inband_packet_prims.h
diff --git a/usrp/host/lib/inband/qa_inband_usrp_server.cc b/usrp/limbo/inband/qa_inband_usrp_server.cc
index 6049a8a87..6049a8a87 100644
--- a/usrp/host/lib/inband/qa_inband_usrp_server.cc
+++ b/usrp/limbo/inband/qa_inband_usrp_server.cc
diff --git a/usrp/host/lib/inband/qa_inband_usrp_server.h b/usrp/limbo/inband/qa_inband_usrp_server.h
index 52a4a0b06..52a4a0b06 100644
--- a/usrp/host/lib/inband/qa_inband_usrp_server.h
+++ b/usrp/limbo/inband/qa_inband_usrp_server.h
diff --git a/usrp/host/lib/inband/symbols_usrp_channel.h b/usrp/limbo/inband/symbols_usrp_channel.h
index a0114cf3c..a0114cf3c 100644
--- a/usrp/host/lib/inband/symbols_usrp_channel.h
+++ b/usrp/limbo/inband/symbols_usrp_channel.h
diff --git a/usrp/host/lib/inband/symbols_usrp_interface_cs.h b/usrp/limbo/inband/symbols_usrp_interface_cs.h
index 72c8fcc91..72c8fcc91 100644
--- a/usrp/host/lib/inband/symbols_usrp_interface_cs.h
+++ b/usrp/limbo/inband/symbols_usrp_interface_cs.h
diff --git a/usrp/host/lib/inband/symbols_usrp_low_level_cs.h b/usrp/limbo/inband/symbols_usrp_low_level_cs.h
index a7260603a..a7260603a 100644
--- a/usrp/host/lib/inband/symbols_usrp_low_level_cs.h
+++ b/usrp/limbo/inband/symbols_usrp_low_level_cs.h
diff --git a/usrp/host/lib/inband/symbols_usrp_rx.h b/usrp/limbo/inband/symbols_usrp_rx.h
index 07d58a3f5..07d58a3f5 100644
--- a/usrp/host/lib/inband/symbols_usrp_rx.h
+++ b/usrp/limbo/inband/symbols_usrp_rx.h
diff --git a/usrp/host/lib/inband/symbols_usrp_rx_cs.h b/usrp/limbo/inband/symbols_usrp_rx_cs.h
index bf4f0338b..bf4f0338b 100644
--- a/usrp/host/lib/inband/symbols_usrp_rx_cs.h
+++ b/usrp/limbo/inband/symbols_usrp_rx_cs.h
diff --git a/usrp/host/lib/inband/symbols_usrp_server_cs.h b/usrp/limbo/inband/symbols_usrp_server_cs.h
index e612e24ea..e612e24ea 100644
--- a/usrp/host/lib/inband/symbols_usrp_server_cs.h
+++ b/usrp/limbo/inband/symbols_usrp_server_cs.h
diff --git a/usrp/host/lib/inband/symbols_usrp_tx.h b/usrp/limbo/inband/symbols_usrp_tx.h
index 4e58e2cf9..4e58e2cf9 100644
--- a/usrp/host/lib/inband/symbols_usrp_tx.h
+++ b/usrp/limbo/inband/symbols_usrp_tx.h
diff --git a/usrp/host/lib/inband/symbols_usrp_tx_cs.h b/usrp/limbo/inband/symbols_usrp_tx_cs.h
index d02ef1d26..d02ef1d26 100644
--- a/usrp/host/lib/inband/symbols_usrp_tx_cs.h
+++ b/usrp/limbo/inband/symbols_usrp_tx_cs.h
diff --git a/usrp/host/lib/inband/test_inband.cc b/usrp/limbo/inband/test_inband.cc
index 77cdca556..77cdca556 100644
--- a/usrp/host/lib/inband/test_inband.cc
+++ b/usrp/limbo/inband/test_inband.cc
diff --git a/usrp/host/lib/inband/usb_packet.py b/usrp/limbo/inband/usb_packet.py
index 6dfcf8638..6dfcf8638 100644
--- a/usrp/host/lib/inband/usb_packet.py
+++ b/usrp/limbo/inband/usb_packet.py
diff --git a/usrp/host/lib/inband/usrp_inband_usb_packet.cc b/usrp/limbo/inband/usrp_inband_usb_packet.cc
index 72bc45ccb..72bc45ccb 100644
--- a/usrp/host/lib/inband/usrp_inband_usb_packet.cc
+++ b/usrp/limbo/inband/usrp_inband_usb_packet.cc
diff --git a/usrp/host/lib/inband/usrp_inband_usb_packet.h b/usrp/limbo/inband/usrp_inband_usb_packet.h
index 6f1a3feb3..6f1a3feb3 100644
--- a/usrp/host/lib/inband/usrp_inband_usb_packet.h
+++ b/usrp/limbo/inband/usrp_inband_usb_packet.h
diff --git a/usrp/host/lib/inband/usrp_interface.mbh b/usrp/limbo/inband/usrp_interface.mbh
index ad0f78b4e..ad0f78b4e 100644
--- a/usrp/host/lib/inband/usrp_interface.mbh
+++ b/usrp/limbo/inband/usrp_interface.mbh
diff --git a/usrp/host/lib/inband/usrp_rx.cc b/usrp/limbo/inband/usrp_rx.cc
index fe9486cf6..fe9486cf6 100644
--- a/usrp/host/lib/inband/usrp_rx.cc
+++ b/usrp/limbo/inband/usrp_rx.cc
diff --git a/usrp/host/lib/inband/usrp_rx.h b/usrp/limbo/inband/usrp_rx.h
index 1006235bf..1006235bf 100644
--- a/usrp/host/lib/inband/usrp_rx.h
+++ b/usrp/limbo/inband/usrp_rx.h
diff --git a/usrp/host/lib/inband/usrp_rx_stub.cc b/usrp/limbo/inband/usrp_rx_stub.cc
index e5c454d24..e5c454d24 100644
--- a/usrp/host/lib/inband/usrp_rx_stub.cc
+++ b/usrp/limbo/inband/usrp_rx_stub.cc
diff --git a/usrp/host/lib/inband/usrp_rx_stub.h b/usrp/limbo/inband/usrp_rx_stub.h
index 238b4568f..238b4568f 100644
--- a/usrp/host/lib/inband/usrp_rx_stub.h
+++ b/usrp/limbo/inband/usrp_rx_stub.h
diff --git a/usrp/host/lib/inband/usrp_server.cc b/usrp/limbo/inband/usrp_server.cc
index ac2636308..ac2636308 100644
--- a/usrp/host/lib/inband/usrp_server.cc
+++ b/usrp/limbo/inband/usrp_server.cc
diff --git a/usrp/host/lib/inband/usrp_server.h b/usrp/limbo/inband/usrp_server.h
index dd1825d57..dd1825d57 100644
--- a/usrp/host/lib/inband/usrp_server.h
+++ b/usrp/limbo/inband/usrp_server.h
diff --git a/usrp/host/lib/inband/usrp_server.mbh b/usrp/limbo/inband/usrp_server.mbh
index ed7943fc3..ed7943fc3 100644
--- a/usrp/host/lib/inband/usrp_server.mbh
+++ b/usrp/limbo/inband/usrp_server.mbh
diff --git a/usrp/host/lib/inband/usrp_tx.cc b/usrp/limbo/inband/usrp_tx.cc
index 0d4a84619..0d4a84619 100644
--- a/usrp/host/lib/inband/usrp_tx.cc
+++ b/usrp/limbo/inband/usrp_tx.cc
diff --git a/usrp/host/lib/inband/usrp_tx.h b/usrp/limbo/inband/usrp_tx.h
index d3a6f8b54..d3a6f8b54 100644
--- a/usrp/host/lib/inband/usrp_tx.h
+++ b/usrp/limbo/inband/usrp_tx.h
diff --git a/usrp/host/lib/inband/usrp_tx_stub.cc b/usrp/limbo/inband/usrp_tx_stub.cc
index c78b1a7b8..c78b1a7b8 100644
--- a/usrp/host/lib/inband/usrp_tx_stub.cc
+++ b/usrp/limbo/inband/usrp_tx_stub.cc
diff --git a/usrp/host/lib/inband/usrp_tx_stub.h b/usrp/limbo/inband/usrp_tx_stub.h
index b81037ad7..b81037ad7 100644
--- a/usrp/host/lib/inband/usrp_tx_stub.h
+++ b/usrp/limbo/inband/usrp_tx_stub.h
diff --git a/usrp/host/lib/inband/usrp_usb_interface.cc b/usrp/limbo/inband/usrp_usb_interface.cc
index fb7109a5a..fb7109a5a 100644
--- a/usrp/host/lib/inband/usrp_usb_interface.cc
+++ b/usrp/limbo/inband/usrp_usb_interface.cc
diff --git a/usrp/host/lib/inband/usrp_usb_interface.h b/usrp/limbo/inband/usrp_usb_interface.h
index 4d7750a7d..4d7750a7d 100644
--- a/usrp/host/lib/inband/usrp_usb_interface.h
+++ b/usrp/limbo/inband/usrp_usb_interface.h
diff --git a/usrp/usrp-inband.pc.in b/usrp/usrp-inband.pc.in
deleted file mode 100644
index 57e274624..000000000
--- a/usrp/usrp-inband.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: usrp-inband
-Description: USRP C++ Interface with in-band signaling
-Requires: usrp pmt mblock
-Version: @VERSION@
-Libs: -L${libdir} -lusrp-inband
-Cflags: -I${includedir}