From 66dca69648e7fa8fbdd2973f77224ad34198d9a5 Mon Sep 17 00:00:00 2001
From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Sat, 20 Dec 2008 20:54:52 +0000
Subject: [PATCH] Move mblock library include files into separate library. 
 Updates to usrp in-band code to accommodate.  Tested with out-of-tree mblock
 application builds.  Trunk passes distcheck.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10144 221aa14e-8319-0410-a670-987f0aec2ac5
---
 config/grc_mblock.m4                          |  4 +-
 mblock/src/Makefile.am                        |  4 +-
 mblock/src/include/Makefile.am                | 24 ++++++++++++
 mblock/src/include/mblock/Makefile.am         | 37 +++++++++++++++++++
 .../mblock/class_registry.h}                  |  4 +-
 .../mb_common.h => include/mblock/common.h}   |  2 +-
 .../mblock/exception.h}                       |  2 +-
 .../mb_mblock.h => include/mblock/mblock.h}   | 10 ++---
 .../mb_message.h => include/mblock/message.h} |  4 +-
 .../mblock/msg_accepter.h}                    |  4 +-
 .../mblock/msg_queue.h}                       |  6 +--
 .../{lib/mb_port.h => include/mblock/port.h}  |  4 +-
 .../mblock/protocol_class.h}                  |  4 +-
 .../mb_runtime.h => include/mblock/runtime.h} |  4 +-
 .../{lib/mb_time.h => include/mblock/time.h}  |  0
 mblock/src/lib/Makefile.am                    | 21 ++---------
 mblock/src/lib/benchmark_send.cc              |  4 +-
 mblock/src/lib/mb_class_registry.cc           |  4 +-
 mblock/src/lib/mb_endpoint.h                  |  4 +-
 mblock/src/lib/mb_exception.cc                |  6 +--
 mblock/src/lib/mb_mblock.cc                   |  8 ++--
 mblock/src/lib/mb_mblock_impl.cc              | 10 ++---
 mblock/src/lib/mb_mblock_impl.h               |  6 +--
 mblock/src/lib/mb_message.cc                  |  4 +-
 mblock/src/lib/mb_msg_accepter.cc             |  2 +-
 mblock/src/lib/mb_msg_accepter_msgq.cc        |  4 +-
 mblock/src/lib/mb_msg_accepter_msgq.h         |  6 +--
 mblock/src/lib/mb_msg_accepter_smp.cc         |  8 ++--
 mblock/src/lib/mb_msg_accepter_smp.h          |  2 +-
 mblock/src/lib/mb_msg_queue.cc                |  6 +--
 mblock/src/lib/mb_port.cc                     |  6 +--
 mblock/src/lib/mb_port_simple.cc              |  8 ++--
 mblock/src/lib/mb_port_simple.h               |  4 +-
 mblock/src/lib/mb_protocol_class.cc           |  4 +-
 mblock/src/lib/mb_runtime.cc                  |  4 +-
 mblock/src/lib/mb_runtime_base.cc             |  2 +-
 mblock/src/lib/mb_runtime_base.h              |  4 +-
 mblock/src/lib/mb_runtime_nop.cc              |  8 ++--
 mblock/src/lib/mb_runtime_thread_per_block.cc |  8 ++--
 mblock/src/lib/mb_runtime_thread_per_block.h  |  2 +-
 mblock/src/lib/mb_timer_queue.h               |  6 +--
 mblock/src/lib/mb_worker.cc                   |  8 ++--
 mblock/src/lib/mb_worker.h                    |  6 +--
 mblock/src/lib/mbi_runtime_lock.h             |  4 +-
 mblock/src/lib/qa_bitset.cc                   | 10 ++---
 mblock/src/lib/qa_disconnect.cc               | 10 ++---
 mblock/src/lib/qa_mblock_prims.cc             | 18 ++++-----
 mblock/src/lib/qa_mblock_send.cc              | 18 ++++-----
 mblock/src/lib/qa_mblock_sys.cc               | 18 ++++-----
 mblock/src/lib/qa_timeouts.cc                 | 14 +++----
 mblock/src/scheme/gnuradio/compile-mbh.scm    |  4 +-
 usrp/host/apps-inband/Makefile.am             |  2 +-
 usrp/host/apps-inband/read_packets.cc         |  4 +-
 usrp/host/apps-inband/test_usrp_inband_2rx.cc | 18 ++++-----
 usrp/host/apps-inband/test_usrp_inband_2tx.cc | 18 ++++-----
 .../apps-inband/test_usrp_inband_overrun.cc   | 18 ++++-----
 .../host/apps-inband/test_usrp_inband_ping.cc | 18 ++++-----
 .../apps-inband/test_usrp_inband_registers.cc | 16 ++++----
 usrp/host/apps-inband/test_usrp_inband_rx.cc  | 16 ++++----
 .../test_usrp_inband_timestamps.cc            | 18 ++++-----
 usrp/host/apps-inband/test_usrp_inband_tx.cc  | 18 ++++-----
 .../apps-inband/test_usrp_inband_underrun.cc  | 18 ++++-----
 usrp/host/lib/inband/qa_inband_usrp_server.cc | 10 ++---
 usrp/host/lib/inband/usrp_inband_usb_packet.h |  4 +-
 usrp/host/lib/inband/usrp_rx.cc               |  2 +-
 usrp/host/lib/inband/usrp_rx.h                |  4 +-
 usrp/host/lib/inband/usrp_rx_stub.cc          |  4 +-
 usrp/host/lib/inband/usrp_rx_stub.h           |  4 +-
 usrp/host/lib/inband/usrp_server.cc           |  4 +-
 usrp/host/lib/inband/usrp_server.h            |  4 +-
 usrp/host/lib/inband/usrp_tx.cc               |  4 +-
 usrp/host/lib/inband/usrp_tx.h                |  4 +-
 usrp/host/lib/inband/usrp_tx_stub.cc          |  4 +-
 usrp/host/lib/inband/usrp_tx_stub.h           |  4 +-
 usrp/host/lib/inband/usrp_usb_interface.cc    |  4 +-
 usrp/host/lib/inband/usrp_usb_interface.h     |  2 +-
 76 files changed, 323 insertions(+), 273 deletions(-)
 create mode 100644 mblock/src/include/Makefile.am
 create mode 100644 mblock/src/include/mblock/Makefile.am
 rename mblock/src/{lib/mb_class_registry.h => include/mblock/class_registry.h} (95%)
 rename mblock/src/{lib/mb_common.h => include/mblock/common.h} (97%)
 rename mblock/src/{lib/mb_exception.h => include/mblock/exception.h} (97%)
 rename mblock/src/{lib/mb_mblock.h => include/mblock/mblock.h} (98%)
 rename mblock/src/{lib/mb_message.h => include/mblock/message.h} (96%)
 rename mblock/src/{lib/mb_msg_accepter.h => include/mblock/msg_accepter.h} (95%)
 rename mblock/src/{lib/mb_msg_queue.h => include/mblock/msg_queue.h} (95%)
 rename mblock/src/{lib/mb_port.h => include/mblock/port.h} (96%)
 rename mblock/src/{lib/mb_protocol_class.h => include/mblock/protocol_class.h} (95%)
 rename mblock/src/{lib/mb_runtime.h => include/mblock/runtime.h} (96%)
 rename mblock/src/{lib/mb_time.h => include/mblock/time.h} (100%)

diff --git a/config/grc_mblock.m4 b/config/grc_mblock.m4
index e262f25b..e3ae1817 100644
--- a/config/grc_mblock.m4
+++ b/config/grc_mblock.m4
@@ -36,7 +36,7 @@ AC_DEFUN([GRC_MBLOCK],[
     fi
     if test $passed != with; then
 	dnl how and where to find INCLUDES and LA
-	mblock_INCLUDES="-I\${abs_top_srcdir}/mblock/src/lib"
+	mblock_INCLUDES="-I\${abs_top_srcdir}/mblock/src/include"
         mblock_LA="\${abs_top_builddir}/mblock/src/lib/libmblock.la"
     fi
 
@@ -45,6 +45,8 @@ AC_DEFUN([GRC_MBLOCK],[
         mblock/mblock.pc \
         mblock/doc/Makefile \
         mblock/src/Makefile \
+	mblock/src/include/Makefile \
+	mblock/src/include/mblock/Makefile \
         mblock/src/lib/Makefile \
         mblock/src/scheme/Makefile \
         mblock/src/scheme/gnuradio/Makefile \
diff --git a/mblock/src/Makefile.am b/mblock/src/Makefile.am
index 52f60f47..60995c97 100644
--- a/mblock/src/Makefile.am
+++ b/mblock/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2006 Free Software Foundation, Inc.
+# Copyright 2004,2006,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -19,4 +19,4 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = lib scheme
+SUBDIRS = include lib scheme
diff --git a/mblock/src/include/Makefile.am b/mblock/src/include/Makefile.am
new file mode 100644
index 00000000..d5672989
--- /dev/null
+++ b/mblock/src/include/Makefile.am
@@ -0,0 +1,24 @@
+#
+# Copyright 2008 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
+
+SUBDIRS = mblock
diff --git a/mblock/src/include/mblock/Makefile.am b/mblock/src/include/mblock/Makefile.am
new file mode 100644
index 00000000..e36215aa
--- /dev/null
+++ b/mblock/src/include/mblock/Makefile.am
@@ -0,0 +1,37 @@
+#
+# Copyright 2008 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
+
+mbincludedir = $(includedir)/mblock
+
+mbinclude_HEADERS = \
+	common.h \
+	class_registry.h \
+	exception.h \
+	mblock.h \
+	message.h \
+	msg_accepter.h \
+	msg_queue.h \
+	port.h \
+	protocol_class.h \
+	runtime.h \
+	time.h
diff --git a/mblock/src/lib/mb_class_registry.h b/mblock/src/include/mblock/class_registry.h
similarity index 95%
rename from mblock/src/lib/mb_class_registry.h
rename to mblock/src/include/mblock/class_registry.h
index 713cc1e2..b94a7cbc 100644
--- a/mblock/src/lib/mb_class_registry.h
+++ b/mblock/src/include/mblock/class_registry.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_MB_CLASS_REGISTRY_H
 #define INCLUDED_MB_CLASS_REGISTRY_H
 
-#include <mb_common.h>
+#include <mblock/common.h>
 
 //! conceptually, pointer to constructor
 typedef mb_mblock_sptr (*mb_mblock_maker_t)(mb_runtime *runtime,
diff --git a/mblock/src/lib/mb_common.h b/mblock/src/include/mblock/common.h
similarity index 97%
rename from mblock/src/lib/mb_common.h
rename to mblock/src/include/mblock/common.h
index 1f78d5a4..2507d053 100644
--- a/mblock/src/lib/mb_common.h
+++ b/mblock/src/include/mblock/common.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2007 Free Software Foundation, Inc.
+ * Copyright 2006,2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
diff --git a/mblock/src/lib/mb_exception.h b/mblock/src/include/mblock/exception.h
similarity index 97%
rename from mblock/src/lib/mb_exception.h
rename to mblock/src/include/mblock/exception.h
index 837e49f4..6cc45665 100644
--- a/mblock/src/lib/mb_exception.h
+++ b/mblock/src/include/mblock/exception.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
diff --git a/mblock/src/lib/mb_mblock.h b/mblock/src/include/mblock/mblock.h
similarity index 98%
rename from mblock/src/lib/mb_mblock.h
rename to mblock/src/include/mblock/mblock.h
index 146e2800..14517ffc 100644
--- a/mblock/src/lib/mb_mblock.h
+++ b/mblock/src/include/mblock/mblock.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,10 +21,10 @@
 #ifndef INCLUDED_MB_MBLOCK_H
 #define INCLUDED_MB_MBLOCK_H
 
-#include <mb_common.h>
-#include <mb_message.h>
-#include <mb_port.h>
-#include <mb_time.h>
+#include <mblock/common.h>
+#include <mblock/message.h>
+#include <mblock/port.h>
+#include <mblock/time.h>
 
 
 /*!
diff --git a/mblock/src/lib/mb_message.h b/mblock/src/include/mblock/message.h
similarity index 96%
rename from mblock/src/lib/mb_message.h
rename to mblock/src/include/mblock/message.h
index f5e46553..8fbee2ff 100644
--- a/mblock/src/lib/mb_message.h
+++ b/mblock/src/include/mblock/message.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2007 Free Software Foundation, Inc.
+ * Copyright 2006,2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_MB_MESSAGE_H
 #define INCLUDED_MB_MESSAGE_H
 
-#include <mb_common.h>
+#include <mblock/common.h>
 #include <iosfwd>
 
 #define MB_MESSAGE_LOCAL_ALLOCATOR 0	// define to 0 or 1
diff --git a/mblock/src/lib/mb_msg_accepter.h b/mblock/src/include/mblock/msg_accepter.h
similarity index 95%
rename from mblock/src/lib/mb_msg_accepter.h
rename to mblock/src/include/mblock/msg_accepter.h
index 254b3b04..69be1311 100644
--- a/mblock/src/lib/mb_msg_accepter.h
+++ b/mblock/src/include/mblock/msg_accepter.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_MB_MSG_ACCEPTER_H
 #define INCLUDED_MB_MSG_ACCEPTER_H
 
-#include <mb_common.h>
+#include <mblock/common.h>
 
 /*!
  * \brief Abstract class that accepts messages
diff --git a/mblock/src/lib/mb_msg_queue.h b/mblock/src/include/mblock/msg_queue.h
similarity index 95%
rename from mblock/src/lib/mb_msg_queue.h
rename to mblock/src/include/mblock/msg_queue.h
index a1cd43f1..31ff65a5 100644
--- a/mblock/src/lib/mb_msg_queue.h
+++ b/mblock/src/include/mblock/msg_queue.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,9 +21,9 @@
 #ifndef INCLUDED_MB_MSG_QUEUE_H
 #define INCLUDED_MB_MSG_QUEUE_H
 
-#include <mb_common.h>
+#include <mblock/common.h>
 #include <omnithread.h>
-#include <mb_time.h>
+#include <mblock/time.h>
 
 /*!
  * \brief priority queue for mblock messages
diff --git a/mblock/src/lib/mb_port.h b/mblock/src/include/mblock/port.h
similarity index 96%
rename from mblock/src/lib/mb_port.h
rename to mblock/src/include/mblock/port.h
index 0e9898bc..892a1dd9 100644
--- a/mblock/src/lib/mb_port.h
+++ b/mblock/src/include/mblock/port.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_MB_PORT_H
 #define INCLUDED_MB_PORT_H
 
-#include <mb_common.h>
+#include <mblock/common.h>
 
 /*!
  * \brief Abstract port characteristics
diff --git a/mblock/src/lib/mb_protocol_class.h b/mblock/src/include/mblock/protocol_class.h
similarity index 95%
rename from mblock/src/lib/mb_protocol_class.h
rename to mblock/src/include/mblock/protocol_class.h
index 7a1d9afb..33c5d711 100644
--- a/mblock/src/lib/mb_protocol_class.h
+++ b/mblock/src/include/mblock/protocol_class.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_MB_PROTOCOL_CLASS_H
 #define INCLUDED_MB_PROTOCOL_CLASS_H
 
-#include <mb_common.h>
+#include <mblock/common.h>
 
 /*!
  * \brief construct a protocol_class
diff --git a/mblock/src/lib/mb_runtime.h b/mblock/src/include/mblock/runtime.h
similarity index 96%
rename from mblock/src/lib/mb_runtime.h
rename to mblock/src/include/mblock/runtime.h
index 1c9ebcab..4236e346 100644
--- a/mblock/src/lib/mb_runtime.h
+++ b/mblock/src/include/mblock/runtime.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_MB_RUNTIME_H
 #define INCLUDED_MB_RUNTIME_H
 
-#include <mb_common.h>
+#include <mblock/common.h>
 #include <omnithread.h>
 
 /*!
diff --git a/mblock/src/lib/mb_time.h b/mblock/src/include/mblock/time.h
similarity index 100%
rename from mblock/src/lib/mb_time.h
rename to mblock/src/include/mblock/time.h
diff --git a/mblock/src/lib/Makefile.am b/mblock/src/lib/Makefile.am
index e8e5f59a..269c8ae2 100644
--- a/mblock/src/lib/Makefile.am
+++ b/mblock/src/lib/Makefile.am
@@ -22,7 +22,8 @@
 include $(top_srcdir)/Makefile.common
 
 AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) \
-	$(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
+	$(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) \
+	$(MBLOCK_INCLUDES)
 
 # disable test until we fix ticket:180
 # TESTS = test_mblock
@@ -75,25 +76,11 @@ libmblock_la_LIBADD = 			\
 	$(PMT_LA)			\
 	-lstdc++			
 
-include_HEADERS =			\
-	mb_class_registry.h		\
-	mb_common.h			\
-	mb_exception.h			\
+noinst_HEADERS =			\
 	mb_gettid.h			\
-	mb_mblock.h			\
-	mb_message.h			\
-	mb_msg_accepter.h		\
 	mb_msg_accepter_msgq.h		\
-	mb_msg_queue.h			\
-	mb_port.h			\
 	mb_port_simple.h		\
-	mb_protocol_class.h		\
-	mb_runtime.h			\
-	mb_time.h			\
-	mb_util.h			
-
-
-noinst_HEADERS = 			\
+	mb_util.h			\
 	mb_connection.h			\
 	mb_endpoint.h			\
 	mb_mblock_impl.h		\
diff --git a/mblock/src/lib/benchmark_send.cc b/mblock/src/lib/benchmark_send.cc
index 7b8f7cb7..fe873a69 100644
--- a/mblock/src/lib/benchmark_send.cc
+++ b/mblock/src/lib/benchmark_send.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -19,7 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <mb_runtime.h>
+#include <mblock/runtime.h>
 #include <iostream>
 
 int
diff --git a/mblock/src/lib/mb_class_registry.cc b/mblock/src/lib/mb_class_registry.cc
index 77cec8de..7ccee296 100644
--- a/mblock/src/lib/mb_class_registry.cc
+++ b/mblock/src/lib/mb_class_registry.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,7 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <mb_class_registry.h>
+#include <mblock/class_registry.h>
 #include <map>
 
 static std::map<std::string, mb_mblock_maker_t>	s_registry;
diff --git a/mblock/src/lib/mb_endpoint.h b/mblock/src/lib/mb_endpoint.h
index db55b3f4..aae376a5 100644
--- a/mblock/src/lib/mb_endpoint.h
+++ b/mblock/src/lib/mb_endpoint.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,7 +23,7 @@
 #define INCLUDED_MB_ENDPOINT_H
 
 #include <string>
-#include <mb_port.h>
+#include <mblock/port.h>
 
 /*!
  * \brief Endpoint specification for connection
diff --git a/mblock/src/lib/mb_exception.cc b/mblock/src/lib/mb_exception.cc
index 3c08a01d..81013184 100644
--- a/mblock/src/lib/mb_exception.cc
+++ b/mblock/src/lib/mb_exception.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,8 +23,8 @@
 #include <config.h>
 #endif
 
-#include <mb_exception.h>
-#include <mb_mblock.h>
+#include <mblock/exception.h>
+#include <mblock/mblock.h>
 #include <mb_util.h>
 
 
diff --git a/mblock/src/lib/mb_mblock.cc b/mblock/src/lib/mb_mblock.cc
index 38d216ad..b2f76362 100644
--- a/mblock/src/lib/mb_mblock.cc
+++ b/mblock/src/lib/mb_mblock.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,10 +23,10 @@
 #include <config.h>
 #endif
 
-#include <mb_mblock.h>
+#include <mblock/mblock.h>
 #include <mb_mblock_impl.h>
-#include <mb_runtime.h>
-#include <mb_exception.h>
+#include <mblock/runtime.h>
+#include <mblock/exception.h>
 #include <iostream>
 
 
diff --git a/mblock/src/lib/mb_mblock_impl.cc b/mblock/src/lib/mb_mblock_impl.cc
index 90868cf4..e11b0089 100644
--- a/mblock/src/lib/mb_mblock_impl.cc
+++ b/mblock/src/lib/mb_mblock_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,11 +23,11 @@
 #include <config.h>
 #endif
 #include <mb_mblock_impl.h>
-#include <mb_mblock.h>
-#include <mb_protocol_class.h>
-#include <mb_port.h>
+#include <mblock/mblock.h>
+#include <mblock/protocol_class.h>
+#include <mblock/port.h>
 #include <mb_port_simple.h>
-#include <mb_exception.h>
+#include <mblock/exception.h>
 #include <mb_util.h>
 #include <mb_msg_accepter_smp.h>
 #include <mbi_runtime_lock.h>
diff --git a/mblock/src/lib/mb_mblock_impl.h b/mblock/src/lib/mb_mblock_impl.h
index 374ee8fe..ed8059b0 100644
--- a/mblock/src/lib/mb_mblock_impl.h
+++ b/mblock/src/lib/mb_mblock_impl.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2007 Free Software Foundation, Inc.
+ * Copyright 2006,2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,10 +21,10 @@
 #ifndef INCLUDED_MB_MBLOCK_IMPL_H
 #define INCLUDED_MB_MBLOCK_IMPL_H
 
-#include <mb_mblock.h>
+#include <mblock/mblock.h>
 #include <mb_runtime_base.h>
 #include <mb_connection.h>
-#include <mb_msg_queue.h>
+#include <mblock/msg_queue.h>
 #include <list>
 #include <map>
 
diff --git a/mblock/src/lib/mb_message.cc b/mblock/src/lib/mb_message.cc
index ce98a931..664e369f 100644
--- a/mblock/src/lib/mb_message.cc
+++ b/mblock/src/lib/mb_message.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,7 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <mb_message.h>
+#include <mblock/message.h>
 #include <stdio.h>
 #include <pmt_pool.h>
 
diff --git a/mblock/src/lib/mb_msg_accepter.cc b/mblock/src/lib/mb_msg_accepter.cc
index 001b1f11..88b92394 100644
--- a/mblock/src/lib/mb_msg_accepter.cc
+++ b/mblock/src/lib/mb_msg_accepter.cc
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <mb_msg_accepter.h>
+#include <mblock/msg_accepter.h>
 
 mb_msg_accepter::~mb_msg_accepter()
 {
diff --git a/mblock/src/lib/mb_msg_accepter_msgq.cc b/mblock/src/lib/mb_msg_accepter_msgq.cc
index 8220dbfe..fb97914e 100644
--- a/mblock/src/lib/mb_msg_accepter_msgq.cc
+++ b/mblock/src/lib/mb_msg_accepter_msgq.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 #include <mb_msg_accepter_msgq.h>
-#include <mb_message.h>
+#include <mblock/message.h>
 
 pmt_t s_sys_port = pmt_intern("%sys-port");
 
diff --git a/mblock/src/lib/mb_msg_accepter_msgq.h b/mblock/src/lib/mb_msg_accepter_msgq.h
index 1436e8c0..6c743bb4 100644
--- a/mblock/src/lib/mb_msg_accepter_msgq.h
+++ b/mblock/src/lib/mb_msg_accepter_msgq.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_MB_MSG_ACCEPTER_MSGQ_H
 #define INCLUDED_MB_MSG_ACCEPTER_MSGQ_H
 
-#include <mb_msg_accepter.h>
-#include <mb_msg_queue.h>
+#include <mblock/msg_accepter.h>
+#include <mblock/msg_queue.h>
 
 /*!
  * \brief Concrete class that accepts messages and inserts them into a message queue.
diff --git a/mblock/src/lib/mb_msg_accepter_smp.cc b/mblock/src/lib/mb_msg_accepter_smp.cc
index ac3b4cfd..3b392a8c 100644
--- a/mblock/src/lib/mb_msg_accepter_smp.cc
+++ b/mblock/src/lib/mb_msg_accepter_smp.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,10 +23,10 @@
 #include <config.h>
 #endif
 #include <mb_msg_accepter_smp.h>
-#include <mb_common.h>
-#include <mb_mblock.h>
+#include <mblock/common.h>
+#include <mblock/mblock.h>
 #include <mb_mblock_impl.h>
-#include <mb_message.h>
+#include <mblock/message.h>
 
 mb_msg_accepter_smp::mb_msg_accepter_smp(mb_mblock_sptr mblock, pmt_t port_name)
   : d_mb(mblock), d_port_name(port_name)
diff --git a/mblock/src/lib/mb_msg_accepter_smp.h b/mblock/src/lib/mb_msg_accepter_smp.h
index 39eedf8f..0e0cd7c6 100644
--- a/mblock/src/lib/mb_msg_accepter_smp.h
+++ b/mblock/src/lib/mb_msg_accepter_smp.h
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_MB_MSG_ACCEPTER_SMP_H
 #define INCLUDED_MB_MSG_ACCEPTER_SMP_H
 
-#include <mb_msg_accepter.h>
+#include <mblock/msg_accepter.h>
 
 /*!
  * \brief Concrete message acceptor that does an mb_msg_queue insertion
diff --git a/mblock/src/lib/mb_msg_queue.cc b/mblock/src/lib/mb_msg_queue.cc
index c5dd72fb..c68c5fd6 100644
--- a/mblock/src/lib/mb_msg_queue.cc
+++ b/mblock/src/lib/mb_msg_queue.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,8 +22,8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <mb_msg_queue.h>
-#include <mb_message.h>
+#include <mblock/msg_queue.h>
+#include <mblock/message.h>
 
 
 mb_msg_queue::mb_msg_queue()
diff --git a/mblock/src/lib/mb_port.cc b/mblock/src/lib/mb_port.cc
index 959e89c7..a13f49f2 100644
--- a/mblock/src/lib/mb_port.cc
+++ b/mblock/src/lib/mb_port.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,8 +23,8 @@
 #include <config.h>
 #endif
 
-#include <mb_port.h>
-#include <mb_protocol_class.h>
+#include <mblock/port.h>
+#include <mblock/protocol_class.h>
 
 mb_port::mb_port(mb_mblock *mblock,
 		 const std::string &port_name,
diff --git a/mblock/src/lib/mb_port_simple.cc b/mblock/src/lib/mb_port_simple.cc
index 24a01b56..1b4b35cb 100644
--- a/mblock/src/lib/mb_port_simple.cc
+++ b/mblock/src/lib/mb_port_simple.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,9 +24,9 @@
 #endif
 
 #include <mb_port_simple.h>
-#include <mb_msg_accepter.h>
-#include <mb_exception.h>
-#include <mb_mblock.h>
+#include <mblock/msg_accepter.h>
+#include <mblock/exception.h>
+#include <mblock/mblock.h>
 #include <mb_mblock_impl.h>
 #include <assert.h>
 #include <mbi_runtime_lock.h>
diff --git a/mblock/src/lib/mb_port_simple.h b/mblock/src/lib/mb_port_simple.h
index db9e226e..3041239a 100644
--- a/mblock/src/lib/mb_port_simple.h
+++ b/mblock/src/lib/mb_port_simple.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_MB_PORT_SIMPLE_H
 #define INCLUDED_MB_PORT_SIMPLE_H
 
-#include <mb_port.h>
+#include <mblock/port.h>
 
 /*!
  * \brief Concrete port realization
diff --git a/mblock/src/lib/mb_protocol_class.cc b/mblock/src/lib/mb_protocol_class.cc
index fb1f6531..f076909e 100644
--- a/mblock/src/lib/mb_protocol_class.cc
+++ b/mblock/src/lib/mb_protocol_class.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <mb_protocol_class.h>
+#include <mblock/protocol_class.h>
 #include <iostream>
 
 static pmt_t s_ALL_PROTOCOL_CLASSES = PMT_NIL;
diff --git a/mblock/src/lib/mb_runtime.cc b/mblock/src/lib/mb_runtime.cc
index 56ae2869..57a05c41 100644
--- a/mblock/src/lib/mb_runtime.cc
+++ b/mblock/src/lib/mb_runtime.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <mb_runtime.h>
+#include <mblock/runtime.h>
 #include <mb_runtime_thread_per_block.h>
 
 mb_runtime_sptr
diff --git a/mblock/src/lib/mb_runtime_base.cc b/mblock/src/lib/mb_runtime_base.cc
index c10c3168..1dea4d46 100644
--- a/mblock/src/lib/mb_runtime_base.cc
+++ b/mblock/src/lib/mb_runtime_base.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
diff --git a/mblock/src/lib/mb_runtime_base.h b/mblock/src/lib/mb_runtime_base.h
index 4872bd81..019662bc 100644
--- a/mblock/src/lib/mb_runtime_base.h
+++ b/mblock/src/lib/mb_runtime_base.h
@@ -22,9 +22,9 @@
 #ifndef INCLUDED_MB_RUNTIME_BASE_H
 #define INCLUDED_MB_RUNTIME_BASE_H
 
-#include <mb_runtime.h>
+#include <mblock/runtime.h>
 #include <omnithread.h>
-#include <mb_time.h>
+#include <mblock/time.h>
 
 /*
  * \brief This is the runtime class used by the implementation.
diff --git a/mblock/src/lib/mb_runtime_nop.cc b/mblock/src/lib/mb_runtime_nop.cc
index 78bc0a1a..603d5add 100644
--- a/mblock/src/lib/mb_runtime_nop.cc
+++ b/mblock/src/lib/mb_runtime_nop.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,9 +23,9 @@
 #include <config.h>
 #endif
 #include <mb_runtime_nop.h>
-#include <mb_mblock.h>
-#include <mb_class_registry.h>
-#include <mb_exception.h>
+#include <mblock/mblock.h>
+#include <mblock/class_registry.h>
+#include <mblock/exception.h>
 
 mb_runtime_sptr 
 mb_make_runtime_nop()
diff --git a/mblock/src/lib/mb_runtime_thread_per_block.cc b/mblock/src/lib/mb_runtime_thread_per_block.cc
index f1e4d10a..d12014a1 100644
--- a/mblock/src/lib/mb_runtime_thread_per_block.cc
+++ b/mblock/src/lib/mb_runtime_thread_per_block.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,10 +23,10 @@
 #include <config.h>
 #endif
 #include <mb_runtime_thread_per_block.h>
-#include <mb_mblock.h>
+#include <mblock/mblock.h>
 #include <mb_mblock_impl.h>
-#include <mb_class_registry.h>
-#include <mb_exception.h>
+#include <mblock/class_registry.h>
+#include <mblock/exception.h>
 #include <mb_worker.h>
 #include <omnithread.h>
 #include <iostream>
diff --git a/mblock/src/lib/mb_runtime_thread_per_block.h b/mblock/src/lib/mb_runtime_thread_per_block.h
index ed2dc046..ef962911 100644
--- a/mblock/src/lib/mb_runtime_thread_per_block.h
+++ b/mblock/src/lib/mb_runtime_thread_per_block.h
@@ -23,7 +23,7 @@
 
 #include <mb_runtime_base.h>
 #include <mb_worker.h>
-#include <mb_msg_queue.h>
+#include <mblock/msg_queue.h>
 #include <mb_timer_queue.h>
 
 /*!
diff --git a/mblock/src/lib/mb_timer_queue.h b/mblock/src/lib/mb_timer_queue.h
index 208e37d5..e8b8e1b6 100644
--- a/mblock/src/lib/mb_timer_queue.h
+++ b/mblock/src/lib/mb_timer_queue.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,11 +22,11 @@
 #ifndef INCLUDED_MB_TIMER_QUEUE_H
 #define INCLUDED_MB_TIMER_QUEUE_H
 
-#include <mb_time.h>
+#include <mblock/time.h>
 #include <vector>
 #include <queue>
 #include <pmt.h>
-#include <mb_msg_accepter.h>
+#include <mblock/msg_accepter.h>
 
 class mb_timeout {
 public:
diff --git a/mblock/src/lib/mb_worker.cc b/mblock/src/lib/mb_worker.cc
index 4ac161e9..e7ac6a9b 100644
--- a/mblock/src/lib/mb_worker.cc
+++ b/mblock/src/lib/mb_worker.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,10 +24,10 @@
 #endif
 #include <mb_worker.h>
 #include <mb_runtime_thread_per_block.h>
-#include <mb_exception.h>
-#include <mb_mblock.h>
+#include <mblock/exception.h>
+#include <mblock/mblock.h>
 #include <mb_gettid.h>
-#include <mb_msg_accepter.h>
+#include <mblock/msg_accepter.h>
 #include <iostream>
 #ifdef HAVE_SCHED_H
 #include <sched.h>
diff --git a/mblock/src/lib/mb_worker.h b/mblock/src/lib/mb_worker.h
index d5937144..b840ae55 100644
--- a/mblock/src/lib/mb_worker.h
+++ b/mblock/src/lib/mb_worker.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,8 +23,8 @@
 #define INCLUDED_MB_WORKER_H
 
 #include <omnithread.h>
-#include <mb_common.h>
-#include <mb_class_registry.h>
+#include <mblock/common.h>
+#include <mblock/class_registry.h>
 
 
 class mb_worker;
diff --git a/mblock/src/lib/mbi_runtime_lock.h b/mblock/src/lib/mbi_runtime_lock.h
index a4dec76f..020cd733 100644
--- a/mblock/src/lib/mbi_runtime_lock.h
+++ b/mblock/src/lib/mbi_runtime_lock.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_MBI_RUNTIME_LOCK_H
 #define INCLUDED_MBI_RUNTIME_LOCK_H
 
-#include <mb_runtime.h>
+#include <mblock/runtime.h>
 #include <mb_mblock_impl.h>
 #include <boost/utility.hpp>
 
diff --git a/mblock/src/lib/qa_bitset.cc b/mblock/src/lib/qa_bitset.cc
index 85f388fc..bc42ac8b 100644
--- a/mblock/src/lib/qa_bitset.cc
+++ b/mblock/src/lib/qa_bitset.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,10 +22,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <mb_mblock.h>
-#include <mb_protocol_class.h>
-#include <mb_message.h>
-#include <mb_class_registry.h>
+#include <mblock/mblock.h>
+#include <mblock/protocol_class.h>
+#include <mblock/message.h>
+#include <mblock/class_registry.h>
 #include <iostream>
 #include <sstream>
 #include <bitset>
diff --git a/mblock/src/lib/qa_disconnect.cc b/mblock/src/lib/qa_disconnect.cc
index ff263da8..e098e8b2 100644
--- a/mblock/src/lib/qa_disconnect.cc
+++ b/mblock/src/lib/qa_disconnect.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,10 +22,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <mb_mblock.h>
-#include <mb_protocol_class.h>
-#include <mb_message.h>
-#include <mb_class_registry.h>
+#include <mblock/mblock.h>
+#include <mblock/protocol_class.h>
+#include <mblock/message.h>
+#include <mblock/class_registry.h>
 #include <iostream>
 #include <sstream>
 #include <bitset>
diff --git a/mblock/src/lib/qa_mblock_prims.cc b/mblock/src/lib/qa_mblock_prims.cc
index 6802986f..2eed3afd 100644
--- a/mblock/src/lib/qa_mblock_prims.cc
+++ b/mblock/src/lib/qa_mblock_prims.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2007 Free Software Foundation, Inc.
+ * Copyright 2006,2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,15 +26,15 @@
 
 #include <qa_mblock_prims.h>
 #include <cppunit/TestAssert.h>
-#include <mb_mblock.h>
-#include <mb_runtime.h>
-#include <mb_protocol_class.h>
-#include <mb_exception.h>
-#include <mb_msg_queue.h>
-#include <mb_message.h>
+#include <mblock/mblock.h>
+#include <mblock/runtime.h>
+#include <mblock/protocol_class.h>
+#include <mblock/exception.h>
+#include <mblock/msg_queue.h>
+#include <mblock/message.h>
 #include <mb_mblock_impl.h>
-#include <mb_msg_accepter.h>
-#include <mb_class_registry.h>
+#include <mblock/msg_accepter.h>
+#include <mblock/class_registry.h>
 #include <stdio.h>
 
 static pmt_t s_cs = pmt_intern("cs");
diff --git a/mblock/src/lib/qa_mblock_send.cc b/mblock/src/lib/qa_mblock_send.cc
index b9db971c..114dbdc4 100644
--- a/mblock/src/lib/qa_mblock_send.cc
+++ b/mblock/src/lib/qa_mblock_send.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2007 Free Software Foundation, Inc.
+ * Copyright 2006,2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,16 +26,16 @@
 
 #include <qa_mblock_send.h>
 #include <cppunit/TestAssert.h>
-#include <mb_mblock.h>
-#include <mb_runtime.h>
+#include <mblock/mblock.h>
+#include <mblock/runtime.h>
 #include <mb_runtime_nop.h>		// QA only
-#include <mb_protocol_class.h>
-#include <mb_exception.h>
-#include <mb_msg_queue.h>
-#include <mb_message.h>
+#include <mblock/protocol_class.h>
+#include <mblock/exception.h>
+#include <mblock/msg_queue.h>
+#include <mblock/message.h>
 #include <mb_mblock_impl.h>
-#include <mb_msg_accepter.h>
-#include <mb_class_registry.h>
+#include <mblock/msg_accepter.h>
+#include <mblock/class_registry.h>
 #include <stdio.h>
 
 static pmt_t s_data    = pmt_intern("data");
diff --git a/mblock/src/lib/qa_mblock_sys.cc b/mblock/src/lib/qa_mblock_sys.cc
index 5991b7ff..58e48f71 100644
--- a/mblock/src/lib/qa_mblock_sys.cc
+++ b/mblock/src/lib/qa_mblock_sys.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2007 Free Software Foundation, Inc.
+ * Copyright 2006,2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,16 +26,16 @@
 
 #include <qa_mblock_sys.h>
 #include <cppunit/TestAssert.h>
-#include <mb_mblock.h>
-#include <mb_runtime.h>
+#include <mblock/mblock.h>
+#include <mblock/runtime.h>
 #include <mb_runtime_nop.h>		// QA only
-#include <mb_protocol_class.h>
-#include <mb_exception.h>
-#include <mb_msg_queue.h>
-#include <mb_message.h>
+#include <mblock/protocol_class.h>
+#include <mblock/exception.h>
+#include <mblock/msg_queue.h>
+#include <mblock/message.h>
 #include <mb_mblock_impl.h>
-#include <mb_msg_accepter.h>
-#include <mb_class_registry.h>
+#include <mblock/msg_accepter.h>
+#include <mblock/class_registry.h>
 #include <stdio.h>
 #include <string.h>
 #include <iostream>
diff --git a/mblock/src/lib/qa_timeouts.cc b/mblock/src/lib/qa_timeouts.cc
index 4f1eb46e..2505635c 100644
--- a/mblock/src/lib/qa_timeouts.cc
+++ b/mblock/src/lib/qa_timeouts.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,12 +24,12 @@
 #endif
 #include <qa_timeouts.h>
 #include <cppunit/TestAssert.h>
-#include <mb_mblock.h>
-#include <mb_runtime.h>
-#include <mb_protocol_class.h>
-#include <mb_message.h>
-#include <mb_msg_accepter.h>
-#include <mb_class_registry.h>
+#include <mblock/mblock.h>
+#include <mblock/runtime.h>
+#include <mblock/protocol_class.h>
+#include <mblock/message.h>
+#include <mblock/msg_accepter.h>
+#include <mblock/class_registry.h>
 #include <mb_timer_queue.h>
 #include <string.h>
 #include <iostream>
diff --git a/mblock/src/scheme/gnuradio/compile-mbh.scm b/mblock/src/scheme/gnuradio/compile-mbh.scm
index a16e14c5..30085340 100755
--- a/mblock/src/scheme/gnuradio/compile-mbh.scm
+++ b/mblock/src/scheme/gnuradio/compile-mbh.scm
@@ -3,7 +3,7 @@
 !#
 ;; -*-scheme-*-
 ;;
-;; Copyright 2007 Free Software Foundation, Inc.
+;; Copyright 2007,2008 Free Software Foundation, Inc.
 ;; 
 ;; This file is part of GNU Radio
 ;; 
@@ -180,7 +180,7 @@
 		  (format o-port "// protocol-classes: ~{~a ~}~%" (map car protocol-classes))
 		  (format o-port "//~%")
 
-		  (format o-port "#include <mb_protocol_class.h>~%")
+		  (format o-port "#include <mblock/protocol_class.h>~%")
 		  (format o-port "#include <unistd.h>~%")
 		  (format o-port
 			  "static const char~%protocol_class_init_data[~d] = {~%  "
diff --git a/usrp/host/apps-inband/Makefile.am b/usrp/host/apps-inband/Makefile.am
index 663a861e..0a44d811 100644
--- a/usrp/host/apps-inband/Makefile.am
+++ b/usrp/host/apps-inband/Makefile.am
@@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.common
 AM_CPPFLAGS = 	\
 	$(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
 	$(USRP_INCLUDES) $(USRP_INBAND_INCLUDES) $(BOOST_CPPFLAGS) \
-	$(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
+	$(CPPUNIT_INCLUDES) $(WITH_INCLUDES) -I$(top_srcdir)/mblock/src/lib
 
 
 bin_PROGRAMS =				
diff --git a/usrp/host/apps-inband/read_packets.cc b/usrp/host/apps-inband/read_packets.cc
index 3d112d98..24a1e88b 100644
--- a/usrp/host/apps-inband/read_packets.cc
+++ b/usrp/host/apps-inband/read_packets.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -25,7 +25,7 @@
 
 #include <iostream>
 #include <usrp_inband_usb_packet.h>
-#include <mb_class_registry.h>
+#include <mblock/class_registry.h>
 #include <vector>
 #include <usrp_usb_interface.h>
 #include <fstream>
diff --git a/usrp/host/apps-inband/test_usrp_inband_2rx.cc b/usrp/host/apps-inband/test_usrp_inband_2rx.cc
index da8d7271..c210f196 100644
--- a/usrp/host/apps-inband/test_usrp_inband_2rx.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_2rx.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,16 +23,16 @@
 #include <config.h>
 #endif
 
-#include <mb_mblock.h>
-#include <mb_runtime.h>
+#include <mblock/mblock.h>
+#include <mblock/runtime.h>
 #include <mb_runtime_nop.h>		// QA only
-#include <mb_protocol_class.h>
-#include <mb_exception.h>
-#include <mb_msg_queue.h>
-#include <mb_message.h>
+#include <mblock/protocol_class.h>
+#include <mblock/exception.h>
+#include <mblock/msg_queue.h>
+#include <mblock/message.h>
 #include <mb_mblock_impl.h>
-#include <mb_msg_accepter.h>
-#include <mb_class_registry.h>
+#include <mblock/msg_accepter.h>
+#include <mblock/class_registry.h>
 #include <pmt.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/usrp/host/apps-inband/test_usrp_inband_2tx.cc b/usrp/host/apps-inband/test_usrp_inband_2tx.cc
index 942f6df0..caa78033 100644
--- a/usrp/host/apps-inband/test_usrp_inband_2tx.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_2tx.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,16 +23,16 @@
 #include <config.h>
 #endif
 
-#include <mb_mblock.h>
-#include <mb_runtime.h>
+#include <mblock/mblock.h>
+#include <mblock/runtime.h>
 #include <mb_runtime_nop.h>		// QA only
-#include <mb_protocol_class.h>
-#include <mb_exception.h>
-#include <mb_msg_queue.h>
-#include <mb_message.h>
+#include <mblock/protocol_class.h>
+#include <mblock/exception.h>
+#include <mblock/msg_queue.h>
+#include <mblock/message.h>
 #include <mb_mblock_impl.h>
-#include <mb_msg_accepter.h>
-#include <mb_class_registry.h>
+#include <mblock/msg_accepter.h>
+#include <mblock/class_registry.h>
 #include <pmt.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/usrp/host/apps-inband/test_usrp_inband_overrun.cc b/usrp/host/apps-inband/test_usrp_inband_overrun.cc
index 107668b8..cd0fa525 100644
--- a/usrp/host/apps-inband/test_usrp_inband_overrun.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_overrun.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,14 +23,14 @@
 #include <config.h>
 #endif
 
-#include <mb_mblock.h>
-#include <mb_runtime.h>
-#include <mb_protocol_class.h>
-#include <mb_exception.h>
-#include <mb_msg_queue.h>
-#include <mb_message.h>
-#include <mb_msg_accepter.h>
-#include <mb_class_registry.h>
+#include <mblock/mblock.h>
+#include <mblock/runtime.h>
+#include <mblock/protocol_class.h>
+#include <mblock/exception.h>
+#include <mblock/msg_queue.h>
+#include <mblock/message.h>
+#include <mblock/msg_accepter.h>
+#include <mblock/class_registry.h>
 #include <pmt.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/usrp/host/apps-inband/test_usrp_inband_ping.cc b/usrp/host/apps-inband/test_usrp_inband_ping.cc
index 6b1347cc..d779c9a6 100644
--- a/usrp/host/apps-inband/test_usrp_inband_ping.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_ping.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,14 +23,14 @@
 #include <config.h>
 #endif
 
-#include <mb_mblock.h>
-#include <mb_runtime.h>
-#include <mb_protocol_class.h>
-#include <mb_exception.h>
-#include <mb_msg_queue.h>
-#include <mb_message.h>
-#include <mb_msg_accepter.h>
-#include <mb_class_registry.h>
+#include <mblock/mblock.h>
+#include <mblock/runtime.h>
+#include <mblock/protocol_class.h>
+#include <mblock/exception.h>
+#include <mblock/msg_queue.h>
+#include <mblock/message.h>
+#include <mblock/msg_accepter.h>
+#include <mblock/class_registry.h>
 #include <pmt.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/usrp/host/apps-inband/test_usrp_inband_registers.cc b/usrp/host/apps-inband/test_usrp_inband_registers.cc
index a1d9cc14..d9bd2db1 100644
--- a/usrp/host/apps-inband/test_usrp_inband_registers.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_registers.cc
@@ -23,15 +23,15 @@
 #include <config.h>
 #endif
 
-#include <mb_mblock.h>
-#include <mb_runtime.h>
-#include <mb_protocol_class.h>
-#include <mb_exception.h>
-#include <mb_msg_queue.h>
-#include <mb_message.h>
+#include <mblock/mblock.h>
+#include <mblock/runtime.h>
+#include <mblock/protocol_class.h>
+#include <mblock/exception.h>
+#include <mblock/msg_queue.h>
+#include <mblock/message.h>
 //#include <mb_mblock_impl.h>
-#include <mb_msg_accepter.h>
-#include <mb_class_registry.h>
+#include <mblock/msg_accepter.h>
+#include <mblock/class_registry.h>
 #include <pmt.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/usrp/host/apps-inband/test_usrp_inband_rx.cc b/usrp/host/apps-inband/test_usrp_inband_rx.cc
index cff2aa72..dcb87a7c 100644
--- a/usrp/host/apps-inband/test_usrp_inband_rx.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_rx.cc
@@ -23,14 +23,14 @@
 #include <config.h>
 #endif
 
-#include <mb_mblock.h>
-#include <mb_runtime.h>
-#include <mb_protocol_class.h>
-#include <mb_exception.h>
-#include <mb_msg_queue.h>
-#include <mb_message.h>
-#include <mb_msg_accepter.h>
-#include <mb_class_registry.h>
+#include <mblock/mblock.h>
+#include <mblock/runtime.h>
+#include <mblock/protocol_class.h>
+#include <mblock/exception.h>
+#include <mblock/msg_queue.h>
+#include <mblock/message.h>
+#include <mblock/msg_accepter.h>
+#include <mblock/class_registry.h>
 #include <pmt.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/usrp/host/apps-inband/test_usrp_inband_timestamps.cc b/usrp/host/apps-inband/test_usrp_inband_timestamps.cc
index 43d0c46a..3b874d1a 100644
--- a/usrp/host/apps-inband/test_usrp_inband_timestamps.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_timestamps.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,14 +23,14 @@
 #include <config.h>
 #endif
 
-#include <mb_mblock.h>
-#include <mb_runtime.h>
-#include <mb_protocol_class.h>
-#include <mb_exception.h>
-#include <mb_msg_queue.h>
-#include <mb_message.h>
-#include <mb_msg_accepter.h>
-#include <mb_class_registry.h>
+#include <mblock/mblock.h>
+#include <mblock/runtime.h>
+#include <mblock/protocol_class.h>
+#include <mblock/exception.h>
+#include <mblock/msg_queue.h>
+#include <mblock/message.h>
+#include <mblock/msg_accepter.h>
+#include <mblock/class_registry.h>
 #include <pmt.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/usrp/host/apps-inband/test_usrp_inband_tx.cc b/usrp/host/apps-inband/test_usrp_inband_tx.cc
index 9cdb92c2..7ce38c2e 100644
--- a/usrp/host/apps-inband/test_usrp_inband_tx.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_tx.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,14 +23,14 @@
 #include <config.h>
 #endif
 
-#include <mb_mblock.h>
-#include <mb_runtime.h>
-#include <mb_protocol_class.h>
-#include <mb_exception.h>
-#include <mb_msg_queue.h>
-#include <mb_message.h>
-#include <mb_msg_accepter.h>
-#include <mb_class_registry.h>
+#include <mblock/mblock.h>
+#include <mblock/runtime.h>
+#include <mblock/protocol_class.h>
+#include <mblock/exception.h>
+#include <mblock/msg_queue.h>
+#include <mblock/message.h>
+#include <mblock/msg_accepter.h>
+#include <mblock/class_registry.h>
 #include <pmt.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/usrp/host/apps-inband/test_usrp_inband_underrun.cc b/usrp/host/apps-inband/test_usrp_inband_underrun.cc
index e9f85d31..11babb04 100644
--- a/usrp/host/apps-inband/test_usrp_inband_underrun.cc
+++ b/usrp/host/apps-inband/test_usrp_inband_underrun.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,14 +23,14 @@
 #include <config.h>
 #endif
 
-#include <mb_mblock.h>
-#include <mb_runtime.h>
-#include <mb_protocol_class.h>
-#include <mb_exception.h>
-#include <mb_msg_queue.h>
-#include <mb_message.h>
-#include <mb_msg_accepter.h>
-#include <mb_class_registry.h>
+#include <mblock/mblock.h>
+#include <mblock/runtime.h>
+#include <mblock/protocol_class.h>
+#include <mblock/exception.h>
+#include <mblock/msg_queue.h>
+#include <mblock/message.h>
+#include <mblock/msg_accepter.h>
+#include <mblock/class_registry.h>
 #include <pmt.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/usrp/host/lib/inband/qa_inband_usrp_server.cc b/usrp/host/lib/inband/qa_inband_usrp_server.cc
index e457e8d6..c6641839 100644
--- a/usrp/host/lib/inband/qa_inband_usrp_server.cc
+++ b/usrp/host/lib/inband/qa_inband_usrp_server.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -28,10 +28,10 @@
 #include <cppunit/TestAssert.h>
 #include <stdio.h>
 #include <usrp_server.h>
-#include <mb_mblock.h>
-#include <mb_runtime.h>
-#include <mb_protocol_class.h>
-#include <mb_class_registry.h>
+#include <mblock/mblock.h>
+#include <mblock/runtime.h>
+#include <mblock/protocol_class.h>
+#include <mblock/class_registry.h>
 #include <vector>
 #include <iostream>
 #include <pmt.h>
diff --git a/usrp/host/lib/inband/usrp_inband_usb_packet.h b/usrp/host/lib/inband/usrp_inband_usb_packet.h
index 8f59d1b6..6f1a3feb 100644
--- a/usrp/host/lib/inband/usrp_inband_usb_packet.h
+++ b/usrp/host/lib/inband/usrp_inband_usb_packet.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,7 +23,7 @@
 #define INCLUDED_USRP_INBAND_USB_PACKET_H_
 
 #include <usrp_bytesex.h>
-#include <mb_mblock.h>
+#include <mblock/mblock.h>
 #include <pmt.h>
 #include <iostream>
 
diff --git a/usrp/host/lib/inband/usrp_rx.cc b/usrp/host/lib/inband/usrp_rx.cc
index b1f9f7b9..45d41bed 100644
--- a/usrp/host/lib/inband/usrp_rx.cc
+++ b/usrp/host/lib/inband/usrp_rx.cc
@@ -29,7 +29,7 @@
 #include <iostream>
 #include <vector>
 #include <usb.h>
-#include <mb_class_registry.h>
+#include <mblock/class_registry.h>
 #include <usrp_inband_usb_packet.h>
 #include <fpga_regs_common.h>
 #include <stdio.h>
diff --git a/usrp/host/lib/inband/usrp_rx.h b/usrp/host/lib/inband/usrp_rx.h
index 10104bd6..9496b27d 100644
--- a/usrp/host/lib/inband/usrp_rx.h
+++ b/usrp/host/lib/inband/usrp_rx.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_USRP_RX_H
 #define INCLUDED_USRP_RX_H
 
-#include <mb_mblock.h>
+#include <mblock/mblock.h>
 #include <fstream>
 
 class usrp_standard_rx;
diff --git a/usrp/host/lib/inband/usrp_rx_stub.cc b/usrp/host/lib/inband/usrp_rx_stub.cc
index 8be70953..e5c454d2 100644
--- a/usrp/host/lib/inband/usrp_rx_stub.cc
+++ b/usrp/host/lib/inband/usrp_rx_stub.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -28,7 +28,7 @@
 #include <iostream>
 #include <vector>
 #include <usb.h>
-#include <mb_class_registry.h>
+#include <mblock/class_registry.h>
 #include <usrp_inband_usb_packet.h>
 #include <fpga_regs_common.h>
 #include "usrp_standard.h"
diff --git a/usrp/host/lib/inband/usrp_rx_stub.h b/usrp/host/lib/inband/usrp_rx_stub.h
index 9cf308a9..238b4568 100644
--- a/usrp/host/lib/inband/usrp_rx_stub.h
+++ b/usrp/host/lib/inband/usrp_rx_stub.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_USRP_RX_STUB_H
 #define INCLUDED_USRP_RX_STUB_H
 
-#include <mb_mblock.h>
+#include <mblock/mblock.h>
 #include <vector>
 #include "usrp_standard.h"
 #include <ui_nco.h>
diff --git a/usrp/host/lib/inband/usrp_server.cc b/usrp/host/lib/inband/usrp_server.cc
index 9f92e2af..ac263630 100644
--- a/usrp/host/lib/inband/usrp_server.cc
+++ b/usrp/host/lib/inband/usrp_server.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -25,7 +25,7 @@
 #include <usrp_server.h>
 #include <iostream>
 #include <usrp_inband_usb_packet.h>
-#include <mb_class_registry.h>
+#include <mblock/class_registry.h>
 #include <vector>
 #include <usrp_usb_interface.h>
 #include <string.h>
diff --git a/usrp/host/lib/inband/usrp_server.h b/usrp/host/lib/inband/usrp_server.h
index 09c82faa..dd1825d5 100644
--- a/usrp/host/lib/inband/usrp_server.h
+++ b/usrp/host/lib/inband/usrp_server.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_USRP_SERVER_H
 #define INCLUDED_USRP_SERVER_H
 
-#include <mb_mblock.h>
+#include <mblock/mblock.h>
 #include <vector>
 #include <queue>
 #include <fstream>
diff --git a/usrp/host/lib/inband/usrp_tx.cc b/usrp/host/lib/inband/usrp_tx.cc
index 5c0a8c30..cf7976bc 100644
--- a/usrp/host/lib/inband/usrp_tx.cc
+++ b/usrp/host/lib/inband/usrp_tx.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,7 +26,7 @@
 #include <usrp_tx.h>
 #include <iostream>
 #include <usb.h>
-#include <mb_class_registry.h>
+#include <mblock/class_registry.h>
 #include <usrp_inband_usb_packet.h>
 #include <fpga_regs_common.h>
 #include <usrp_standard.h>
diff --git a/usrp/host/lib/inband/usrp_tx.h b/usrp/host/lib/inband/usrp_tx.h
index 546a26af..823d5cea 100644
--- a/usrp/host/lib/inband/usrp_tx.h
+++ b/usrp/host/lib/inband/usrp_tx.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_USRP_TX_H
 #define INCLUDED_USRP_TX_H
 
-#include <mb_mblock.h>
+#include <mblock/mblock.h>
 #include <fstream>
 
 class usrp_standard_tx;
diff --git a/usrp/host/lib/inband/usrp_tx_stub.cc b/usrp/host/lib/inband/usrp_tx_stub.cc
index 8d47f815..c78b1a7b 100644
--- a/usrp/host/lib/inband/usrp_tx_stub.cc
+++ b/usrp/host/lib/inband/usrp_tx_stub.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,7 +26,7 @@
 #include <iostream>
 #include <vector>
 #include <usb.h>
-#include <mb_class_registry.h>
+#include <mblock/class_registry.h>
 #include <usrp_tx_stub.h>
 #include <usrp_inband_usb_packet.h>
 #include <fpga_regs_common.h>
diff --git a/usrp/host/lib/inband/usrp_tx_stub.h b/usrp/host/lib/inband/usrp_tx_stub.h
index 52294bee..b81037ad 100644
--- a/usrp/host/lib/inband/usrp_tx_stub.h
+++ b/usrp/host/lib/inband/usrp_tx_stub.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_USRP_TX_STUB_H
 #define INCLUDED_USRP_TX_STUB_H
 
-#include <mb_mblock.h>
+#include <mblock/mblock.h>
 #include <vector>
 #include "usrp_standard.h"
 #include <fstream>
diff --git a/usrp/host/lib/inband/usrp_usb_interface.cc b/usrp/host/lib/inband/usrp_usb_interface.cc
index 51b6d464..c69eb0b0 100644
--- a/usrp/host/lib/inband/usrp_usb_interface.cc
+++ b/usrp/host/lib/inband/usrp_usb_interface.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -28,7 +28,7 @@
 #include <iostream>
 #include <vector>
 #include <usb.h>
-#include <mb_class_registry.h>
+#include <mblock/class_registry.h>
 #include <usrp_inband_usb_packet.h>
 #include <fpga_regs_common.h>
 #include "usrp_rx.h"
diff --git a/usrp/host/lib/inband/usrp_usb_interface.h b/usrp/host/lib/inband/usrp_usb_interface.h
index 6c2c1576..5151f155 100644
--- a/usrp/host/lib/inband/usrp_usb_interface.h
+++ b/usrp/host/lib/inband/usrp_usb_interface.h
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_USRP_USB_INTERFACE_H
 #define INCLUDED_USRP_USB_INTERFACE_H
 
-#include <mb_mblock.h>
+#include <mblock/mblock.h>
 #include <vector>
 #include "usrp_standard.h"
 
-- 
2.47.2