runtime: migrate remaining gnuradio-core contents into gnuradio-runtime

author: Johnathan Corgan <johnathan@corganlabs.com> 2013-03-26 20:18:53 -0700
committer: Johnathan Corgan <johnathan@corganlabs.com> 2013-03-26 20:18:53 -0700
commit: 26dceecc80390f10cedb94bd9e4fd655827d7f17 (patch)
tree: f88cb2995133048b4a2191bae688fa09b33a19ae
parent: 9bbbda510c265b211b5b571db79ba259c67ee049 (diff)
485 files changed, 1282 insertions, 4300 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9caa87f2f9..2b5b48d2d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -256,12 +256,12 @@ install(
 ########################################################################
 # The following dependency libraries are needed by all gr modules:
 ########################################################################
-list(APPEND GR_TEST_TARGET_DEPS volk gruel gnuradio-core)
+list(APPEND GR_TEST_TARGET_DEPS volk gruel gnuradio-runtime)
 list(APPEND GR_TEST_PYTHON_DIRS
     ${CMAKE_SOURCE_DIR}/gruel/src/python
     ${CMAKE_BINARY_DIR}/gruel/src/swig
-    ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
-    ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
+    ${CMAKE_SOURCE_DIR}/gnuradio-runtime/python
+    ${CMAKE_BINARY_DIR}/gnuradio-runtime/swig
 )
 
 ########################################################################
@@ -269,7 +269,7 @@ list(APPEND GR_TEST_PYTHON_DIRS
 ########################################################################
 add_subdirectory(docs)
 add_subdirectory(gruel)
-add_subdirectory(gnuradio-core)
+add_subdirectory(gnuradio-runtime)
 add_subdirectory(gr-blocks)
 add_subdirectory(grc)
 add_subdirectory(gr-fec)
diff --git a/cmake/Modules/FindGnuradio.cmake b/cmake/Modules/FindGnuradio.cmake
index 14498488f2..bf54b9589c 100644
--- a/cmake/Modules/FindGnuradio.cmake
+++ b/cmake/Modules/FindGnuradio.cmake
@@ -86,6 +86,7 @@ function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE)
 endfunction()
 
 GR_MODULE(CORE gnuradio-core gr_top_block.h gnuradio-core)
+GR_MODULE(RUNTIME gnuradio-runtime gr_top_block.h gnuradio-runtime)
 GR_MODULE(ANALOG gnuradio-analog analog/noise_type.h gnuradio-analog)
 GR_MODULE(ATSC gnuradio-atsc atsc_api.h gnuradio-atsc)
 GR_MODULE(AUDIO gnuradio-audio audio/sink.h gnuradio-audio)
diff --git a/gnuradio-core/gnuradio-core.pc.in b/gnuradio-core/gnuradio-core.pc.in
deleted file mode 100644
index 2de9a32e7f..0000000000
--- a/gnuradio-core/gnuradio-core.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/gnuradio
-
-Name: gnuradio-core
-Description: GNU Software Radio toolkit
-Requires: gruel fftw3f
-Version: @LIBVER@
-Libs.private: @BOOST_LDFLAGS@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@
-Libs: -L${libdir} -lgnuradio-core
-Cflags: @BOOST_CPPFLAGS@ @BOOST_CXXFLAGS@ -I${includedir}
diff --git a/gnuradio-core/src/lib/CMakeLists.txt b/gnuradio-core/src/lib/CMakeLists.txt
deleted file mode 100644
index c72be94db5..0000000000
--- a/gnuradio-core/src/lib/CMakeLists.txt
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 2010-2011,2013 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.
-
-########################################################################
-# Setup compatibility checks and defines
-########################################################################
-include(${CMAKE_CURRENT_SOURCE_DIR}/ConfigChecks.cmake)
-
-########################################################################
-# Include subdirs rather to populate to the sources lists.
-########################################################################
-GR_INCLUDE_SUBDIRECTORY(missing)
-GR_INCLUDE_SUBDIRECTORY(runtime)
-GR_INCLUDE_SUBDIRECTORY(general)
-
-list(APPEND gnuradio_core_sources bug_work_around_6.cc)
-list(APPEND test_gnuradio_core_sources bug_work_around_6.cc)
-
-########################################################################
-# Set up Windows DLL resource files
-########################################################################
-
-IF(MSVC)
-    include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake)
-
-    configure_file(
-        ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-core.rc.in
-        ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.rc
-    @ONLY)
-
-    list(APPEND gnuradio_core_sources ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.rc)
-ENDIF(MSVC)
-
-########################################################################
-# Setup the include and linker paths
-########################################################################
-include_directories(
-	${GNURADIO_CORE_INCLUDE_DIRS}
-	${VOLK_INCLUDE_DIRS}
-        ${GRUEL_INCLUDE_DIRS}
-        ${Boost_INCLUDE_DIRS}
-	${FFTW3F_INCLUDE_DIRS}
-)
-
-link_directories(
-	${Boost_LIBRARY_DIRS}
-	${FFTW3F_LIBRARY_DIRS}
-)
-
-include_directories(${LOG4CPP_INCLUDE_DIRS})
-link_directories(${LOG4CPP_LIBRARY_DIRS})
-
-########################################################################
-# Setup library
-########################################################################
-
-# Only use if log4cpp is installed
-# Define ENABLE_GR_LOG so .h and .cc files can turn actual
-# logging and insert dummy functions.
-#if(LOG4CPP_FOUND)
-#    add_definitions(-DENABLE_GR_LOG)
-#endif(LOG4CPP_FOUND)
-
-list(APPEND gnuradio_core_libs
-    gruel
-    ${Boost_LIBRARIES}
-    ${FFTW3F_LIBRARIES}
-    ${LOG4CPP_LIBRARIES}
-)
-
-if(FFTW3F_THREADS_LIBRARIES)
-	list(APPEND gnuradio_core_libs ${FFTW3F_THREADS_LIBRARIES} )
-	add_definitions("-DFFTW3F_THREADS")
-endif()
-
-#need to link with librt on ubuntu 11.10 for shm_*
-if(LINUX)
-    list(APPEND gnuradio_core_libs rt)
-endif()
-
-# Link against libvolk
-list(APPEND gnuradio_core_libs volk)
-
-if(ENABLE_GR_CTRLPORT)
-
-########################################################################
-# Run ICE To compile Slice files
-########################################################################
-EXECUTE_PROCESS(
-   COMMAND "${ICE_SLICE2CPP}" "-I${CMAKE_CURRENT_SOURCE_DIR}/runtime"
-       "--output-dir=${CMAKE_CURRENT_BINARY_DIR}"
-       "${CMAKE_CURRENT_SOURCE_DIR}/runtime/gnuradio.ice"
-   )
-
-# Append generated file in build directory
-list(APPEND gnuradio_core_generated_sources 
-    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio.cpp
-)
-
-list(APPEND gnuradio_core_generated_includes 
-    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio.h
-)
-
-########################################################################
-# Add controlport stuff to gnuradio-core
-########################################################################
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-list(APPEND gnuradio_core_libs
-  ${ICE_LIBRARIES}
-)
-
-endif(ENABLE_GR_CTRLPORT)
-
-add_library(gnuradio-core SHARED ${gnuradio_core_sources} ${gnuradio_core_generated_sources})
-target_link_libraries(gnuradio-core ${gnuradio_core_libs})
-GR_LIBRARY_FOO(gnuradio-core RUNTIME_COMPONENT "core_runtime" DEVEL_COMPONENT "core_devel")
-set_target_properties(gnuradio-core PROPERTIES LINK_INTERFACE_LIBRARIES "gruel")
-ADD_DEPENDENCIES(gnuradio-core
-  gnuradio_core_generated_sources
-  gnuradio_core_generated_includes
-  gnuradio_core_generated_swigs)
-
-########################################################################
-# Setup executables
-########################################################################
-add_executable(gnuradio-config-info gnuradio-config-info.cc)
-target_link_libraries(gnuradio-config-info gnuradio-core ${Boost_LIBRARIES})
-install(
-    TARGETS gnuradio-config-info
-    DESTINATION ${GR_RUNTIME_DIR}
-    COMPONENT "core_runtime"
-)
-
-########################################################################
-# Setup tests
-########################################################################
-if(ENABLE_TESTING)
-
-include_directories(${CPPUNIT_INCLUDE_DIRS})
-link_directories(${CPPUNIT_LIBRARY_DIRS})
-
-add_library(test-gnuradio-core SHARED ${test_gnuradio_core_sources})
-target_link_libraries(test-gnuradio-core gnuradio-core ${CPPUNIT_LIBRARIES} ${Boost_LIBRARIES} ${LOG4CPP_LIBRARIES})
-
-endif(ENABLE_TESTING)
diff --git a/gnuradio-core/src/lib/bug_work_around_6.cc b/gnuradio-core/src/lib/bug_work_around_6.cc
deleted file mode 100644
index f8012af0dc..0000000000
--- a/gnuradio-core/src/lib/bug_work_around_6.cc
+++ /dev/null
@@ -1,3 +0,0 @@
-// if libgrio has no sources, it doesn't get built correctly
-#include <gruel/attributes.h>
-static int gr_bug_work_around_6 __GR_ATTR_UNUSED;
diff --git a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt
deleted file mode 100644
index d85039fe60..0000000000
--- a/gnuradio-core/src/lib/general/CMakeLists.txt
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 2010-2012 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.
-
-########################################################################
-# This file included, use CMake directory variables
-########################################################################
-
-########################################################################
-# Handle the generated sine table
-########################################################################
-add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sine_table.h
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gen_sine_table.py
-    COMMAND ${PYTHON_EXECUTABLE}
-        ${CMAKE_CURRENT_SOURCE_DIR}/gen_sine_table.py >
-        ${CMAKE_CURRENT_BINARY_DIR}/sine_table.h
-)
-
-include(AddFileDependencies)
-ADD_FILE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/gr_fxpt.cc
-    ${CMAKE_CURRENT_BINARY_DIR}/sine_table.h
-)
-
-add_custom_target(general_generated DEPENDS
-    ${CMAKE_CURRENT_BINARY_DIR}/sine_table.h
-)
-
-########################################################################
-# Handle the generated constants
-########################################################################
-execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
-    "import time;print time.strftime('%a, %d %b %Y %H:%M:%S', time.gmtime())"
-    OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-message(STATUS "Loading build date ${BUILD_DATE} into gr_constants...")
-
-message(STATUS "Loading version ${VERSION} into gr_constants...")
-
-#double escape for windows backslash path separators
-string(REPLACE "\\" "\\\\" prefix ${prefix})
-string(REPLACE "\\" "\\\\" SYSCONFDIR ${SYSCONFDIR})
-string(REPLACE "\\" "\\\\" GR_PREFSDIR ${GR_PREFSDIR})
-
-configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_constants.cc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/gr_constants.cc
-@ONLY)
-
-list(APPEND gnuradio_core_sources ${CMAKE_CURRENT_BINARY_DIR}/gr_constants.cc)
-
-########################################################################
-# Append gnuradio-core library sources
-########################################################################
-list(APPEND gnuradio_core_sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_circular_file.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fast_atan2f.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fxpt.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_misc.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_random.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_reverse.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sincos.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/gri_debugger_hook.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/malloc16.c
-)
-
-########################################################################
-# Append gnuradio-core test sources
-########################################################################
-list(APPEND test_gnuradio_core_sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/qa_general.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_circular_file.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_fxpt.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_fxpt_nco.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_fxpt_vco.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_math.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/qa_sincos.cc
-)
-
-########################################################################
-# Install runtime headers
-########################################################################
-install(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_core_api.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_circular_file.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_constants.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_endianness.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_expj.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fxpt.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fxpt_nco.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fxpt_vco.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_math.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_misc.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_nco.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_random.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_reverse.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sincos.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_test_types.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_vco.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gri_debugger_hook.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/malloc16.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/random.h
-    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
-    COMPONENT "core_devel"
-)
-
-########################################################################
-# Install swig headers
-########################################################################
-if(ENABLE_PYTHON)
-install(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/general.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_constants.i
-    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
-    COMPONENT "core_swig"
-)
-endif(ENABLE_PYTHON)
-
-########################################################################
-# Handle triple-threat files that have cc, h, and i
-########################################################################
-set(gr_core_general_triple_threats
-    complex_vec_test
-    gr_block_gateway
-    gr_feval
-    gr_prefs
-    gr_test
-)
-
-foreach(file_tt ${gr_core_general_triple_threats})
-    list(APPEND gnuradio_core_sources ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.cc)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio COMPONENT "core_devel")
-    if(ENABLE_PYTHON)
-        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig COMPONENT "core_swig")
-    endif(ENABLE_PYTHON)
-endforeach(file_tt ${gr_core_general_triple_threats})
-
-CHECK_CXX_SOURCE_COMPILES("
-    #define _GNU_SOURCE
-    #include <math.h>
-    int main(){double x, sin, cos; sincos(x, &sin, &cos); return 0;}
-    " HAVE_SINCOS
-)
-GR_ADD_COND_DEF(HAVE_SINCOS)
diff --git a/gnuradio-core/src/lib/general/atsc_rrc1x.dat b/gnuradio-core/src/lib/general/atsc_rrc1x.dat
deleted file mode 100644
index 3dc87bb0b7..0000000000
--- a/gnuradio-core/src/lib/general/atsc_rrc1x.dat
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * FILTER SPECIFICATION FILE
- * FILTER TYPE:ROOT RAISED COSINE            12H
- * PASSBAND RIPPLE IN -dB            -.0500
- * STOPBAND RIPPLE IN -dB          -50.0000
- * SYMBOL RATE                  .538112E+07 HERTZ
- * ROLLOF FACTOR                .115200
- * SAMPLING FREQUENCY           .107622E+08 HERTZ
- * SAMPLING FREQUENCY           .107622E+08 HERTZ
- */
-   .1821269281208515e-02,
-  -.9323525242507458e-02,
-  -.8581001311540604e-02,
-   .2809949219226837e-02,
-   .9649330750107765e-03,
-  -.4944681189954281e-02,
-   .1624439377337694e-02,
-   .6519509013742209e-02,
-  -.4803944379091263e-02,
-  -.8026130497455597e-02,
-   .8922342676669359e-02,
-   .9611152112483978e-02,
-  -.1463735569268465e-01,
-  -.1107082655653358e-01,
-   .2262782817706466e-01,
-   .1240625558421016e-01,
-  -.3461387194693089e-01,
-  -.1348070800304413e-01,
-   .5474480940029025e-01,
-   .1432673400267959e-01,
-  -.9872047463431954e-01,
-  -.1482593175023794e-01,
-   .3077511447481811e+00,
-   .5007477863691747e+00,
-   .3077511447481811e+00,
-  -.1482593175023794e-01,
-  -.9872047463431954e-01,
-   .1432673400267959e-01,
-   .5474480940029025e-01,
-  -.1348070800304413e-01,
-  -.3461387194693089e-01,
-   .1240625558421016e-01,
-   .2262782817706466e-01,
-  -.1107082655653358e-01,
-  -.1463735569268465e-01,
-   .9611152112483978e-02,
-   .8922342676669359e-02,
-  -.8026130497455597e-02,
-  -.4803944379091263e-02,
-   .6519509013742209e-02,
-   .1624439377337694e-02,
-  -.4944681189954281e-02,
-   .9649330750107765e-03,
-   .2809949219226837e-02,
-  -.8581001311540604e-02,
-  -.9323525242507458e-02,
-   .1821269281208515e-02
diff --git a/gnuradio-core/src/lib/general/atsc_rrc20.dat b/gnuradio-core/src/lib/general/atsc_rrc20.dat
deleted file mode 100644
index 94445e96ec..0000000000
--- a/gnuradio-core/src/lib/general/atsc_rrc20.dat
+++ /dev/null
@@ -1,101 +0,0 @@
-  -.1141865178942680e-01,
-   .2192483097314835e-01,
-  -.6814673542976379e-04,
-  -.5894266534596682e-02,
-  -.3580642864108086e-02,
-   .7064016535878182e-03,
-   .3225978463888168e-02,
-   .2832664176821709e-02,
-   .4997388459742069e-03,
-  -.1796286087483168e-02,
-  -.2396093215793371e-02,
-  -.1009003724902868e-02,
-   .1184449531137943e-02,
-   .2406611572951078e-02,
-   .1609810627996922e-02,
-  -.6790305487811565e-03,
-  -.2634476870298386e-02,
-  -.2524725627154112e-02,
-  -.1492514275014401e-03,
-   .2789965830743313e-02,
-   .3848167601972818e-02,
-   .1755146309733391e-02,
-  -.2288600429892540e-02,
-  -.5209952127188444e-02,
-  -.4314901307225227e-02,
-   .3885449841618538e-03,
-   .5747230723500252e-02,
-   .7460035849362612e-02,
-   .3387423232197762e-02,
-  -.4307936877012253e-02,
-  -.1007711654528976e-01,
-  -.8849395904690027e-02,
-  -.1979861408472061e-03,
-   .1040456583723426e-01,
-   .1484309835359454e-01,
-   .8285604882985354e-02,
-  -.6346960552036762e-02,
-  -.1915087224915624e-01,
-  -.1949162455275655e-01,
-  -.4145141225308180e-02,
-   .1850909460335970e-01,
-   .3220130456611514e-01,
-   .2337836893275380e-01,
-  -.7863232865929604e-02,
-  -.4402747144922614e-01,
-  -.5751598253846169e-01,
-  -.2598480274900794e-01,
-   .5246857088059187e-01,
-   .1544690094888210e+00,
-   .2405302016995847e+00,
-   .2741314689628780e+00,
-   .2405302016995847e+00,
-   .1544690094888210e+00,
-   .5246857088059187e-01,
-  -.2598480274900794e-01,
-  -.5751598253846169e-01,
-  -.4402747144922614e-01,
-  -.7863232865929604e-02,
-   .2337836893275380e-01,
-   .3220130456611514e-01,
-   .1850909460335970e-01,
-  -.4145141225308180e-02,
-  -.1949162455275655e-01,
-  -.1915087224915624e-01,
-  -.6346960552036762e-02,
-   .8285604882985354e-02,
-   .1484309835359454e-01,
-   .1040456583723426e-01,
-  -.1979861408472061e-03,
-  -.8849395904690027e-02,
-  -.1007711654528976e-01,
-  -.4307936877012253e-02,
-   .3387423232197762e-02,
-   .7460035849362612e-02,
-   .5747230723500252e-02,
-   .3885449841618538e-03,
-  -.4314901307225227e-02,
-  -.5209952127188444e-02,
-  -.2288600429892540e-02,
-   .1755146309733391e-02,
-   .3848167601972818e-02,
-   .2789965830743313e-02,
-  -.1492514275014401e-03,
-  -.2524725627154112e-02,
-  -.2634476870298386e-02,
-  -.6790305487811565e-03,
-   .1609810627996922e-02,
-   .2406611572951078e-02,
-   .1184449531137943e-02,
-  -.1009003724902868e-02,
-  -.2396093215793371e-02,
-  -.1796286087483168e-02,
-   .4997388459742069e-03,
-   .2832664176821709e-02,
-   .3225978463888168e-02,
-   .7064016535878182e-03,
-  -.3580642864108086e-02,
-  -.5894266534596682e-02,
-  -.6814673542976379e-04,
-   .2192483097314835e-01,
-  -.1141865178942680e-01
diff --git a/gnuradio-core/src/lib/general/atsc_rrc2x.dat b/gnuradio-core/src/lib/general/atsc_rrc2x.dat
deleted file mode 100644
index 8eae94d773..0000000000
--- a/gnuradio-core/src/lib/general/atsc_rrc2x.dat
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * FILTER SPECIFICATION FILE
- * FILTER TYPE:ROOT RAISED COSINE            12H
- * PASSBAND RIPPLE IN -dB            -.0500
- * STOPBAND RIPPLE IN -dB          -50.0000
- * SYMBOL RATE                  .538112E+07 HERTZ
- * ROLLOF FACTOR                .115200
- * SAMPLING FREQUENCY           .215245E+08 HERTZ
-*/
-   .8186036720871925E-03,
-  -.1256920862942934E-02,
-  -.4844595678150654E-02,
-  -.6055080797523260E-02,
-  -.4247304052114487E-02,
-  -.9502284228801727E-03,
-   .1615938264876604E-02,
-   .2120061777532101E-02,
-   .6354246288537979E-03,
-  -.1464351080358028E-02,
-  -.2508673351258040E-02,
-  -.1573510002344847E-02,
-   .8145328611135483E-03,
-   .2996938303112984E-02,
-   .3244197461754084E-02,
-   .1038576476275921E-02,
-  -.2401810139417648E-02,
-  -.4728596191853285E-02,
-  -.4019895102828741E-02,
-  -.2215979620814323E-03,
-   .4481043666601181E-02,
-   .6867439020425081E-02,
-   .4793671425431967E-02,
-  -.1089230179786682E-02,
-  -.7325290236622095E-02,
-  -.9580074809491634E-02,
-  -.5532339215278626E-02,
-   .3166179172694683E-02,
-   .1132524851709604E-01,
-   .1316944882273674E-01,
-   .6192639470100403E-02,
-  -.6509334780275822E-02,
-  -.1730504119768739E-01,
-  -.1832502009347081E-01,
-  -.6741075310856104E-02,
-   .1229691226035357E-01,
-   .2738198731094599E-01,
-   .2702147699892521E-01,
-   .7156732492148876E-02,
-  -.2432488137856126E-01,
-  -.4934547096490860E-01,
-  -.4763523396104574E-01,
-  -.7410581223666668E-02,
-   .6681889295578003E-01,
-   .1538293845951557E+00,
-   .2236228249967098E+00,
-   .2502835178747773E+00,
-   .2236228249967098E+00,
-   .1538293845951557E+00,
-   .6681889295578003E-01,
-  -.7410581223666668E-02,
-  -.4763523396104574E-01,
-  -.4934547096490860E-01,
-  -.2432488137856126E-01,
-   .7156732492148876E-02,
-   .2702147699892521E-01,
-   .2738198731094599E-01,
-   .1229691226035357E-01,
-  -.6741075310856104E-02,
-  -.1832502009347081E-01,
-  -.1730504119768739E-01,
-  -.6509334780275822E-02,
-   .6192639470100403E-02,
-   .1316944882273674E-01,
-   .1132524851709604E-01,
-   .3166179172694683E-02,
-  -.5532339215278626E-02,
-  -.9580074809491634E-02,
-  -.7325290236622095E-02,
-  -.1089230179786682E-02,
-   .4793671425431967E-02,
-   .6867439020425081E-02,
-   .4481043666601181E-02,
-  -.2215979620814323E-03,
-  -.4019895102828741E-02,
-  -.4728596191853285E-02,
-  -.2401810139417648E-02,
-   .1038576476275921E-02,
-   .3244197461754084E-02,
-   .2996938303112984E-02,
-   .8145328611135483E-03,
-  -.1573510002344847E-02,
-  -.2508673351258040E-02,
-  -.1464351080358028E-02,
-   .6354246288537979E-03,
-   .2120061777532101E-02,
-   .1615938264876604E-02,
-  -.9502284228801727E-03,
-  -.4247304052114487E-02,
-  -.6055080797523260E-02,
-  -.4844595678150654E-02,
-  -.1256920862942934E-02,
-   .8186036720871925E-03
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i
deleted file mode 100644
index 68b963702c..0000000000
--- a/gnuradio-core/src/lib/general/general.i
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004-2012 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 <gr_prefs.h>
-#include <gr_constants.h>
-#include <gr_test_types.h>
-#include <gr_test.h>
-#include <gr_feval.h>
-#include <complex_vec_test.h>
-#include <gr_endianness.h>
-%}
-
-%include "gr_prefs.i"
-%include "gr_constants.i"
-%include "gr_test_types.h"
-%include "gr_test.i"
-%include "gr_feval.i"
-%include "complex_vec_test.i"
-%include "gr_block_gateway.i"
-%include "gr_endianness.h"
diff --git a/gnuradio-core/src/lib/general/gr_test.i b/gnuradio-core/src/lib/general/gr_test.i
deleted file mode 100644
index d810250116..0000000000
--- a/gnuradio-core/src/lib/general/gr_test.i
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006 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.
- */
-
-GR_SWIG_BLOCK_MAGIC(gr,test);
-
-
-class gr_test;
-typedef boost::shared_ptr<gr_test> gr_test_sptr;
-
-
-// public constructor
-gr_test_sptr gr_make_test (const std::string &name=std::string("gr_test"),
-        int min_inputs=1, int max_inputs=1, unsigned int sizeof_input_item=1,
-        int min_outputs=1, int max_outputs=1, unsigned int sizeof_output_item=1,
-        unsigned int history=1,unsigned int output_multiple=1,double relative_rate=1.0,
-        bool fixed_rate=true,gr_consume_type_t cons_type=CONSUME_NOUTPUT_ITEMS, gr_produce_type_t prod_type=PRODUCE_NOUTPUT_ITEMS);
-
-
-class gr_test : public gr_block {
-
- public:
-
-  ~gr_test ();
-  void forecast (int noutput_items,
-			 gr_vector_int &ninput_items_required);
-  void set_check_topology (bool check_topology);
-  bool check_topology (int ninputs, int noutputs);
-  int fixed_rate_ninput_to_noutput(int ninput);
-  int fixed_rate_noutput_to_ninput(int noutput);
-  void set_fixed_rate_public(bool fixed_rate);
-  void set_consume_type (gr_consume_type_t cons_type);
-  void set_consume_limit (unsigned int limit);
-  void set_produce_type (gr_produce_type_t prod_type);
-  void set_produce_limit (unsigned int limit);
-
- protected:
-  gr_test (const std::string &name,int min_inputs, int max_inputs, unsigned int sizeof_input_item,
-                                   int min_outputs, int max_outputs, unsigned int sizeof_output_item,
-                                   unsigned int history,unsigned int output_multiple,double relative_rate,
-                                   bool fixed_rate,gr_consume_type_t cons_type, gr_produce_type_t prod_type);
-
-};
-
-
-
diff --git a/gnuradio-core/src/lib/gnuradio-core.rc.in b/gnuradio-core/src/lib/gnuradio-core.rc.in
deleted file mode 100644
index a5579ce4ed..0000000000
--- a/gnuradio-core/src/lib/gnuradio-core.rc.in
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2013 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 <afxres.h>
-
-VS_VERSION_INFO VERSIONINFO
-  FILEVERSION @MAJOR_VERSION@,@API_COMPAT@,@RC_MINOR_VERSION@,@RC_MAINT_VERSION@
-  PRODUCTVERSION @MAJOR_VERSION@,@API_COMPAT@,@RC_MINOR_VERSION@,@RC_MAINT_VERSION@
-  FILEFLAGSMASK 0x3fL
-#ifndef NDEBUG
-  FILEFLAGS 0x0L
-#else
-  FILEFLAGS 0x1L
-#endif
-  FILEOS VOS__WINDOWS32
-  FILETYPE VFT_DLL
-  FILESUBTYPE VFT2_DRV_INSTALLABLE
-  BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-      BLOCK "040904b0"
-      BEGIN
-        VALUE "FileDescription", "gnuradio-core"
-        VALUE "FileVersion", "@VERSION@"
-        VALUE "InternalName", "gnuradio-core.dll"
-        VALUE "LegalCopyright", "Licensed under GPLv3 or any later version"
-        VALUE "OriginalFilename", "gnuradio-core.dll"
-        VALUE "ProductName", "gnuradio-core"
-        VALUE "ProductVersion", "@VERSION@"
-      END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-      VALUE "Translation", 0x409, 1200
-    END
-  END
diff --git a/gnuradio-core/src/lib/missing/bug_work_around_8.cc b/gnuradio-core/src/lib/missing/bug_work_around_8.cc
deleted file mode 100644
index 5e431a210c..0000000000
--- a/gnuradio-core/src/lib/missing/bug_work_around_8.cc
+++ /dev/null
@@ -1,3 +0,0 @@
-// if libmisc has no sources, it doesn't get built correctly
-#include <gruel/attributes.h>
-static int gr_bug_work_around_8 __GR_ATTR_UNUSED;
diff --git a/gnuradio-core/src/lib/missing/getopt.c b/gnuradio-core/src/lib/missing/getopt.c
deleted file mode 100644
index 69c7c16f75..0000000000
--- a/gnuradio-core/src/lib/missing/getopt.c
+++ /dev/null
@@ -1,733 +0,0 @@
-/* Getopt for GNU.
-   NOTE: getopt is now part of the C library, so if you don't know what
-   "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
-   before changing it!
-
-   Copyright (C) 1987, 88, 89, 90, 91, 92, 1993
-   	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, 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/* NOTE!!!  AIX requires this to be the first thing in the file.
-   Do not put ANYTHING before it!  */
-#if !defined (__GNUC__) && defined (_AIX)
- #pragma alloca
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef __GNUC__
-#define alloca __builtin_alloca
-#else /* not __GNUC__ */
-#if defined (HAVE_ALLOCA_H) || (defined(sparc) && (defined(sun) || (!defined(USG) && !defined(SVR4) && !defined(__svr4__))))
-#include <alloca.h>
-#else
-#ifndef _AIX
-char *alloca ();
-#endif
-#endif /* alloca.h */
-#endif /* not __GNUC__ */
-
-#if !__STDC__ && !defined(const) && IN_GCC
-#define const
-#endif
-
-/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.  */
-#ifndef _NO_PROTO
-#define _NO_PROTO
-#endif
-
-#include <stdio.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
-   actually compiling the library itself.  This code is part of the GNU C
-   Library, but also included in many other GNU distributions.  Compiling
-   and linking in this code is a waste when using the GNU C library
-   (especially if it is a shared library).  Rather than having every GNU
-   program understand `configure --with-gnu-libc' and omit the object files,
-   it is simpler to just do this in the source for each such file.  */
-
-#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
-
-
-/* This needs to come after some library #include
-   to get __GNU_LIBRARY__ defined.  */
-#ifdef	__GNU_LIBRARY__
-#undef	alloca
-/* Don't include stdlib.h for non-GNU C libraries because some of them
-   contain conflicting prototypes for getopt.  */
-#include <stdlib.h>
-#else	/* Not GNU C library.  */
-#define	__alloca	alloca
-#endif	/* GNU C library.  */
-
-/* If GETOPT_COMPAT is defined, `+' as well as `--' can introduce a
-   long-named option.  Because this is not POSIX.2 compliant, it is
-   being phased out.  */
-/* #define GETOPT_COMPAT */
-
-/* This version of `getopt' appears to the caller like standard Unix `getopt'
-   but it behaves differently for the user, since it allows the user
-   to intersperse the options with the other arguments.
-
-   As `getopt' works, it permutes the elements of ARGV so that,
-   when it is done, all the options precede everything else.  Thus
-   all application programs are extended to handle flexible argument order.
-
-   Setting the environment variable POSIXLY_CORRECT disables permutation.
-   Then the behavior is completely standard.
-
-   GNU application programs can use a third alternative mode in which
-   they can distinguish the relative order of options and other arguments.  */
-
-#include "getopt.h"
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-char *optarg = 0;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns EOF, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-/* XXX 1003.2 says this must be 1 before any call.  */
-int optind = 0;
-
-/* The next char to be scanned in the option-element
-   in which the last option character we returned was found.
-   This allows us to pick up the scan where we left off.
-
-   If this is zero, or a null string, it means resume the scan
-   by advancing to the next ARGV-element.  */
-
-static char *nextchar;
-
-/* Callers store zero here to inhibit the error message
-   for unrecognized options.  */
-
-int opterr = 1;
-
-/* Set to an option character which was unrecognized.
-   This must be initialized on some systems to avoid linking in the
-   system's own getopt implementation.  */
-
-int optopt = '?';
-
-/* Describe how to deal with options that follow non-option ARGV-elements.
-
-   If the caller did not specify anything,
-   the default is REQUIRE_ORDER if the environment variable
-   POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
-   REQUIRE_ORDER means don't recognize them as options;
-   stop option processing when the first non-option is seen.
-   This is what Unix does.
-   This mode of operation is selected by either setting the environment
-   variable POSIXLY_CORRECT, or using `+' as the first character
-   of the list of option characters.
-
-   PERMUTE is the default.  We permute the contents of ARGV as we scan,
-   so that eventually all the non-options are at the end.  This allows options
-   to be given in any order, even with programs that were not written to
-   expect this.
-
-   RETURN_IN_ORDER is an option available to programs that were written
-   to expect options and other ARGV-elements in any order and that care about
-   the ordering of the two.  We describe each non-option ARGV-element
-   as if it were the argument of an option with character code 1.
-   Using `-' as the first character of the list of option characters
-   selects this mode of operation.
-
-   The special argument `--' forces an end of option-scanning regardless
-   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
-   `--' can cause `getopt' to return EOF with `optind' != ARGC.  */
-
-static enum
-{
-  REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
-} ordering;
-
-#ifdef	__GNU_LIBRARY__
-/* We want to avoid inclusion of string.h with non-GNU libraries
-   because there are many ways it can cause trouble.
-   On some systems, it contains special magic macros that don't work
-   in GCC.  */
-#include <string.h>
-#define	my_index	strchr
-#define	my_bcopy(src, dst, n)	memcpy ((dst), (src), (n))
-#else
-
-/* Avoid depending on library functions or files
-   whose names are inconsistent.  */
-
-char *getenv ();
-
-static char *
-my_index (str, chr)
-     const char *str;
-     int chr;
-{
-  while (*str)
-    {
-      if (*str == chr)
-	return (char *) str;
-      str++;
-    }
-  return 0;
-}
-
-static void
-my_bcopy (from, to, size)
-     const char *from;
-     char *to;
-     int size;
-{
-  int i;
-  for (i = 0; i < size; i++)
-    to[i] = from[i];
-}
-#endif				/* GNU C library.  */
-
-/* Handle permutation of arguments.  */
-
-/* Describe the part of ARGV that contains non-options that have
-   been skipped.  `first_nonopt' is the index in ARGV of the first of them;
-   `last_nonopt' is the index after the last of them.  */
-
-static int first_nonopt;
-static int last_nonopt;
-
-/* Exchange two adjacent subsequences of ARGV.
-   One subsequence is elements [first_nonopt,last_nonopt)
-   which contains all the non-options that have been skipped so far.
-   The other is elements [last_nonopt,optind), which contains all
-   the options processed since those non-options were skipped.
-
-   `first_nonopt' and `last_nonopt' are relocated so that they describe
-   the new indices of the non-options in ARGV after they are moved.  */
-
-static void
-exchange (argv)
-     char **argv;
-{
-  int nonopts_size = (last_nonopt - first_nonopt) * sizeof (char *);
-  char **temp = (char **) __alloca (nonopts_size);
-
-  /* Interchange the two blocks of data in ARGV.  */
-
-  my_bcopy ((char *) &argv[first_nonopt], (char *) temp, nonopts_size);
-  my_bcopy ((char *) &argv[last_nonopt], (char *) &argv[first_nonopt],
-	    (optind - last_nonopt) * sizeof (char *));
-  my_bcopy ((char *) temp,
-	    (char *) &argv[first_nonopt + optind - last_nonopt],
-	    nonopts_size);
-
-  /* Update records for the slots the non-options now occupy.  */
-
-  first_nonopt += (optind - last_nonopt);
-  last_nonopt = optind;
-}
-
-/* Scan elements of ARGV (whose length is ARGC) for option characters
-   given in OPTSTRING.
-
-   If an element of ARGV starts with '-', and is not exactly "-" or "--",
-   then it is an option element.  The characters of this element
-   (aside from the initial '-') are option characters.  If `getopt'
-   is called repeatedly, it returns successively each of the option characters
-   from each of the option elements.
-
-   If `getopt' finds another option character, it returns that character,
-   updating `optind' and `nextchar' so that the next call to `getopt' can
-   resume the scan with the following option character or ARGV-element.
-
-   If there are no more option characters, `getopt' returns `EOF'.
-   Then `optind' is the index in ARGV of the first ARGV-element
-   that is not an option.  (The ARGV-elements have been permuted
-   so that those that are not options now come last.)
-
-   OPTSTRING is a string containing the legitimate option characters.
-   If an option character is seen that is not listed in OPTSTRING,
-   return '?' after printing an error message.  If you set `opterr' to
-   zero, the error message is suppressed but we still return '?'.
-
-   If a char in OPTSTRING is followed by a colon, that means it wants an arg,
-   so the following text in the same ARGV-element, or the text of the following
-   ARGV-element, is returned in `optarg'.  Two colons mean an option that
-   wants an optional arg; if there is text in the current ARGV-element,
-   it is returned in `optarg', otherwise `optarg' is set to zero.
-
-   If OPTSTRING starts with `-' or `+', it requests different methods of
-   handling the non-option ARGV-elements.
-   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
-
-   Long-named options begin with `--' instead of `-'.
-   Their names may be abbreviated as long as the abbreviation is unique
-   or is an exact match for some defined option.  If they have an
-   argument, it follows the option name in the same ARGV-element, separated
-   from the option name by a `=', or else the in next ARGV-element.
-   When `getopt' finds a long-named option, it returns 0 if that option's
-   `flag' field is nonzero, the value of the option's `val' field
-   if the `flag' field is zero.
-
-   The elements of ARGV aren't really const, because we permute them.
-   But we pretend they're const in the prototype to be compatible
-   with other systems.
-
-   LONGOPTS is a vector of `struct option' terminated by an
-   element containing a name which is zero.
-
-   LONGIND returns the index in LONGOPT of the long-named option found.
-   It is only valid when a long-named option has been found by the most
-   recent call.
-
-   If LONG_ONLY is nonzero, '-' as well as '--' can introduce
-   long-named options.  */
-
-int
-_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
-     int argc;
-     char *const *argv;
-     const char *optstring;
-     const struct option *longopts;
-     int *longind;
-     int long_only;
-{
-  int option_index;
-
-  optarg = 0;
-
-  /* Initialize the internal data when the first call is made.
-     Start processing options with ARGV-element 1 (since ARGV-element 0
-     is the program name); the sequence of previously skipped
-     non-option ARGV-elements is empty.  */
-
-  if (optind == 0)
-    {
-      first_nonopt = last_nonopt = optind = 1;
-
-      nextchar = NULL;
-
-      /* Determine how to handle the ordering of options and nonoptions.  */
-
-      if (optstring[0] == '-')
-	{
-	  ordering = RETURN_IN_ORDER;
-	  ++optstring;
-	}
-      else if (optstring[0] == '+')
-	{
-	  ordering = REQUIRE_ORDER;
-	  ++optstring;
-	}
-      else if (getenv ("POSIXLY_CORRECT") != NULL)
-	ordering = REQUIRE_ORDER;
-      else
-	ordering = PERMUTE;
-    }
-
-  if (nextchar == NULL || *nextchar == '\0')
-    {
-      if (ordering == PERMUTE)
-	{
-	  /* If we have just processed some options following some non-options,
-	     exchange them so that the options come first.  */
-
-	  if (first_nonopt != last_nonopt && last_nonopt != optind)
-	    exchange ((char **) argv);
-	  else if (last_nonopt != optind)
-	    first_nonopt = optind;
-
-	  /* Now skip any additional non-options
-	     and extend the range of non-options previously skipped.  */
-
-	  while (optind < argc
-		 && (argv[optind][0] != '-' || argv[optind][1] == '\0')
-#ifdef GETOPT_COMPAT
-		 && (longopts == NULL
-		     || argv[optind][0] != '+' || argv[optind][1] == '\0')
-#endif				/* GETOPT_COMPAT */
-		 )
-	    optind++;
-	  last_nonopt = optind;
-	}
-
-      /* Special ARGV-element `--' means premature end of options.
-	 Skip it like a null option,
-	 then exchange with previous non-options as if it were an option,
-	 then skip everything else like a non-option.  */
-
-      if (optind != argc && !strcmp (argv[optind], "--"))
-	{
-	  optind++;
-
-	  if (first_nonopt != last_nonopt && last_nonopt != optind)
-	    exchange ((char **) argv);
-	  else if (first_nonopt == last_nonopt)
-	    first_nonopt = optind;
-	  last_nonopt = argc;
-
-	  optind = argc;
-	}
-
-      /* If we have done all the ARGV-elements, stop the scan
-	 and back over any non-options that we skipped and permuted.  */
-
-      if (optind == argc)
-	{
-	  /* Set the next-arg-index to point at the non-options
-	     that we previously skipped, so the caller will digest them.  */
-	  if (first_nonopt != last_nonopt)
-	    optind = first_nonopt;
-	  return EOF;
-	}
-
-      /* If we have come to a non-option and did not permute it,
-	 either stop the scan or describe it to the caller and pass it by.  */
-
-      if ((argv[optind][0] != '-' || argv[optind][1] == '\0')
-#ifdef GETOPT_COMPAT
-	  && (longopts == NULL
-	      || argv[optind][0] != '+' || argv[optind][1] == '\0')
-#endif				/* GETOPT_COMPAT */
-	  )
-	{
-	  if (ordering == REQUIRE_ORDER)
-	    return EOF;
-	  optarg = argv[optind++];
-	  return 1;
-	}
-
-      /* We have found another option-ARGV-element.
-	 Start decoding its characters.  */
-
-      nextchar = (argv[optind] + 1
-		  + (longopts != NULL && argv[optind][1] == '-'));
-    }
-
-  if (longopts != NULL
-      && ((argv[optind][0] == '-'
-	   && (argv[optind][1] == '-' || long_only))
-#ifdef GETOPT_COMPAT
-	  || argv[optind][0] == '+'
-#endif				/* GETOPT_COMPAT */
-	  ))
-    {
-      const struct option *p;
-      char *s = nextchar;
-      int exact = 0;
-      int ambig = 0;
-      const struct option *pfound = NULL;
-      int indfound;
-
-      while (*s && *s != '=')
-	s++;
-
-      /* Test all options for either exact match or abbreviated matches.  */
-      for (p = longopts, option_index = 0; p->name;
-	   p++, option_index++)
-	if (!strncmp (p->name, nextchar, s - nextchar))
-	  {
-	    if (s - nextchar == strlen (p->name))
-	      {
-		/* Exact match found.  */
-		pfound = p;
-		indfound = option_index;
-		exact = 1;
-		break;
-	      }
-	    else if (pfound == NULL)
-	      {
-		/* First nonexact match found.  */
-		pfound = p;
-		indfound = option_index;
-	      }
-	    else
-	      /* Second nonexact match found.  */
-	      ambig = 1;
-	  }
-
-      if (ambig && !exact)
-	{
-	  if (opterr)
-	    fprintf (stderr, "%s: option `%s' is ambiguous\n",
-		     argv[0], argv[optind]);
-	  nextchar += strlen (nextchar);
-	  optind++;
-	  return '?';
-	}
-
-      if (pfound != NULL)
-	{
-	  option_index = indfound;
-	  optind++;
-	  if (*s)
-	    {
-	      /* Don't test has_arg with >, because some C compilers don't
-		 allow it to be used on enums.  */
-	      if (pfound->has_arg)
-		optarg = s + 1;
-	      else
-		{
-		  if (opterr)
-		    {
-		      if (argv[optind - 1][1] == '-')
-			/* --option */
-			fprintf (stderr,
-				 "%s: option `--%s' doesn't allow an argument\n",
-				 argv[0], pfound->name);
-		      else
-			/* +option or -option */
-			fprintf (stderr,
-			     "%s: option `%c%s' doesn't allow an argument\n",
-			     argv[0], argv[optind - 1][0], pfound->name);
-		    }
-		  nextchar += strlen (nextchar);
-		  return '?';
-		}
-	    }
-	  else if (pfound->has_arg == 1)
-	    {
-	      if (optind < argc)
-		optarg = argv[optind++];
-	      else
-		{
-		  if (opterr)
-		    fprintf (stderr, "%s: option `%s' requires an argument\n",
-			     argv[0], argv[optind - 1]);
-		  nextchar += strlen (nextchar);
-		  return optstring[0] == ':' ? ':' : '?';
-		}
-	    }
-	  nextchar += strlen (nextchar);
-	  if (longind != NULL)
-	    *longind = option_index;
-	  if (pfound->flag)
-	    {
-	      *(pfound->flag) = pfound->val;
-	      return 0;
-	    }
-	  return pfound->val;
-	}
-      /* Can't find it as a long option.  If this is not getopt_long_only,
-	 or the option starts with '--' or is not a valid short
-	 option, then it's an error.
-	 Otherwise interpret it as a short option.  */
-      if (!long_only || argv[optind][1] == '-'
-#ifdef GETOPT_COMPAT
-	  || argv[optind][0] == '+'
-#endif				/* GETOPT_COMPAT */
-	  || my_index (optstring, *nextchar) == NULL)
-	{
-	  if (opterr)
-	    {
-	      if (argv[optind][1] == '-')
-		/* --option */
-		fprintf (stderr, "%s: unrecognized option `--%s'\n",
-			 argv[0], nextchar);
-	      else
-		/* +option or -option */
-		fprintf (stderr, "%s: unrecognized option `%c%s'\n",
-			 argv[0], argv[optind][0], nextchar);
-	    }
-	  nextchar = (char *) "";
-	  optind++;
-	  return '?';
-	}
-    }
-
-  /* Look at and handle the next option-character.  */
-
-  {
-    char c = *nextchar++;
-    char *temp = my_index (optstring, c);
-
-    /* Increment `optind' when we start to process its last character.  */
-    if (*nextchar == '\0')
-      ++optind;
-
-    if (temp == NULL || c == ':')
-      {
-	if (opterr)
-	  {
-#if 0
-	    if (c < 040 || c >= 0177)
-	      fprintf (stderr, "%s: unrecognized option, character code 0%o\n",
-		       argv[0], c);
-	    else
-	      fprintf (stderr, "%s: unrecognized option `-%c'\n", argv[0], c);
-#else
-	    /* 1003.2 specifies the format of this message.  */
-	    fprintf (stderr, "%s: illegal option -- %c\n", argv[0], c);
-#endif
-	  }
-	optopt = c;
-	return '?';
-      }
-    if (temp[1] == ':')
-      {
-	if (temp[2] == ':')
-	  {
-	    /* This is an option that accepts an argument optionally.  */
-	    if (*nextchar != '\0')
-	      {
-		optarg = nextchar;
-		optind++;
-	      }
-	    else
-	      optarg = 0;
-	    nextchar = NULL;
-	  }
-	else
-	  {
-	    /* This is an option that requires an argument.  */
-	    if (*nextchar != '\0')
-	      {
-		optarg = nextchar;
-		/* If we end this ARGV-element by taking the rest as an arg,
-		   we must advance to the next element now.  */
-		optind++;
-	      }
-	    else if (optind == argc)
-	      {
-		if (opterr)
-		  {
-#if 0
-		    fprintf (stderr, "%s: option `-%c' requires an argument\n",
-			     argv[0], c);
-#else
-		    /* 1003.2 specifies the format of this message.  */
-		    fprintf (stderr, "%s: option requires an argument -- %c\n",
-			     argv[0], c);
-#endif
-		  }
-		optopt = c;
-		if (optstring[0] == ':')
-		  c = ':';
-		else
-		  c = '?';
-	      }
-	    else
-	      /* We already incremented `optind' once;
-		 increment it again when taking next ARGV-elt as argument.  */
-	      optarg = argv[optind++];
-	    nextchar = NULL;
-	  }
-      }
-    return c;
-  }
-}
-
-#ifdef GETOPT
-int
-getopt (argc, argv, optstring)
-     int argc;
-     char *const *argv;
-     const char *optstring;
-{
-  return _getopt_internal (argc, argv, optstring,
-			   (const struct option *) 0,
-			   (int *) 0,
-			   0);
-}
-#endif
-
-#endif	/* _LIBC or not __GNU_LIBRARY__.  */
-
-#ifdef TEST
-
-/* Compile with -DTEST to make an executable for use in testing
-   the above definition of `getopt'.  */
-
-int
-main (argc, argv)
-     int argc;
-     char **argv;
-{
-  int c;
-  int digit_optind = 0;
-
-  while (1)
-    {
-      int this_option_optind = optind ? optind : 1;
-
-      c = getopt (argc, argv, "abc:d:0123456789");
-      if (c == EOF)
-	break;
-
-      switch (c)
-	{
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	  if (digit_optind != 0 && digit_optind != this_option_optind)
-	    printf ("digits occur in two different argv-elements.\n");
-	  digit_optind = this_option_optind;
-	  printf ("option %c\n", c);
-	  break;
-
-	case 'a':
-	  printf ("option a\n");
-	  break;
-
-	case 'b':
-	  printf ("option b\n");
-	  break;
-
-	case 'c':
-	  printf ("option c with value `%s'\n", optarg);
-	  break;
-
-	case '?':
-	  break;
-
-	default:
-	  printf ("?? getopt returned character code 0%o ??\n", c);
-	}
-    }
-
-  if (optind < argc)
-    {
-      printf ("non-option ARGV-elements: ");
-      while (optind < argc)
-	printf ("%s ", argv[optind++]);
-      printf ("\n");
-    }
-
-  exit (0);
-}
-
-#endif /* TEST */
diff --git a/gnuradio-core/src/lib/missing/getopt.h b/gnuradio-core/src/lib/missing/getopt.h
deleted file mode 100644
index 0679081473..0000000000
--- a/gnuradio-core/src/lib/missing/getopt.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Declarations for getopt.
-   Copyright (C) 1989, 1990, 1991, 1992, 1993 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, 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef _GETOPT_H
-#define _GETOPT_H 1
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-extern char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns EOF, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-extern int optind;
-
-/* Callers store zero here to inhibit the error message `getopt' prints
-   for unrecognized options.  */
-
-extern int opterr;
-
-/* Set to an option character which was unrecognized.  */
-
-extern int optopt;
-
-/* Describe the long-named options requested by the application.
-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of `struct option' terminated by an element containing a name which is
-   zero.
-
-   The field `has_arg' is:
-   no_argument		(or 0) if the option does not take an argument,
-   required_argument	(or 1) if the option requires an argument,
-   optional_argument 	(or 2) if the option takes an optional argument.
-
-   If the field `flag' is not NULL, it points to a variable that is set
-   to the value given in the field `val' when the option is found, but
-   left unchanged if the option is not found.
-
-   To have a long-named option do something other than set an `int' to
-   a compiled-in constant, such as set a value from `optarg', set the
-   option's `flag' field to zero and its `val' field to a nonzero
-   value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero `flag' field, `getopt'
-   returns the contents of the `val' field.  */
-
-struct option
-{
-#if	__STDC__
-  const char *name;
-#else
-  char *name;
-#endif
-  /* has_arg can't be an enum because some compilers complain about
-     type mismatches in all the code that assumes it is an int.  */
-  int has_arg;
-  int *flag;
-  int val;
-};
-
-/* Names for the values of the `has_arg' field of `struct option'.  */
-
-#define	no_argument		0
-#define required_argument	1
-#define optional_argument	2
-
-#if __STDC__
-#if defined(__GNU_LIBRARY__)
-/* Many other libraries have conflicting prototypes for getopt, with
-   differences in the consts, in stdlib.h.  To avoid compilation
-   errors, only prototype getopt for the GNU C library.  */
-extern int getopt (int argc, char *const *argv, const char *shortopts);
-#else /* not __GNU_LIBRARY__ */
-extern int getopt ();
-#endif /* not __GNU_LIBRARY__ */
-extern int getopt_long (int argc, char *const *argv, const char *shortopts,
-		        const struct option *longopts, int *longind);
-extern int getopt_long_only (int argc, char *const *argv,
-			     const char *shortopts,
-		             const struct option *longopts, int *longind);
-
-/* Internal only.  Users should not call this directly.  */
-extern int _getopt_internal (int argc, char *const *argv,
-			     const char *shortopts,
-		             const struct option *longopts, int *longind,
-			     int long_only);
-#else /* not __STDC__ */
-extern int getopt ();
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
-#endif /* not __STDC__ */
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* _GETOPT_H */
diff --git a/gnuradio-core/src/lib/missing/gettimeofday.c b/gnuradio-core/src/lib/missing/gettimeofday.c
deleted file mode 100644
index a53e47ed90..0000000000
--- a/gnuradio-core/src/lib/missing/gettimeofday.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2003 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 <config.h>
-
-#ifdef HAVE_WINDOWS_H
-#include <windows.h>
-#endif
-#ifdef HAVE_WINBASE_H
-# include <winbase.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-/*
- * broken implementation for WIN32.
- * FIXME: usec precision
- */
-int gettimeofday(struct timeval *tv, struct timezone *tz)
-{
-	if (tv) {
-		time_t tm;
-
-		time(&tm);
-		tv->tv_sec = tm;
-		tv->tv_usec = 0;
-	}
-	return 0;
-}
-
diff --git a/gnuradio-core/src/lib/missing/usleep.c b/gnuradio-core/src/lib/missing/usleep.c
deleted file mode 100644
index b1d7dad473..0000000000
--- a/gnuradio-core/src/lib/missing/usleep.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 3 of the
-License, or (at your option) any later version.
-
-The GNU C Library 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
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-#include <config.h>
-
-#ifndef HAVE_USLEEP
-
-#include <sys/types.h>
-#include <sys/time.h>
-
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
-
-#ifdef HAVE_WINDOWS_H
-#include <windows.h>
-#endif
-#ifdef HAVE_WINBASE_H
-# include <winbase.h>
-#endif
-
-#ifdef apollo
-# include <apollo/base.h>
-# include <apollo/time.h>
-  static time_$clock_t DomainTime100mS =
-    {
-	0, 100000/4
-    };
-  static status_$t DomainStatus;
-#endif
-
-/* Sleep USECONDS microseconds, or until a previously set timer goes off.  */
-int
-usleep (unsigned long useconds)
-{
-#ifdef apollo
-  /* The usleep function does not work under the SYS5.3 environment.
-     Use the Domain/OS time_$wait call instead. */
-  time_$wait (time_$relative, DomainTime100mS, &DomainStatus);
-#elif defined(HAVE_SSLEEP)	/* Win32 */
-  Sleep( useconds/1000 );
-#else
-  struct timeval delay;
-
-  delay.tv_sec = 0;
-  delay.tv_usec = useconds;
-  select (0, 0, 0, 0, &delay);
-#endif
-  return 0;
-}
-
-#endif /* !HAVE_USLEEP */
diff --git a/gnuradio-core/src/lib/runtime/CMakeLists.txt b/gnuradio-core/src/lib/runtime/CMakeLists.txt
deleted file mode 100644
index f3982f53cd..0000000000
--- a/gnuradio-core/src/lib/runtime/CMakeLists.txt
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 2010-2010 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.
-
-########################################################################
-# This file included, use CMake directory variables
-########################################################################
-
-########################################################################
-# Control availability of vmcircbuf methods.
-# For now, only allows disabling of shm methods, which cause uncatchable
-#    segmentation faults on Cygwin with gcc 4.x (x <= 5)
-# Usage:
-#   GR_VMCIRCBUF()
-#
-# Will set TRY_SHM_VMCIRCBUF to 1 by default except on Windows machines.
-# Can manually set with -DTRY_SHM_VMCIRCBUF=0|1
-########################################################################
-
-  if(WIN32)
-    OPTION(TRY_SHM_VMCIRCBUF "Try SHM VMCIRCBUF" OFF)
-  else(WIN32)
-    OPTION(TRY_SHM_VMCIRCBUF "Try SHM VMCIRCBUF" ON)
-  endif(WIN32)
-
-  message(STATUS "TRY_SHM_VMCIRCBUF set to ${TRY_SHM_VMCIRCBUF}.")
-
-  if(TRY_SHM_VMCIRCBUF)
-    add_definitions( -DTRY_SHM_VMCIRCBUF )
-  endif(TRY_SHM_VMCIRCBUF)
-
-########################################################################
-# Append gnuradio-core library sources
-########################################################################
-list(APPEND gnuradio_core_sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_basic_block.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_flowgraph.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_flat_flowgraph.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block_detail.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block_executor.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block_registry.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_hier_block2.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_hier_block2_detail.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_buffer.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_dispatcher.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_error_handler.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_io_signature.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_local_sighandler.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_logger.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_message.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_msg_accepter.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_msg_handler.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_msg_queue.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_pagesize.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_preferences.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_realtime.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_scheduler.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_scheduler_sts.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_scheduler_tpb.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_single_threaded_scheduler.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sptr_magic.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_block.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_decimator.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_interpolator.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sys_paths.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_tagged_stream_block.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_top_block.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_top_block_impl.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_tpb_detail.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_tpb_thread_body.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_vmcircbuf.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_vmcircbuf_mmap_shm_open.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_vmcircbuf_mmap_tmpfile.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_vmcircbuf_createfilemapping.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_vmcircbuf_sysv_shm.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_select_handler.cc
-)
-
-if(ENABLE_GR_CTRLPORT)
-list(APPEND gnuradio_core_sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/ice_application_base.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_ice.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_booter_ice.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_booter_aggregator.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_aggregator.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_selector.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpcpmtconverters_ice.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpcmanager.cc
-)
-endif(ENABLE_GR_CTRLPORT)
-
-
-########################################################################
-# Append gnuradio-core test sources
-########################################################################
-list(APPEND test_gnuradio_core_sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_buffer.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_io_signature.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_vmcircbuf.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_logger.cc
-)
-
-########################################################################
-# Install runtime headers
-########################################################################
-install(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_basic_block.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_flowgraph.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_flat_flowgraph.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block_detail.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block_executor.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block_registry.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_hier_block2.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_hier_block2_detail.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_buffer.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_complex.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_dispatcher.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_error_handler.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_io_signature.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_local_sighandler.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_logger.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_message.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_msg_accepter.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_msg_handler.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_msg_queue.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_pagesize.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_preferences.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_realtime.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_runtime_types.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_scheduler.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_scheduler_sts.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_scheduler_tpb.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_select_handler.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_single_threaded_scheduler.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sptr_magic.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_block.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_decimator.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_interpolator.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_tagged_stream_block.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_top_block.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_top_block_impl.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_tpb_detail.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_tpb_thread_body.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_timer.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sys_paths.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_types.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_unittests.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_vmcircbuf.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_tags.h
-    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
-    COMPONENT "core_devel"
-)
-
-
-if(ENABLE_GR_CTRLPORT)
-ADD_DEFINITIONS(-DGR_CTRLPORT)
-INSTALL(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/ice_application_base.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ice_server_template.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpccallbackregister_base.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpcmanager_base.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpcmanager.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpcpmtconverters_ice.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpcregisterhelpers.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_aggregator.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_base.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_booter_aggregator.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_booter_base.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_booter_ice.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_selector.h
-    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
-    COMPONENT "core_devel"
-)
-endif(ENABLE_GR_CTRLPORT)
-
-########################################################################
-# Install swig headers
-########################################################################
-if(ENABLE_PYTHON)
-install(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_basic_block.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block_detail.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_hier_block2.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_buffer.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_dispatcher.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_error_handler.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_io_signature.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_logger.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_message.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_msg_handler.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_msg_queue.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_realtime.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_single_threaded_scheduler.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_block.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_decimator.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_interpolator.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_tagged_stream_block.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_tags.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/gr_top_block.i
-    ${CMAKE_CURRENT_SOURCE_DIR}/runtime.i
-    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
-    COMPONENT "core_swig"
-)
-    
-endif(ENABLE_PYTHON)
diff --git a/gnuradio-core/src/lib/runtime/nop.h b/gnuradio-core/src/lib/runtime/nop.h
deleted file mode 100644
index 5b3166da7b..0000000000
--- a/gnuradio-core/src/lib/runtime/nop.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- c++ -*- */
-/* 
- * Copyright 2012 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.
- */
-
-#ifndef INCLUDED_CTRLPORT_NOP_H
-#define INCLUDED_CTRLPORT_NOP_H
-
-#include <ctrlport/api.h>
-#include <gr_sync_block.h>
-
-namespace gr {
-  namespace ctrlport {
-    
-    /*!
-     * \brief A NOP block for testing ctrlport
-     *
-     */
-    class CTRLPORT_API nop : virtual public gr_sync_block
-    {
-    public:
-      // gr::ctrlport::nop::sptr
-      typedef boost::shared_ptr<nop> sptr;
-
-      /*!
-       * Build a simple test block
-       */
-      static sptr make(size_t itemsize, int a, int b);
-
-      virtual void set_a(int b) = 0;
-      virtual void set_b(int b) = 0;
-      virtual int a() const = 0;
-      virtual int b() const = 0;
-    };
-
-  } /* namespace ctrlport */
-} /* namespace gr */
-
-#endif /* INCLUDED_CTRLPORT_NOP_H */
-
diff --git a/gnuradio-core/src/lib/runtime/nop_impl.cc b/gnuradio-core/src/lib/runtime/nop_impl.cc
deleted file mode 100644
index def1740678..0000000000
--- a/gnuradio-core/src/lib/runtime/nop_impl.cc
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "nop_impl.h"
-#include <gr_io_signature.h>
-
-namespace gr {
-  namespace ctrlport {
-
-    nop::sptr
-    nop::make(size_t itemsize, int a, int b)
-    {
-      return gnuradio::get_initial_sptr
-	(new nop_impl(itemsize, a, b));
-    }
-
-
-    nop_impl::nop_impl(size_t itemsize, int a, int b)
-      : gr_sync_block("nop",
-		      gr_make_io_signature(1, 1, itemsize),
-		      gr_make_io_signature(0, 0, 0))
-    {
-      set_a(a);
-      set_b(b);
-    }
-
-    nop_impl::~nop_impl()
-    {
-    }
-
-    void
-    nop_impl::set_a(int a)
-    {
-      d_a = a;
-    }
-
-    void
-    nop_impl::set_b(int b)
-    {
-      d_b = b;
-    }
-
-    int
-    nop_impl::a() const
-    {
-      return d_a;
-    }
-
-    int
-    nop_impl::b() const
-    {
-      return d_b;
-    }
-
-    int
-    nop_impl::work(int noutput_items,
-		   gr_vector_const_void_star &input_items,
-		   gr_vector_void_star &output_items)
-    {
-      return noutput_items;
-    }
-
-    void
-    nop_impl::setup_rpc()
-    {
-      d_get_32i_rpcs.push_back(get_32i_sptr
-	 (new get_32i_t(d_name, "a", this, unique_id(),
-			&nop_impl::a,
-			pmt::mp(-128), pmt::mp(127), pmt::mp(0),
-			"", "Value of a", RPC_PRIVLVL_MIN,
-                        DISPTIME | DISPOPTSTRIP)));
-
-      d_get_32i_rpcs.push_back(get_32i_sptr
-	 (new get_32i_t(d_name, "b", this, unique_id(),
-			&nop_impl::b,
-			pmt::mp(-128), pmt::mp(127), pmt::mp(0),
-			"", "Value of b", RPC_PRIVLVL_MIN,
-                        DISPTIME | DISPOPTSTRIP)));
-
-      d_set_32i_rpcs.push_back(set_32i_sptr
-	 (new set_32i_t(d_name, "a", this, unique_id(),
-			&nop_impl::set_a,
-			pmt::mp(-128), pmt::mp(127), pmt::mp(0),
-			"", "Value of a",
-			RPC_PRIVLVL_MIN, DISPNULL)));
-
-      d_set_32i_rpcs.push_back(set_32i_sptr
-	 (new set_32i_t(d_name, "b", this, unique_id(),
-			&nop_impl::set_b,
-			pmt::mp(-128), pmt::mp(127), pmt::mp(0),
-			"", "Value of b",
-			RPC_PRIVLVL_MIN, DISPNULL)));
-    }
-
-  } /* namespace ctrlport */
-} /* namespace gr */
diff --git a/gnuradio-core/src/lib/runtime/nop_impl.h b/gnuradio-core/src/lib/runtime/nop_impl.h
deleted file mode 100644
index a39ddac8f9..0000000000
--- a/gnuradio-core/src/lib/runtime/nop_impl.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2012 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.
- */
-
-#ifndef INCLUDED_CTRLPORT_NOP_IMPL_H
-#define INCLUDED_CTRLPORT_NOP_IMPL_H
-
-#include <ctrlport/nop.h>
-#include <ctrlport/rpcregisterhelpers.h>
-#include <boost/thread/shared_mutex.hpp>
-
-namespace gr {
-  namespace ctrlport {
-
-    class CTRLPORT_API nop_impl : public nop
-    {
-    private:
-      typedef rpcbasic_register_get<nop_impl, int> get_32i_t;
-      typedef rpcbasic_register_set<nop_impl, int> set_32i_t;
-
-      typedef boost::shared_ptr<get_32i_t> get_32i_sptr;
-      typedef boost::shared_ptr<set_32i_t> set_32i_sptr;
-
-      std::vector<get_32i_sptr> d_get_32i_rpcs;
-      std::vector<set_32i_sptr> d_set_32i_rpcs;
-
-      void setup_rpc();
-
-      int d_a, d_b;
-
-    public:
-      nop_impl(size_t itemsize, int a, int b);
-      ~nop_impl();
-
-      void set_a(int a);
-      void set_b(int b);
-      int a() const;
-      int b() const;
-
-      int work(int noutput_items,
-	       gr_vector_const_void_star &input_items,
-	       gr_vector_void_star &output_items);
-    };
-
-  } /* namespace ctrlport */
-} /* namespace gr */
-
-#endif /* INCLUDED_CTRLPORT_NOP_IMPL_H */
-
diff --git a/gnuradio-core/src/lib/runtime/test_shared_block_ptr.cc b/gnuradio-core/src/lib/runtime/test_shared_block_ptr.cc
deleted file mode 100644
index 0a391c1354..0000000000
--- a/gnuradio-core/src/lib/runtime/test_shared_block_ptr.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2013 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 <gr_shared_block_sptr.h>
-#include <blocks/vector_source_i.h>
-
-gr_block_sptr
-foo (gr::blocks::vector_source_i::sptr s)
-{
-  return gr_block_sptr (s);
-}
-
-typedef gr_shared_block_sptr<gr::blocks::vector_source_i> gr_vector_source_i_ptrX;
-//typedef boost::shared_ptr<gr::blocks::vector_source_i> gr_vector_source_i_ptrX;
-
-gr_vector_source_i_ptrX
-bar (gr_vector_source_i *s)
-{
-  return gr_vector_source_i_ptrX (s);
-}
-
-gr_block_sptr
-baz_1 (gr_vector_source_i_ptrX s)
-{
-  return gr_block_sptr (s);
-}
-
-#if 0
-gr_block_sptr
-baz_2 (gr_vector_source_i_ptrX s)
-{
-  return s.block_sptr ();
-}
-#endif
diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt
deleted file mode 100644
index f098597df0..0000000000
--- a/gnuradio-core/src/lib/swig/CMakeLists.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2010-2011 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(GrPython)
-include(GrSwig)
-
-set(GR_SWIG_INCLUDE_DIRS
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
-    ${GRUEL_INCLUDE_DIRS}
-    ${LOG4CPP_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-)
-set(GR_SWIG_LIBRARIES
-    gnuradio-core
-    ${LOG4CPP_LIBRARIES}
-)
-
-# Only use if log4cpp is installed
-# Define ENABLE_GR_LOG for the .i file to ignore it.
-if(ENABLE_GR_LOG)
-     SET(GR_SWIG_FLAGS "-DENABLE_GR_LOG")
-endif(ENABLE_GR_LOG)
-
-if(ENABLE_GR_CTRLPORT)
-  list(APPEND GR_SWIG_FLAGS -DGR_CTRLPORT)
-  list(APPEND GR_SWIG_LIBRARIES ${ICE_LIBRARIES})
-  list(APPEND GR_SWIG_INCLUDE_DIRS ${ICE_INCLUDE_DIR})
-endif(ENABLE_GR_CTRLPORT)
-
-link_directories(${Boost_LIBRARY_DIRS})
-
-########################################################################
-# Build and install the swig targets
-########################################################################
-# ----------------------------------------------------------------
-# We've split the previously monstrous gnuradio_corethon into 6
-# smaller pieces.  This reduces compile time coupling and creates
-# smaller pieces for the compiler to digest.  prior to this change, on
-# X86_64, g++'s resident set size was 650MB!
-# ----------------------------------------------------------------
-
-set(GR_SWIG_TARGET_DEPS gnuradio_core_generated_sources
-  general_generated filter_generated pmt_swig)
-
-foreach(what runtime general)
-    SET(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${what}_swig_doc.i)
-    SET(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../${what} ${CMAKE_CURRENT_BINARY_DIR}/../${what})
-    GR_SWIG_MAKE(gnuradio_core_${what} gnuradio_core_${what}.i)
-    GR_SWIG_INSTALL(
-        TARGETS gnuradio_core_${what}
-        DESTINATION ${GR_PYTHON_DIR}/gnuradio/gr
-        COMPONENT "core_python"
-    )
-    install(
-        FILES
-        gnuradio_core_${what}.i
-        ${CMAKE_CURRENT_BINARY_DIR}/${what}_swig_doc.i
-        DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
-        COMPONENT "core_swig"
-    )
-    list(APPEND core_swig_deps ${SWIG_MODULE_gnuradio_core_${what}_REAL_NAME})
-endforeach(what)
-
-add_custom_target(core_swig DEPENDS ${core_swig_deps})
-
-########################################################################
-# Install various files
-########################################################################
-install(FILES
-    gnuradio.i
-    gr_swig_block_magic.i
-    gr_shared_ptr.i
-    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
-    COMPONENT "core_swig"
-)
-
-GR_PYTHON_INSTALL(
-    FILES gnuradio_core.py
-    DESTINATION ${GR_PYTHON_DIR}/gnuradio/gr
-    COMPONENT "core_python"
-)
-
-install(
-    FILES ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio_swig_bug_workaround.h
-    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
-    COMPONENT "core_swig"
-)
diff --git a/gnuradio-core/src/lib/swig/gnuradio_core.py b/gnuradio-core/src/lib/swig/gnuradio_core.py
deleted file mode 100644
index 09d00fcdc1..0000000000
--- a/gnuradio-core/src/lib/swig/gnuradio_core.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright 2006,2009,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-# This file implements the old gnuradio_core namespace
-
-from gnuradio_core_runtime import *
-from gnuradio_core_general import *
diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_general.i b/gnuradio-core/src/lib/swig/gnuradio_core_general.i
deleted file mode 100644
index 33f97815e8..0000000000
--- a/gnuradio-core/src/lib/swig/gnuradio_core_general.i
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2009,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-%include "general_swig_doc.i"
-
-#define GR_CORE_API
-
-#ifndef SWIGIMPORTED
-%module(directors="1") gnuradio_core_general
-#endif
-
- //%feature("autodoc", "1");		// generate python docstrings
-
-%include "gnuradio.i"				// the common stuff
-
-%include "general.i"
-
- // Simple test case for complex input and output
-%inline
-%{
-  std::complex<float> complexf_add_2j(std::complex<float> x)
-  {
-    return std::complex<float>(x.real(), x.imag() + 2);
-  }
-
-  std::complex<double> complexd_add_2j(std::complex<double> x)
-  {
-    return std::complex<double>(x.real(), x.imag() + 2);
-  }
-
-  std::complex<float> complexf_add_x_2j(float x, std::complex<float> y)
-  {
-    return std::complex<float>(x + y.real(), y.imag() + 2);
-  }
-
-%}
diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i b/gnuradio-core/src/lib/swig/gnuradio_core_hier.i
deleted file mode 100644
index 141d9b1635..0000000000
--- a/gnuradio-core/src/lib/swig/gnuradio_core_hier.i
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-%include "hier_swig_doc.i"
-
-#ifndef SWIGIMPORTED
-%module(directors="1") gnuradio_hier_hier
-#endif
-
- //%feature("autodoc", "1");		// generate python docstrings
-
-%include "gnuradio.i"				// the common stuff
-
-%include "hier.i"
diff --git a/gnuradio-core/src/python/gnuradio/eng_notation.py b/gnuradio-core/src/python/gnuradio/eng_notation.py
deleted file mode 100644
index d23f9005f0..0000000000
--- a/gnuradio-core/src/python/gnuradio/eng_notation.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Copyright 2003 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.
-#
-"""
-Display numbers as strings using engineering notation.
-"""
-
-scale_factor = {}
-scale_factor['E'] = 1e18
-scale_factor['P'] = 1e15
-scale_factor['T'] = 1e12
-scale_factor['G'] = 1e9
-scale_factor['M'] = 1e6
-scale_factor['k'] = 1e3
-scale_factor['m'] = 1e-3
-scale_factor['u'] = 1e-6
-scale_factor['n'] = 1e-9
-scale_factor['p'] = 1e-12
-scale_factor['f'] = 1e-15
-scale_factor['a'] = 1e-18
-
-def num_to_str (n):
-    '''Convert a number to a string in engineering notation.  E.g., 5e-9 -> 5n'''
-    m = abs(n)
-    if m >= 1e9:
-        return "%gG" % (n * 1e-9)
-    elif m >= 1e6:
-        return "%gM" % (n * 1e-6)
-    elif m >= 1e3:
-        return "%gk" % (n * 1e-3)
-    elif m >= 1:
-        return "%g" % (n)
-    elif m >= 1e-3:
-        return "%gm" % (n * 1e3)
-    elif m >= 1e-6:
-        return "%gu" % (n * 1e6)        # where's that mu when you need it (unicode?)
-    elif m >= 1e-9:
-        return "%gn" % (n * 1e9)
-    elif m >= 1e-12:
-        return "%gp" % (n * 1e12)
-    elif m >= 1e-15:
-        return "%gf" % (n * 1e15)
-    else:
-        return "%g" % (n)
-
-
-def str_to_num (value):
-    '''Convert a string in engineering notation to a number.  E.g., '15m' -> 15e-3'''
-    try:
-        scale = 1.0
-        suffix = value[-1]
-        if scale_factor.has_key (suffix):
-            return float (value[0:-1]) * scale_factor[suffix]
-        return float (value)
-    except:
-        raise RuntimeError (
-            "Invalid engineering notation value: %r" % (value,))
diff --git a/gnuradio-core/src/python/gnuradio/eng_option.py b/gnuradio-core/src/python/gnuradio/eng_option.py
deleted file mode 100644
index 5d8660f0f2..0000000000
--- a/gnuradio-core/src/python/gnuradio/eng_option.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright 2004 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.
-#
-
-'''Add support for engineering notation to optparse.OptionParser'''
-
-from copy import copy
-from optparse import Option, OptionValueError
-import eng_notation
-
-def check_eng_float (option, opt, value):
-    try:
-        return eng_notation.str_to_num(value)
-    except:
-        raise OptionValueError (
-            "option %s: invalid engineering notation value: %r" % (opt, value))
-
-def check_intx (option, opt, value):
-    try:
-        return int (value, 0)
-    except:
-        raise OptionValueError (
-            "option %s: invalid integer value: %r" % (opt, value))
-
-def check_subdev (option, opt, value):
-    """
-    Value has the form: (A|B)(:0|1)?
-
-    Returns:
-        a 2-tuple (0|1, 0|1)
-    """
-    d = { 'A' : (0, 0), 'A:0' : (0, 0), 'A:1' : (0, 1), 'A:2' : (0, 2),
-          'B' : (1, 0), 'B:0' : (1, 0), 'B:1' : (1, 1), 'B:2' : (1, 2) }
-    try:
-        return d[value.upper()]
-    except:
-        raise OptionValueError(
-            "option %s: invalid subdev: '%r', must be one of %s" % (opt, value, ', '.join(sorted(d.keys()))))
-
-class eng_option (Option):
-    TYPES = Option.TYPES + ("eng_float", "intx", "subdev")
-    TYPE_CHECKER = copy (Option.TYPE_CHECKER)
-    TYPE_CHECKER["eng_float"] = check_eng_float
-    TYPE_CHECKER["intx"] = check_intx
-    TYPE_CHECKER["subdev"] = check_subdev
-
diff --git a/gnuradio-core/src/python/gnuradio/gru/__init__.py b/gnuradio-core/src/python/gnuradio/gru/__init__.py
deleted file mode 100644
index c24439ff54..0000000000
--- a/gnuradio-core/src/python/gnuradio/gru/__init__.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright 2005 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.
-#
-
-import glob
-import os.path
-
-# Semi-hideous kludge to import everything in the gruimpl directory
-# into the gnuradio.gru namespace.  This keeps us from having to remember
-# to manually update this file.
-
-for p in __path__:
-    filenames = glob.glob (os.path.join (p, "..", "gruimpl", "*.py"))
-    for f in filenames:
-        f = os.path.basename(f).lower()
-        f = f[:-3]
-        if f == '__init__':
-            continue
-        # print f
-        exec "from gnuradio.gruimpl.%s import *" % (f,)
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/__init__.py b/gnuradio-core/src/python/gnuradio/gruimpl/__init__.py
deleted file mode 100644
index a4917cf64c..0000000000
--- a/gnuradio-core/src/python/gnuradio/gruimpl/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# make this a package
diff --git a/gnuradio-core/src/tests/CMakeLists.txt b/gnuradio-core/src/tests/CMakeLists.txt
deleted file mode 100644
index 7723680dd9..0000000000
--- a/gnuradio-core/src/tests/CMakeLists.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2010-2012 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(GrMiscUtils) #check n def
-GR_CHECK_HDR_N_DEF(sys/resource.h HAVE_SYS_RESOURCE_H)
-
-########################################################################
-# Setup the include and linker paths
-########################################################################
-include_directories(
-	${GNURADIO_CORE_INCLUDE_DIRS}
-	${GRUEL_INCLUDE_DIRS}
-	${Boost_INCLUDE_DIRS}
-	${CPPUNIT_INCLUDE_DIRS}
-)
-
-link_directories(
-	${Boost_LIBRARY_DIRS}
-	${CPPUNIT_LIBRARY_DIRS}
-)
-
-include_directories(${LOG4CPP_INCLUDE_DIRS})
-link_directories(${LOG4CPP_LIBRARY_DIRS})
-
-########################################################################
-# Build benchmarks and non-registered tests
-########################################################################
-set(tests_not_run #single source per test
-    benchmark_nco.cc
-    benchmark_vco.cc
-    test_general.cc
-    test_vmcircbuf.cc
-)
-
-foreach(test_not_run_src ${tests_not_run})
-    get_filename_component(name ${test_not_run_src} NAME_WE)
-    add_executable(${name} ${test_not_run_src})
-    target_link_libraries(${name} test-gnuradio-core)
-endforeach(test_not_run_src)
-
-########################################################################
-# Build the test-all test to end all tests
-# Set the test environment so the build libs will be found under MSVC.
-########################################################################
-include(GrTest)
-list(APPEND GR_TEST_TARGET_DEPS test-gnuradio-core)
-add_executable(gr_core_test_all test_all.cc)
-target_link_libraries(gr_core_test_all test-gnuradio-core)
-GR_ADD_TEST(gr-core-test-all gr_core_test_all)
diff --git a/gnuradio-core/src/tests/benchmark_nco.cc b/gnuradio-core/src/tests/benchmark_nco.cc
deleted file mode 100644
index 20d53e410f..0000000000
--- a/gnuradio-core/src/tests/benchmark_nco.cc
+++ /dev/null
@@ -1,220 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002,2004 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.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <stdio.h>
-#include <sys/time.h>
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
-#include <unistd.h>
-#include <gr_nco.h>
-#include <gr_fxpt_nco.h>
-#include <string.h>
-
-#define ITERATIONS	20000000
-#define BLOCK_SIZE	(10 * 1000)	// fits in cache
-
-#define FREQ	5003.123
-
-static double
-timeval_to_double (const struct timeval *tv)
-{
-  return (double) tv->tv_sec + (double) tv->tv_usec * 1e-6;
-}
-
-
-static void
-benchmark (void test (float *x, float *y), const char *implementation_name)
-{
-#ifdef HAVE_SYS_RESOURCE_H
-  struct rusage	rusage_start;
-  struct rusage	rusage_stop;
-#else
-  double clock_start;
-  double clock_end;
-#endif
-  float output[2*BLOCK_SIZE];
-  float *x = &output[0], *y = &output[BLOCK_SIZE];
-
-  // touch memory
-  memset(output, 0, 2*BLOCK_SIZE*sizeof(float));
-
-  // get starting CPU usage
-#ifdef HAVE_SYS_RESOURCE_H
-  if (getrusage (RUSAGE_SELF, &rusage_start) < 0){
-    perror ("getrusage");
-    exit (1);
-  }
-#else
-  clock_start = (double) clock() * (1000000. / CLOCKS_PER_SEC);
-#endif
-  // do the actual work
-
-  test (x, y);
-
-  // get ending CPU usage
-
-#ifdef HAVE_SYS_RESOURCE_H
-  if (getrusage (RUSAGE_SELF, &rusage_stop) < 0){
-    perror ("getrusage");
-    exit (1);
-  }
-
-  // compute results
-
-  double user =
-    timeval_to_double (&rusage_stop.ru_utime)
-    - timeval_to_double (&rusage_start.ru_utime);
-
-  double sys =
-    timeval_to_double (&rusage_stop.ru_stime)
-    - timeval_to_double (&rusage_start.ru_stime);
-
-  double total = user + sys;
-#else
-  clock_end = (double) clock () * (1000000. / CLOCKS_PER_SEC);
-  double total = clock_end - clock_start;
-#endif
-
-  printf ("%18s:  cpu: %6.3f  steps/sec: %10.3e\n",
-	  implementation_name, total, ITERATIONS / total);
-}
-
-// ----------------------------------------------------------------
-// Don't compare the _vec with other functions since memory store's
-// are involved.
-
-void basic_sincos_vec (float *x, float *y)
-{
-  gr_nco<float,float>	nco;
-
-  nco.set_freq (2 * M_PI / FREQ);
-
-  for (int i = 0; i < ITERATIONS/BLOCK_SIZE; i++){
-    for (int j = 0; j < BLOCK_SIZE; j++){
-      nco.sincos (&x[2*j+1], &x[2*j]);
-      nco.step ();
-    }
-  }
-}
-
-void native_sincos_vec (float *x, float *y)
-{
-  gr_nco<float,float>	nco;
-
-  nco.set_freq (2 * M_PI / FREQ);
-
-  for (int i = 0; i < ITERATIONS/BLOCK_SIZE; i++){
-    nco.sincos ((gr_complex*)x, BLOCK_SIZE);
-  }
-}
-
-void fxpt_sincos_vec (float *x, float *y)
-{
-  gr_fxpt_nco	nco;
-
-  nco.set_freq (2 * M_PI / FREQ);
-
-  for (int i = 0; i < ITERATIONS/BLOCK_SIZE; i++){
-    nco.sincos ((gr_complex*)x, BLOCK_SIZE);
-  }
-}
-
-// ----------------------------------------------------------------
-
-void native_sincos (float *x, float *y)
-{
-  gr_nco<float,float>	nco;
-
-  nco.set_freq (2 * M_PI / FREQ);
-
-  for (int i = 0; i < ITERATIONS; i++){
-    nco.sincos (x, y);
-    nco.step ();
-  }
-}
-
-void fxpt_sincos (float *x, float *y)
-{
-  gr_fxpt_nco	nco;
-
-  nco.set_freq (2 * M_PI / FREQ);
-
-  for (int i = 0; i < ITERATIONS; i++){
-    nco.sincos (x, y);
-    nco.step ();
-  }
-}
-
-// ----------------------------------------------------------------
-
-void native_sin (float *x, float *y)
-{
-  gr_nco<float,float>	nco;
-
-  nco.set_freq (2 * M_PI / FREQ);
-
-  for (int i = 0; i < ITERATIONS; i++){
-    *x = nco.sin ();
-    nco.step ();
-  }
-}
-
-void fxpt_sin (float *x, float *y)
-{
-  gr_fxpt_nco	nco;
-
-  nco.set_freq (2 * M_PI / FREQ);
-
-  for (int i = 0; i < ITERATIONS; i++){
-    *x = nco.sin ();
-    nco.step ();
-  }
-}
-
-// ----------------------------------------------------------------
-
-void nop_fct (float *x, float *y)
-{
-}
-
-void nop_loop (float *x, float *y)
-{
-  for (int i = 0; i < ITERATIONS; i++){
-    nop_fct (x, y);
-  }
-}
-
-int
-main (int argc, char **argv)
-{
-  benchmark (nop_loop, "nop loop");
-  benchmark (native_sin, "native sine");
-  benchmark (fxpt_sin, "fxpt sine");
-  benchmark (native_sincos, "native sin/cos");
-  benchmark (fxpt_sincos, "fxpt sin/cos");
-  benchmark (basic_sincos_vec, "basic sin/cos vec");
-  benchmark (native_sincos_vec, "native sin/cos vec");
-  benchmark (fxpt_sincos_vec, "fxpt sin/cos vec");
-}
diff --git a/gnuradio-core/src/tests/benchmark_vco.cc b/gnuradio-core/src/tests/benchmark_vco.cc
deleted file mode 100644
index 3a6ade78c9..0000000000
--- a/gnuradio-core/src/tests/benchmark_vco.cc
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002,2004,2005 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.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <stdio.h>
-#include <sys/time.h>
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
-#include <unistd.h>
-#include <gr_vco.h>
-#include <gr_fxpt_vco.h>
-#include <string.h>
-
-#define ITERATIONS	5000000
-#define BLOCK_SIZE	(10 * 1000)	// fits in cache
-
-#define FREQ	5003.123
-#define K	4.9999999
-#define AMPLITUDE	2.444444444
-
-
-static double
-timeval_to_double (const struct timeval *tv)
-{
-  return (double) tv->tv_sec + (double) tv->tv_usec * 1e-6;
-}
-
-
-static void
-benchmark (void test (float *x, const float *y), const char *implementation_name)
-{
-#ifdef HAVE_SYS_RESOURCE_H
-  struct rusage	rusage_start;
-  struct rusage	rusage_stop;
-#else
-  double clock_start;
-  double clock_end;
-#endif
-  float output[BLOCK_SIZE];
-  float input[BLOCK_SIZE];
-
-  // touch memory
-  memset(output, 0, BLOCK_SIZE*sizeof(float));
-  for (int i = 0; i<BLOCK_SIZE; i++)
-    input[i] = sin(double(i));
-
-  // get starting CPU usage
-#ifdef HAVE_SYS_RESOURCE_H
-  if (getrusage (RUSAGE_SELF, &rusage_start) < 0){
-    perror ("getrusage");
-    exit (1);
-  }
-#else
-  clock_start = (double) clock() * (1000000. / CLOCKS_PER_SEC);
-#endif
-  // do the actual work
-
-  test (output, input);
-
-  // get ending CPU usage
-
-#ifdef HAVE_SYS_RESOURCE_H
-  if (getrusage (RUSAGE_SELF, &rusage_stop) < 0){
-    perror ("getrusage");
-    exit (1);
-  }
-
-  // compute results
-
-  double user =
-    timeval_to_double (&rusage_stop.ru_utime)
-    - timeval_to_double (&rusage_start.ru_utime);
-
-  double sys =
-    timeval_to_double (&rusage_stop.ru_stime)
-    - timeval_to_double (&rusage_start.ru_stime);
-
-  double total = user + sys;
-#else
-  clock_end = (double) clock () * (1000000. / CLOCKS_PER_SEC);
-  double total = clock_end - clock_start;
-#endif
-
-  printf ("%18s:  cpu: %6.3f  steps/sec: %10.3e\n",
-	  implementation_name, total, ITERATIONS / total);
-}
-
-// ----------------------------------------------------------------
-
-void basic_vco (float *output, const float *input)
-{
-  double phase = 0;
-
-  for (int j = 0; j < ITERATIONS/BLOCK_SIZE; j++){
-    for (int i = 0; i < BLOCK_SIZE; i++){
-      output[i] = cos(phase) * AMPLITUDE;
-      phase += input[i] * K;
-
-      while (phase > 2 * M_PI)
-	phase -= 2 * M_PI;
-
-      while (phase < -2 * M_PI)
-	phase += 2 * M_PI;
-    }
-  }
-}
-
-void native_vco (float *output, const float *input)
-{
-  gr_vco<float,float>	vco;
-
-  for (int j = 0; j < ITERATIONS/BLOCK_SIZE; j++){
-    vco.cos(output, input, BLOCK_SIZE, K, AMPLITUDE);
-  }
-    }
-
-void fxpt_vco (float *output, const float *input)
-{
-  gr_fxpt_vco	vco;
-
-  for (int j = 0; j < ITERATIONS/BLOCK_SIZE; j++){
-    vco.cos(output, input, BLOCK_SIZE, K, AMPLITUDE);
-  }
-}
-
-// ----------------------------------------------------------------
-
-void nop_fct (float *x, const float *y)
-{
-}
-
-void nop_loop (float *x, const float *y)
-{
-  for (int i = 0; i < ITERATIONS; i++){
-    nop_fct (x, y);
-  }
-}
-
-int
-main (int argc, char **argv)
-{
-  benchmark (nop_loop, "nop loop");
-  benchmark (basic_vco, "basic vco");
-  benchmark (native_vco, "native vco");
-  benchmark (fxpt_vco, "fxpt vco");
-}
diff --git a/gnuradio-core/src/tests/nco_results b/gnuradio-core/src/tests/nco_results
deleted file mode 100644
index 5bdf5dd1cb..0000000000
--- a/gnuradio-core/src/tests/nco_results
+++ /dev/null
@@ -1,48 +0,0 @@
-================================================================
-These are on a 1.4 GHz Pentium M using g++ 3.4.1
-================================================================
-
-Default compiler options -O2
-
-        nop loop:  cpu:  0.015  steps/sec:  6.668e+08
-     native sine:  cpu:  0.900  steps/sec:  1.111e+07
-       fxpt sine:  cpu:  0.281  steps/sec:  3.559e+07
-  native sin/cos:  cpu:  1.138  steps/sec:  8.789e+06
-    fxpt sin/cos:  cpu:  0.550  steps/sec:  1.818e+07
-
--O2 -march=pentium-m -fomit-frame-pointer
-
-        nop loop:  cpu:  0.015  steps/sec:  6.668e+08
-     native sine:  cpu:  0.903  steps/sec:  1.108e+07
-       fxpt sine:  cpu:  0.271  steps/sec:  3.691e+07
-  native sin/cos:  cpu:  1.092  steps/sec:  9.159e+06
-    fxpt sin/cos:  cpu:  0.542  steps/sec:  1.845e+07
-
-Inlined fxpt::sin & cos
--O2 -march=pentium-m -fomit-frame-pointer
-
-        nop loop:  cpu:  0.015  steps/sec:  6.668e+08
-     native sine:  cpu:  0.904  steps/sec:  1.106e+07
-       fxpt sine:  cpu:  0.187  steps/sec:  5.348e+07
-  native sin/cos:  cpu:  1.091  steps/sec:  9.167e+06
-    fxpt sin/cos:  cpu:  0.373  steps/sec:  2.681e+07
-
-================================================================
-These are on a 1.5 GHz Athon MP 1800+
-================================================================
-
-Default compiler options: -O2
-
-        nop loop:  cpu:  0.013  steps/sec:  7.693e+08
-     native sine:  cpu:  0.733  steps/sec:  1.364e+07
-       fxpt sine:  cpu:  0.210  steps/sec:  4.763e+07
-  native sin/cos:  cpu:  1.183  steps/sec:  8.454e+06
-    fxpt sin/cos:  cpu:  0.420  steps/sec:  2.381e+07
-
--O2 -fomit-frame-pointer -march=athlon-mp
-
-        nop loop:  cpu:  0.013  steps/sec:  7.693e+08
-     native sine:  cpu:  0.679  steps/sec:  1.473e+07
-       fxpt sine:  cpu:  0.200  steps/sec:  5.001e+07
-  native sin/cos:  cpu:  1.147  steps/sec:  8.720e+06
-    fxpt sin/cos:  cpu:  0.444  steps/sec:  2.253e+07
diff --git a/gnuradio-core/src/tests/test_all.cc b/gnuradio-core/src/tests/test_all.cc
deleted file mode 100644
index f1fbce4e05..0000000000
--- a/gnuradio-core/src/tests/test_all.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002,2010,2011 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 <cppunit/TextTestRunner.h>
-#include <cppunit/XmlOutputter.h>
-
-#include <gr_unittests.h>
-#include <qa_general.h>
-
-// FIXME add atsc back in.
-
-int
-main (int argc, char **argv)
-{
-  CppUnit::TextTestRunner runner;
-  std::ofstream xmlfile(get_unittest_path("gnuradio_core_all.xml").c_str());
-  CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile);
-
-  runner.addTest (qa_general::suite ());
-  runner.setOutputter(xmlout);
-
-  bool was_successful = runner.run ("", false);
-
-  return was_successful ? 0 : 1;
-}
diff --git a/gnuradio-core/src/tests/test_atsc.cc b/gnuradio-core/src/tests/test_atsc.cc
deleted file mode 100644
index d99bccce50..0000000000
--- a/gnuradio-core/src/tests/test_atsc.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002,2011 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 <cppunit/TextTestRunner.h>
-#include <cppunit/XmlOutputter.h>
-
-#include <gr_unittests.h>
-#include <qa_atsc.h>
-
-int
-main (int argc, char **argv)
-{
-  CppUnit::TextTestRunner runner;
-  std::ofstream xmlfile(get_unittest_path("gnuradio_core_atsc.xml").c_str());
-  CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile);
-
-  runner.addTest (qa_atsc::suite ());
-  runner.setOutputter(xmlout);
-
-  bool was_successful = runner.run ("", false);
-
-  return was_successful ? 0 : 1;
-}
diff --git a/gnuradio-core/src/tests/test_buffers.py b/gnuradio-core/src/tests/test_buffers.py
deleted file mode 100755
index e0abb8b304..0000000000
--- a/gnuradio-core/src/tests/test_buffers.py
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2006,2013 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.
-#
-
-from gnuradio import gr, gru
-from gnuradio import audio
-from gnuradio import blocks
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-
-import time, math
-import sys
-
-def sig_source_f(samp_rate, freq, amp, N):
-    t = map(lambda x: float(x)/samp_rate, xrange(N))
-    y = map(lambda x: math.sin(2.*math.pi*freq*x), t)
-    return y
-
-# Test script to test setting up the buffers using gr_test
-# For very large buffers it will fail when you hit the circbuf memory limit.
-# On linux this limit is shmmax, it will fail when it tries to create a buffer > shmmax.
-# With a 2.6 or later kernel you can set the shmmax limit manually in a root console
-#show current shmmax limit
-#$ cat /proc/sys/kernel/shmmax
-#33554432
-
-#set shmmax limit manually to 300MB
-#echo 300000000 >/proc/sys/kernel/shmmax
-
-#show new shmmax limit
-#$ cat /proc/sys/kernel/shmmax
-#300000000
-
-class my_graph(gr.top_block):
-
-    def __init__(self, seconds,history,output_multiple):
-        gr.top_block.__init__(self)
-
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-O", "--audio-output", type="string", default="",
-                          help="pcm output device name.  E.g., hw:0,0 or /dev/dsp")
-        parser.add_option("-r", "--sample-rate", type="eng_float", default=48000,
-                          help="set sample rate to RATE (48000)")
-        (options, args) = parser.parse_args ()
-        if len(args) != 0:
-            parser.print_help()
-            raise SystemExit, 1
-
-        sample_rate = int(options.sample_rate)
-        ampl = 0.1
-        nsamples=int(sample_rate * seconds) #1 seconds
-
-        data = sig_source_f(sample_rate, 350, ampl, nsamples)
-        src0 = blocks.vector_source_f(data)
-
-        # gr.test (const std::string &name=std::string("gr_test"),
-        # int min_inputs=1, int max_inputs=1, unsigned int sizeof_input_item=1,
-        # int min_outputs=1, int max_outputs=1, unsigned int sizeof_output_item=1,
-        # unsigned int history=1,unsigned int output_multiple=1,double relative_rate=1.0,
-        # bool fixed_rate=true,gr_consume_type_t cons_type=CONSUME_NOUTPUT_ITEMS, gr_produce_type_t prod_type=PRODUCE_NOUTPUT_ITEMS);
-        name="gr_test"
-        min_inputs=1
-        max_inputs=1
-        sizeof_input_item=gr.sizeof_float
-        min_outputs=1
-        max_outputs=1
-        sizeof_output_item=gr.sizeof_float
-        #history=1 # problems start at 8150
-        #output_multiple=1 #problems start at 8000 in combination with large history
-        relative_rate=1.0
-        fixed_rate=True
-        consume_type=gr.CONSUME_NOUTPUT_ITEMS
-        produce_type=gr.PRODUCE_NOUTPUT_ITEMS
-        test = gr.test(name, min_inputs,max_inputs,sizeof_input_item,
-                                 min_outputs,max_outputs,sizeof_output_item,
-                                 history,output_multiple,relative_rate,
-                                 fixed_rate, consume_type,produce_type)
-        #test = gr.test("gr_test",1,1,gr.sizeof_float,
-        #                         1,1,gr.sizeof_float,
-        #                         1,1,1.0,
-        #                         True, gr.CONSUME_NOUTPUT_ITEMS,gr.PRODUCE_NOUTPUT_ITEMS)
-        #unsigned int history=1,unsigned int output_multiple=1,double relative_rate=1.0,
-        #bool fixed_rate=false
-        dst = audio.sink (sample_rate, options.audio_output)
-
-        self.connect (src0,test,(dst, 0))
-
-
-if __name__ == '__main__':
-
-    seconds=5.0
-    output_multiple=1
-    for history in (1,1000,8000,8100,8150,8175,8190,8191,8192,8193,8194,8195,9000,10000,100000,1000000,10000000): #,100000000):
-      sys.stdout.flush()
-      sys.stderr.flush()
-      print 'Test with history=', history, 'output_multiple=',output_multiple
-      sys.stdout.flush()
-      sys.stderr.flush()
-      succeed=True
-      starttime=time.time()
-      try:
-          my_graph(seconds,history,output_multiple).run()
-      except KeyboardInterrupt:
-          pass
-      except:
-          print "\nAn exception has terminated the graph."
-          exception=True
-          succeed=False
-      sys.stdout.flush()
-      sys.stderr.flush()
-      if succeed:
-         print ''
-      endtime=time.time()
-      duration=endtime - starttime
-      if (duration < 0.5*seconds) and (succeed):
-         print "A problem has terminated the graph."
-         succeed=False
-      if (duration > 1.5*seconds) and (succeed):
-         print "Something slowed the graph down considerably."
-         succeed=False
-
-      print 'The test result was:' , succeed
-      print 'Test duration' , duration
-      print ''
diff --git a/gnuradio-core/src/tests/test_vmcircbuf.cc b/gnuradio-core/src/tests/test_vmcircbuf.cc
deleted file mode 100644
index ee24b6d62f..0000000000
--- a/gnuradio-core/src/tests/test_vmcircbuf.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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 <gr_vmcircbuf.h>
-#include <stdio.h>
-
-int
-main (int argc, char **argv)
-{
-  int	verbose = 1;		// summary
-
-  if (argc > 1)
-    verbose = 2;		// extra chatty
-
-  bool ok = gr_vmcircbuf_sysconfig::test_all_factories (verbose);
-
-  if (ok){
-    fprintf (stdout, "test_vmcircbuf: OK.  We've got at least one workable solution\n");
-    return 0;
-  }
-  else {
-    fprintf (stdout, "test_vmcircbuf: NOT OK.  We don't have a workable solution\n");
-    return 1;
-  }
-}
diff --git a/gnuradio-core/src/utils/partition-cascaded-decimating-filters.scm b/gnuradio-core/src/utils/partition-cascaded-decimating-filters.scm
deleted file mode 100644
index 6ae7877f9b..0000000000
--- a/gnuradio-core/src/utils/partition-cascaded-decimating-filters.scm
+++ /dev/null
@@ -1,67 +0,0 @@
-;; Estimate the total work (ntaps * sampling rate) for two cascaded
-;; decimating low pass filters.
-;;
-;; The basic assumption is that the number of taps required in any
-;; section is inversely proportional to the normalized transition width
-;; for that section.
-;;
-;; FS is the input sampling frequency
-;; F1 is the cutoff frequency
-;; F2 is the far edge of the transition band
-;; DEC1 is the decimation factor for the first filter
-;; DEC2 is the decimation factor for the 2nd filter
-;;
-;; The total decimation factor is DEC1 * DEC2.  Therefore,
-;; the output rate of the filter is FS / (DEC1 * DEC2)
-
-(require 'common-list-functions)
-(require 'factor)
-
-
-
-(define (work2 fs f1 f2 dec1 dec2)
-  (+ (work1 fs f1 (/ fs (* 2 dec1)) dec1)
-     (work1 (/ fs dec1) f1 f2 dec2)))
-
-
-;; work for a single section
-
-(define (work1 fs f1 f2 dec)
-  (/ (* fs (/ fs (- f2 f1))) dec))
-
-
-;; return the max integer dec such that fs/(2*dec) >= f2
-
-(define (max-dec fs f2)
-  (inexact->exact (floor (/ fs (* 2 f2)))))
-
-
-;; `adjoin' returns the adjoint of the element OBJ and the list LST.
-;;  That is, if OBJ is in LST, `adjoin' returns LST, otherwise, it returns
-;;  `(cons OBJ LST)'.
-
-(define (adjoin-equal obj lst)
-  (if (member obj lst) lst (cons obj lst)))
-
-
-;;; not quite right
-
-(define (permute lst)
-  (let ((result '()))
-    (define (aux set head)
-      (if (null? set)
-	  (set! result (cons head result))
-	  (for-each (lambda (x)
-		      (aux (set-difference set (list x))
-			   (cons x head)))
-		    set)))
-    (aux lst '())
-    result))
-
-;; `extract-nth' returns the Nth element of LST consed on to the
-;; list resulting from splicing out the Nth element of LST.
-;; Indexing is 0 based.
-
-(define (extract-nth n lst)
-  lst)
-
diff --git a/gnuradio-core/src/utils/permute.scm b/gnuradio-core/src/utils/permute.scm
deleted file mode 100644
index 23ddfc9991..0000000000
--- a/gnuradio-core/src/utils/permute.scm
+++ /dev/null
@@ -1,27 +0,0 @@
-(require 'common-list-functions)
-
-
-(define (permute lst)
-  (define (aux set head)
-    (cond ((null? set) head)
-	  (else
-	   (map (lambda (x)
-		  (aux (set-difference set (list x))
-		       (cons x head)))
-		set))))
-  (aux lst '()))
-
-(define (permute-2 lst)
-  (let ((result '()))
-    (define (aux set head)
-      (if (null? set)
-	  (set! result (cons head result))
-	  (for-each (lambda (x)
-		      (aux (set-difference set (list x))
-			   (cons x head)))
-		    set)))
-    (aux lst '())
-    result))
-
-
-
diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-runtime/CMakeLists.txt
index 6a88b63cc7..96b844b193 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-runtime/CMakeLists.txt
@@ -1,17 +1,17 @@
-# Copyright 2010-2012 Free Software Foundation, Inc.
-#
+# Copyright 2013 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,
@@ -21,52 +21,40 @@
 # Setup dependencies
 ########################################################################
 include(GrBoost)
+include(GrPython)
 
-find_package(FFTW3f)
-
-include(GrPython) #used for code generation
-
-get_filename_component(GR_CORE_PYTHONPATH
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/python ABSOLUTE
-)
-GR_SET_GLOBAL(GR_CORE_PYTHONPATH ${GR_CORE_PYTHONPATH})
+########################################################################
+# Setup compatibility checks and defines
+########################################################################
+include(${CMAKE_CURRENT_SOURCE_DIR}/ConfigChecks.cmake)
 
 ########################################################################
 # Register component
 ########################################################################
 include(GrComponent)
-GR_REGISTER_COMPONENT("gnuradio-core" ENABLE_GR_CORE
+GR_REGISTER_COMPONENT("gnuradio-runtime" ENABLE_GNURADIO_RUNTIME
+    Boost_FOUND
     ENABLE_GRUEL
     ENABLE_VOLK
-    Boost_FOUND
-    FFTW3F_FOUND
     PYTHONINTERP_FOUND
 )
 
-include(GrMiscUtils)
-
-GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/runtime
-    ${CMAKE_CURRENT_BINARY_DIR}/src/lib/general
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/general
-    ${CMAKE_CURRENT_BINARY_DIR}/src/lib/filter
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/filter
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/missing
-    ${CMAKE_CURRENT_BINARY_DIR}/src/lib/swig
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/hier
+GR_SET_GLOBAL(GNURADIO_RUNTIME_INCLUDE_DIRS
     ${CMAKE_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/gnuradio-runtime/include
+    ${CMAKE_BINARY_DIR}/gnuradio-runtime/include
 )
 
-list(APPEND GNURADIO_CORE_INCLUDE_DIRS ${CMAKE_BINARY_DIR})
+GR_SET_GLOBAL(GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+    ${CMAKE_SOURCE_DIR}/gnuradio-runtime/swig
+    ${CMAKE_BINARY_DIR}/gnuradio-runtime/swig
+)
 
-GR_SET_GLOBAL(GNURADIO_CORE_SWIG_INCLUDE_DIRS
-    ${GNURADIO_CORE_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig
-    ${CMAKE_SOURCE_DIR}/gruel/src/swig
-    ${CMAKE_BINARY_DIR}/gruel/src/swig
-    ${CMAKE_BINARY_DIR}
+get_filename_component(GNURADIO_RUNTIME_PYTHONPATH
+    ${CMAKE_SOURCE_DIR}/python ABSOLUTE
 )
+GR_SET_GLOBAL(GNURADIO_RUNTIME_PYTHONPATH ${GNURADIO_RUNTIME_PYTHONPATH})
 
 ########################################################################
 # Register controlport component
@@ -91,56 +79,59 @@ GR_REGISTER_COMPONENT("gr-ctrlport" ENABLE_GR_CTRLPORT
     SWIG_VERSION_CHECK
     ICE_FOUND
     ENABLE_GRUEL
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
 )
 
 ########################################################################
 # Begin conditional configuration
 ########################################################################
-if(ENABLE_GR_CORE)
+if(ENABLE_GNURADIO_RUNTIME)
+
+get_filename_component(GR_RUNTIME_PYTHONPATH
+    ${CMAKE_CURRENT_SOURCE_DIR}/python ABSOLUTE
+)
+GR_SET_GLOBAL(GR_RUNTIME_PYTHONPATH ${GR_RUNTIME_PYTHONPATH})
 
 ########################################################################
 # Setup CPack components
 ########################################################################
 include(GrPackage)
-CPACK_SET(CPACK_COMPONENT_GROUP_CORE_DESCRIPTION "GNU Radio Core Library")
+CPACK_SET(CPACK_COMPONENT_GROUP_RUNTIME_DESCRIPTION "GNU Radio Runtime")
 
-CPACK_COMPONENT("core_runtime"
-    GROUP        "Core"
+CPACK_COMPONENT("runtime_runtime"
+    GROUP        "Runtime"
     DISPLAY_NAME "Runtime"
-    DESCRIPTION  "Runtime"
-    DEPENDS      "gruel_runtime"
+    DESCRIPTION  "Dynamic link libraries"
+    DEPENDS      "core_runtime"
 )
 
-CPACK_COMPONENT("core_devel"
-    GROUP        "Core"
+CPACK_COMPONENT("runtime_devel"
+    GROUP        "Runtime"
     DISPLAY_NAME "Development"
     DESCRIPTION  "C++ headers, package config, import libraries"
-    DEPENDS      "gruel_devel"
+    DEPENDS      "core_devel"
 )
 
-CPACK_COMPONENT("core_python"
-    GROUP        "Core"
+CPACK_COMPONENT("runtime_python"
+    GROUP        "Runtime"
     DISPLAY_NAME "Python"
-    DESCRIPTION  "Python modules for runtime; GRC xml files"
-    DEPENDS      "gruel_python;core_runtime"
+    DESCRIPTION  "Python modules for runtime"
+    DEPENDS      "core_python;runtime_runtime"
 )
 
-CPACK_COMPONENT("core_swig"
-    GROUP        "Core"
+CPACK_COMPONENT("runtime_swig"
+    GROUP        "Runtime"
     DISPLAY_NAME "SWIG"
     DESCRIPTION  "SWIG development .i files"
-    DEPENDS      "gruel_swig;core_python;core_devel"
+    DEPENDS      "core_swig;runtime_python;runtime_devel"
 )
-
-# Setup configure file
 configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-core.conf.in
-    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.conf
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-runtime.conf.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.conf
 @ONLY)
 
 install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.conf
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.conf
     ctrlport.conf.example
     DESTINATION ${GR_PREFSDIR}
     COMPONENT "core_runtime"
@@ -157,31 +148,31 @@ endif(ENABLE_GR_LOG AND HAVE_LOG4CPP)
 ########################################################################
 # Add subdirectories
 ########################################################################
-add_subdirectory(src/lib)
-if(ENABLE_TESTING)
-    add_subdirectory(src/tests)
-endif(ENABLE_TESTING)
+add_subdirectory(include)
+add_subdirectory(lib)
+add_subdirectory(apps)
+#add_subdirectory(doc)
 if(ENABLE_PYTHON)
-    add_subdirectory(src/lib/swig)
-    add_subdirectory(src/python/gnuradio)
-    add_subdirectory(src/examples)
+     add_subdirectory(swig)
+     add_subdirectory(python)
+#    add_subdirectory(grc)
+    add_subdirectory(examples)
 endif(ENABLE_PYTHON)
 
 ########################################################################
 # Create Pkg Config File
 ########################################################################
 configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-core.pc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.pc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-runtime.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.pc
 @ONLY)
 
 install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.pc
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.pc
     DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
-    COMPONENT "core_devel"
+    COMPONENT "runtime_devel"
 )
 
-
 ########################################################################
 # Setup ControlPort preferences file and installation information
 ########################################################################
@@ -195,10 +186,9 @@ file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GR_PKG_CTRL_SLICE_DIR} slicedir)
 install(
     FILES ctrlport.conf.example
     DESTINATION ${SYSCONFDIR}/${CMAKE_PROJECT_NAME}
-    COMPONENT "core_runtime"
+    COMPONENT "gnuradio_runtime"
 )
 
 endif(ENABLE_GR_CTRLPORT)
 
-
-endif(ENABLE_GR_CORE)
+endif(ENABLE_GNURADIO_RUNTIME)
diff --git a/gnuradio-core/src/lib/ConfigChecks.cmake b/gnuradio-runtime/ConfigChecks.cmake
index 26b778a7a7..e6c97bada4 100644
--- a/gnuradio-core/src/lib/ConfigChecks.cmake
+++ b/gnuradio-runtime/ConfigChecks.cmake
@@ -1,4 +1,4 @@
-# Copyright 2010-2011 Free Software Foundation, Inc.
+# Copyright 2010-2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
diff --git a/gnuradio-core/src/lib/missing/CMakeLists.txt b/gnuradio-runtime/apps/CMakeLists.txt
index 85267ee482..9efd3f2b69 100644
--- a/gnuradio-core/src/lib/missing/CMakeLists.txt
+++ b/gnuradio-runtime/apps/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2010 Free Software Foundation, Inc.
+# Copyright 2010-2011,2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -18,15 +18,25 @@
 # Boston, MA 02110-1301, USA.
 
 ########################################################################
-# This file included, use CMake directory variables
+# Setup the include and linker paths
 ########################################################################
+include_directories(
+  ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+  ${GRUEL_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIRS}
+)
 
-list(APPEND gnuradio_core_sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/bug_work_around_8.cc
+link_directories(
+  ${Boost_LIBRARY_DIRS}
 )
 
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
-    list(APPEND gnuradio_core_sources
-        ${CMAKE_CURRENT_SOURCE_DIR}/posix_memalign.cc
-    )
-endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
+########################################################################
+# Setup executables
+########################################################################
+add_executable(gnuradio-config-info gnuradio-config-info.cc)
+target_link_libraries(gnuradio-config-info gnuradio-runtime ${Boost_LIBRARIES})
+install(
+    TARGETS gnuradio-config-info
+    DESTINATION ${GR_RUNTIME_DIR}
+    COMPONENT "runtime_runtime"
+)
diff --git a/gnuradio-core/src/lib/gnuradio-config-info.cc b/gnuradio-runtime/apps/gnuradio-config-info.cc
index d3e6454fd8..d3e6454fd8 100644
--- a/gnuradio-core/src/lib/gnuradio-config-info.cc
+++ b/gnuradio-runtime/apps/gnuradio-config-info.cc
diff --git a/gnuradio-core/ctrlport.conf.example b/gnuradio-runtime/ctrlport.conf.example
index 51d9e934f2..51d9e934f2 100644
--- a/gnuradio-core/ctrlport.conf.example
+++ b/gnuradio-runtime/ctrlport.conf.example
diff --git a/gnuradio-runtime/ctrlport.conf.in b/gnuradio-runtime/ctrlport.conf.in
new file mode 100644
index 0000000000..5c31a04516
--- /dev/null
+++ b/gnuradio-runtime/ctrlport.conf.in
@@ -0,0 +1,6 @@
+# This file contains system wide configuration data for GNU Radio.
+# You may override any setting on a per-user basis by editing
+# ~/.gnuradio/config.conf
+
+[ctrlport]
+ice_directory=@slicedir@
diff --git a/gnuradio-core/src/examples/CMakeLists.txt b/gnuradio-runtime/examples/CMakeLists.txt
index b90a5542df..b90a5542df 100644
--- a/gnuradio-core/src/examples/CMakeLists.txt
+++ b/gnuradio-runtime/examples/CMakeLists.txt
diff --git a/gnuradio-core/src/examples/mp-sched/CMakeLists.txt b/gnuradio-runtime/examples/mp-sched/CMakeLists.txt
index d2d910ecf2..863cfa733a 100644
--- a/gnuradio-core/src/examples/mp-sched/CMakeLists.txt
+++ b/gnuradio-runtime/examples/mp-sched/CMakeLists.txt
@@ -26,11 +26,11 @@ GR_PYTHON_INSTALL(PROGRAMS
   synthetic.py
   wfm_rcv_pll_to_wav.py
   DESTINATION ${GR_PKG_DATA_DIR}/examples/mp-sched
-  COMPONENT "core_python"
+  COMPONENT "runtime_python"
 )
 
 install(
     FILES README
     DESTINATION ${GR_PKG_DATA_DIR}/examples/mp-sched
-    COMPONENT "core_python"
+    COMPONENT "runtime_python"
 )
diff --git a/gnuradio-core/src/examples/mp-sched/README b/gnuradio-runtime/examples/mp-sched/README
index ae575437ac..ae575437ac 100644
--- a/gnuradio-core/src/examples/mp-sched/README
+++ b/gnuradio-runtime/examples/mp-sched/README
diff --git a/gnuradio-core/src/examples/mp-sched/affinity_set.py b/gnuradio-runtime/examples/mp-sched/affinity_set.py
index 4d28a04174..4d28a04174 100755
--- a/gnuradio-core/src/examples/mp-sched/affinity_set.py
+++ b/gnuradio-runtime/examples/mp-sched/affinity_set.py
diff --git a/gnuradio-core/src/examples/mp-sched/perf-data/core-duo.dat b/gnuradio-runtime/examples/mp-sched/perf-data/core-duo.dat
index 064d1e1282..064d1e1282 100644
--- a/gnuradio-core/src/examples/mp-sched/perf-data/core-duo.dat
+++ b/gnuradio-runtime/examples/mp-sched/perf-data/core-duo.dat
diff --git a/gnuradio-core/src/examples/mp-sched/perf-data/core2-duo.dat b/gnuradio-runtime/examples/mp-sched/perf-data/core2-duo.dat
index d67dee8e51..d67dee8e51 100644
--- a/gnuradio-core/src/examples/mp-sched/perf-data/core2-duo.dat
+++ b/gnuradio-runtime/examples/mp-sched/perf-data/core2-duo.dat
diff --git a/gnuradio-core/src/examples/mp-sched/perf-data/dual-quad-core-2.33-clovertown.dat b/gnuradio-runtime/examples/mp-sched/perf-data/dual-quad-core-2.33-clovertown.dat
index fa182c69a7..fa182c69a7 100644
--- a/gnuradio-core/src/examples/mp-sched/perf-data/dual-quad-core-2.33-clovertown.dat
+++ b/gnuradio-runtime/examples/mp-sched/perf-data/dual-quad-core-2.33-clovertown.dat
diff --git a/gnuradio-core/src/examples/mp-sched/perf-data/dual-quad-core-3.00-penryn.dat b/gnuradio-runtime/examples/mp-sched/perf-data/dual-quad-core-3.00-penryn.dat
index 57d49ed334..57d49ed334 100644
--- a/gnuradio-core/src/examples/mp-sched/perf-data/dual-quad-core-3.00-penryn.dat
+++ b/gnuradio-runtime/examples/mp-sched/perf-data/dual-quad-core-3.00-penryn.dat
diff --git a/gnuradio-core/src/examples/mp-sched/perf-data/js21-altivec.dat b/gnuradio-runtime/examples/mp-sched/perf-data/js21-altivec.dat
index d0b8148f0e..d0b8148f0e 100644
--- a/gnuradio-core/src/examples/mp-sched/perf-data/js21-altivec.dat
+++ b/gnuradio-runtime/examples/mp-sched/perf-data/js21-altivec.dat
diff --git a/gnuradio-core/src/examples/mp-sched/perf-data/js21.dat b/gnuradio-runtime/examples/mp-sched/perf-data/js21.dat
index a23bcebe77..a23bcebe77 100644
--- a/gnuradio-core/src/examples/mp-sched/perf-data/js21.dat
+++ b/gnuradio-runtime/examples/mp-sched/perf-data/js21.dat
diff --git a/gnuradio-core/src/examples/mp-sched/perf-data/ps3-altivec.dat b/gnuradio-runtime/examples/mp-sched/perf-data/ps3-altivec.dat
index dd01b31bd7..dd01b31bd7 100644
--- a/gnuradio-core/src/examples/mp-sched/perf-data/ps3-altivec.dat
+++ b/gnuradio-runtime/examples/mp-sched/perf-data/ps3-altivec.dat
diff --git a/gnuradio-core/src/examples/mp-sched/perf-data/ps3.dat b/gnuradio-runtime/examples/mp-sched/perf-data/ps3.dat
index c9bac37cc1..c9bac37cc1 100644
--- a/gnuradio-core/src/examples/mp-sched/perf-data/ps3.dat
+++ b/gnuradio-runtime/examples/mp-sched/perf-data/ps3.dat
diff --git a/gnuradio-core/src/examples/mp-sched/perf-data/qs21-altivec.dat b/gnuradio-runtime/examples/mp-sched/perf-data/qs21-altivec.dat
index 8364be363d..8364be363d 100644
--- a/gnuradio-core/src/examples/mp-sched/perf-data/qs21-altivec.dat
+++ b/gnuradio-runtime/examples/mp-sched/perf-data/qs21-altivec.dat
diff --git a/gnuradio-core/src/examples/mp-sched/perf-data/qs21.dat b/gnuradio-runtime/examples/mp-sched/perf-data/qs21.dat
index cc628740a8..cc628740a8 100644
--- a/gnuradio-core/src/examples/mp-sched/perf-data/qs21.dat
+++ b/gnuradio-runtime/examples/mp-sched/perf-data/qs21.dat
diff --git a/gnuradio-core/src/examples/mp-sched/plot_flops.py b/gnuradio-runtime/examples/mp-sched/plot_flops.py
index d9d810ae2f..d9d810ae2f 100755
--- a/gnuradio-core/src/examples/mp-sched/plot_flops.py
+++ b/gnuradio-runtime/examples/mp-sched/plot_flops.py
diff --git a/gnuradio-core/src/examples/mp-sched/run_synthetic.py b/gnuradio-runtime/examples/mp-sched/run_synthetic.py
index 4896bca462..4896bca462 100755
--- a/gnuradio-core/src/examples/mp-sched/run_synthetic.py
+++ b/gnuradio-runtime/examples/mp-sched/run_synthetic.py
diff --git a/gnuradio-core/src/examples/mp-sched/synthetic.py b/gnuradio-runtime/examples/mp-sched/synthetic.py
index 6f0bb85da8..6f0bb85da8 100755
--- a/gnuradio-core/src/examples/mp-sched/synthetic.py
+++ b/gnuradio-runtime/examples/mp-sched/synthetic.py
diff --git a/gnuradio-core/src/examples/mp-sched/wfm_rcv_pll_to_wav.py b/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py
index 7cf3210b0e..7cf3210b0e 100755
--- a/gnuradio-core/src/examples/mp-sched/wfm_rcv_pll_to_wav.py
+++ b/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py
diff --git a/gnuradio-core/src/examples/network/CMakeLists.txt b/gnuradio-runtime/examples/network/CMakeLists.txt
index 902933e297..92eb734768 100644
--- a/gnuradio-core/src/examples/network/CMakeLists.txt
+++ b/gnuradio-runtime/examples/network/CMakeLists.txt
@@ -25,6 +25,6 @@ GR_PYTHON_INSTALL(PROGRAMS
   vector_sink.py
   vector_source.py
   DESTINATION ${GR_PKG_DATA_DIR}/examples/network
-  COMPONENT "core_python"
+  COMPONENT "runtime_python"
 )
 
diff --git a/gnuradio-core/src/examples/network/audio_sink.py b/gnuradio-runtime/examples/network/audio_sink.py
index 0e412de5ae..0e412de5ae 100755
--- a/gnuradio-core/src/examples/network/audio_sink.py
+++ b/gnuradio-runtime/examples/network/audio_sink.py
diff --git a/gnuradio-core/src/examples/network/audio_source.py b/gnuradio-runtime/examples/network/audio_source.py
index 577beff84c..577beff84c 100755
--- a/gnuradio-core/src/examples/network/audio_source.py
+++ b/gnuradio-runtime/examples/network/audio_source.py
diff --git a/gnuradio-core/src/examples/network/dial_tone_sink.py b/gnuradio-runtime/examples/network/dial_tone_sink.py
index fee6ded846..fee6ded846 100755
--- a/gnuradio-core/src/examples/network/dial_tone_sink.py
+++ b/gnuradio-runtime/examples/network/dial_tone_sink.py
diff --git a/gnuradio-core/src/examples/network/dial_tone_source.py b/gnuradio-runtime/examples/network/dial_tone_source.py
index 44f05dc83c..44f05dc83c 100755
--- a/gnuradio-core/src/examples/network/dial_tone_source.py
+++ b/gnuradio-runtime/examples/network/dial_tone_source.py
diff --git a/gnuradio-core/src/examples/network/vector_sink.py b/gnuradio-runtime/examples/network/vector_sink.py
index c0397d1e43..c0397d1e43 100755
--- a/gnuradio-core/src/examples/network/vector_sink.py
+++ b/gnuradio-runtime/examples/network/vector_sink.py
diff --git a/gnuradio-core/src/examples/network/vector_source.py b/gnuradio-runtime/examples/network/vector_source.py
index 568425fd50..568425fd50 100755
--- a/gnuradio-core/src/examples/network/vector_source.py
+++ b/gnuradio-runtime/examples/network/vector_source.py
diff --git a/gnuradio-core/src/examples/volk_benchmark/CMakeLists.txt b/gnuradio-runtime/examples/volk_benchmark/CMakeLists.txt
index 255d9bf5cc..f56675e556 100644
--- a/gnuradio-core/src/examples/volk_benchmark/CMakeLists.txt
+++ b/gnuradio-runtime/examples/volk_benchmark/CMakeLists.txt
@@ -25,11 +25,11 @@ GR_PYTHON_INSTALL(PROGRAMS
   volk_test_funcs.py
   volk_types.py
   DESTINATION ${GR_PKG_DATA_DIR}/examples/volk_benchmark
-  COMPONENT "core_python"
+  COMPONENT "runtime_python"
 )
 
 install(
     FILES README
     DESTINATION ${GR_PKG_DATA_DIR}/examples/volk_benchmark
-    COMPONENT "core_python"
+    COMPONENT "runtime_python"
 )
diff --git a/gnuradio-core/src/examples/volk_benchmark/README b/gnuradio-runtime/examples/volk_benchmark/README
index c58b40d115..c58b40d115 100644
--- a/gnuradio-core/src/examples/volk_benchmark/README
+++ b/gnuradio-runtime/examples/volk_benchmark/README
diff --git a/gnuradio-core/src/examples/volk_benchmark/volk_math.py b/gnuradio-runtime/examples/volk_benchmark/volk_math.py
index 753257c237..753257c237 100755
--- a/gnuradio-core/src/examples/volk_benchmark/volk_math.py
+++ b/gnuradio-runtime/examples/volk_benchmark/volk_math.py
diff --git a/gnuradio-core/src/examples/volk_benchmark/volk_plot.py b/gnuradio-runtime/examples/volk_benchmark/volk_plot.py
index 48f9922054..48f9922054 100755
--- a/gnuradio-core/src/examples/volk_benchmark/volk_plot.py
+++ b/gnuradio-runtime/examples/volk_benchmark/volk_plot.py
diff --git a/gnuradio-core/src/examples/volk_benchmark/volk_test_funcs.py b/gnuradio-runtime/examples/volk_benchmark/volk_test_funcs.py
index 0f2c84100a..0f2c84100a 100644
--- a/gnuradio-core/src/examples/volk_benchmark/volk_test_funcs.py
+++ b/gnuradio-runtime/examples/volk_benchmark/volk_test_funcs.py
diff --git a/gnuradio-core/src/examples/volk_benchmark/volk_types.py b/gnuradio-runtime/examples/volk_benchmark/volk_types.py
index e8db14aff7..e8db14aff7 100755
--- a/gnuradio-core/src/examples/volk_benchmark/volk_types.py
+++ b/gnuradio-runtime/examples/volk_benchmark/volk_types.py
diff --git a/gnuradio-core/gnuradio-core.conf.in b/gnuradio-runtime/gnuradio-runtime.conf.in
index d41801aa23..d41801aa23 100644
--- a/gnuradio-core/gnuradio-core.conf.in
+++ b/gnuradio-runtime/gnuradio-runtime.conf.in
diff --git a/gnuradio-runtime/gnuradio-runtime.pc.in b/gnuradio-runtime/gnuradio-runtime.pc.in
new file mode 100644
index 0000000000..ede19cbba4
--- /dev/null
+++ b/gnuradio-runtime/gnuradio-runtime.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: gnuradio-runtime
+Description: GNU Radio core runtime infrastructure
+Requires:
+Version: @LIBVER@
+Libs: -L${libdir} -lgnuradio-runtime
+Cflags: -I${includedir}
diff --git a/gnuradio-core/gr_log_default.conf b/gnuradio-runtime/gr_log_default.conf
index 79c2d91e94..79c2d91e94 100644
--- a/gnuradio-core/gr_log_default.conf
+++ b/gnuradio-runtime/gr_log_default.conf
diff --git a/gnuradio-runtime/include/CMakeLists.txt b/gnuradio-runtime/include/CMakeLists.txt
new file mode 100644
index 0000000000..a9b39958b0
--- /dev/null
+++ b/gnuradio-runtime/include/CMakeLists.txt
@@ -0,0 +1,92 @@
+# Copyright 2013 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.
+
+########################################################################
+# Install header files
+########################################################################
+install(FILES
+  gr_basic_block.h
+  gr_block_detail.h
+  gr_block_gateway.h
+  gr_block.h
+  gr_block_registry.h
+  gr_buffer.h
+  gr_complex.h
+  gr_constants.h
+  gr_dispatcher.h
+  gr_endianness.h
+  gr_error_handler.h
+  gr_expj.h
+  gr_feval.h
+  gr_flowgraph.h
+  gr_fxpt.h
+  gr_fxpt_nco.h
+  gr_fxpt_vco.h
+  gr_hier_block2.h
+  gr_io_signature.h
+  gr_logger.h
+  gr_math.h
+  gr_message.h
+  gr_misc.h
+  gr_msg_accepter.h
+  gr_msg_handler.h
+  gr_msg_queue.h
+  gr_nco.h
+  gr_preferences.h
+  gr_prefs.h
+  gr_py_feval.h
+  gr_random.h
+  gr_realtime.h
+  gr_runtime_api.h
+  gr_runtime_types.h
+  gr_select_handler.h
+  gr_sincos.h
+  gr_single_threaded_scheduler.h
+  gr_sptr_magic.h
+  gr_sync_block.h
+  gr_sync_decimator.h
+  gr_sync_interpolator.h
+  gr_sys_paths.h
+  gr_tagged_stream_block.h
+  gr_tags.h
+  gr_timer.h
+  gr_top_block.h
+  gr_tpb_detail.h
+  gr_types.h
+  gr_unittests.h
+  ice_application_base.h
+  IcePy_Communicator.h
+  ice_server_template.h
+  pycallback_object.h
+  random.h
+  rpccallbackregister_base.h
+  rpcmanager_base.h
+  rpcmanager.h
+  rpcpmtconverters_ice.h
+  rpcregisterhelpers.h
+  rpcserver_aggregator.h
+  rpcserver_base.h
+  rpcserver_booter_aggregator.h
+  rpcserver_booter_base.h
+  rpcserver_booter_ice.h
+  rpcserver_ice.h
+  rpcserver_selector.h
+  DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+  COMPONENT "runtime_devel"
+)
diff --git a/gnuradio-core/src/lib/runtime/IcePy_Communicator.h b/gnuradio-runtime/include/IcePy_Communicator.h
index d613190d2c..aae4378229 100644
--- a/gnuradio-core/src/lib/runtime/IcePy_Communicator.h
+++ b/gnuradio-runtime/include/IcePy_Communicator.h
@@ -11,19 +11,19 @@
 #define ICEPY_COMMUNICATOR_H
 
 #include <Ice/CommunicatorF.h>
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 
 namespace IcePy
 {
 
 extern PyTypeObject CommunicatorType;
 
-GR_CORE_API bool initCommunicator(PyObject*);
+GR_RUNTIME_API bool initCommunicator(PyObject*);
 
-GR_CORE_API Ice::CommunicatorPtr getCommunicator(PyObject*);
+GR_RUNTIME_API Ice::CommunicatorPtr getCommunicator(PyObject*);
 
-GR_CORE_API PyObject* createCommunicator(const Ice::CommunicatorPtr&);
-GR_CORE_API PyObject* getCommunicatorWrapper(const Ice::CommunicatorPtr&);
+GR_RUNTIME_API PyObject* createCommunicator(const Ice::CommunicatorPtr&);
+GR_RUNTIME_API PyObject* getCommunicatorWrapper(const Ice::CommunicatorPtr&);
 
 }
 
diff --git a/gnuradio-core/src/lib/runtime/gr_basic_block.h b/gnuradio-runtime/include/gr_basic_block.h
index 66fb72d87e..1fa8bb9d7a 100644
--- a/gnuradio-core/src/lib/runtime/gr_basic_block.h
+++ b/gnuradio-runtime/include/gr_basic_block.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_BASIC_BLOCK_H
 #define INCLUDED_GR_BASIC_BLOCK_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_runtime_types.h>
 #include <gr_sptr_magic.h>
 #include <boost/enable_shared_from_this.hpp>
@@ -53,7 +53,7 @@
  * signal processing functions.
  */
 
-class GR_CORE_API gr_basic_block : public gr_msg_accepter, public boost::enable_shared_from_this<gr_basic_block>
+class GR_RUNTIME_API gr_basic_block : public gr_msg_accepter, public boost::enable_shared_from_this<gr_basic_block>
 {
   typedef boost::function<void(pmt::pmt_t)> msg_handler_t;
   
@@ -333,7 +333,7 @@ inline bool operator<(gr_basic_block_sptr lhs, gr_basic_block_sptr rhs)
 typedef std::vector<gr_basic_block_sptr> gr_basic_block_vector_t;
 typedef std::vector<gr_basic_block_sptr>::iterator gr_basic_block_viter_t;
 
-GR_CORE_API long gr_basic_block_ncurrently_allocated();
+GR_RUNTIME_API long gr_basic_block_ncurrently_allocated();
 
 inline std::ostream &operator << (std::ostream &os, gr_basic_block_sptr basic_block)
 {
diff --git a/gnuradio-core/src/lib/runtime/gr_block.h b/gnuradio-runtime/include/gr_block.h
index f13f54870d..0b7bbf3eda 100644
--- a/gnuradio-core/src/lib/runtime/gr_block.h
+++ b/gnuradio-runtime/include/gr_block.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_BLOCK_H
 #define INCLUDED_GR_BLOCK_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_basic_block.h>
 #include <gr_tags.h>
 #include <gr_logger.h>
@@ -56,7 +56,7 @@
  * It reads the input items and writes the output items.
  */
 
-class GR_CORE_API gr_block : public gr_basic_block {
+class GR_RUNTIME_API gr_block : public gr_basic_block {
 
  public:
 
@@ -678,7 +678,7 @@ class GR_CORE_API gr_block : public gr_basic_block {
   gr_logger_ptr d_debug_logger;
 
   // These are really only for internal use, but leaving them public avoids
-  // having to work up an ever-varying list of friend GR_CORE_APIs
+  // having to work up an ever-varying list of friend GR_RUNTIME_APIs
 
  public:
   gr_block_detail_sptr detail () const { return d_detail; }
diff --git a/gnuradio-core/src/lib/runtime/gr_block_detail.h b/gnuradio-runtime/include/gr_block_detail.h
index 8a5a08bcf3..c197266769 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_detail.h
+++ b/gnuradio-runtime/include/gr_block_detail.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_BLOCK_DETAIL_H
 #define INCLUDED_GR_BLOCK_DETAIL_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_runtime_types.h>
 #include <gr_tpb_detail.h>
 #include <gr_tags.h>
@@ -38,7 +38,7 @@
  * of almost all users of GNU Radio.  This decoupling also means that
  * we can make changes to the guts without having to recompile everything.
  */
-class GR_CORE_API gr_block_detail {
+class GR_RUNTIME_API gr_block_detail {
  public:
   ~gr_block_detail ();
 
@@ -235,14 +235,14 @@ class GR_CORE_API gr_block_detail {
 
   friend struct gr_tpb_detail;
 
-  friend GR_CORE_API gr_block_detail_sptr
+  friend GR_RUNTIME_API gr_block_detail_sptr
   gr_make_block_detail (unsigned int ninputs, unsigned int noutputs);
 };
 
-GR_CORE_API gr_block_detail_sptr
+GR_RUNTIME_API gr_block_detail_sptr
 gr_make_block_detail (unsigned int ninputs, unsigned int noutputs);
 
-GR_CORE_API long
+GR_RUNTIME_API long
 gr_block_detail_ncurrently_allocated ();
 
 #endif /* INCLUDED_GR_BLOCK_DETAIL_H */
diff --git a/gnuradio-core/src/lib/general/gr_block_gateway.h b/gnuradio-runtime/include/gr_block_gateway.h
index ce87a76c25..93bfd75144 100644
--- a/gnuradio-core/src/lib/general/gr_block_gateway.h
+++ b/gnuradio-runtime/include/gr_block_gateway.h
@@ -19,10 +19,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GRBLOCK_GATEWAY_H
-#define INCLUDED_GRBLOCK_GATEWAY_H
+#ifndef INCLUDED_GR_BLOCK_GATEWAY_H
+#define INCLUDED_GR_BLOCK_GATEWAY_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_block.h>
 #include <gr_feval.h>
 
@@ -79,7 +79,7 @@ struct gr_block_gw_message_type{
  * The methods prefixed with gr_block__ are renamed
  * to class methods without the prefix in python.
  */
-class GR_CORE_API gr_block_gateway : virtual public gr_block{
+class GR_RUNTIME_API gr_block_gateway : virtual public gr_block{
 public:
     //! Provide access to the shared message object
     virtual gr_block_gw_message_type &gr_block_message(void) = 0;
@@ -252,7 +252,7 @@ protected:
  * \param factor the decimation or interpolation factor
  * \return a new gateway block
  */
-GR_CORE_API boost::shared_ptr<gr_block_gateway> gr_make_block_gateway(
+GR_RUNTIME_API boost::shared_ptr<gr_block_gateway> gr_make_block_gateway(
     gr_feval_ll *handler,
     const std::string &name,
     gr_io_signature_sptr in_sig,
@@ -261,4 +261,4 @@ GR_CORE_API boost::shared_ptr<gr_block_gateway> gr_make_block_gateway(
     const unsigned factor
 );
 
-#endif /* INCLUDED_GRBLOCK_GATEWAY_H */
+#endif /* INCLUDED_GR_BLOCK_GATEWAY_H */
diff --git a/gnuradio-core/src/lib/runtime/gr_block_registry.h b/gnuradio-runtime/include/gr_block_registry.h
index 2e0a3b6d5c..9b038287bc 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_registry.h
+++ b/gnuradio-runtime/include/gr_block_registry.h
@@ -1,7 +1,7 @@
 #ifndef GR_BLOCK_REGISTRY_H
 #define GR_BLOCK_REGISTRY_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <map>
 #include <gr_basic_block.h>
 
@@ -10,7 +10,7 @@ class gr_basic_block;
 class gr_block;
 #endif
 
-class GR_CORE_API gr_block_registry {
+class GR_RUNTIME_API gr_block_registry {
     public:
         gr_block_registry();
 
@@ -38,7 +38,7 @@ class GR_CORE_API gr_block_registry {
  
 };
 
-GR_CORE_API extern gr_block_registry global_block_registry;
+GR_RUNTIME_API extern gr_block_registry global_block_registry;
 
 #endif
 
diff --git a/gnuradio-core/src/lib/runtime/gr_buffer.h b/gnuradio-runtime/include/gr_buffer.h
index 28ea977269..1a10ba6d8d 100644
--- a/gnuradio-core/src/lib/runtime/gr_buffer.h
+++ b/gnuradio-runtime/include/gr_buffer.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_BUFFER_H
 #define INCLUDED_GR_BUFFER_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_runtime_types.h>
 #include <boost/weak_ptr.hpp>
 #include <gruel/thread.h>
@@ -43,14 +43,14 @@ class gr_vmcircbuf;
  * \param sizeof_item is the size of an item in bytes.
  * \param link is the block that writes to this buffer.
  */
-GR_CORE_API gr_buffer_sptr gr_make_buffer (int nitems, size_t sizeof_item, gr_block_sptr link=gr_block_sptr());
+GR_RUNTIME_API gr_buffer_sptr gr_make_buffer (int nitems, size_t sizeof_item, gr_block_sptr link=gr_block_sptr());
 
 
 /*!
  * \brief Single writer, multiple reader fifo.
  * \ingroup internal
  */
-class GR_CORE_API gr_buffer {
+class GR_RUNTIME_API gr_buffer {
  public:
 
   virtual ~gr_buffer ();
@@ -126,8 +126,8 @@ class GR_CORE_API gr_buffer {
  private:
 
   friend class gr_buffer_reader;
-  friend GR_CORE_API gr_buffer_sptr gr_make_buffer (int nitems, size_t sizeof_item, gr_block_sptr link);
-  friend GR_CORE_API gr_buffer_reader_sptr gr_buffer_add_reader (gr_buffer_sptr buf, int nzero_preload, gr_block_sptr link);
+  friend GR_RUNTIME_API gr_buffer_sptr gr_make_buffer (int nitems, size_t sizeof_item, gr_block_sptr link);
+  friend GR_RUNTIME_API gr_buffer_reader_sptr gr_buffer_add_reader (gr_buffer_sptr buf, int nzero_preload, gr_block_sptr link);
 
  protected:
   char				       *d_base;		// base address of buffer
@@ -203,11 +203,11 @@ class GR_CORE_API gr_buffer {
  * \param nzero_preload -- number of zero items to "preload" into buffer.
  * \param link is the block that reads from the buffer using this gr_buffer_reader.
  */
-GR_CORE_API gr_buffer_reader_sptr
+GR_RUNTIME_API gr_buffer_reader_sptr
 gr_buffer_add_reader (gr_buffer_sptr buf, int nzero_preload, gr_block_sptr link=gr_block_sptr());
 
 //! returns # of gr_buffers currently allocated
-GR_CORE_API long gr_buffer_ncurrently_allocated ();
+GR_RUNTIME_API long gr_buffer_ncurrently_allocated ();
 
 
 // ---------------------------------------------------------------------------
@@ -217,7 +217,7 @@ GR_CORE_API long gr_buffer_ncurrently_allocated ();
  * \ingroup internal
  */
 
-class GR_CORE_API gr_buffer_reader {
+class GR_RUNTIME_API gr_buffer_reader {
  public:
 
   ~gr_buffer_reader ();
@@ -289,7 +289,7 @@ class GR_CORE_API gr_buffer_reader {
  private:
 
   friend class gr_buffer;
-  friend GR_CORE_API gr_buffer_reader_sptr
+  friend GR_RUNTIME_API gr_buffer_reader_sptr
   gr_buffer_add_reader (gr_buffer_sptr buf, int nzero_preload, gr_block_sptr link);
 
 
@@ -303,7 +303,7 @@ class GR_CORE_API gr_buffer_reader {
 };
 
 //! returns # of gr_buffer_readers currently allocated
-GR_CORE_API long gr_buffer_reader_ncurrently_allocated ();
+GR_RUNTIME_API long gr_buffer_reader_ncurrently_allocated ();
 
 
 #endif /* INCLUDED_GR_BUFFER_H */
diff --git a/gnuradio-core/src/lib/runtime/gr_complex.h b/gnuradio-runtime/include/gr_complex.h
index 58d1525b4d..6166c0b142 100644
--- a/gnuradio-core/src/lib/runtime/gr_complex.h
+++ b/gnuradio-runtime/include/gr_complex.h
@@ -26,7 +26,6 @@
 typedef std::complex<float>			gr_complex;
 typedef std::complex<double>			gr_complexd;
 
-
 inline bool is_complex (gr_complex x) { (void) x; return true;}
 inline bool is_complex (gr_complexd x) { (void) x; return true;}
 inline bool is_complex (float x) { (void) x; return false;}
@@ -35,7 +34,6 @@ inline bool is_complex (int x) { (void) x; return false;}
 inline bool is_complex (char x) { (void) x; return false;}
 inline bool is_complex (short x) { (void) x; return false;}
 
-
 // this doesn't really belong here, but there are worse places for it...
 
 #define CPPUNIT_ASSERT_COMPLEXES_EQUAL(expected,actual,delta)			\
diff --git a/gnuradio-core/src/lib/general/gr_constants.h b/gnuradio-runtime/include/gr_constants.h
index 00ed9463d8..3534166bc0 100644
--- a/gnuradio-core/src/lib/general/gr_constants.h
+++ b/gnuradio-runtime/include/gr_constants.h
@@ -22,32 +22,32 @@
 #ifndef INCLUDED_GR_CONSTANTS_H
 #define INCLUDED_GR_CONSTANTS_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <string>
 
 /*!
  * \brief return ./configure --prefix argument.  Typically /usr/local
  */
-GR_CORE_API const std::string gr_prefix();
+GR_RUNTIME_API const std::string gr_prefix();
 
 /*!
  * \brief return ./configure --sysconfdir argument.  Typically $prefix/etc or /etc
  */
-GR_CORE_API const std::string gr_sysconfdir();
+GR_RUNTIME_API const std::string gr_sysconfdir();
 
 /*!
  * \brief return preferences file directory.  Typically $sysconfdir/etc/conf.d
  */
-GR_CORE_API const std::string gr_prefsdir();
+GR_RUNTIME_API const std::string gr_prefsdir();
 
 /*!
  * \brief return date/time of build, as set when 'bootstrap' is run
  */
-GR_CORE_API const std::string gr_build_date();
+GR_RUNTIME_API const std::string gr_build_date();
 
 /*!
  * \brief return version string defined in configure.ac
  */
-GR_CORE_API const std::string gr_version();
+GR_RUNTIME_API const std::string gr_version();
 
 #endif /* INCLUDED_GR_CONSTANTS_H */
diff --git a/gnuradio-core/src/lib/runtime/gr_dispatcher.h b/gnuradio-runtime/include/gr_dispatcher.h
index 72a0b0176b..7a9e80c9fe 100644
--- a/gnuradio-core/src/lib/runtime/gr_dispatcher.h
+++ b/gnuradio-runtime/include/gr_dispatcher.h
@@ -23,15 +23,15 @@
 #ifndef INCLUDED_GR_DISPATCHER_H
 #define INCLUDED_GR_DISPATCHER_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_select_handler.h>
 #include <vector>
 
 class gr_dispatcher;
 typedef boost::shared_ptr<gr_dispatcher> gr_dispatcher_sptr;
 
-GR_CORE_API gr_dispatcher_sptr gr_dispatcher_singleton();
-GR_CORE_API gr_dispatcher_sptr gr_make_dispatcher();
+GR_RUNTIME_API gr_dispatcher_sptr gr_dispatcher_singleton();
+GR_RUNTIME_API gr_dispatcher_sptr gr_make_dispatcher();
 
 /*!
  * \brief invoke callbacks based on select.
@@ -39,10 +39,10 @@ GR_CORE_API gr_dispatcher_sptr gr_make_dispatcher();
  *
  * \sa gr_select_handler
  */
-class GR_CORE_API gr_dispatcher
+class GR_RUNTIME_API gr_dispatcher
 {
   gr_dispatcher();
-  friend GR_CORE_API gr_dispatcher_sptr gr_make_dispatcher();
+  friend GR_RUNTIME_API gr_dispatcher_sptr gr_make_dispatcher();
 
   std::vector<gr_select_handler_sptr> d_handler;
   int			      	      d_max_index;
diff --git a/gnuradio-core/src/lib/general/gr_endianness.h b/gnuradio-runtime/include/gr_endianness.h
index c4ecb1383e..c4ecb1383e 100644
--- a/gnuradio-core/src/lib/general/gr_endianness.h
+++ b/gnuradio-runtime/include/gr_endianness.h
diff --git a/gnuradio-core/src/lib/runtime/gr_error_handler.h b/gnuradio-runtime/include/gr_error_handler.h
index 569c01c457..4d326a6ba1 100644
--- a/gnuradio-core/src/lib/runtime/gr_error_handler.h
+++ b/gnuradio-runtime/include/gr_error_handler.h
@@ -43,7 +43,7 @@
 #ifndef INCLUDED_GR_ERROR_HANDLER_H
 #define INCLUDED_GR_ERROR_HANDLER_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <stdarg.h>
 #include <string>
 #include <cstdio>  // for FILE
@@ -52,7 +52,7 @@
  * \brief abstract error handler
  * \ingroup base
  */
-class GR_CORE_API gr_error_handler {
+class GR_RUNTIME_API gr_error_handler {
 public:
   enum seriousness {
     ERR_DEBUG		= 0x00000000,
@@ -91,7 +91,7 @@ protected:
 };
 
 
-class GR_CORE_API gr_base_error_handler : public gr_error_handler {
+class GR_RUNTIME_API gr_base_error_handler : public gr_error_handler {
   int	d_nwarnings;
   int	d_nerrors;
 
@@ -103,7 +103,7 @@ public:
   void count_error(seriousness s);
 };
 
-class GR_CORE_API gr_file_error_handler : public gr_base_error_handler {
+class GR_RUNTIME_API gr_file_error_handler : public gr_base_error_handler {
   FILE		*d_file;
   int		 d_fd;
 public:
diff --git a/gnuradio-core/src/lib/general/gr_expj.h b/gnuradio-runtime/include/gr_expj.h
index 1d8633242b..56291a0a6a 100644
--- a/gnuradio-core/src/lib/general/gr_expj.h
+++ b/gnuradio-runtime/include/gr_expj.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_GR_EXPJ_H
 #define INCLUDED_GR_EXPJ_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_sincos.h>
 #include <gr_types.h>
 
diff --git a/gnuradio-core/src/lib/general/gr_feval.h b/gnuradio-runtime/include/gr_feval.h
index a9bccfe51c..af11ca2a2a 100644
--- a/gnuradio-core/src/lib/general/gr_feval.h
+++ b/gnuradio-runtime/include/gr_feval.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_GR_FEVAL_H
 #define INCLUDED_GR_FEVAL_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_complex.h>
 #include <gruel/pmt.h>
 
@@ -39,7 +39,7 @@
  * Use calleval to invoke eval (this kludge is required to allow a
  * python specific "shim" to be inserted.
  */
-class GR_CORE_API gr_feval_dd
+class GR_RUNTIME_API gr_feval_dd
 {
 protected:
   /*!
@@ -67,7 +67,7 @@ public:
  * Use calleval to invoke eval (this kludge is required to allow a
  * python specific "shim" to be inserted.
  */
-class GR_CORE_API gr_feval_cc
+class GR_RUNTIME_API gr_feval_cc
 {
 protected:
   /*!
@@ -95,7 +95,7 @@ public:
  * Use calleval to invoke eval (this kludge is required to allow a
  * python specific "shim" to be inserted.
  */
-class GR_CORE_API gr_feval_ll
+class GR_RUNTIME_API gr_feval_ll
 {
 protected:
   /*!
@@ -123,7 +123,7 @@ public:
  * Use calleval to invoke eval (this kludge is required to allow a
  * python specific "shim" to be inserted.
  */
-class GR_CORE_API gr_feval
+class GR_RUNTIME_API gr_feval
 {
 protected:
   /*!
@@ -151,7 +151,7 @@ public:
  * Use calleval to invoke eval (this kludge is required to allow a
  * python specific "shim" to be inserted.
  */
-class GR_CORE_API gr_feval_p
+class GR_RUNTIME_API gr_feval_p
 {
 protected:
   /*!
@@ -169,9 +169,9 @@ public:
 /*!
  * \brief trivial examples / test cases showing C++ calling Python code
  */
-GR_CORE_API double     gr_feval_dd_example(gr_feval_dd *f, double x);
-GR_CORE_API gr_complex gr_feval_cc_example(gr_feval_cc *f, gr_complex x);
-GR_CORE_API long       gr_feval_ll_example(gr_feval_ll *f, long x);
-GR_CORE_API void       gr_feval_example(gr_feval *f);
+GR_RUNTIME_API double     gr_feval_dd_example(gr_feval_dd *f, double x);
+GR_RUNTIME_API gr_complex gr_feval_cc_example(gr_feval_cc *f, gr_complex x);
+GR_RUNTIME_API long       gr_feval_ll_example(gr_feval_ll *f, long x);
+GR_RUNTIME_API void       gr_feval_example(gr_feval *f);
 
 #endif /* INCLUDED_GR_FEVAL_H */
diff --git a/gnuradio-core/src/lib/runtime/gr_flowgraph.h b/gnuradio-runtime/include/gr_flowgraph.h
index 40e9dc3675..107c50b7b6 100644
--- a/gnuradio-core/src/lib/runtime/gr_flowgraph.h
+++ b/gnuradio-runtime/include/gr_flowgraph.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_FLOWGRAPH_H
 #define INCLUDED_GR_FLOWGRAPH_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_basic_block.h>
 #include <iostream>
 
@@ -31,7 +31,7 @@
  * \brief Class representing a specific input or output graph endpoint
  * \ingroup internal
  */
-class GR_CORE_API gr_endpoint
+class GR_RUNTIME_API gr_endpoint
 {
 private:
   gr_basic_block_sptr d_basic_block;
@@ -52,7 +52,7 @@ inline bool gr_endpoint::operator==(const gr_endpoint &other) const
 	  d_port == other.d_port);
 }
 
-class GR_CORE_API gr_msg_endpoint
+class GR_RUNTIME_API gr_msg_endpoint
 {
 private:
   gr_basic_block_sptr d_basic_block;
@@ -85,7 +85,7 @@ typedef std::vector<gr_endpoint>::iterator gr_endpoint_viter_t;
  *\brief Class representing a connection between to graph endpoints
  *
  */
-class GR_CORE_API gr_edge
+class GR_RUNTIME_API gr_edge
 {
 public:
   gr_edge() : d_src(), d_dst() { };
@@ -110,7 +110,7 @@ typedef std::vector<gr_edge>::iterator gr_edge_viter_t;
  *\brief Class representing a msg connection between to graph msg endpoints
  *
  */
-class GR_CORE_API gr_msg_edge
+class GR_RUNTIME_API gr_msg_edge
 {
 public:
   gr_msg_edge() : d_src(), d_dst() { };
@@ -131,16 +131,16 @@ typedef std::vector<gr_msg_edge>::iterator gr_msg_edge_viter_t;
 
 // Create a shared pointer to a heap allocated flowgraph
 // (types defined in gr_runtime_types.h)
-GR_CORE_API gr_flowgraph_sptr gr_make_flowgraph();
+GR_RUNTIME_API gr_flowgraph_sptr gr_make_flowgraph();
 
 /*!
  * \brief Class representing a directed, acyclic graph of basic blocks
  * \ingroup internal
  */
-class GR_CORE_API gr_flowgraph
+class GR_RUNTIME_API gr_flowgraph
 {
 public:
-  friend GR_CORE_API gr_flowgraph_sptr gr_make_flowgraph();
+  friend GR_RUNTIME_API gr_flowgraph_sptr gr_make_flowgraph();
 
   // Destruct an arbitrary flowgraph
   ~gr_flowgraph();
diff --git a/gnuradio-core/src/lib/general/gr_fxpt.h b/gnuradio-runtime/include/gr_fxpt.h
index 9de6c0c18a..b7e3518ffb 100644
--- a/gnuradio-core/src/lib/general/gr_fxpt.h
+++ b/gnuradio-runtime/include/gr_fxpt.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_GR_FXPT_H
 #define INCLUDED_GR_FXPT_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_types.h>
 
 /*!
@@ -36,7 +36,7 @@
  *  2**31-1        pi - epsilon
  *
  */
-class GR_CORE_API gr_fxpt
+class GR_RUNTIME_API gr_fxpt
 {
   static const int WORDBITS = 32;
   static const int NBITS = 10;
diff --git a/gnuradio-core/src/lib/general/gr_fxpt_nco.h b/gnuradio-runtime/include/gr_fxpt_nco.h
index 9defa083da..36b99ee132 100644
--- a/gnuradio-core/src/lib/general/gr_fxpt_nco.h
+++ b/gnuradio-runtime/include/gr_fxpt_nco.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_GR_FXPT_NCO_H
 #define INCLUDED_GR_FXPT_NCO_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_fxpt.h>
 #include <gr_complex.h>
 
@@ -30,7 +30,7 @@
  * \brief Numerically Controlled Oscillator (NCO)
  * \ingroup misc
  */
-class /*GR_CORE_API*/ gr_fxpt_nco {
+class /*GR_RUNTIME_API*/ gr_fxpt_nco {
   gr_uint32	d_phase;
   gr_int32	d_phase_inc;
 
diff --git a/gnuradio-core/src/lib/general/gr_fxpt_vco.h b/gnuradio-runtime/include/gr_fxpt_vco.h
index 13be2526bd..15e7327f79 100644
--- a/gnuradio-core/src/lib/general/gr_fxpt_vco.h
+++ b/gnuradio-runtime/include/gr_fxpt_vco.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_GR_FXPT_VCO_H
 #define INCLUDED_GR_FXPT_VCO_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_fxpt.h>
 #include <gr_complex.h>
 
@@ -30,7 +30,7 @@
  * \brief Voltage Controlled Oscillator (VCO)
  * \ingroup misc
  */
-class /*GR_CORE_API*/ gr_fxpt_vco {
+class /*GR_RUNTIME_API*/ gr_fxpt_vco {
   gr_int32	d_phase;
 
 public:
diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2.h b/gnuradio-runtime/include/gr_hier_block2.h
index aa6b180cac..c39a98f6d7 100644
--- a/gnuradio-core/src/lib/runtime/gr_hier_block2.h
+++ b/gnuradio-runtime/include/gr_hier_block2.h
@@ -22,14 +22,14 @@
 #ifndef INCLUDED_GR_HIER_BLOCK2_H
 #define INCLUDED_GR_HIER_BLOCK2_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_basic_block.h>
 
 /*!
  * \brief public constructor for gr_hier_block2
 
  */
-GR_CORE_API gr_hier_block2_sptr gr_make_hier_block2(const std::string &name,
+GR_RUNTIME_API gr_hier_block2_sptr gr_make_hier_block2(const std::string &name,
                                         gr_io_signature_sptr input_signature,
                                         gr_io_signature_sptr output_signature);
 
@@ -41,11 +41,11 @@ class gr_hier_block2_detail;
  * \ingroup base_blk
  *
  */
-class GR_CORE_API gr_hier_block2 : public gr_basic_block
+class GR_RUNTIME_API gr_hier_block2 : public gr_basic_block
 {
 private:
   friend class gr_hier_block2_detail;
-  friend GR_CORE_API gr_hier_block2_sptr gr_make_hier_block2(const std::string &name,
+  friend GR_RUNTIME_API gr_hier_block2_sptr gr_make_hier_block2(const std::string &name,
 						 gr_io_signature_sptr input_signature,
 						 gr_io_signature_sptr output_signature);
 
diff --git a/gnuradio-core/src/lib/runtime/gr_io_signature.h b/gnuradio-runtime/include/gr_io_signature.h
index fd18257973..345cd6b9d2 100644
--- a/gnuradio-core/src/lib/runtime/gr_io_signature.h
+++ b/gnuradio-runtime/include/gr_io_signature.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_IO_SIGNATURE_H
 #define INCLUDED_IO_SIGNATURE_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_runtime_types.h>
 
 /*!
@@ -34,7 +34,7 @@
  * \param max_streams  specify maximum number of streams (>= min_streams or -1 -> infinite)
  * \param sizeof_stream_item  specify the size of the items in each stream
  */
-GR_CORE_API gr_io_signature_sptr
+GR_RUNTIME_API gr_io_signature_sptr
 gr_make_io_signature(int min_streams, int max_streams,
 		     int sizeof_stream_item);
 
@@ -46,7 +46,7 @@ gr_make_io_signature(int min_streams, int max_streams,
  * \param sizeof_stream_item1 specify the size of the items in the first stream
  * \param sizeof_stream_item2 specify the size of the items in the second and subsequent streams
  */
-GR_CORE_API gr_io_signature_sptr
+GR_RUNTIME_API gr_io_signature_sptr
 gr_make_io_signature2(int min_streams, int max_streams,
 		      int sizeof_stream_item1,
 		      int sizeof_stream_item2
@@ -61,7 +61,7 @@ gr_make_io_signature2(int min_streams, int max_streams,
  * \param sizeof_stream_item2 specify the size of the items in the second stream
  * \param sizeof_stream_item3 specify the size of the items in the third and subsequent streams
  */
-GR_CORE_API gr_io_signature_sptr
+GR_RUNTIME_API gr_io_signature_sptr
 gr_make_io_signature3(int min_streams, int max_streams,
 		      int sizeof_stream_item1,
 		      int sizeof_stream_item2,
@@ -79,7 +79,7 @@ gr_make_io_signature3(int min_streams, int max_streams,
  * value of the last entry in sizeof_stream_items is used for the missing values.
  * sizeof_stream_items must contain at least 1 entry.
  */
-GR_CORE_API gr_io_signature_sptr
+GR_RUNTIME_API gr_io_signature_sptr
 gr_make_io_signaturev(int min_streams, int max_streams,
 		      const std::vector<int> &sizeof_stream_items);
 
@@ -88,7 +88,7 @@ gr_make_io_signaturev(int min_streams, int max_streams,
  * \brief i/o signature for input and output ports.
  * \brief misc
  */
-class GR_CORE_API gr_io_signature {
+class GR_RUNTIME_API gr_io_signature {
   int			d_min_streams;
   int			d_max_streams;
   std::vector<int>	d_sizeof_stream_item;
@@ -96,7 +96,7 @@ class GR_CORE_API gr_io_signature {
   gr_io_signature(int min_streams, int max_streams,
 		  const std::vector<int> &sizeof_stream_items);
 
-  friend GR_CORE_API gr_io_signature_sptr
+  friend GR_RUNTIME_API gr_io_signature_sptr
   gr_make_io_signaturev(int min_streams,
 			int max_streams,
 			const std::vector<int> &sizeof_stream_items);
diff --git a/gnuradio-core/src/lib/runtime/gr_logger.h b/gnuradio-runtime/include/gr_logger.h
index db6df722ec..f3114467d9 100644
--- a/gnuradio-core/src/lib/runtime/gr_logger.h
+++ b/gnuradio-runtime/include/gr_logger.h
@@ -40,7 +40,7 @@
 #include "config.h"
 #endif
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <assert.h>
 #include <iostream>
 #include <time.h>
@@ -327,7 +327,7 @@ public:
  *
  * \param name Name of the logger for which a pointer is requested
  */
-GR_CORE_API gr_logger_ptr logger_get_logger(std::string name);
+GR_RUNTIME_API gr_logger_ptr logger_get_logger(std::string name);
 
 /*!
  * \brief Load logger's configuration file.
@@ -338,14 +338,18 @@ GR_CORE_API gr_logger_ptr logger_get_logger(std::string name);
  * \param config_filename The configuration file. Set to "" for the
  *        basic logger that outputs to the console.
  */
-GR_CORE_API void logger_load_config(const std::string &config_filename="");
+GR_RUNTIME_API void logger_load_config(const std::string &config_filename="");
 
 /*!
  * \brief Reset logger's configuration file.
  *
  * Remove all appenders from loggers
  */
-GR_CORE_API void logger_reset_config(void);
+GR_RUNTIME_API void logger_reset_config(void);
+
+GR_RUNTIME_API void logger_load_config_and_watch(const std::string &config_filename,
+						 unsigned int watch_period);
+
 
 /*!
  * \brief Set the logger's output level.
@@ -367,7 +371,7 @@ GR_CORE_API void logger_reset_config(void);
  * \param logger the logger to set the level of.
  * \param level  string to set the level to.
  */
-GR_CORE_API void logger_set_level(gr_logger_ptr logger, const std::string &level);
+GR_RUNTIME_API void logger_set_level(gr_logger_ptr logger, const std::string &level);
 
 /*!
  * \brief Set the logger's output level.
@@ -389,7 +393,7 @@ GR_CORE_API void logger_set_level(gr_logger_ptr logger, const std::string &level
  * \param logger the logger to set the level of.
  * \param level  new logger level of type Log4cpp::Priority
  */
-GR_CORE_API void logger_set_level(gr_logger_ptr logger, log4cpp::Priority::Value level);
+GR_RUNTIME_API void logger_set_level(gr_logger_ptr logger, log4cpp::Priority::Value level);
 
 
 /*!
@@ -412,7 +416,7 @@ GR_CORE_API void logger_set_level(gr_logger_ptr logger, log4cpp::Priority::Value
  * \param logger the logger to get the level of.
  * \param level  string to get the level into.
  */
-GR_CORE_API void logger_get_level(gr_logger_ptr logger, std::string &level);
+GR_RUNTIME_API void logger_get_level(gr_logger_ptr logger, std::string &level);
 
 /*!
  * \brief Get the logger's output level.
@@ -434,7 +438,7 @@ GR_CORE_API void logger_get_level(gr_logger_ptr logger, std::string &level);
  * \param logger the logger to get the level of.
  * \param level of the logger.
  */
-GR_CORE_API void logger_get_level(gr_logger_ptr logger, log4cpp::Priority::Value &level);
+GR_RUNTIME_API void logger_get_level(gr_logger_ptr logger, log4cpp::Priority::Value &level);
 
 /*!
  * \brief Add console appender to a given logger
@@ -445,7 +449,7 @@ GR_CORE_API void logger_get_level(gr_logger_ptr logger, log4cpp::Priority::Value
  * \param target Std target to write 'cout' or 'cerr' (default is cout)
  * \param pattern Formating pattern for log messages
  */
-GR_CORE_API void logger_add_console_appender(gr_logger_ptr logger,std::string target,std::string pattern);
+GR_RUNTIME_API void logger_add_console_appender(gr_logger_ptr logger,std::string target,std::string pattern);
 
 /*!
  * \brief Add file appender to a given logger
@@ -457,7 +461,7 @@ GR_CORE_API void logger_add_console_appender(gr_logger_ptr logger,std::string ta
  * \param append Overwrite or append to log file
  * \param pattern Formating pattern for log messages
  */
-GR_CORE_API void logger_add_file_appender(gr_logger_ptr logger,std::string filename,bool append,std::string pattern);
+GR_RUNTIME_API void logger_add_file_appender(gr_logger_ptr logger,std::string filename,bool append,std::string pattern);
 
 /*!
  * \brief Add rolling file appender to a given logger
@@ -472,9 +476,10 @@ GR_CORE_API void logger_add_file_appender(gr_logger_ptr logger,std::string filen
  * \param mode Permissions to set on log file
  * \param pattern Formating pattern for log messages
  */
-GR_CORE_API void logger_add_rollingfile_appender(gr_logger_ptr logger,std::string filename,
+GR_RUNTIME_API void logger_add_rollingfile_appender(gr_logger_ptr logger,std::string filename,
                     size_t filesize,int bkup_index,bool append,mode_t mode,std::string pattern);
 
+
 /*!
  * \brief Add rolling file appender to a given logger
  *
@@ -482,7 +487,7 @@ GR_CORE_API void logger_add_rollingfile_appender(gr_logger_ptr logger,std::strin
  *
  * \return vector of string names of loggers 
  */
-GR_CORE_API std::vector<std::string> logger_get_logger_names(void);
+GR_RUNTIME_API std::vector<std::string> logger_get_logger_names(void);
 
 #endif /* HAVE_LOG4CPP */
 
@@ -627,17 +632,17 @@ class gr_logger
  * \param watch_period Seconds to wait between checking for changes in conf file.
  *        Watch_period defaults to 0 in which case the file is not watched for changes
  */
-GR_CORE_API void gr_logger_config(const std::string config_filename, unsigned int watch_period = 0);
+GR_RUNTIME_API void gr_logger_config(const std::string config_filename, unsigned int watch_period = 0);
 /*!
  * \brief Function to return logger names to python
  * \return Vector of name strings
  *
  */
-GR_CORE_API std::vector<std::string> gr_logger_get_logger_names(void);
+GR_RUNTIME_API std::vector<std::string> gr_logger_get_logger_names(void);
 /*!
  * \brief Function to reset logger configuration from python
  * 
  */
-GR_CORE_API void gr_logger_reset_config(void);
+GR_RUNTIME_API void gr_logger_reset_config(void);
 
 #endif /* INCLUDED_GR_LOGGER_H */
diff --git a/gnuradio-core/src/lib/general/gr_math.h b/gnuradio-runtime/include/gr_math.h
index b9a802da84..c7efe8facb 100644
--- a/gnuradio-core/src/lib/general/gr_math.h
+++ b/gnuradio-runtime/include/gr_math.h
@@ -27,7 +27,7 @@
 #ifndef _GR_MATH_H_
 #define _GR_MATH_H_
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_complex.h>
 
 static inline bool
@@ -52,7 +52,7 @@ gr_is_power_of_2(long x)
  * to zero. This routine calculates the arc tangent with an average
  * error of +/- 0.045 degrees.
  */
-GR_CORE_API float gr_fast_atan2f(float y, float x);
+GR_RUNTIME_API float gr_fast_atan2f(float y, float x);
 
 static inline float gr_fast_atan2f(gr_complex z)
 {
diff --git a/gnuradio-core/src/lib/runtime/gr_message.h b/gnuradio-runtime/include/gr_message.h
index d386ca0097..941821617b 100644
--- a/gnuradio-core/src/lib/runtime/gr_message.h
+++ b/gnuradio-runtime/include/gr_message.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_GR_MESSAGE_H
 #define INCLUDED_GR_MESSAGE_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_types.h>
 #include <string>
 
@@ -32,10 +32,10 @@ typedef boost::shared_ptr<gr_message> gr_message_sptr;
 /*!
  * \brief public constructor for gr_message
  */
-GR_CORE_API gr_message_sptr
+GR_RUNTIME_API gr_message_sptr
 gr_make_message(long type = 0, double arg1 = 0, double arg2 = 0, size_t length = 0);
 
-GR_CORE_API gr_message_sptr
+GR_RUNTIME_API gr_message_sptr
 gr_make_message_from_string(const std::string s, long type = 0, double arg1 = 0, double arg2 = 0);
 
 /*!
@@ -45,7 +45,7 @@ gr_make_message_from_string(const std::string s, long type = 0, double arg1 = 0,
  * The ideas and method names for adjustable message length were
  * lifted from the click modular router "Packet" class.
  */
-class GR_CORE_API gr_message {
+class GR_RUNTIME_API gr_message {
   gr_message_sptr d_next;	// link field for msg queue
   long		  d_type;	// type of the message
   double	  d_arg1;	// optional arg1
@@ -58,10 +58,10 @@ class GR_CORE_API gr_message {
 
   gr_message (long type, double arg1, double arg2, size_t length);
 
-  friend GR_CORE_API gr_message_sptr
+  friend GR_RUNTIME_API gr_message_sptr
     gr_make_message (long type, double arg1, double arg2, size_t length);
 
-  friend GR_CORE_API gr_message_sptr
+  friend GR_RUNTIME_API gr_message_sptr
     gr_make_message_from_string (const std::string s, long type, double arg1, double arg2);
 
   friend class gr_msg_queue;
@@ -86,6 +86,6 @@ public:
 
 };
 
-GR_CORE_API long gr_message_ncurrently_allocated ();
+GR_RUNTIME_API long gr_message_ncurrently_allocated ();
 
 #endif /* INCLUDED_GR_MESSAGE_H */
diff --git a/gnuradio-core/src/lib/general/gr_misc.h b/gnuradio-runtime/include/gr_misc.h
index 0c790e90ce..182ae87de6 100644
--- a/gnuradio-core/src/lib/general/gr_misc.h
+++ b/gnuradio-runtime/include/gr_misc.h
@@ -23,17 +23,17 @@
 #ifndef INCLUDED_GR_MISC_H
 #define INCLUDED_GR_MISC_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_types.h>
 
-GR_CORE_API unsigned int
+GR_RUNTIME_API unsigned int
 gr_rounduppow2(unsigned int n);
 
 // FIXME should be template
-GR_CORE_API void gr_zero_vector(std::vector<float> &v);
-GR_CORE_API void gr_zero_vector(std::vector<double> &v);
-GR_CORE_API void gr_zero_vector(std::vector<int> &v);
-GR_CORE_API void gr_zero_vector(std::vector<gr_complex> &v);
+GR_RUNTIME_API void gr_zero_vector(std::vector<float> &v);
+GR_RUNTIME_API void gr_zero_vector(std::vector<double> &v);
+GR_RUNTIME_API void gr_zero_vector(std::vector<int> &v);
+GR_RUNTIME_API void gr_zero_vector(std::vector<gr_complex> &v);
 
 
 #endif /* INCLUDED_GR_MISC_H */
diff --git a/gnuradio-core/src/lib/runtime/gr_msg_accepter.h b/gnuradio-runtime/include/gr_msg_accepter.h
index a497ba6e7d..8db28bb747 100644
--- a/gnuradio-core/src/lib/runtime/gr_msg_accepter.h
+++ b/gnuradio-runtime/include/gr_msg_accepter.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_GR_MSG_ACCEPTER_H
 #define INCLUDED_GR_MSG_ACCEPTER_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gruel/msg_accepter.h>
 #include <gruel/pmt.h>
 
@@ -30,7 +30,7 @@
  * \brief Accepts messages and inserts them into a message queue, then notifies
  * subclass gr_basic_block there is a message pending.
  */
-class GR_CORE_API gr_msg_accepter : public gruel::msg_accepter
+class GR_RUNTIME_API gr_msg_accepter : public gruel::msg_accepter
 {
 public:
   gr_msg_accepter();
diff --git a/gnuradio-core/src/lib/runtime/gr_msg_handler.h b/gnuradio-runtime/include/gr_msg_handler.h
index 57e8a95d62..06d583a38b 100644
--- a/gnuradio-core/src/lib/runtime/gr_msg_handler.h
+++ b/gnuradio-runtime/include/gr_msg_handler.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_GR_MSG_HANDLER_H
 #define INCLUDED_GR_MSG_HANDLER_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_message.h>
 
 class gr_msg_handler;
@@ -32,7 +32,7 @@ typedef boost::shared_ptr<gr_msg_handler> gr_msg_handler_sptr;
  * \brief abstract class of message handlers
  * \ingroup base
  */
-class GR_CORE_API gr_msg_handler {
+class GR_RUNTIME_API gr_msg_handler {
 public:
   virtual ~gr_msg_handler ();
 
diff --git a/gnuradio-core/src/lib/runtime/gr_msg_queue.h b/gnuradio-runtime/include/gr_msg_queue.h
index 86440bbb01..127186ec51 100644
--- a/gnuradio-core/src/lib/runtime/gr_msg_queue.h
+++ b/gnuradio-runtime/include/gr_msg_queue.h
@@ -22,20 +22,20 @@
 #ifndef INCLUDED_GR_MSG_QUEUE_H
 #define INCLUDED_GR_MSG_QUEUE_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_msg_handler.h>
 #include <gruel/thread.h>
 
 class gr_msg_queue;
 typedef boost::shared_ptr<gr_msg_queue> gr_msg_queue_sptr;
 
-GR_CORE_API gr_msg_queue_sptr gr_make_msg_queue(unsigned int limit=0);
+GR_RUNTIME_API gr_msg_queue_sptr gr_make_msg_queue(unsigned int limit=0);
 
 /*!
  * \brief thread-safe message queue
  * \ingroup misc
  */
-class GR_CORE_API gr_msg_queue : public gr_msg_handler {
+class GR_RUNTIME_API gr_msg_queue : public gr_msg_handler {
 
   gruel::mutex		    d_mutex;
   gruel::condition_variable d_not_empty;
diff --git a/gnuradio-core/src/lib/general/gr_nco.h b/gnuradio-runtime/include/gr_nco.h
index fb51106aab..fb51106aab 100644
--- a/gnuradio-core/src/lib/general/gr_nco.h
+++ b/gnuradio-runtime/include/gr_nco.h
diff --git a/gnuradio-core/src/lib/runtime/gr_preferences.h b/gnuradio-runtime/include/gr_preferences.h
index bfcc0424b6..df5aecacba 100644
--- a/gnuradio-core/src/lib/runtime/gr_preferences.h
+++ b/gnuradio-runtime/include/gr_preferences.h
@@ -23,9 +23,9 @@
 #ifndef _GR_PREFERENCES_H_
 #define _GR_PREFERENCES_H_
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 
-class GR_CORE_API gr_preferences {
+class GR_RUNTIME_API gr_preferences {
  public:
   static const char *get (const char *key);
   static void set (const char *key, const char *value);
diff --git a/gnuradio-core/src/lib/general/gr_prefs.h b/gnuradio-runtime/include/gr_prefs.h
index 4e11d04c5b..7ca0991ca8 100644
--- a/gnuradio-core/src/lib/general/gr_prefs.h
+++ b/gnuradio-runtime/include/gr_prefs.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_PREFS_H
 #define INCLUDED_GR_PREFS_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <string>
 #include <map>
 #include <gruel/thread.h>
@@ -41,7 +41,7 @@ typedef std::map<std::string, std::string>::iterator gr_config_map_elem_itr;
  * via the magic of SWIG directors.
  */
 
-class GR_CORE_API gr_prefs
+class GR_RUNTIME_API gr_prefs
 {
 public:
   static gr_prefs *singleton();
diff --git a/gnuradio-runtime/include/gr_py_feval.h b/gnuradio-runtime/include/gr_py_feval.h
new file mode 100644
index 0000000000..cf7c7bfbe5
--- /dev/null
+++ b/gnuradio-runtime/include/gr_py_feval.h
@@ -0,0 +1,51 @@
+#include <gruel/pmt.h>
+
+class gr_py_feval_dd : public gr_feval_dd
+{
+ public:
+  double calleval(double x)
+  {
+    ensure_py_gil_state _lock;
+    return eval(x);
+  }
+};
+
+class gr_py_feval_cc : public gr_feval_cc
+{
+ public:
+  gr_complex calleval(gr_complex x)
+  {
+    ensure_py_gil_state _lock;
+    return eval(x);
+  }
+};
+
+class gr_py_feval_ll : public gr_feval_ll
+{
+ public:
+  long calleval(long x)
+  {
+    ensure_py_gil_state _lock;
+    return eval(x);
+  }
+};
+
+class gr_py_feval : public gr_feval
+{
+ public:
+  void calleval()
+  {
+    ensure_py_gil_state _lock;
+    eval();
+  }
+};
+
+class gr_py_feval_p : public gr_feval_p
+{
+ public:
+  void calleval(pmt::pmt_t x)
+  {
+    ensure_py_gil_state _lock;
+    eval(x);
+  }
+};
diff --git a/gnuradio-core/src/lib/general/gr_random.h b/gnuradio-runtime/include/gr_random.h
index 96a8f44180..783c05f920 100644
--- a/gnuradio-core/src/lib/general/gr_random.h
+++ b/gnuradio-runtime/include/gr_random.h
@@ -23,14 +23,14 @@
 #ifndef INCLUDED_GR_RANDOM_H
 #define INCLUDED_GR_RANDOM_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_complex.h>
 
 /*!
  * \brief pseudo random number generator
  * \ingroup math_blk
  */
-class GR_CORE_API gr_random {
+class GR_RUNTIME_API gr_random {
 protected:
   static const int NTAB  = 32;
   long  d_seed;
diff --git a/gnuradio-core/src/lib/runtime/gr_realtime.h b/gnuradio-runtime/include/gr_realtime.h
index fe6549039f..fcdb5222cc 100644
--- a/gnuradio-core/src/lib/runtime/gr_realtime.h
+++ b/gnuradio-runtime/include/gr_realtime.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_REALTIME_H
 #define INCLUDED_GR_REALTIME_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gruel/realtime.h>
 
 typedef gruel::rt_status_t gr_rt_status_t;
@@ -32,6 +32,6 @@ typedef gruel::rt_status_t gr_rt_status_t;
  * \brief If possible, enable high-priority "real time" scheduling.
  * \ingroup misc
  */
-GR_CORE_API gr_rt_status_t gr_enable_realtime_scheduling();
+GR_RUNTIME_API gr_rt_status_t gr_enable_realtime_scheduling();
 
 #endif /* INCLUDED_GR_REALTIME_H */
diff --git a/gnuradio-core/src/lib/general/gr_core_api.h b/gnuradio-runtime/include/gr_runtime_api.h
index 74c802857b..32c53bd723 100644
--- a/gnuradio-core/src/lib/general/gr_core_api.h
+++ b/gnuradio-runtime/include/gr_runtime_api.h
@@ -19,15 +19,15 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_CORE_API_H
-#define INCLUDED_GR_CORE_API_H
+#ifndef INCLUDED_GR_RUNTIME_API_H
+#define INCLUDED_GR_RUNTIME_API_H
 
 #include <gruel/attributes.h>
 
 #ifdef gnuradio_core_EXPORTS
-#  define GR_CORE_API __GR_ATTR_EXPORT
+#  define GR_RUNTIME_API __GR_ATTR_EXPORT
 #else
-#  define GR_CORE_API __GR_ATTR_IMPORT
+#  define GR_RUNTIME_API __GR_ATTR_IMPORT
 #endif
 
-#endif /* INCLUDED_GR_CORE_API_H */
+#endif /* INCLUDED_GR_RUNTIME_API_H */
diff --git a/gnuradio-core/src/lib/runtime/gr_runtime_types.h b/gnuradio-runtime/include/gr_runtime_types.h
index 0d61492881..9af745b3fa 100644
--- a/gnuradio-core/src/lib/runtime/gr_runtime_types.h
+++ b/gnuradio-runtime/include/gr_runtime_types.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_RUNTIME_TYPES_H
 #define INCLUDED_GR_RUNTIME_TYPES_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_types.h>
 
 /*
diff --git a/gnuradio-core/src/lib/runtime/gr_select_handler.h b/gnuradio-runtime/include/gr_select_handler.h
index c4c3592132..ae4b9dfdb1 100644
--- a/gnuradio-core/src/lib/runtime/gr_select_handler.h
+++ b/gnuradio-runtime/include/gr_select_handler.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_SELECT_HANDLER_H
 #define INCLUDED_GR_SELECT_HANDLER_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <boost/shared_ptr.hpp>
 
 class gr_select_handler;
@@ -36,7 +36,7 @@ typedef boost::shared_ptr<gr_select_handler> gr_select_handler_sptr;
  *
  * \sa gr_dispatcher
  */
-class GR_CORE_API gr_select_handler
+class GR_RUNTIME_API gr_select_handler
 {
   int	d_fd;
 
diff --git a/gnuradio-core/src/lib/general/gr_sincos.h b/gnuradio-runtime/include/gr_sincos.h
index 516f43437a..5a182081de 100644
--- a/gnuradio-core/src/lib/general/gr_sincos.h
+++ b/gnuradio-runtime/include/gr_sincos.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_SINCOS_H
 #define INCLUDED_GR_SINCOS_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -31,8 +31,8 @@ extern "C" {
 
 // compute sine and cosine at the same time
 
-GR_CORE_API void gr_sincos (double x, double *sin, double *cos);
-GR_CORE_API void gr_sincosf (float x, float *sin, float *cos);
+GR_RUNTIME_API void gr_sincos (double x, double *sin, double *cos);
+GR_RUNTIME_API void gr_sincosf (float x, float *sin, float *cos);
 
 #ifdef __cplusplus
 };
diff --git a/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.h b/gnuradio-runtime/include/gr_single_threaded_scheduler.h
index 3a95c7194f..d538fa3921 100644
--- a/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.h
+++ b/gnuradio-runtime/include/gr_single_threaded_scheduler.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_SINGLE_THREADED_SCHEDULER_H
 #define INCLUDED_GR_SINGLE_THREADED_SCHEDULER_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_runtime_types.h>
 #include <fstream>
 
@@ -36,7 +36,7 @@ typedef boost::shared_ptr<gr_single_threaded_scheduler>	gr_single_threaded_sched
  * \ingroup internal
  */
 
-class GR_CORE_API gr_single_threaded_scheduler {
+class GR_RUNTIME_API gr_single_threaded_scheduler {
  public:
   ~gr_single_threaded_scheduler ();
 
@@ -52,11 +52,11 @@ class GR_CORE_API gr_single_threaded_scheduler {
 
   void main_loop ();
 
-  friend GR_CORE_API gr_single_threaded_scheduler_sptr
+  friend GR_RUNTIME_API gr_single_threaded_scheduler_sptr
   gr_make_single_threaded_scheduler (const std::vector<gr_block_sptr> &blocks);
 };
 
-GR_CORE_API gr_single_threaded_scheduler_sptr
+GR_RUNTIME_API gr_single_threaded_scheduler_sptr
 gr_make_single_threaded_scheduler (const std::vector<gr_block_sptr> &blocks);
 
 #endif /* INCLUDED_GR_SINGLE_THREADED_SCHEDULER_H */
diff --git a/gnuradio-core/src/lib/runtime/gr_sptr_magic.h b/gnuradio-runtime/include/gr_sptr_magic.h
index 3d997539c0..2a94806d18 100644
--- a/gnuradio-core/src/lib/runtime/gr_sptr_magic.h
+++ b/gnuradio-runtime/include/gr_sptr_magic.h
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GR_SPTR_MAGIC_H
 #define INCLUDED_GR_SPTR_MAGIC_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <boost/shared_ptr.hpp>
 
 class gr_basic_block;
@@ -31,7 +31,7 @@ namespace gnuradio {
 
   namespace detail {
 
-    class GR_CORE_API sptr_magic {
+    class GR_RUNTIME_API sptr_magic {
     public:
       static boost::shared_ptr<gr_basic_block> fetch_initial_sptr(gr_basic_block *p);
       static void create_and_stash_initial_sptr(gr_hier_block2 *p);
diff --git a/gnuradio-core/src/lib/runtime/gr_sync_block.h b/gnuradio-runtime/include/gr_sync_block.h
index 1e4109b035..01eb646143 100644
--- a/gnuradio-core/src/lib/runtime/gr_sync_block.h
+++ b/gnuradio-runtime/include/gr_sync_block.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_SYNC_BLOCK_H
 #define INCLUDED_GR_SYNC_BLOCK_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_block.h>
 
 /*!
@@ -32,7 +32,7 @@
  *
  * Override work to provide the signal processing implementation.
  */
-class GR_CORE_API gr_sync_block : public gr_block
+class GR_RUNTIME_API gr_sync_block : public gr_block
 {
  protected:
   gr_sync_block (void){} //allows pure virtual interface sub-classes
diff --git a/gnuradio-core/src/lib/runtime/gr_sync_decimator.h b/gnuradio-runtime/include/gr_sync_decimator.h
index 657aba9852..c799ee0f7c 100644
--- a/gnuradio-core/src/lib/runtime/gr_sync_decimator.h
+++ b/gnuradio-runtime/include/gr_sync_decimator.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_SYNC_DECIMATOR_H
 #define INCLUDED_GR_SYNC_DECIMATOR_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_sync_block.h>
 
 /*!
@@ -32,7 +32,7 @@
  *
  * Override work to provide the signal processing implementation.
  */
-class GR_CORE_API gr_sync_decimator : public gr_sync_block
+class GR_RUNTIME_API gr_sync_decimator : public gr_sync_block
 {
  private:
   unsigned	d_decimation;
diff --git a/gnuradio-core/src/lib/runtime/gr_sync_interpolator.h b/gnuradio-runtime/include/gr_sync_interpolator.h
index 86d2fde430..f219916743 100644
--- a/gnuradio-core/src/lib/runtime/gr_sync_interpolator.h
+++ b/gnuradio-runtime/include/gr_sync_interpolator.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_SYNC_INTERPOLATOR_H
 #define INCLUDED_GR_SYNC_INTERPOLATOR_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_sync_block.h>
 
 /*!
@@ -32,7 +32,7 @@
  *
  * Override work to provide the signal processing implementation.
  */
-class GR_CORE_API gr_sync_interpolator : public gr_sync_block
+class GR_RUNTIME_API gr_sync_interpolator : public gr_sync_block
 {
  private:
   unsigned	d_interpolation;
diff --git a/gnuradio-core/src/lib/runtime/gr_sys_paths.h b/gnuradio-runtime/include/gr_sys_paths.h
index bd51ebdf94..6235e0e78f 100644
--- a/gnuradio-core/src/lib/runtime/gr_sys_paths.h
+++ b/gnuradio-runtime/include/gr_sys_paths.h
@@ -22,12 +22,12 @@
 #ifndef _GR_SYS_PATHS_H_
 #define _GR_SYS_PATHS_H_
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 
 //! directory to create temporary files
-GR_CORE_API const char *gr_tmp_path();
+GR_RUNTIME_API const char *gr_tmp_path();
 
 //! directory to store application data
-GR_CORE_API const char *gr_appdata_path();
+GR_RUNTIME_API const char *gr_appdata_path();
 
 #endif /* _GR_SYS_PATHS_H_ */
diff --git a/gnuradio-core/src/lib/runtime/gr_tagged_stream_block.h b/gnuradio-runtime/include/gr_tagged_stream_block.h
index a9d396c06f..797845f8e2 100644
--- a/gnuradio-core/src/lib/runtime/gr_tagged_stream_block.h
+++ b/gnuradio-runtime/include/gr_tagged_stream_block.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_TAGGED_STREAM_BLOCK_H
 #define INCLUDED_GR_TAGGED_STREAM_BLOCK_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_block.h>
 
 /*!
@@ -32,7 +32,7 @@
  *
  * Override work to provide the signal processing implementation.
  */
-class GR_CORE_API gr_tagged_stream_block : public gr_block
+class GR_RUNTIME_API gr_tagged_stream_block : public gr_block
 {
  private:
   pmt::pmt_t d_length_tag_key; //! This is the key for the tag that stores the PDU length
diff --git a/gnuradio-core/src/lib/runtime/gr_tags.h b/gnuradio-runtime/include/gr_tags.h
index a9ca902352..278a5a53ae 100644
--- a/gnuradio-core/src/lib/runtime/gr_tags.h
+++ b/gnuradio-runtime/include/gr_tags.h
@@ -22,10 +22,10 @@
 #ifndef INCLUDED_GR_TAGS_H
 #define INCLUDED_GR_TAGS_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gruel/pmt.h>
 
-struct GR_CORE_API gr_tag_t{
+struct GR_RUNTIME_API gr_tag_t{
 
     //! the item \p tag occurred at (as a uint64_t)
     uint64_t offset;
diff --git a/gnuradio-core/src/lib/runtime/gr_timer.h b/gnuradio-runtime/include/gr_timer.h
index e0b4cc4378..45b663b368 100644
--- a/gnuradio-core/src/lib/runtime/gr_timer.h
+++ b/gnuradio-runtime/include/gr_timer.h
@@ -22,14 +22,14 @@
 #ifndef INCLUDED_GR_TIMER_H
 #define INCLUDED_GR_TIMER_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_types.h>
 
 class gr_timer;
 
 typedef boost::shared_ptr<gr_timer> gr_timer_sptr;
 
-GR_CORE_API typedef void (*gr_timer_hook)(gr_timer *, void *);
+GR_RUNTIME_API typedef void (*gr_timer_hook)(gr_timer *, void *);
 
 /*!
  * \brief create a timeout.
@@ -37,18 +37,18 @@ GR_CORE_API typedef void (*gr_timer_hook)(gr_timer *, void *);
  * \ingroup misc
  * gr_timer_hook is called when timer fires.
  */
-GR_CORE_API gr_timer_sptr gr_make_timer (gr_timer_hook, void *);
+GR_RUNTIME_API gr_timer_sptr gr_make_timer (gr_timer_hook, void *);
 
 /*!
  * \brief implement timeouts
  */
-class GR_CORE_API gr_timer {
+class GR_RUNTIME_API gr_timer {
   double	d_expiry;
   double	d_period;
   gr_timer_hook	d_hook;
   void	       *d_hook_arg;
 
-  friend GR_CORE_API gr_timer_sptr gr_make_timer (gr_timer_hook, void *);
+  friend GR_RUNTIME_API gr_timer_sptr gr_make_timer (gr_timer_hook, void *);
 
   gr_timer (...);
 
diff --git a/gnuradio-core/src/lib/runtime/gr_top_block.h b/gnuradio-runtime/include/gr_top_block.h
index 9634b53f3c..f523442cd0 100644
--- a/gnuradio-core/src/lib/runtime/gr_top_block.h
+++ b/gnuradio-runtime/include/gr_top_block.h
@@ -23,22 +23,22 @@
 #ifndef INCLUDED_GR_TOP_BLOCK_H
 #define INCLUDED_GR_TOP_BLOCK_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_hier_block2.h>
 
 class gr_top_block_impl;
 
-GR_CORE_API gr_top_block_sptr gr_make_top_block(const std::string &name);
+GR_RUNTIME_API gr_top_block_sptr gr_make_top_block(const std::string &name);
 
 /*!
  *\brief Top-level hierarchical block representing a flowgraph
  * \ingroup container_blk
  *
  */
-class GR_CORE_API gr_top_block : public gr_hier_block2
+class GR_RUNTIME_API gr_top_block : public gr_hier_block2
 {
 private:
-  friend GR_CORE_API gr_top_block_sptr gr_make_top_block(const std::string &name);
+  friend GR_RUNTIME_API gr_top_block_sptr gr_make_top_block(const std::string &name);
 
   gr_top_block_impl *d_impl;
 
diff --git a/gnuradio-core/src/lib/runtime/gr_tpb_detail.h b/gnuradio-runtime/include/gr_tpb_detail.h
index 69feb60073..398e18cdc8 100644
--- a/gnuradio-core/src/lib/runtime/gr_tpb_detail.h
+++ b/gnuradio-runtime/include/gr_tpb_detail.h
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GR_TPB_DETAIL_H
 #define INCLUDED_GR_TPB_DETAIL_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gruel/thread.h>
 #include <deque>
 #include <gruel/pmt.h>
@@ -31,7 +31,7 @@ class gr_block_detail;
 /*!
  * \brief used by thread-per-block scheduler
  */
-struct GR_CORE_API gr_tpb_detail {
+struct GR_RUNTIME_API gr_tpb_detail {
 
   gruel::mutex			mutex;			//< protects all vars
   bool				input_changed;
diff --git a/gnuradio-core/src/lib/runtime/gr_types.h b/gnuradio-runtime/include/gr_types.h
index db13e456aa..47e22469b0 100644
--- a/gnuradio-core/src/lib/runtime/gr_types.h
+++ b/gnuradio-runtime/include/gr_types.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2013 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_TYPES_H
 #define INCLUDED_GR_TYPES_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <boost/shared_ptr.hpp>
 #include <vector>
 #include <stddef.h>				// size_t
diff --git a/gnuradio-core/src/lib/runtime/gr_unittests.h b/gnuradio-runtime/include/gr_unittests.h
index 9fbf228cd0..730ca7f884 100644
--- a/gnuradio-core/src/lib/runtime/gr_unittests.h
+++ b/gnuradio-runtime/include/gr_unittests.h
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/gnuradio-core/src/lib/runtime/ice_application_base.h b/gnuradio-runtime/include/ice_application_base.h
index 799ab9c21e..f25c7272fc 100644
--- a/gnuradio-core/src/lib/runtime/ice_application_base.h
+++ b/gnuradio-runtime/include/ice_application_base.h
@@ -23,7 +23,7 @@
 #ifndef ICE_APPLICATION_BASE_H
 #define ICE_APPLICATION_BASE_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_prefs.h>
 #include <Ice/Ice.h>
 #include <boost/thread.hpp>
@@ -39,7 +39,7 @@ namespace {
 };
 
 
-class GR_CORE_API ice_application_common : public Ice::Application 
+class GR_RUNTIME_API ice_application_common : public Ice::Application 
 {
  public:
   template<typename TserverBase, typename TserverClass> friend class ice_application_base;
diff --git a/gnuradio-core/src/lib/runtime/ice_server_template.h b/gnuradio-runtime/include/ice_server_template.h
index 8ddb03cc8e..8ddb03cc8e 100644
--- a/gnuradio-core/src/lib/runtime/ice_server_template.h
+++ b/gnuradio-runtime/include/ice_server_template.h
diff --git a/gnuradio-core/src/lib/runtime/pycallback_object.h b/gnuradio-runtime/include/pycallback_object.h
index 922e03393e..922e03393e 100644
--- a/gnuradio-core/src/lib/runtime/pycallback_object.h
+++ b/gnuradio-runtime/include/pycallback_object.h
diff --git a/gnuradio-core/src/lib/general/random.h b/gnuradio-runtime/include/random.h
index c643c3e422..c643c3e422 100644
--- a/gnuradio-core/src/lib/general/random.h
+++ b/gnuradio-runtime/include/random.h
diff --git a/gnuradio-core/src/lib/runtime/rpccallbackregister_base.h b/gnuradio-runtime/include/rpccallbackregister_base.h
index dbfda4ed47..dbfda4ed47 100644
--- a/gnuradio-core/src/lib/runtime/rpccallbackregister_base.h
+++ b/gnuradio-runtime/include/rpccallbackregister_base.h
diff --git a/gnuradio-core/src/lib/runtime/rpcmanager.h b/gnuradio-runtime/include/rpcmanager.h
index 8cb176b2e5..6e1e181c3c 100644
--- a/gnuradio-core/src/lib/runtime/rpcmanager.h
+++ b/gnuradio-runtime/include/rpcmanager.h
@@ -23,13 +23,13 @@
 #ifndef RPCMANAGER_H
 #define RPCMANAGER_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <rpcmanager_base.h>
 #include <rpcserver_booter_aggregator.h>
 #include <memory>
 #include <iostream>
 
-class GR_CORE_API rpcmanager : public virtual rpcmanager_base
+class GR_RUNTIME_API rpcmanager : public virtual rpcmanager_base
 {
  public:
   rpcmanager();
diff --git a/gnuradio-core/src/lib/runtime/rpcmanager_base.h b/gnuradio-runtime/include/rpcmanager_base.h
index 60425c4a15..60425c4a15 100644
--- a/gnuradio-core/src/lib/runtime/rpcmanager_base.h
+++ b/gnuradio-runtime/include/rpcmanager_base.h
diff --git a/gnuradio-core/src/lib/runtime/rpcpmtconverters_ice.h b/gnuradio-runtime/include/rpcpmtconverters_ice.h
index 4403b96a2a..4403b96a2a 100644
--- a/gnuradio-core/src/lib/runtime/rpcpmtconverters_ice.h
+++ b/gnuradio-runtime/include/rpcpmtconverters_ice.h
diff --git a/gnuradio-core/src/lib/runtime/rpcregisterhelpers.h b/gnuradio-runtime/include/rpcregisterhelpers.h
index 1be3769ac8..1be3769ac8 100644
--- a/gnuradio-core/src/lib/runtime/rpcregisterhelpers.h
+++ b/gnuradio-runtime/include/rpcregisterhelpers.h
diff --git a/gnuradio-core/src/lib/runtime/rpcserver_aggregator.h b/gnuradio-runtime/include/rpcserver_aggregator.h
index 050d9bb1e5..050d9bb1e5 100644
--- a/gnuradio-core/src/lib/runtime/rpcserver_aggregator.h
+++ b/gnuradio-runtime/include/rpcserver_aggregator.h
diff --git a/gnuradio-core/src/lib/runtime/rpcserver_base.h b/gnuradio-runtime/include/rpcserver_base.h
index bc985c8d53..bc985c8d53 100644
--- a/gnuradio-core/src/lib/runtime/rpcserver_base.h
+++ b/gnuradio-runtime/include/rpcserver_base.h
diff --git a/gnuradio-core/src/lib/runtime/rpcserver_booter_aggregator.h b/gnuradio-runtime/include/rpcserver_booter_aggregator.h
index da190a0be1..38739a1b50 100644
--- a/gnuradio-core/src/lib/runtime/rpcserver_booter_aggregator.h
+++ b/gnuradio-runtime/include/rpcserver_booter_aggregator.h
@@ -23,7 +23,7 @@
 #ifndef RPCSERVER_BOOTER_AGGREGATOR
 #define RPCSERVER_BOOTER_AGGREGATOR
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <rpcserver_booter_base.h>
 #include <rpcserver_aggregator.h>
 #include <boost/shared_ptr.hpp>
@@ -31,7 +31,7 @@
 
 class rpcserver_server;
 
-class GR_CORE_API rpcserver_booter_aggregator :
+class GR_RUNTIME_API rpcserver_booter_aggregator :
   public virtual rpcserver_booter_base
 {
  public:
diff --git a/gnuradio-core/src/lib/runtime/rpcserver_booter_base.h b/gnuradio-runtime/include/rpcserver_booter_base.h
index 682944dada..682944dada 100644
--- a/gnuradio-core/src/lib/runtime/rpcserver_booter_base.h
+++ b/gnuradio-runtime/include/rpcserver_booter_base.h
diff --git a/gnuradio-core/src/lib/runtime/rpcserver_booter_ice.h b/gnuradio-runtime/include/rpcserver_booter_ice.h
index 69dfcc7602..69dfcc7602 100644
--- a/gnuradio-core/src/lib/runtime/rpcserver_booter_ice.h
+++ b/gnuradio-runtime/include/rpcserver_booter_ice.h
diff --git a/gnuradio-core/src/lib/runtime/rpcserver_ice.h b/gnuradio-runtime/include/rpcserver_ice.h
index 66ed8d5156..66ed8d5156 100644
--- a/gnuradio-core/src/lib/runtime/rpcserver_ice.h
+++ b/gnuradio-runtime/include/rpcserver_ice.h
diff --git a/gnuradio-core/src/lib/runtime/rpcserver_selector.h b/gnuradio-runtime/include/rpcserver_selector.h
index fa63c9a2dc..fa63c9a2dc 100644
--- a/gnuradio-core/src/lib/runtime/rpcserver_selector.h
+++ b/gnuradio-runtime/include/rpcserver_selector.h
diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt
new file mode 100644
index 0000000000..b8ece6e772
--- /dev/null
+++ b/gnuradio-runtime/lib/CMakeLists.txt
@@ -0,0 +1,256 @@
+# Copyright 2013 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(GrMiscUtils)
+GR_CHECK_HDR_N_DEF(sys/resource.h HAVE_SYS_RESOURCE_H)
+
+########################################################################
+# Handle the generated constants
+########################################################################
+execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
+    "import time;print time.strftime('%a, %d %b %Y %H:%M:%S', time.gmtime())"
+    OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+message(STATUS "Loading build date ${BUILD_DATE} into gr_constants...")
+message(STATUS "Loading version ${VERSION} into gr_constants...")
+
+#double escape for windows backslash path separators
+string(REPLACE "\\" "\\\\" prefix ${prefix})
+string(REPLACE "\\" "\\\\" SYSCONFDIR ${SYSCONFDIR})
+string(REPLACE "\\" "\\\\" GR_PREFSDIR ${GR_PREFSDIR})
+
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_constants.cc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gr_constants.cc
+@ONLY)
+
+list(APPEND gnuradio_runtime_sources ${CMAKE_CURRENT_BINARY_DIR}/gr_constants.cc)
+
+########################################################################
+# Include subdirs rather to populate to the sources lists.
+########################################################################
+#GR_INCLUDE_SUBDIRECTORY(foo)
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(${GNURADIO_RUNTIME_INCLUDE_DIRS}
+                    ${CMAKE_CURRENT_SOURCE_DIR}
+		    ${CMAKE_CURRENT_BINARY_DIR}/../include/
+                    ${Boost_INCLUDE_DIRS}
+                    ${GRUEL_INCLUDE_DIRS}
+		    ${VOLK_INCLUDE_DIRS}
+)
+
+########################################################################
+# Setup library
+########################################################################
+list(APPEND gnuradio_runtime_sources
+  complex_vec_test.cc
+  gr_basic_block.cc
+  gr_block.cc
+  gr_block_detail.cc
+  gr_block_executor.cc
+  gr_block_gateway.cc
+  gr_block_registry.cc
+  gr_buffer.cc
+  gr_circular_file.cc
+  gr_dispatcher.cc
+  gr_error_handler.cc
+  gr_fast_atan2f.cc
+  gr_feval.cc
+  gr_flat_flowgraph.cc
+  gr_flowgraph.cc
+  gr_fxpt.cc
+  gr_hier_block2.cc
+  gr_hier_block2_detail.cc
+  gri_debugger_hook.cc
+  gr_io_signature.cc
+  gr_local_sighandler.cc
+  gr_logger.cc
+  gr_message.cc
+  gr_misc.cc
+  gr_msg_accepter.cc
+  gr_msg_handler.cc
+  gr_msg_queue.cc
+  gr_pagesize.cc
+  gr_preferences.cc
+  gr_prefs.cc
+  gr_random.cc
+  gr_realtime.cc
+  gr_reverse.cc
+  gr_scheduler.cc
+  gr_scheduler_sts.cc
+  gr_scheduler_tpb.cc
+  gr_select_handler.cc
+  gr_sincos.c
+  gr_single_threaded_scheduler.cc
+  gr_sptr_magic.cc
+  gr_sync_block.cc
+  gr_sync_decimator.cc
+  gr_sync_interpolator.cc
+  gr_sys_paths.cc
+  gr_tagged_stream_block.cc
+  gr_test.cc
+  gr_top_block.cc
+  gr_top_block_impl.cc
+  gr_tpb_detail.cc
+  gr_tpb_thread_body.cc
+  gr_vmcircbuf.cc
+  gr_vmcircbuf_createfilemapping.cc
+  gr_vmcircbuf_mmap_shm_open.cc
+  gr_vmcircbuf_mmap_tmpfile.cc
+  gr_vmcircbuf_sysv_shm.cc
+  malloc16.c
+)
+
+# PowerPC workaround for posix_memalign
+# Might not be needed, but we'll keep it for now.
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
+    list(APPEND gnuradio_core_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/posix_memalign.cc
+    )
+endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
+
+list(APPEND gnuradio_runtime_libs
+    gruel
+    volk
+    ${Boost_LIBRARIES}
+)
+
+#need to link with librt on ubuntu 11.10 for shm_*
+if(LINUX)
+    list(APPEND gnuradio_runtime_libs rt)
+endif()
+
+if(ENABLE_GR_CTRLPORT)
+
+# Add definition so we can compile in ControlPort to the blocks.
+ADD_DEFINITIONS(-DGR_CTRLPORT)
+
+########################################################################
+# Run ICE To compile Slice files
+########################################################################
+EXECUTE_PROCESS(
+   COMMAND "${ICE_SLICE2CPP}" "-I${CMAKE_CURRENT_SOURCE_DIR}"
+       "--output-dir=${CMAKE_CURRENT_BINARY_DIR}"
+       "${CMAKE_CURRENT_SOURCE_DIR}/gnuradio.ice"
+   )
+
+list(APPEND gnuradio_runtime_sources
+    ice_application_base.cc
+    rpcmanager.cc
+    rpcpmtconverters_ice.cc
+    rpcserver_aggregator.cc
+    rpcserver_booter_aggregator.cc
+    rpcserver_booter_ice.cc
+    rpcserver_ice.cc
+    rpcserver_selector.cc
+    rpcpmtconverters_ice.cc
+)
+
+# Append generated file in build directory
+list(APPEND gnuradio_runtime_sources 
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio.cpp
+)
+
+########################################################################
+# Add controlport stuff to gnuradio-runtime
+########################################################################
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+list(APPEND gnuradio_runtime_libs
+  ${ICE_LIBRARIES}
+)
+
+endif(ENABLE_GR_CTRLPORT)
+
+########################################################################
+# Control availability of vmcircbuf methods.
+# For now, only allows disabling of shm methods, which cause uncatchable
+#    segmentation faults on Cygwin with gcc 4.x (x <= 5)
+# Usage:
+#   GR_VMCIRCBUF()
+#
+# Will set TRY_SHM_VMCIRCBUF to 1 by default except on Windows machines.
+# Can manually set with -DTRY_SHM_VMCIRCBUF=0|1
+########################################################################
+
+if(WIN32)
+    OPTION(TRY_SHM_VMCIRCBUF "Try SHM VMCIRCBUF" OFF)
+else(WIN32)
+    OPTION(TRY_SHM_VMCIRCBUF "Try SHM VMCIRCBUF" ON)
+endif(WIN32)
+
+message(STATUS "TRY_SHM_VMCIRCBUF set to ${TRY_SHM_VMCIRCBUF}.")
+
+if(TRY_SHM_VMCIRCBUF)
+    add_definitions( -DTRY_SHM_VMCIRCBUF )
+endif(TRY_SHM_VMCIRCBUF)
+
+add_library(gnuradio-runtime SHARED ${gnuradio_runtime_sources})
+target_link_libraries(gnuradio-runtime ${gnuradio_runtime_libs})
+GR_LIBRARY_FOO(gnuradio-runtime RUNTIME_COMPONENT "runtime" DEVEL_COMPONENT "runtime_devel")
+set_target_properties(gnuradio-runtime PROPERTIES LINK_INTERFACE_LIBRARIES "gruel")
+
+add_dependencies(gnuradio-runtime
+  runtime_generated_includes
+)
+
+########################################################################
+# Setup tests
+########################################################################
+if(ENABLE_TESTING)
+include(GrTest)
+
+########################################################################
+# Append gnuradio-runtime test sources
+########################################################################
+list(APPEND test_gnuradio_runtime_sources
+  qa_gr_buffer.cc
+  qa_gr_circular_file.cc
+  qa_gr_fxpt.cc
+  qa_gr_fxpt_nco.cc
+  qa_gr_fxpt_vco.cc
+  qa_gr_io_signature.cc
+  qa_gr_logger.cc
+  qa_gr_math.cc
+  qa_gr_vmcircbuf.cc
+  qa_runtime.cc
+  qa_sincos.cc
+)
+
+include_directories(${CPPUNIT_INCLUDE_DIRS})
+link_directories(${CPPUNIT_LIBRARY_DIRS})
+
+add_library(test-gnuradio-runtime SHARED ${test_gnuradio_runtime_sources})
+target_link_libraries(test-gnuradio-runtime gnuradio-runtime ${CPPUNIT_LIBRARIES} ${Boost_LIBRARIES})
+
+########################################################################
+# Build the test executable
+# Set the test environment so the build libs will be found under MSVC.
+########################################################################
+list(APPEND GR_TEST_TARGET_DEPS test-gnuradio-runtime)
+add_executable(gr_runtime_test test_runtime.cc)
+target_link_libraries(gr_runtime_test test-gnuradio-runtime)
+GR_ADD_TEST(gr-runtime-test gr_runtime_test)
+
+endif(ENABLE_TESTING)
+
diff --git a/gnuradio-core/src/lib/runtime/ICE_LICENSE b/gnuradio-runtime/lib/ICE_LICENSE
index 43ea7572d9..43ea7572d9 100644
--- a/gnuradio-core/src/lib/runtime/ICE_LICENSE
+++ b/gnuradio-runtime/lib/ICE_LICENSE
diff --git a/gnuradio-core/src/lib/general/complex_vec_test.cc b/gnuradio-runtime/lib/complex_vec_test.cc
index 99acc2f355..99acc2f355 100644
--- a/gnuradio-core/src/lib/general/complex_vec_test.cc
+++ b/gnuradio-runtime/lib/complex_vec_test.cc
diff --git a/gnuradio-core/src/lib/general/complex_vec_test.h b/gnuradio-runtime/lib/complex_vec_test.h
index be4de41fb0..bcfa732f41 100644
--- a/gnuradio-core/src/lib/general/complex_vec_test.h
+++ b/gnuradio-runtime/lib/complex_vec_test.h
@@ -1,28 +1,28 @@
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <vector>
 #include <complex>
 
-GR_CORE_API std::vector<std::complex<float> >
+GR_RUNTIME_API std::vector<std::complex<float> >
 complex_vec_test0();
 
-GR_CORE_API std::vector<std::complex<float> >
+GR_RUNTIME_API std::vector<std::complex<float> >
 complex_vec_test1(const std::vector<std::complex<float> > &input);
 
-GR_CORE_API std::complex<float>
+GR_RUNTIME_API std::complex<float>
 complex_scalar_test0();
 
-GR_CORE_API std::complex<float>
+GR_RUNTIME_API std::complex<float>
 complex_scalar_test1(std::complex<float> input);
 
-GR_CORE_API std::vector<int>
+GR_RUNTIME_API std::vector<int>
 int_vec_test0();
 
-GR_CORE_API std::vector<int>
+GR_RUNTIME_API std::vector<int>
 int_vec_test1(const std::vector<int> &input);
 
-GR_CORE_API std::vector<float>
+GR_RUNTIME_API std::vector<float>
 float_vec_test0();
 
-GR_CORE_API std::vector<float>
+GR_RUNTIME_API std::vector<float>
 float_vec_test1(const std::vector<float> &input);
 
diff --git a/gnuradio-core/src/lib/runtime/frontend.ice b/gnuradio-runtime/lib/frontend.ice
index befb5b7a97..befb5b7a97 100644
--- a/gnuradio-core/src/lib/runtime/frontend.ice
+++ b/gnuradio-runtime/lib/frontend.ice
diff --git a/gnuradio-core/src/lib/general/gen_sine_table.py b/gnuradio-runtime/lib/gen_sine_table.py
index d7d11eff11..d7d11eff11 100755
--- a/gnuradio-core/src/lib/general/gen_sine_table.py
+++ b/gnuradio-runtime/lib/gen_sine_table.py
diff --git a/gnuradio-core/src/lib/runtime/gnuradio.ice b/gnuradio-runtime/lib/gnuradio.ice
index e17d91901b..e17d91901b 100644
--- a/gnuradio-core/src/lib/runtime/gnuradio.ice
+++ b/gnuradio-runtime/lib/gnuradio.ice
diff --git a/gnuradio-core/src/lib/runtime/gr_basic_block.cc b/gnuradio-runtime/lib/gr_basic_block.cc
index 35ea797167..35ea797167 100644
--- a/gnuradio-core/src/lib/runtime/gr_basic_block.cc
+++ b/gnuradio-runtime/lib/gr_basic_block.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_block.cc b/gnuradio-runtime/lib/gr_block.cc
index 8c8b85dc7e..8c8b85dc7e 100644
--- a/gnuradio-core/src/lib/runtime/gr_block.cc
+++ b/gnuradio-runtime/lib/gr_block.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_block_detail.cc b/gnuradio-runtime/lib/gr_block_detail.cc
index c85c0e9fba..c85c0e9fba 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_detail.cc
+++ b/gnuradio-runtime/lib/gr_block_detail.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_block_executor.cc b/gnuradio-runtime/lib/gr_block_executor.cc
index e070f3c508..e070f3c508 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_executor.cc
+++ b/gnuradio-runtime/lib/gr_block_executor.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_block_executor.h b/gnuradio-runtime/lib/gr_block_executor.h
index fb7f9c2690..7d5c4949a3 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_executor.h
+++ b/gnuradio-runtime/lib/gr_block_executor.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_BLOCK_EXECUTOR_H
 #define INCLUDED_GR_BLOCK_EXECUTOR_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_runtime_types.h>
 #include <fstream>
 #include <gr_tags.h>
@@ -37,7 +37,7 @@
  * \ingroup internal
  */
 
-class GR_CORE_API gr_block_executor {
+class GR_RUNTIME_API gr_block_executor {
 protected:
   gr_block_sptr			d_block;	// The block we're trying to run
   std::ofstream	       	       *d_log;
diff --git a/gnuradio-core/src/lib/general/gr_block_gateway.cc b/gnuradio-runtime/lib/gr_block_gateway.cc
index 79b42803af..79b42803af 100644
--- a/gnuradio-core/src/lib/general/gr_block_gateway.cc
+++ b/gnuradio-runtime/lib/gr_block_gateway.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_block_registry.cc b/gnuradio-runtime/lib/gr_block_registry.cc
index eaa770dcaf..eaa770dcaf 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_registry.cc
+++ b/gnuradio-runtime/lib/gr_block_registry.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_buffer.cc b/gnuradio-runtime/lib/gr_buffer.cc
index 369959d65f..369959d65f 100644
--- a/gnuradio-core/src/lib/runtime/gr_buffer.cc
+++ b/gnuradio-runtime/lib/gr_buffer.cc
diff --git a/gnuradio-core/src/lib/general/gr_circular_file.cc b/gnuradio-runtime/lib/gr_circular_file.cc
index 6f710c49b1..6f710c49b1 100644
--- a/gnuradio-core/src/lib/general/gr_circular_file.cc
+++ b/gnuradio-runtime/lib/gr_circular_file.cc
diff --git a/gnuradio-core/src/lib/general/gr_circular_file.h b/gnuradio-runtime/lib/gr_circular_file.h
index ca1f793f37..2b61bf2711 100644
--- a/gnuradio-core/src/lib/general/gr_circular_file.h
+++ b/gnuradio-runtime/lib/gr_circular_file.h
@@ -23,7 +23,7 @@
 #ifndef _GR_CIRCULAR_FILE_H_
 #define _GR_CIRCULAR_FILE_H_
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 
 /*
  * writes input data into a circular buffer on disk.
@@ -37,7 +37,7 @@
  *		      current start of data
  *
  */
-class GR_CORE_API gr_circular_file {
+class GR_RUNTIME_API gr_circular_file {
   int		 d_fd;
   int		*d_header;
   unsigned char	*d_buffer;
diff --git a/gnuradio-core/src/lib/general/gr_constants.cc.in b/gnuradio-runtime/lib/gr_constants.cc.in
index b94f254d66..b94f254d66 100644
--- a/gnuradio-core/src/lib/general/gr_constants.cc.in
+++ b/gnuradio-runtime/lib/gr_constants.cc.in
diff --git a/gnuradio-core/src/lib/runtime/gr_dispatcher.cc b/gnuradio-runtime/lib/gr_dispatcher.cc
index 96ebe9ad8b..96ebe9ad8b 100644
--- a/gnuradio-core/src/lib/runtime/gr_dispatcher.cc
+++ b/gnuradio-runtime/lib/gr_dispatcher.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_error_handler.cc b/gnuradio-runtime/lib/gr_error_handler.cc
index 448682966e..448682966e 100644
--- a/gnuradio-core/src/lib/runtime/gr_error_handler.cc
+++ b/gnuradio-runtime/lib/gr_error_handler.cc
diff --git a/gnuradio-core/src/lib/general/gr_fast_atan2f.cc b/gnuradio-runtime/lib/gr_fast_atan2f.cc
index 8b7bfea12e..8b7bfea12e 100644
--- a/gnuradio-core/src/lib/general/gr_fast_atan2f.cc
+++ b/gnuradio-runtime/lib/gr_fast_atan2f.cc
diff --git a/gnuradio-core/src/lib/general/gr_feval.cc b/gnuradio-runtime/lib/gr_feval.cc
index 89f09984cf..89f09984cf 100644
--- a/gnuradio-core/src/lib/general/gr_feval.cc
+++ b/gnuradio-runtime/lib/gr_feval.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_flat_flowgraph.cc b/gnuradio-runtime/lib/gr_flat_flowgraph.cc
index de1e227ef0..de1e227ef0 100644
--- a/gnuradio-core/src/lib/runtime/gr_flat_flowgraph.cc
+++ b/gnuradio-runtime/lib/gr_flat_flowgraph.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_flat_flowgraph.h b/gnuradio-runtime/lib/gr_flat_flowgraph.h
index 3cd3228f41..9c47a77e23 100644
--- a/gnuradio-core/src/lib/runtime/gr_flat_flowgraph.h
+++ b/gnuradio-runtime/lib/gr_flat_flowgraph.h
@@ -23,23 +23,23 @@
 #ifndef INCLUDED_GR_FLAT_FLOWGRAPH_H
 #define INCLUDED_GR_FLAT_FLOWGRAPH_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_flowgraph.h>
 #include <gr_block.h>
 
 // Create a shared pointer to a heap allocated gr_flat_flowgraph
 // (types defined in gr_runtime_types.h)
-GR_CORE_API gr_flat_flowgraph_sptr gr_make_flat_flowgraph();
+GR_RUNTIME_API gr_flat_flowgraph_sptr gr_make_flat_flowgraph();
 
 /*!
  *\brief Class specializing gr_flat_flowgraph that has all nodes
  * as gr_blocks, with no hierarchy
  * \ingroup internal
  */
-class GR_CORE_API gr_flat_flowgraph : public gr_flowgraph
+class GR_RUNTIME_API gr_flat_flowgraph : public gr_flowgraph
 {
 public:
-  friend GR_CORE_API gr_flat_flowgraph_sptr gr_make_flat_flowgraph();
+  friend GR_RUNTIME_API gr_flat_flowgraph_sptr gr_make_flat_flowgraph();
 
   // Destruct an arbitrary gr_flat_flowgraph
   ~gr_flat_flowgraph();
diff --git a/gnuradio-core/src/lib/runtime/gr_flowgraph.cc b/gnuradio-runtime/lib/gr_flowgraph.cc
index 63a2084802..63a2084802 100644
--- a/gnuradio-core/src/lib/runtime/gr_flowgraph.cc
+++ b/gnuradio-runtime/lib/gr_flowgraph.cc
diff --git a/gnuradio-core/src/lib/general/gr_fxpt.cc b/gnuradio-runtime/lib/gr_fxpt.cc
index 2ea8520e6b..2ea8520e6b 100644
--- a/gnuradio-core/src/lib/general/gr_fxpt.cc
+++ b/gnuradio-runtime/lib/gr_fxpt.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2.cc b/gnuradio-runtime/lib/gr_hier_block2.cc
index 9e924fdaf5..9e924fdaf5 100644
--- a/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
+++ b/gnuradio-runtime/lib/gr_hier_block2.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc b/gnuradio-runtime/lib/gr_hier_block2_detail.cc
index c8564f6698..c8564f6698 100644
--- a/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc
+++ b/gnuradio-runtime/lib/gr_hier_block2_detail.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.h b/gnuradio-runtime/lib/gr_hier_block2_detail.h
index b38dae3016..d08fe20ac0 100644
--- a/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.h
+++ b/gnuradio-runtime/lib/gr_hier_block2_detail.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_GR_HIER_BLOCK2_DETAIL_H
 #define INCLUDED_GR_HIER_BLOCK2_DETAIL_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_hier_block2.h>
 #include <gr_flat_flowgraph.h>
 #include <boost/utility.hpp>
@@ -30,7 +30,7 @@
 /*!
  * \ingroup internal
  */
-class GR_CORE_API gr_hier_block2_detail : boost::noncopyable
+class GR_RUNTIME_API gr_hier_block2_detail : boost::noncopyable
 {
 public:
   gr_hier_block2_detail(gr_hier_block2 *owner);
diff --git a/gnuradio-core/src/lib/runtime/gr_io_signature.cc b/gnuradio-runtime/lib/gr_io_signature.cc
index 6ac9acd17d..6ac9acd17d 100644
--- a/gnuradio-core/src/lib/runtime/gr_io_signature.cc
+++ b/gnuradio-runtime/lib/gr_io_signature.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc b/gnuradio-runtime/lib/gr_local_sighandler.cc
index fb31742e13..fb31742e13 100644
--- a/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc
+++ b/gnuradio-runtime/lib/gr_local_sighandler.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_local_sighandler.h b/gnuradio-runtime/lib/gr_local_sighandler.h
index a30e2c13a5..a49ee031ca 100644
--- a/gnuradio-core/src/lib/runtime/gr_local_sighandler.h
+++ b/gnuradio-runtime/lib/gr_local_sighandler.h
@@ -27,7 +27,7 @@
 #include <signal.h>
 #endif
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <string>
 
 /*!
@@ -37,7 +37,7 @@
  * Constructor installs new handler, destructor reinstalls
  * original value.
  */
-class GR_CORE_API gr_local_sighandler {
+class GR_RUNTIME_API gr_local_sighandler {
   int			d_signum;
 #ifdef HAVE_SIGACTION
   struct sigaction	d_old_action;
@@ -53,7 +53,7 @@ public:
 /*!
  * \brief Representation of signal.
  */
-class GR_CORE_API gr_signal
+class GR_RUNTIME_API gr_signal
 {
   int	d_signum;
 public:
diff --git a/gnuradio-core/src/lib/runtime/gr_logger.cc b/gnuradio-runtime/lib/gr_logger.cc
index 7e0116d036..7e0116d036 100644
--- a/gnuradio-core/src/lib/runtime/gr_logger.cc
+++ b/gnuradio-runtime/lib/gr_logger.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_message.cc b/gnuradio-runtime/lib/gr_message.cc
index a99dcd7653..a99dcd7653 100644
--- a/gnuradio-core/src/lib/runtime/gr_message.cc
+++ b/gnuradio-runtime/lib/gr_message.cc
diff --git a/gnuradio-core/src/lib/general/gr_misc.cc b/gnuradio-runtime/lib/gr_misc.cc
index 1ed2a03d7f..1ed2a03d7f 100644
--- a/gnuradio-core/src/lib/general/gr_misc.cc
+++ b/gnuradio-runtime/lib/gr_misc.cc
diff --git a/gnuradio-core/src/lib/general/qa_general.h b/gnuradio-runtime/lib/gr_misc.h
index bf52cddc1a..182ae87de6 100644
--- a/gnuradio-core/src/lib/general/qa_general.h
+++ b/gnuradio-runtime/lib/gr_misc.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2002 Free Software Foundation, Inc.
+ * Copyright 2005 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -20,19 +20,20 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef _QA_GENERAL_H_
-#define _QA_GENERAL_H_
+#ifndef INCLUDED_GR_MISC_H
+#define INCLUDED_GR_MISC_H
 
-#include <gruel/attributes.h>
-#include <cppunit/TestSuite.h>
+#include <gr_runtime_api.h>
+#include <gr_types.h>
 
-//! collect all the tests for the gr directory
+GR_RUNTIME_API unsigned int
+gr_rounduppow2(unsigned int n);
 
-class __GR_ATTR_EXPORT qa_general {
- public:
-  //! return suite of tests for all of gr directory
-  static CppUnit::TestSuite *suite ();
-};
+// FIXME should be template
+GR_RUNTIME_API void gr_zero_vector(std::vector<float> &v);
+GR_RUNTIME_API void gr_zero_vector(std::vector<double> &v);
+GR_RUNTIME_API void gr_zero_vector(std::vector<int> &v);
+GR_RUNTIME_API void gr_zero_vector(std::vector<gr_complex> &v);
 
 
-#endif /* _QA_GENERAL_H_ */
+#endif /* INCLUDED_GR_MISC_H */
diff --git a/gnuradio-core/src/lib/runtime/gr_msg_accepter.cc b/gnuradio-runtime/lib/gr_msg_accepter.cc
index 93d5fb20e8..93d5fb20e8 100644
--- a/gnuradio-core/src/lib/runtime/gr_msg_accepter.cc
+++ b/gnuradio-runtime/lib/gr_msg_accepter.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_msg_handler.cc b/gnuradio-runtime/lib/gr_msg_handler.cc
index 0f93497088..0f93497088 100644
--- a/gnuradio-core/src/lib/runtime/gr_msg_handler.cc
+++ b/gnuradio-runtime/lib/gr_msg_handler.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_msg_queue.cc b/gnuradio-runtime/lib/gr_msg_queue.cc
index 0cf0467715..0cf0467715 100644
--- a/gnuradio-core/src/lib/runtime/gr_msg_queue.cc
+++ b/gnuradio-runtime/lib/gr_msg_queue.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_pagesize.cc b/gnuradio-runtime/lib/gr_pagesize.cc
index e31e05ca70..e31e05ca70 100644
--- a/gnuradio-core/src/lib/runtime/gr_pagesize.cc
+++ b/gnuradio-runtime/lib/gr_pagesize.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_pagesize.h b/gnuradio-runtime/lib/gr_pagesize.h
index 3e2daa9255..d14cb22b1b 100644
--- a/gnuradio-core/src/lib/runtime/gr_pagesize.h
+++ b/gnuradio-runtime/lib/gr_pagesize.h
@@ -22,13 +22,13 @@
 #ifndef _GR_PAGESIZE_H_
 #define _GR_PAGESIZE_H_
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 
 /*!
  * \brief return the page size in bytes
  */
 
-GR_CORE_API int gr_pagesize ();
+GR_RUNTIME_API int gr_pagesize ();
 
 
 #endif /* _GR_PAGESIZE_H_ */
 \ No newline at end of file
diff --git a/gnuradio-core/src/lib/runtime/gr_preferences.cc b/gnuradio-runtime/lib/gr_preferences.cc
index a0f5616603..a0f5616603 100644
--- a/gnuradio-core/src/lib/runtime/gr_preferences.cc
+++ b/gnuradio-runtime/lib/gr_preferences.cc
diff --git a/gnuradio-core/src/lib/general/gr_prefs.cc b/gnuradio-runtime/lib/gr_prefs.cc
index 8a79c3335f..8a79c3335f 100644
--- a/gnuradio-core/src/lib/general/gr_prefs.cc
+++ b/gnuradio-runtime/lib/gr_prefs.cc
diff --git a/gnuradio-core/src/lib/general/gr_random.cc b/gnuradio-runtime/lib/gr_random.cc
index 323839acc7..323839acc7 100644
--- a/gnuradio-core/src/lib/general/gr_random.cc
+++ b/gnuradio-runtime/lib/gr_random.cc
diff --git a/gnuradio-core/src/lib/general/qa_general.cc b/gnuradio-runtime/lib/gr_random.h
index 121551b050..783c05f920 100644
--- a/gnuradio-core/src/lib/general/qa_general.cc
+++ b/gnuradio-runtime/lib/gr_random.h
@@ -1,3 +1,4 @@
+/* -*- c++ -*- */
 /*
  * Copyright 2002 Free Software Foundation, Inc.
  *
@@ -19,31 +20,46 @@
  * Boston, MA 02110-1301, USA.
  */
 
-/*
- * This class gathers together all the test cases for the gr
- * directory into a single test suite.  As you create new test cases,
- * add them here.
+#ifndef INCLUDED_GR_RANDOM_H
+#define INCLUDED_GR_RANDOM_H
+
+#include <gr_runtime_api.h>
+#include <gr_complex.h>
+
+/*!
+ * \brief pseudo random number generator
+ * \ingroup math_blk
  */
+class GR_RUNTIME_API gr_random {
+protected:
+  static const int NTAB  = 32;
+  long  d_seed;
+  long  d_iy;
+  long  d_iv[NTAB];
+  int	d_iset;
+  float	d_gset;
+
+
+public:
+  gr_random (long seed=3021);
+
+  void reseed (long seed);
+
+  /*!
+   * \brief uniform random deviate in the range [0.0, 1.0)
+   */
+  float ran1 ();
+
+  /*!
+   * \brief normally distributed deviate with zero mean and variance 1
+   */
+  float gasdev ();
+
+  float laplacian ();
+  float impulse (float factor);
+  float rayleigh ();
+  gr_complex rayleigh_complex ();
+};
+
+#endif /* INCLUDED_GR_RANDOM_H */
 
-#include <qa_general.h>
-#include <qa_gr_circular_file.h>
-#include <qa_gr_fxpt.h>
-#include <qa_gr_fxpt_nco.h>
-#include <qa_gr_fxpt_vco.h>
-#include <qa_gr_math.h>
-#include <qa_sincos.h>
-
-CppUnit::TestSuite *
-qa_general::suite ()
-{
-  CppUnit::TestSuite	*s = new CppUnit::TestSuite ("general");
-
-  s->addTest (qa_gr_circular_file::suite ());
-  s->addTest (qa_gr_fxpt::suite ());
-  s->addTest (qa_gr_fxpt_nco::suite ());
-  s->addTest (qa_gr_fxpt_vco::suite ());
-  s->addTest (qa_gr_math::suite ());
-  s->addTest(gr::analog::qa_sincos::suite());
-
-  return s;
-}
diff --git a/gnuradio-core/src/lib/runtime/gr_realtime.cc b/gnuradio-runtime/lib/gr_realtime.cc
index 75b497999d..75b497999d 100644
--- a/gnuradio-core/src/lib/runtime/gr_realtime.cc
+++ b/gnuradio-runtime/lib/gr_realtime.cc
diff --git a/gnuradio-core/src/lib/general/gr_reverse.cc b/gnuradio-runtime/lib/gr_reverse.cc
index 08c588cb55..08c588cb55 100644
--- a/gnuradio-core/src/lib/general/gr_reverse.cc
+++ b/gnuradio-runtime/lib/gr_reverse.cc
diff --git a/gnuradio-core/src/lib/general/gr_reverse.h b/gnuradio-runtime/lib/gr_reverse.h
index 15bf3cb73a..aa8619619f 100644
--- a/gnuradio-core/src/lib/general/gr_reverse.h
+++ b/gnuradio-runtime/lib/gr_reverse.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_GR_REVERSE_H
 #define INCLUDED_GR_REVERSE_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <vector>
 #include <gr_complex.h>
 
diff --git a/gnuradio-core/src/lib/runtime/gr_scheduler.cc b/gnuradio-runtime/lib/gr_scheduler.cc
index c691f5d99f..c691f5d99f 100644
--- a/gnuradio-core/src/lib/runtime/gr_scheduler.cc
+++ b/gnuradio-runtime/lib/gr_scheduler.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_scheduler.h b/gnuradio-runtime/lib/gr_scheduler.h
index 6d130327fc..097f575c21 100644
--- a/gnuradio-core/src/lib/runtime/gr_scheduler.h
+++ b/gnuradio-runtime/lib/gr_scheduler.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_GR_SCHEDULER_H
 #define INCLUDED_GR_SCHEDULER_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <boost/utility.hpp>
 #include <gr_block.h>
 #include <gr_flat_flowgraph.h>
@@ -37,7 +37,7 @@ typedef boost::shared_ptr<gr_scheduler> gr_scheduler_sptr;
  *
  * Preconditions: details, buffers and buffer readers have been assigned.
  */
-class GR_CORE_API gr_scheduler : boost::noncopyable
+class GR_RUNTIME_API gr_scheduler : boost::noncopyable
 {
 
 public:
diff --git a/gnuradio-core/src/lib/runtime/gr_scheduler_sts.cc b/gnuradio-runtime/lib/gr_scheduler_sts.cc
index 2c96def6d1..2c96def6d1 100644
--- a/gnuradio-core/src/lib/runtime/gr_scheduler_sts.cc
+++ b/gnuradio-runtime/lib/gr_scheduler_sts.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_scheduler_sts.h b/gnuradio-runtime/lib/gr_scheduler_sts.h
index 011874ec0a..43b97b62c1 100644
--- a/gnuradio-core/src/lib/runtime/gr_scheduler_sts.h
+++ b/gnuradio-runtime/lib/gr_scheduler_sts.h
@@ -21,14 +21,14 @@
 #ifndef INCLUDED_GR_SCHEDULER_STS_H
 #define INCLUDED_GR_SCHEDULER_STS_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_scheduler.h>
 #include <gruel/thread_group.h>
 
 /*!
  * \brief Concrete scheduler that uses the single_threaded_scheduler
  */
-class GR_CORE_API gr_scheduler_sts : public gr_scheduler
+class GR_RUNTIME_API gr_scheduler_sts : public gr_scheduler
 {
   gruel::thread_group		       d_threads;
 
diff --git a/gnuradio-core/src/lib/runtime/gr_scheduler_tpb.cc b/gnuradio-runtime/lib/gr_scheduler_tpb.cc
index 2824eb1b3b..2824eb1b3b 100644
--- a/gnuradio-core/src/lib/runtime/gr_scheduler_tpb.cc
+++ b/gnuradio-runtime/lib/gr_scheduler_tpb.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_scheduler_tpb.h b/gnuradio-runtime/lib/gr_scheduler_tpb.h
index a9b3abcfa6..d978dd28e1 100644
--- a/gnuradio-core/src/lib/runtime/gr_scheduler_tpb.h
+++ b/gnuradio-runtime/lib/gr_scheduler_tpb.h
@@ -21,14 +21,14 @@
 #ifndef INCLUDED_GR_SCHEDULER_TPB_H
 #define INCLUDED_GR_SCHEDULER_TPB_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_scheduler.h>
 #include <gruel/thread_group.h>
 
 /*!
  * \brief Concrete scheduler that uses a kernel thread-per-block
  */
-class GR_CORE_API gr_scheduler_tpb : public gr_scheduler
+class GR_RUNTIME_API gr_scheduler_tpb : public gr_scheduler
 {
   gruel::thread_group		       d_threads;
 
diff --git a/gnuradio-core/src/lib/runtime/gr_select_handler.cc b/gnuradio-runtime/lib/gr_select_handler.cc
index 0fc86354a6..0fc86354a6 100644
--- a/gnuradio-core/src/lib/runtime/gr_select_handler.cc
+++ b/gnuradio-runtime/lib/gr_select_handler.cc
diff --git a/gnuradio-core/src/lib/general/gr_sincos.c b/gnuradio-runtime/lib/gr_sincos.c
index a8d01b0da4..a8d01b0da4 100644
--- a/gnuradio-core/src/lib/general/gr_sincos.c
+++ b/gnuradio-runtime/lib/gr_sincos.c
diff --git a/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.cc b/gnuradio-runtime/lib/gr_single_threaded_scheduler.cc
index 1bb9e9b0a8..1bb9e9b0a8 100644
--- a/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.cc
+++ b/gnuradio-runtime/lib/gr_single_threaded_scheduler.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc b/gnuradio-runtime/lib/gr_sptr_magic.cc
index 7fdadf24a2..7fdadf24a2 100644
--- a/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc
+++ b/gnuradio-runtime/lib/gr_sptr_magic.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_sync_block.cc b/gnuradio-runtime/lib/gr_sync_block.cc
index 94efcdc8ee..94efcdc8ee 100644
--- a/gnuradio-core/src/lib/runtime/gr_sync_block.cc
+++ b/gnuradio-runtime/lib/gr_sync_block.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_sync_decimator.cc b/gnuradio-runtime/lib/gr_sync_decimator.cc
index a0f907db53..a0f907db53 100644
--- a/gnuradio-core/src/lib/runtime/gr_sync_decimator.cc
+++ b/gnuradio-runtime/lib/gr_sync_decimator.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_sync_interpolator.cc b/gnuradio-runtime/lib/gr_sync_interpolator.cc
index ece873c14a..ece873c14a 100644
--- a/gnuradio-core/src/lib/runtime/gr_sync_interpolator.cc
+++ b/gnuradio-runtime/lib/gr_sync_interpolator.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_sys_paths.cc b/gnuradio-runtime/lib/gr_sys_paths.cc
index b4918af33d..b4918af33d 100644
--- a/gnuradio-core/src/lib/runtime/gr_sys_paths.cc
+++ b/gnuradio-runtime/lib/gr_sys_paths.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_tagged_stream_block.cc b/gnuradio-runtime/lib/gr_tagged_stream_block.cc
index 32b6a09033..32b6a09033 100644
--- a/gnuradio-core/src/lib/runtime/gr_tagged_stream_block.cc
+++ b/gnuradio-runtime/lib/gr_tagged_stream_block.cc
diff --git a/gnuradio-core/src/lib/general/gr_test.cc b/gnuradio-runtime/lib/gr_test.cc
index cd5ef83611..cd5ef83611 100644
--- a/gnuradio-core/src/lib/general/gr_test.cc
+++ b/gnuradio-runtime/lib/gr_test.cc
diff --git a/gnuradio-core/src/lib/general/gr_test.h b/gnuradio-runtime/lib/gr_test.h
index caeba4c511..2276ab1967 100644
--- a/gnuradio-core/src/lib/general/gr_test.h
+++ b/gnuradio-runtime/lib/gr_test.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_TEST_H
 #define INCLUDED_GR_TEST_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_block.h>
 #include <string>
 #include "gr_test_types.h"
@@ -32,7 +32,7 @@ class gr_test;
 typedef boost::shared_ptr<gr_test> gr_test_sptr;
 
 // public constructor
-GR_CORE_API gr_test_sptr gr_make_test (const std::string &name=std::string("gr_test"),
+GR_RUNTIME_API gr_test_sptr gr_make_test (const std::string &name=std::string("gr_test"),
         int min_inputs=1, int max_inputs=1, unsigned int sizeof_input_item=1,
         int min_outputs=1, int max_outputs=1, unsigned int sizeof_output_item=1,
         unsigned int history=1,unsigned int output_multiple=1,double relative_rate=1.0,
@@ -51,7 +51,7 @@ GR_CORE_API gr_test_sptr gr_make_test (const std::string &name=std::string("gr_t
  * The runtime system should detect this and create large enough buffers
  * all through the signal chain.
  */
-class GR_CORE_API gr_test : public gr_block {
+class GR_RUNTIME_API gr_test : public gr_block {
 
  public:
 
@@ -184,7 +184,7 @@ int general_work (int noutput_items,
 
 
 
-  friend GR_CORE_API gr_test_sptr gr_make_test (const std::string &name,int min_inputs, int max_inputs, unsigned int sizeof_input_item,
+  friend GR_RUNTIME_API gr_test_sptr gr_make_test (const std::string &name,int min_inputs, int max_inputs, unsigned int sizeof_input_item,
                                    int min_outputs, int max_outputs, unsigned int sizeof_output_item,
                                    unsigned int history,unsigned int output_multiple,double relative_rate,
                                    bool fixed_rate,gr_consume_type_t cons_type, gr_produce_type_t prod_type);
diff --git a/gnuradio-core/src/lib/general/gr_test_types.h b/gnuradio-runtime/lib/gr_test_types.h
index 04f38f7b26..04f38f7b26 100644
--- a/gnuradio-core/src/lib/general/gr_test_types.h
+++ b/gnuradio-runtime/lib/gr_test_types.h
diff --git a/gnuradio-core/src/lib/runtime/gr_top_block.cc b/gnuradio-runtime/lib/gr_top_block.cc
index c6118bcfdd..c6118bcfdd 100644
--- a/gnuradio-core/src/lib/runtime/gr_top_block.cc
+++ b/gnuradio-runtime/lib/gr_top_block.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc b/gnuradio-runtime/lib/gr_top_block_impl.cc
index b6d427ce27..b6d427ce27 100644
--- a/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
+++ b/gnuradio-runtime/lib/gr_top_block_impl.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_top_block_impl.h b/gnuradio-runtime/lib/gr_top_block_impl.h
index 3e4da332ae..7293531090 100644
--- a/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
+++ b/gnuradio-runtime/lib/gr_top_block_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GR_TOP_BLOCK_IMPL_H
 #define INCLUDED_GR_TOP_BLOCK_IMPL_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_scheduler.h>
 #include <gruel/thread.h>
 
@@ -35,7 +35,7 @@
  * decoupling of changes from dependent classes.
  *
  */
-class GR_CORE_API gr_top_block_impl
+class GR_RUNTIME_API gr_top_block_impl
 {
 public:
   gr_top_block_impl(gr_top_block *owner);
diff --git a/gnuradio-core/src/lib/runtime/gr_tpb_detail.cc b/gnuradio-runtime/lib/gr_tpb_detail.cc
index 46eb6bbe0d..46eb6bbe0d 100644
--- a/gnuradio-core/src/lib/runtime/gr_tpb_detail.cc
+++ b/gnuradio-runtime/lib/gr_tpb_detail.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_tpb_thread_body.cc b/gnuradio-runtime/lib/gr_tpb_thread_body.cc
index 679fd15124..679fd15124 100644
--- a/gnuradio-core/src/lib/runtime/gr_tpb_thread_body.cc
+++ b/gnuradio-runtime/lib/gr_tpb_thread_body.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_tpb_thread_body.h b/gnuradio-runtime/lib/gr_tpb_thread_body.h
index f920663a2a..6ecb022f69 100644
--- a/gnuradio-core/src/lib/runtime/gr_tpb_thread_body.h
+++ b/gnuradio-runtime/lib/gr_tpb_thread_body.h
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GR_TPB_THREAD_BODY_H
 #define INCLUDED_GR_TPB_THREAD_BODY_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_block_executor.h>
 #include <gr_block.h>
 #include <gr_block_detail.h>
@@ -34,7 +34,7 @@
  * done or is interrupted.
  */
 
-class GR_CORE_API gr_tpb_thread_body {
+class GR_RUNTIME_API gr_tpb_thread_body {
   gr_block_executor	d_exec;
 
 public:
diff --git a/gnuradio-core/src/lib/general/gr_vco.h b/gnuradio-runtime/lib/gr_vco.h
index 3ceaf15dd4..3ceaf15dd4 100644
--- a/gnuradio-core/src/lib/general/gr_vco.h
+++ b/gnuradio-runtime/lib/gr_vco.h
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc b/gnuradio-runtime/lib/gr_vmcircbuf.cc
index 522d9515d0..522d9515d0 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc
+++ b/gnuradio-runtime/lib/gr_vmcircbuf.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf.h b/gnuradio-runtime/lib/gr_vmcircbuf.h
index 45c6f969c1..e7f492a8bd 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf.h
+++ b/gnuradio-runtime/lib/gr_vmcircbuf.h
@@ -23,14 +23,14 @@
 #ifndef _GR_VMCIRCBUF_H_
 #define _GR_VMCIRCBUF_H_
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <vector>
 
 /*!
  * \brief abstract class to implement doubly mapped virtual memory circular buffers
  * \ingroup internal
  */
-class GR_CORE_API gr_vmcircbuf {
+class GR_RUNTIME_API gr_vmcircbuf {
  protected:
   int	 d_size;
   char	*d_base;
@@ -49,7 +49,7 @@ class GR_CORE_API gr_vmcircbuf {
 /*!
  * \brief abstract factory for creating circular buffers
  */
-class GR_CORE_API gr_vmcircbuf_factory {
+class GR_RUNTIME_API gr_vmcircbuf_factory {
  protected:
   gr_vmcircbuf_factory () {};
   virtual ~gr_vmcircbuf_factory ();
@@ -77,7 +77,7 @@ class GR_CORE_API gr_vmcircbuf_factory {
 /*
  * \brief pulls together all implementations of gr_vmcircbuf
  */
-class GR_CORE_API gr_vmcircbuf_sysconfig {
+class GR_RUNTIME_API gr_vmcircbuf_sysconfig {
  public:
 
   /*
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_createfilemapping.cc b/gnuradio-runtime/lib/gr_vmcircbuf_createfilemapping.cc
index 1b4d9700a5..1b4d9700a5 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_createfilemapping.cc
+++ b/gnuradio-runtime/lib/gr_vmcircbuf_createfilemapping.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_createfilemapping.h b/gnuradio-runtime/lib/gr_vmcircbuf_createfilemapping.h
index 5ef31f5c65..a4bb5cbe92 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_createfilemapping.h
+++ b/gnuradio-runtime/lib/gr_vmcircbuf_createfilemapping.h
@@ -23,7 +23,7 @@
 #ifndef _GR_VMCIRCBUF_CREATEFILEMAPPING_H_
 #define _GR_VMCIRCBUF_CREATEFILEMAPPING_H_
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_vmcircbuf.h>
 
 #ifdef HAVE_CREATEFILEMAPPING
@@ -33,7 +33,7 @@
  * \brief concrete class to implement circular buffers with mmap and shm_open
  * \ingroup internal
  */
-class GR_CORE_API gr_vmcircbuf_createfilemapping : public gr_vmcircbuf
+class GR_RUNTIME_API gr_vmcircbuf_createfilemapping : public gr_vmcircbuf
 {
  public:
    // CREATORS
@@ -50,7 +50,7 @@ class GR_CORE_API gr_vmcircbuf_createfilemapping : public gr_vmcircbuf
 /*!
  * \brief concrete factory for circular buffers built using mmap and shm_open
  */
-class GR_CORE_API gr_vmcircbuf_createfilemapping_factory : public gr_vmcircbuf_factory
+class GR_RUNTIME_API gr_vmcircbuf_createfilemapping_factory : public gr_vmcircbuf_factory
 {
  private:
   static gr_vmcircbuf_factory *s_the_factory;
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_shm_open.cc b/gnuradio-runtime/lib/gr_vmcircbuf_mmap_shm_open.cc
index 3d170081d0..3d170081d0 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_shm_open.cc
+++ b/gnuradio-runtime/lib/gr_vmcircbuf_mmap_shm_open.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_shm_open.h b/gnuradio-runtime/lib/gr_vmcircbuf_mmap_shm_open.h
index bcbbbac424..d35df80839 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_shm_open.h
+++ b/gnuradio-runtime/lib/gr_vmcircbuf_mmap_shm_open.h
@@ -23,14 +23,14 @@
 #ifndef _GR_VMCIRCBUF_MMAP_SHM_OPEN_H_
 #define _GR_VMCIRCBUF_MMAP_SHM_OPEN_H_
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_vmcircbuf.h>
 
 /*!
  * \brief concrete class to implement circular buffers with mmap and shm_open
  * \ingroup internal
  */
-class GR_CORE_API gr_vmcircbuf_mmap_shm_open : public gr_vmcircbuf {
+class GR_RUNTIME_API gr_vmcircbuf_mmap_shm_open : public gr_vmcircbuf {
  public:
 
   // CREATORS
@@ -42,7 +42,7 @@ class GR_CORE_API gr_vmcircbuf_mmap_shm_open : public gr_vmcircbuf {
 /*!
  * \brief concrete factory for circular buffers built using mmap and shm_open
  */
-class GR_CORE_API gr_vmcircbuf_mmap_shm_open_factory : public gr_vmcircbuf_factory {
+class GR_RUNTIME_API gr_vmcircbuf_mmap_shm_open_factory : public gr_vmcircbuf_factory {
  private:
   static gr_vmcircbuf_factory	*s_the_factory;
 
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc b/gnuradio-runtime/lib/gr_vmcircbuf_mmap_tmpfile.cc
index 35de64699e..35de64699e 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc
+++ b/gnuradio-runtime/lib/gr_vmcircbuf_mmap_tmpfile.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.h b/gnuradio-runtime/lib/gr_vmcircbuf_mmap_tmpfile.h
index 28ff314908..cd865734f2 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.h
+++ b/gnuradio-runtime/lib/gr_vmcircbuf_mmap_tmpfile.h
@@ -23,14 +23,14 @@
 #ifndef _GR_VMCIRCBUF_MMAP_TMPFILE_H_
 #define _GR_VMCIRCBUF_MMAP_TMPFILE_H_
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_vmcircbuf.h>
 
 /*!
  * \brief concrete class to implement circular buffers with mmap and shm_open
  * \ingroup internal
  */
-class GR_CORE_API gr_vmcircbuf_mmap_tmpfile : public gr_vmcircbuf {
+class GR_RUNTIME_API gr_vmcircbuf_mmap_tmpfile : public gr_vmcircbuf {
  public:
 
   // CREATORS
@@ -42,7 +42,7 @@ class GR_CORE_API gr_vmcircbuf_mmap_tmpfile : public gr_vmcircbuf {
 /*!
  * \brief concrete factory for circular buffers built using mmap and shm_open
  */
-class GR_CORE_API gr_vmcircbuf_mmap_tmpfile_factory : public gr_vmcircbuf_factory {
+class GR_RUNTIME_API gr_vmcircbuf_mmap_tmpfile_factory : public gr_vmcircbuf_factory {
  private:
   static gr_vmcircbuf_factory	*s_the_factory;
 
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.cc b/gnuradio-runtime/lib/gr_vmcircbuf_sysv_shm.cc
index d9cf75e70f..d9cf75e70f 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.cc
+++ b/gnuradio-runtime/lib/gr_vmcircbuf_sysv_shm.cc
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.h b/gnuradio-runtime/lib/gr_vmcircbuf_sysv_shm.h
index 9f5c04f0d6..abebd93f1c 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.h
+++ b/gnuradio-runtime/lib/gr_vmcircbuf_sysv_shm.h
@@ -23,14 +23,14 @@
 #ifndef _GR_VMCIRCBUF_SYSV_SHM_H_
 #define _GR_VMCIRCBUF_SYSV_SHM_H_
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 #include <gr_vmcircbuf.h>
 
 /*!
  * \brief concrete class to implement circular buffers with mmap and shm_open
  * \ingroup internal
  */
-class GR_CORE_API gr_vmcircbuf_sysv_shm : public gr_vmcircbuf {
+class GR_RUNTIME_API gr_vmcircbuf_sysv_shm : public gr_vmcircbuf {
  public:
 
   // CREATORS
@@ -42,7 +42,7 @@ class GR_CORE_API gr_vmcircbuf_sysv_shm : public gr_vmcircbuf {
 /*!
  * \brief concrete factory for circular buffers built using mmap and shm_open
  */
-class GR_CORE_API gr_vmcircbuf_sysv_shm_factory : public gr_vmcircbuf_factory {
+class GR_RUNTIME_API gr_vmcircbuf_sysv_shm_factory : public gr_vmcircbuf_factory {
  private:
   static gr_vmcircbuf_factory	*s_the_factory;
 
diff --git a/gnuradio-core/src/lib/general/gri_debugger_hook.cc b/gnuradio-runtime/lib/gri_debugger_hook.cc
index d9270c435f..d9270c435f 100644
--- a/gnuradio-core/src/lib/general/gri_debugger_hook.cc
+++ b/gnuradio-runtime/lib/gri_debugger_hook.cc
diff --git a/gnuradio-core/src/lib/general/gri_debugger_hook.h b/gnuradio-runtime/lib/gri_debugger_hook.h
index c871c7bf67..6d31ed1b2c 100644
--- a/gnuradio-core/src/lib/general/gri_debugger_hook.h
+++ b/gnuradio-runtime/lib/gri_debugger_hook.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_GRI_DEBUGGER_HOOK_H
 #define INCLUDED_GRI_DEBUGGER_HOOK_H
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 
-GR_CORE_API void gri_debugger_hook ();
+GR_RUNTIME_API void gri_debugger_hook ();
 
 #endif /* INCLUDED_GRI_DEBUGGER_HOOK_H */
 \ No newline at end of file
diff --git a/gnuradio-core/src/lib/runtime/ice_application_base.cc b/gnuradio-runtime/lib/ice_application_base.cc
index 88db6056c1..88db6056c1 100644
--- a/gnuradio-core/src/lib/runtime/ice_application_base.cc
+++ b/gnuradio-runtime/lib/ice_application_base.cc
diff --git a/gnuradio-core/src/lib/general/malloc16.c b/gnuradio-runtime/lib/malloc16.c
index 2cc6135e77..2cc6135e77 100644
--- a/gnuradio-core/src/lib/general/malloc16.c
+++ b/gnuradio-runtime/lib/malloc16.c
diff --git a/gnuradio-core/src/lib/general/malloc16.h b/gnuradio-runtime/lib/malloc16.h
index eaa32c6251..90d1eca77a 100644
--- a/gnuradio-core/src/lib/general/malloc16.h
+++ b/gnuradio-runtime/lib/malloc16.h
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <gr_core_api.h>
+#include <gr_runtime_api.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -28,9 +28,9 @@ extern "C" {
 
 #include <stdlib.h>
 
-GR_CORE_API void *malloc16Align(int size);
-GR_CORE_API void *calloc16Align(size_t nmemb,size_t size);
-GR_CORE_API void free16Align(void *p);
+GR_RUNTIME_API void *malloc16Align(int size);
+GR_RUNTIME_API void *calloc16Align(size_t nmemb,size_t size);
+GR_RUNTIME_API void free16Align(void *p);
 
 #ifdef __cplusplus
 }
diff --git a/gnuradio-core/src/lib/missing/posix_memalign.cc b/gnuradio-runtime/lib/posix_memalign.cc
index aaeff78042..aaeff78042 100644
--- a/gnuradio-core/src/lib/missing/posix_memalign.cc
+++ b/gnuradio-runtime/lib/posix_memalign.cc
diff --git a/gnuradio-core/src/lib/missing/posix_memalign.h b/gnuradio-runtime/lib/posix_memalign.h
index ea79ced2ef..ea79ced2ef 100644
--- a/gnuradio-core/src/lib/missing/posix_memalign.h
+++ b/gnuradio-runtime/lib/posix_memalign.h
diff --git a/gnuradio-core/src/lib/runtime/qa_gr_buffer.cc b/gnuradio-runtime/lib/qa_gr_buffer.cc
index c74baf398e..c74baf398e 100644
--- a/gnuradio-core/src/lib/runtime/qa_gr_buffer.cc
+++ b/gnuradio-runtime/lib/qa_gr_buffer.cc
diff --git a/gnuradio-core/src/lib/runtime/qa_gr_buffer.h b/gnuradio-runtime/lib/qa_gr_buffer.h
index 2937c24b68..2937c24b68 100644
--- a/gnuradio-core/src/lib/runtime/qa_gr_buffer.h
+++ b/gnuradio-runtime/lib/qa_gr_buffer.h
diff --git a/gnuradio-core/src/lib/general/qa_gr_circular_file.cc b/gnuradio-runtime/lib/qa_gr_circular_file.cc
index 243e44784b..243e44784b 100644
--- a/gnuradio-core/src/lib/general/qa_gr_circular_file.cc
+++ b/gnuradio-runtime/lib/qa_gr_circular_file.cc
diff --git a/gnuradio-core/src/lib/general/qa_gr_circular_file.h b/gnuradio-runtime/lib/qa_gr_circular_file.h
index df35ab077b..df35ab077b 100644
--- a/gnuradio-core/src/lib/general/qa_gr_circular_file.h
+++ b/gnuradio-runtime/lib/qa_gr_circular_file.h
diff --git a/gnuradio-core/src/lib/general/qa_gr_fxpt.cc b/gnuradio-runtime/lib/qa_gr_fxpt.cc
index 7eac0d8964..7eac0d8964 100644
--- a/gnuradio-core/src/lib/general/qa_gr_fxpt.cc
+++ b/gnuradio-runtime/lib/qa_gr_fxpt.cc
diff --git a/gnuradio-core/src/lib/general/qa_gr_fxpt.h b/gnuradio-runtime/lib/qa_gr_fxpt.h
index 72211563e7..72211563e7 100644
--- a/gnuradio-core/src/lib/general/qa_gr_fxpt.h
+++ b/gnuradio-runtime/lib/qa_gr_fxpt.h
diff --git a/gnuradio-core/src/lib/general/qa_gr_fxpt_nco.cc b/gnuradio-runtime/lib/qa_gr_fxpt_nco.cc
index 6f208eac80..6f208eac80 100644
--- a/gnuradio-core/src/lib/general/qa_gr_fxpt_nco.cc
+++ b/gnuradio-runtime/lib/qa_gr_fxpt_nco.cc
diff --git a/gnuradio-core/src/lib/general/qa_gr_fxpt_nco.h b/gnuradio-runtime/lib/qa_gr_fxpt_nco.h
index 8998922bbb..8998922bbb 100644
--- a/gnuradio-core/src/lib/general/qa_gr_fxpt_nco.h
+++ b/gnuradio-runtime/lib/qa_gr_fxpt_nco.h
diff --git a/gnuradio-core/src/lib/general/qa_gr_fxpt_vco.cc b/gnuradio-runtime/lib/qa_gr_fxpt_vco.cc
index 5b6993a30c..5b6993a30c 100644
--- a/gnuradio-core/src/lib/general/qa_gr_fxpt_vco.cc
+++ b/gnuradio-runtime/lib/qa_gr_fxpt_vco.cc
diff --git a/gnuradio-core/src/lib/general/qa_gr_fxpt_vco.h b/gnuradio-runtime/lib/qa_gr_fxpt_vco.h
index fab8022e36..fab8022e36 100644
--- a/gnuradio-core/src/lib/general/qa_gr_fxpt_vco.h
+++ b/gnuradio-runtime/lib/qa_gr_fxpt_vco.h
diff --git a/gnuradio-core/src/lib/runtime/qa_gr_io_signature.cc b/gnuradio-runtime/lib/qa_gr_io_signature.cc
index c1737ffb8e..c1737ffb8e 100644
--- a/gnuradio-core/src/lib/runtime/qa_gr_io_signature.cc
+++ b/gnuradio-runtime/lib/qa_gr_io_signature.cc
diff --git a/gnuradio-core/src/lib/runtime/qa_gr_io_signature.h b/gnuradio-runtime/lib/qa_gr_io_signature.h
index 9cd6bb5247..9cd6bb5247 100644
--- a/gnuradio-core/src/lib/runtime/qa_gr_io_signature.h
+++ b/gnuradio-runtime/lib/qa_gr_io_signature.h
diff --git a/gnuradio-core/src/lib/runtime/qa_gr_logger.cc b/gnuradio-runtime/lib/qa_gr_logger.cc
index a8e4a1d766..a8e4a1d766 100644
--- a/gnuradio-core/src/lib/runtime/qa_gr_logger.cc
+++ b/gnuradio-runtime/lib/qa_gr_logger.cc
diff --git a/gnuradio-core/src/lib/runtime/qa_gr_logger.h b/gnuradio-runtime/lib/qa_gr_logger.h
index b0d3711523..b0d3711523 100644
--- a/gnuradio-core/src/lib/runtime/qa_gr_logger.h
+++ b/gnuradio-runtime/lib/qa_gr_logger.h
diff --git a/gnuradio-core/src/lib/general/qa_gr_math.cc b/gnuradio-runtime/lib/qa_gr_math.cc
index 74d51b536e..74d51b536e 100644
--- a/gnuradio-core/src/lib/general/qa_gr_math.cc
+++ b/gnuradio-runtime/lib/qa_gr_math.cc
diff --git a/gnuradio-core/src/lib/general/qa_gr_math.h b/gnuradio-runtime/lib/qa_gr_math.h
index 86858c03d5..86858c03d5 100644
--- a/gnuradio-core/src/lib/general/qa_gr_math.h
+++ b/gnuradio-runtime/lib/qa_gr_math.h
diff --git a/gnuradio-core/src/lib/runtime/qa_gr_vmcircbuf.cc b/gnuradio-runtime/lib/qa_gr_vmcircbuf.cc
index e3b36d8829..e3b36d8829 100644
--- a/gnuradio-core/src/lib/runtime/qa_gr_vmcircbuf.cc
+++ b/gnuradio-runtime/lib/qa_gr_vmcircbuf.cc
diff --git a/gnuradio-core/src/lib/runtime/qa_gr_vmcircbuf.h b/gnuradio-runtime/lib/qa_gr_vmcircbuf.h
index 3576660d5a..3576660d5a 100644
--- a/gnuradio-core/src/lib/runtime/qa_gr_vmcircbuf.h
+++ b/gnuradio-runtime/lib/qa_gr_vmcircbuf.h
diff --git a/gnuradio-core/src/lib/runtime/qa_runtime.cc b/gnuradio-runtime/lib/qa_runtime.cc
index f02fbd7d66..b15051c2ad 100644
--- a/gnuradio-core/src/lib/runtime/qa_runtime.cc
+++ b/gnuradio-runtime/lib/qa_runtime.cc
@@ -30,28 +30,32 @@
 #endif
 
 #include <qa_runtime.h>
-#include <qa_gr_vmcircbuf.h>
+#include <qa_gr_buffer.h>
+#include <qa_gr_circular_file.h>
+#include <qa_gr_fxpt.h>
+#include <qa_gr_fxpt_nco.h>
+#include <qa_gr_fxpt_vco.h>
 #include <qa_gr_io_signature.h>
 #include <qa_gr_logger.h>
-#include <qa_gr_buffer.h>
-#include <qa_set_msg_handler.h>
+#include <qa_gr_math.h>
+#include <qa_gr_vmcircbuf.h>
+#include <qa_sincos.h>
 
 CppUnit::TestSuite *
 qa_runtime::suite ()
 {
   CppUnit::TestSuite	*s = new CppUnit::TestSuite ("runtime");
 
-  s->addTest (qa_gr_vmcircbuf::suite ());
+  s->addTest (qa_gr_buffer::suite ());
+  s->addTest (qa_gr_circular_file::suite ());
+  s->addTest (qa_gr_fxpt::suite ());
+  s->addTest (qa_gr_fxpt_nco::suite ());
+  s->addTest (qa_gr_fxpt_vco::suite ());
   s->addTest (qa_gr_io_signature::suite ());
-  s->addTest (qa_gr_block::suite ());
-  s->addTest (qa_gr_flowgraph::suite ());
   s->addTest (qa_gr_logger::suite ());
-  s->addTest (qa_gr_top_block::suite ());
-  s->addTest (qa_gr_hier_block2::suite ());
-  s->addTest (qa_gr_hier_block2_derived::suite ());
-  s->addTest (qa_gr_buffer::suite ());
-  s->addTest (qa_block_tags::suite ());
-  s->addTest (qa_set_msg_handler::suite ());
+  s->addTest (qa_gr_math::suite ());
+  s->addTest (qa_gr_vmcircbuf::suite ());
+  s->addTest (qa_sincos::suite ());
 
   return s;
 }
diff --git a/gnuradio-core/src/lib/runtime/qa_runtime.h b/gnuradio-runtime/lib/qa_runtime.h
index da71cbd0f4..da71cbd0f4 100644
--- a/gnuradio-core/src/lib/runtime/qa_runtime.h
+++ b/gnuradio-runtime/lib/qa_runtime.h
diff --git a/gnuradio-core/src/lib/general/qa_sincos.cc b/gnuradio-runtime/lib/qa_sincos.cc
index 0066ff6b92..54be957546 100644
--- a/gnuradio-core/src/lib/general/qa_sincos.cc
+++ b/gnuradio-runtime/lib/qa_sincos.cc
@@ -30,46 +30,40 @@
 #include <cppunit/TestAssert.h>
 #include <cmath>
 
-namespace gr {
-  namespace analog {
+void
+qa_sincos::t1()
+{
+  static const unsigned int N = 1000;
+  double c_sin, c_cos;
+  double gr_sin, gr_cos;
+  
+  for(unsigned i = 0; i < N; i++) {
+    double x = i/100.0;
+    c_sin = sin(x);
+    c_cos = cos(x);
+    
+    gr_sincos(x, &gr_sin, &gr_cos);
+    
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(c_sin, gr_sin, 0.0001);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(c_cos, gr_cos, 0.0001);
+  }
+}
 
-    void
-    qa_sincos::t1()
-    {
-      static const unsigned int N = 1000;
-      double c_sin, c_cos;
-      double gr_sin, gr_cos;
-
-      for(unsigned i = 0; i < N; i++) {
-	double x = i/100.0;
-	c_sin = sin(x);
-	c_cos = cos(x);
-
-	gr_sincos(x, &gr_sin, &gr_cos);
-
-	CPPUNIT_ASSERT_DOUBLES_EQUAL(c_sin, gr_sin, 0.0001);
-	CPPUNIT_ASSERT_DOUBLES_EQUAL(c_cos, gr_cos, 0.0001);
-      }
-    }
-
-    void
-    qa_sincos::t2()
-    {
-      static const unsigned int N = 1000;
-      float c_sin, c_cos;
-      float gr_sin, gr_cos;
-
-      for(unsigned i = 0; i < N; i++) {
-	float x = i/100.0;
-	c_sin = sinf(x);
-	c_cos = cosf(x);
-
-	gr_sincosf(x, &gr_sin, &gr_cos);
-
-	CPPUNIT_ASSERT_DOUBLES_EQUAL(c_sin, gr_sin, 0.0001);
-	CPPUNIT_ASSERT_DOUBLES_EQUAL(c_cos, gr_cos, 0.0001);
-      }
-    }
-
-  } /* namespace analog */
-} /* namespace gr */
+void
+qa_sincos::t2()
+{
+  static const unsigned int N = 1000;
+  float c_sin, c_cos;
+  float gr_sin, gr_cos;
+  
+  for(unsigned i = 0; i < N; i++) {
+    float x = i/100.0;
+    c_sin = sinf(x);
+    c_cos = cosf(x);
+    
+    gr_sincosf(x, &gr_sin, &gr_cos);
+    
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(c_sin, gr_sin, 0.0001);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(c_cos, gr_cos, 0.0001);
+  }
+}
diff --git a/gnuradio-core/src/lib/general/qa_sincos.h b/gnuradio-runtime/lib/qa_sincos.h
index f18e879dd8..c54b75f97f 100644
--- a/gnuradio-core/src/lib/general/qa_sincos.h
+++ b/gnuradio-runtime/lib/qa_sincos.h
@@ -20,28 +20,22 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef _QA_ANALOG_SINCOS_H_
-#define _QA_ANALOG_SINCOS_H_
+#ifndef _QA_SINCOS_H_
+#define _QA_SINCOS_H_
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/TestCase.h>
 
-namespace gr {
-  namespace analog {
+class qa_sincos : public CppUnit::TestCase
+{
+  CPPUNIT_TEST_SUITE(qa_sincos);
+  CPPUNIT_TEST(t1);
+  CPPUNIT_TEST(t2);
+  CPPUNIT_TEST_SUITE_END();
+  
+private:
+  void t1();
+  void t2();
+};
 
-    class qa_sincos : public CppUnit::TestCase
-    {
-      CPPUNIT_TEST_SUITE(qa_sincos);
-      CPPUNIT_TEST(t1);
-      CPPUNIT_TEST(t2);
-      CPPUNIT_TEST_SUITE_END();
-
-    private:
-      void t1();
-      void t2();
-    };
-
-  } /* namespace analog */
-} /* namespace gr */
-
-#endif /* _QA_ANALOG_SINCOS_H_ */
+#endif /* _QA_SINCOS_H_ */
diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i b/gnuradio-runtime/lib/random.h
index fb311d226d..c643c3e422 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_core_runtime.i
+++ b/gnuradio-runtime/lib/random.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2009,2010 Free Software Foundation, Inc.
+ * Copyright 2003, 2008 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -20,15 +20,19 @@
  * Boston, MA 02110-1301, USA.
  */
 
-%include "runtime_swig_doc.i"
+#ifndef _RANDOM_H_
+#define _RANDOM_H_
 
-#ifndef SWIGIMPORTED
-%module(directors="1") gnuradio_core_runtime
-#endif
+// While rand(3) specifies RAND_MAX, random(3) says that the output
+// ranges from 0 to 2^31-1 but does not specify a macro to denote
+// this.  We define RANDOM_MAX for cleanliness.  We must omit the
+// definition for systems that have made the same choice.  (Note that
+// random(3) is from 4.2BSD, and not specified by POSIX.)
 
- //%feature("autodoc", "1");		// generate python docstrings
+#ifndef RANDOM_MAX
+static const int RANDOM_MAX = 2147483647; // 2^31-1
+#endif /* RANDOM_MAX */
 
-#define SW_RUNTIME
-%include "gnuradio.i"				// the common stuff
+#include <stdlib.h>
 
-%include "runtime.i"
+#endif // _RANDOM_H_
diff --git a/gnuradio-core/src/lib/runtime/rpcmanager.cc b/gnuradio-runtime/lib/rpcmanager.cc
index 4d164b63f3..4d164b63f3 100644
--- a/gnuradio-core/src/lib/runtime/rpcmanager.cc
+++ b/gnuradio-runtime/lib/rpcmanager.cc
diff --git a/gnuradio-core/src/lib/runtime/rpcpmtconverters_ice.cc b/gnuradio-runtime/lib/rpcpmtconverters_ice.cc
index 7c8b6041e9..7c8b6041e9 100644
--- a/gnuradio-core/src/lib/runtime/rpcpmtconverters_ice.cc
+++ b/gnuradio-runtime/lib/rpcpmtconverters_ice.cc
diff --git a/gnuradio-core/src/lib/runtime/rpcserver_aggregator.cc b/gnuradio-runtime/lib/rpcserver_aggregator.cc
index d750d64905..d750d64905 100644
--- a/gnuradio-core/src/lib/runtime/rpcserver_aggregator.cc
+++ b/gnuradio-runtime/lib/rpcserver_aggregator.cc
diff --git a/gnuradio-core/src/lib/runtime/rpcserver_booter_aggregator.cc b/gnuradio-runtime/lib/rpcserver_booter_aggregator.cc
index c4c1b03c15..c4c1b03c15 100644
--- a/gnuradio-core/src/lib/runtime/rpcserver_booter_aggregator.cc
+++ b/gnuradio-runtime/lib/rpcserver_booter_aggregator.cc
diff --git a/gnuradio-core/src/lib/runtime/rpcserver_booter_ice.cc b/gnuradio-runtime/lib/rpcserver_booter_ice.cc
index 7cc8cc8938..7cc8cc8938 100644
--- a/gnuradio-core/src/lib/runtime/rpcserver_booter_ice.cc
+++ b/gnuradio-runtime/lib/rpcserver_booter_ice.cc
diff --git a/gnuradio-core/src/lib/runtime/rpcserver_ice.cc b/gnuradio-runtime/lib/rpcserver_ice.cc
index 12229a0688..12229a0688 100644
--- a/gnuradio-core/src/lib/runtime/rpcserver_ice.cc
+++ b/gnuradio-runtime/lib/rpcserver_ice.cc
diff --git a/gnuradio-core/src/lib/runtime/rpcserver_selector.cc b/gnuradio-runtime/lib/rpcserver_selector.cc
index 362d5f060a..362d5f060a 100644
--- a/gnuradio-core/src/lib/runtime/rpcserver_selector.cc
+++ b/gnuradio-runtime/lib/rpcserver_selector.cc
diff --git a/gnuradio-core/src/lib/general/sine_table.h b/gnuradio-runtime/lib/sine_table.h
index 69834943bc..69834943bc 100644
--- a/gnuradio-core/src/lib/general/sine_table.h
+++ b/gnuradio-runtime/lib/sine_table.h
diff --git a/gnuradio-core/src/tests/test_general.cc b/gnuradio-runtime/lib/test_runtime.cc
index 32fac1b35a..bd5378332e 100644
--- a/gnuradio-core/src/tests/test_general.cc
+++ b/gnuradio-runtime/lib/test_runtime.cc
@@ -24,16 +24,16 @@
 #include <cppunit/XmlOutputter.h>
 
 #include <gr_unittests.h>
-#include <qa_general.h>
+#include <qa_runtime.h>
 
 int
 main (int argc, char **argv)
 {
   CppUnit::TextTestRunner runner;
-  std::ofstream xmlfile(get_unittest_path("gnuradio_core_general.xml").c_str());
+  std::ofstream xmlfile(get_unittest_path("gnuradio_core_runtime.xml").c_str());
   CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile);
 
-  runner.addTest (qa_general::suite ());
+  runner.addTest (qa_runtime::suite ());
   runner.setOutputter(xmlout);
 
   bool was_successful = runner.run ("", false);
diff --git a/gnuradio-core/src/python/gnuradio/gru/CMakeLists.txt b/gnuradio-runtime/python/CMakeLists.txt
index 1c50989d96..74adec3f11 100644
--- a/gnuradio-core/src/python/gnuradio/gru/CMakeLists.txt
+++ b/gnuradio-runtime/python/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2010-2011 Free Software Foundation, Inc.
+# Copyright 2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -17,10 +17,7 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
+########################################################################
 include(GrPython)
 
-GR_PYTHON_INSTALL(
-    FILES __init__.py
-    DESTINATION ${GR_PYTHON_DIR}/gnuradio/gru
-    COMPONENT "core_python"
-)
+add_subdirectory(gnuradio)
diff --git a/gnuradio-core/src/python/build_utils.py b/gnuradio-runtime/python/build_utils.py
index cf58a97637..cf58a97637 100644
--- a/gnuradio-core/src/python/build_utils.py
+++ b/gnuradio-runtime/python/build_utils.py
diff --git a/gnuradio-core/src/python/build_utils_codes.py b/gnuradio-runtime/python/build_utils_codes.py
index 9ea96baae4..9ea96baae4 100644
--- a/gnuradio-core/src/python/build_utils_codes.py
+++ b/gnuradio-runtime/python/build_utils_codes.py
diff --git a/gnuradio-core/src/python/gnuradio/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/CMakeLists.txt
index 9b75f20f33..bf5ec331d3 100644
--- a/gnuradio-core/src/python/gnuradio/CMakeLists.txt
+++ b/gnuradio-runtime/python/gnuradio/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2010-2011 Free Software Foundation, Inc.
+# Copyright 2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -17,22 +17,21 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
+########################################################################
 include(GrPython)
 
 add_subdirectory(gr)
 add_subdirectory(gru)
-add_subdirectory(gruimpl)
+add_subdirectory(ctrlport)
 
 if(ENABLE_GR_CTRLPORT)
-add_subdirectory(ctrlport)
+#add_subdirectory(ctrlport)
 endif(ENABLE_GR_CTRLPORT)
 
 GR_PYTHON_INSTALL(FILES
     __init__.py
-    eng_notation.py
-    eng_option.py
     gr_unittest.py
     gr_xmlrunner.py
     DESTINATION ${GR_PYTHON_DIR}/gnuradio
-    COMPONENT "core_python"
+    COMPONENT "runtime_python"
 )
diff --git a/gnuradio-core/src/python/gnuradio/__init__.py b/gnuradio-runtime/python/gnuradio/__init__.py
index d55dac79db..d55dac79db 100644
--- a/gnuradio-core/src/python/gnuradio/__init__.py
+++ b/gnuradio-runtime/python/gnuradio/__init__.py
diff --git a/gnuradio-core/src/python/gnuradio/ctrlport/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
index 994e3a48cf..c68694785f 100644
--- a/gnuradio-core/src/python/gnuradio/ctrlport/CMakeLists.txt
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
@@ -21,15 +21,15 @@
 include(GrPython)
 
 EXECUTE_PROCESS(
-  COMMAND ${ICE_SLICE2PY} -I${CMAKE_SOURCE_DIR}/gnuradio-core/src/lib/runtime
-          --output-dir=${CMAKE_BINARY_DIR}/gnuradio-core/src/python
-          ${CMAKE_SOURCE_DIR}/gnuradio-core/src/lib/runtime/gnuradio.ice
+  COMMAND ${ICE_SLICE2PY} -I${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib
+          --output-dir=${CMAKE_BINARY_DIR}/gnuradio-runtime/python
+          ${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib/gnuradio.ice
 )
 
 EXECUTE_PROCESS(
-  COMMAND ${ICE_SLICE2PY} -I${CMAKE_SOURCE_DIR}/gnuradio-core/src/lib/runtime
-          --output-dir=${CMAKE_BINARY_DIR}/gnuradio-core/src/python
-          ${CMAKE_SOURCE_DIR}/gnuradio-core/src/lib/runtime/frontend.ice
+  COMMAND ${ICE_SLICE2PY} -I${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib
+          --output-dir=${CMAKE_BINARY_DIR}/gnuradio-runtime/python
+          ${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib/frontend.ice
 )
 
 GR_PYTHON_INSTALL(
@@ -45,8 +45,8 @@ GR_PYTHON_INSTALL(
 # information.
 GR_PYTHON_INSTALL(
     FILES
-    ${CMAKE_BINARY_DIR}/gnuradio-core/src/python/gnuradio_ice.py
-    ${CMAKE_BINARY_DIR}/gnuradio-core/src/python/frontend_ice.py
+    ${CMAKE_BINARY_DIR}/gnuradio-runtime/python/gnuradio_ice.py
+    ${CMAKE_BINARY_DIR}/gnuradio-runtime/python/frontend_ice.py
     DESTINATION ${GR_PYTHON_DIR}
     COMPONENT "core_python"
 )
@@ -95,18 +95,3 @@ GR_PYTHON_INSTALL(
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE 
     COMPONENT "core_python"
 )
-
-########################################################################
-# Handle the unit tests
-########################################################################
-if(ENABLE_GR_CTRLPORT)
-  if(ENABLE_TESTING)
-    include(GrTest)
-    file(GLOB py_qa_test_files "qa_*.py")
-    foreach(py_qa_test_file ${py_qa_test_files})
-      get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
-      set(GR_TEST_TARGET_DEPS gruel gnuradio-core)
-      GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
-    endforeach(py_qa_test_file)
-  endif(ENABLE_TESTING)
-endif(ENABLE_GR_CTRLPORT)
diff --git a/gnuradio-core/src/python/gnuradio/ctrlport/GrDataPlotter.py b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py
index 8597ca6497..8597ca6497 100644
--- a/gnuradio-core/src/python/gnuradio/ctrlport/GrDataPlotter.py
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py
diff --git a/gnuradio-core/src/python/gnuradio/ctrlport/IceRadioClient.py b/gnuradio-runtime/python/gnuradio/ctrlport/IceRadioClient.py
index 0964b5a4ba..0964b5a4ba 100644
--- a/gnuradio-core/src/python/gnuradio/ctrlport/IceRadioClient.py
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/IceRadioClient.py
diff --git a/gnuradio-core/src/python/gnuradio/ctrlport/__init__.py b/gnuradio-runtime/python/gnuradio/ctrlport/__init__.py
index 031c3b424e..031c3b424e 100644
--- a/gnuradio-core/src/python/gnuradio/ctrlport/__init__.py
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/__init__.py
diff --git a/gnuradio-core/src/python/gnuradio/ctrlport/gr-ctrlport-curses b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-curses
index 1bee3b1a1e..1bee3b1a1e 100755
--- a/gnuradio-core/src/python/gnuradio/ctrlport/gr-ctrlport-curses
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-curses
diff --git a/gnuradio-core/src/python/gnuradio/ctrlport/gr-ctrlport-monitor b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor
index e71cd92ab7..e71cd92ab7 100755
--- a/gnuradio-core/src/python/gnuradio/ctrlport/gr-ctrlport-monitor
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor
diff --git a/gnuradio-core/src/python/gnuradio/ctrlport/gr-perf-monitor b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitor
index f2c01691a1..f2c01691a1 100755
--- a/gnuradio-core/src/python/gnuradio/ctrlport/gr-perf-monitor
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitor
diff --git a/gnuradio-core/src/python/gnuradio/ctrlport/gr-perf-monitorx b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
index a65b0406e4..a65b0406e4 100755
--- a/gnuradio-core/src/python/gnuradio/ctrlport/gr-perf-monitorx
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
diff --git a/gnuradio-core/src/python/gnuradio/ctrlport/icon.png b/gnuradio-runtime/python/gnuradio/ctrlport/icon.png
index 4beb204428..4beb204428 100644
--- a/gnuradio-core/src/python/gnuradio/ctrlport/icon.png
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/icon.png
diff --git a/gnuradio-core/src/python/gnuradio/ctrlport/monitor.py b/gnuradio-runtime/python/gnuradio/ctrlport/monitor.py
index 53a571a698..53a571a698 100644
--- a/gnuradio-core/src/python/gnuradio/ctrlport/monitor.py
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/monitor.py
diff --git a/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt
index da22a5f987..343577deb8 100644
--- a/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt
+++ b/gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2010-2012 Free Software Foundation, Inc.
+# Copyright 2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -22,18 +22,14 @@ include(GrPython)
 
 GR_PYTHON_INSTALL(FILES
     __init__.py
-    exceptions.py
-    gateway.py
     gr_threading.py
     gr_threading_23.py
     gr_threading_24.py
     hier_block2.py
-    prefs.py
     tag_utils.py
     top_block.py
-    pubsub.py
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/gr
-    COMPONENT "core_python"
+    COMPONENT "runtime_python"
 )
 
 ########################################################################
diff --git a/gnuradio-core/src/python/gnuradio/gr/__init__.py b/gnuradio-runtime/python/gnuradio/gr/__init__.py
index c468437db7..0a6c859bdd 100644
--- a/gnuradio-core/src/python/gnuradio/gr/__init__.py
+++ b/gnuradio-runtime/python/gnuradio/gr/__init__.py
@@ -28,12 +28,12 @@ Core contents.
 # This is the main GNU Radio python module.
 # We pull the swig output and the other modules into the gnuradio.gr namespace
 
-from gnuradio_core import *
+from runtime_swig import *
 from exceptions import *
-from hier_block2 import *
 from top_block import *
-from gateway import basic_block, sync_block, decim_block, interp_block
-from tag_utils import tag_to_python, tag_to_pmt
+from hier_block2 import *
+from tag_utils import *
+#from gateway import basic_block, sync_block, decim_block, interp_block
 
 # Force the preference database to be initialized
-prefs = gr_prefs.singleton
+#from prefs import prefs
diff --git a/gnuradio-core/src/python/gnuradio/gr/exceptions.py b/gnuradio-runtime/python/gnuradio/gr/exceptions.py
index dba04750bc..dba04750bc 100644
--- a/gnuradio-core/src/python/gnuradio/gr/exceptions.py
+++ b/gnuradio-runtime/python/gnuradio/gr/exceptions.py
diff --git a/gnuradio-core/src/python/gnuradio/gr/gateway.py b/gnuradio-runtime/python/gnuradio/gr/gateway.py
index c25755bb57..b595959494 100644
--- a/gnuradio-core/src/python/gnuradio/gr/gateway.py
+++ b/gnuradio-runtime/python/gnuradio/gr/gateway.py
@@ -19,10 +19,10 @@
 # Boston, MA 02110-1301, USA.
 #
 
-import gnuradio_core as gr_core
-from gnuradio_core import io_signature, io_signaturev
-from gnuradio_core import gr_block_gw_message_type
-from gnuradio_core import block_gateway
+import runtime_swig as gr
+from runtime_swig import io_signature, io_signaturev
+from runtime_swig import gr_block_gw_message_type
+from runtime_swig import block_gateway
 import numpy
 
 ########################################################################
@@ -44,7 +44,7 @@ def pointer_to_ndarray(addr, dtype, nitems):
 ########################################################################
 # Handler that does callbacks from C++
 ########################################################################
-class gateway_handler(gr_core.feval_ll):
+class gateway_handler(gr.feval_ll):
 
     #dont put a constructor, it wont work
 
@@ -62,7 +62,7 @@ class gateway_handler(gr_core.feval_ll):
 ########################################################################
 # Handler that does callbacks from C++
 ########################################################################
-class msg_handler(gr_core.feval_p):
+class msg_handler(gr.feval_p):
 
     #dont put a constructor, it wont work
 
@@ -116,7 +116,7 @@ class gateway_block(object):
         prefix = 'gr_block__'
         for attr in [x for x in dir(self.__gateway) if x.startswith(prefix)]:
             setattr(self, attr.replace(prefix, ''), getattr(self.__gateway, attr))
-        self.pop_msg_queue = lambda: gr_core.gr_block_gw_pop_msg_queue_safe(self.__gateway)
+        self.pop_msg_queue = lambda: gr.gr_block_gw_pop_msg_queue_safe(self.__gateway)
 
     def to_basic_block(self):
         """
@@ -208,7 +208,7 @@ class basic_block(gateway_block):
             name=name,
             in_sig=in_sig,
             out_sig=out_sig,
-            work_type=gr_core.GR_BLOCK_GW_WORK_GENERAL,
+            work_type=gr.GR_BLOCK_GW_WORK_GENERAL,
             factor=1, #not relevant factor
         )
 
@@ -218,7 +218,7 @@ class sync_block(gateway_block):
             name=name,
             in_sig=in_sig,
             out_sig=out_sig,
-            work_type=gr_core.GR_BLOCK_GW_WORK_SYNC,
+            work_type=gr.GR_BLOCK_GW_WORK_SYNC,
             factor=1,
         )
 
@@ -228,7 +228,7 @@ class decim_block(gateway_block):
             name=name,
             in_sig=in_sig,
             out_sig=out_sig,
-            work_type=gr_core.GR_BLOCK_GW_WORK_DECIM,
+            work_type=gr.GR_BLOCK_GW_WORK_DECIM,
             factor=decim,
         )
 
@@ -238,6 +238,6 @@ class interp_block(gateway_block):
             name=name,
             in_sig=in_sig,
             out_sig=out_sig,
-            work_type=gr_core.GR_BLOCK_GW_WORK_INTERP,
+            work_type=gr.GR_BLOCK_GW_WORK_INTERP,
             factor=interp,
         )
diff --git a/gnuradio-core/src/python/gnuradio/gr/gr_threading.py b/gnuradio-runtime/python/gnuradio/gr/gr_threading.py
index 5d6f0fdaf9..5d6f0fdaf9 100644
--- a/gnuradio-core/src/python/gnuradio/gr/gr_threading.py
+++ b/gnuradio-runtime/python/gnuradio/gr/gr_threading.py
diff --git a/gnuradio-core/src/python/gnuradio/gr/gr_threading_23.py b/gnuradio-runtime/python/gnuradio/gr/gr_threading_23.py
index dee8034c1c..dee8034c1c 100644
--- a/gnuradio-core/src/python/gnuradio/gr/gr_threading_23.py
+++ b/gnuradio-runtime/python/gnuradio/gr/gr_threading_23.py
diff --git a/gnuradio-core/src/python/gnuradio/gr/gr_threading_24.py b/gnuradio-runtime/python/gnuradio/gr/gr_threading_24.py
index 8539bfc047..8539bfc047 100644
--- a/gnuradio-core/src/python/gnuradio/gr/gr_threading_24.py
+++ b/gnuradio-runtime/python/gnuradio/gr/gr_threading_24.py
diff --git a/gnuradio-core/src/python/gnuradio/gr/hier_block2.py b/gnuradio-runtime/python/gnuradio/gr/hier_block2.py
index ff39b3e709..31e4065a25 100644
--- a/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
+++ b/gnuradio-runtime/python/gnuradio/gr/hier_block2.py
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio_core import hier_block2_swig
+from runtime_swig import hier_block2_swig
 
 try:
     import pmt
diff --git a/gnuradio-core/src/python/gnuradio/gr/prefs.py b/gnuradio-runtime/python/gnuradio/gr/prefs.py
index 25fa8cd6ae..25fa8cd6ae 100644
--- a/gnuradio-core/src/python/gnuradio/gr/prefs.py
+++ b/gnuradio-runtime/python/gnuradio/gr/prefs.py
diff --git a/gnuradio-core/src/python/gnuradio/gr/pubsub.py b/gnuradio-runtime/python/gnuradio/gr/pubsub.py
index 90568418fc..90568418fc 100644
--- a/gnuradio-core/src/python/gnuradio/gr/pubsub.py
+++ b/gnuradio-runtime/python/gnuradio/gr/pubsub.py
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_feval.py b/gnuradio-runtime/python/gnuradio/gr/qa_feval.py
index 9018e12f36..9018e12f36 100755
--- a/gnuradio-core/src/python/gnuradio/gr/qa_feval.py
+++ b/gnuradio-runtime/python/gnuradio/gr/qa_feval.py
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_kludged_imports.py b/gnuradio-runtime/python/gnuradio/gr/qa_kludged_imports.py
index f80188c9fc..f80188c9fc 100755
--- a/gnuradio-core/src/python/gnuradio/gr/qa_kludged_imports.py
+++ b/gnuradio-runtime/python/gnuradio/gr/qa_kludged_imports.py
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_tag_utils.py b/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py
index de1b5aa002..de1b5aa002 100755
--- a/gnuradio-core/src/python/gnuradio/gr/qa_tag_utils.py
+++ b/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py
diff --git a/gnuradio-core/src/python/gnuradio/gr/tag_utils.py b/gnuradio-runtime/python/gnuradio/gr/tag_utils.py
index 923718fc98..1c9594d6d0 100644
--- a/gnuradio-core/src/python/gnuradio/gr/tag_utils.py
+++ b/gnuradio-runtime/python/gnuradio/gr/tag_utils.py
@@ -23,7 +23,10 @@
 try: import pmt
 except: from gruel import pmt
 
-from gnuradio_core import gr_tag_t
+try:
+    from gnuradio import gr
+except ImportError:
+    from runtime_swig import gr_tag_t
 
 class PythonTag(object):
     " Python container for tags "
diff --git a/gnuradio-core/src/python/gnuradio/gr/top_block.py b/gnuradio-runtime/python/gnuradio/gr/top_block.py
index 947e46bc55..944e95e5ae 100644
--- a/gnuradio-core/src/python/gnuradio/gr/top_block.py
+++ b/gnuradio-runtime/python/gnuradio/gr/top_block.py
@@ -19,13 +19,12 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio_core import top_block_swig, \
+from runtime_swig import top_block_swig, \
     top_block_wait_unlocked, top_block_run_unlocked
 
 #import gnuradio.gr.gr_threading as _threading
 import gr_threading as _threading
 
-
 #
 # There is no problem that can't be solved with an additional
 # level of indirection...
diff --git a/gnuradio-core/src/python/gnuradio/gr_unittest.py b/gnuradio-runtime/python/gnuradio/gr_unittest.py
index c729566e88..c729566e88 100755
--- a/gnuradio-core/src/python/gnuradio/gr_unittest.py
+++ b/gnuradio-runtime/python/gnuradio/gr_unittest.py
diff --git a/gnuradio-core/src/python/gnuradio/gr_xmlrunner.py b/gnuradio-runtime/python/gnuradio/gr_xmlrunner.py
index 31298197ff..31298197ff 100644
--- a/gnuradio-core/src/python/gnuradio/gr_xmlrunner.py
+++ b/gnuradio-runtime/python/gnuradio/gr_xmlrunner.py
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt
index d77da24073..c147981472 100644
--- a/gnuradio-core/src/python/gnuradio/gruimpl/CMakeLists.txt
+++ b/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt
@@ -31,6 +31,6 @@ GR_PYTHON_INSTALL(FILES
     seq_with_cursor.py
     socket_stuff.py
     daemon.py
-    DESTINATION ${GR_PYTHON_DIR}/gnuradio/gruimpl
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/gru
     COMPONENT "core_python"
 )
diff --git a/gnuradio-runtime/python/gnuradio/gru/__init__.py b/gnuradio-runtime/python/gnuradio/gru/__init__.py
new file mode 100644
index 0000000000..4e41d03a74
--- /dev/null
+++ b/gnuradio-runtime/python/gnuradio/gru/__init__.py
@@ -0,0 +1,13 @@
+# make this a package
+
+# Import gru stuff
+from daemon import *
+from freqz import *
+from gnuplot_freqz import *
+from hexint import *
+from listmisc import *
+from mathmisc import *
+from msgq_runner import *
+from os_read_exactly import *
+from seq_with_cursor import *
+from socket_stuff import *
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/daemon.py b/gnuradio-runtime/python/gnuradio/gru/daemon.py
index e04702152d..e04702152d 100644
--- a/gnuradio-core/src/python/gnuradio/gruimpl/daemon.py
+++ b/gnuradio-runtime/python/gnuradio/gru/daemon.py
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/freqz.py b/gnuradio-runtime/python/gnuradio/gru/freqz.py
index 60dca64a58..60dca64a58 100644
--- a/gnuradio-core/src/python/gnuradio/gruimpl/freqz.py
+++ b/gnuradio-runtime/python/gnuradio/gru/freqz.py
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/gnuplot_freqz.py b/gnuradio-runtime/python/gnuradio/gru/gnuplot_freqz.py
index 18dcbec3eb..dd483e4277 100755
--- a/gnuradio-core/src/python/gnuradio/gruimpl/gnuplot_freqz.py
+++ b/gnuradio-runtime/python/gnuradio/gru/gnuplot_freqz.py
@@ -28,7 +28,7 @@ import math
 import numpy
 
 from gnuradio import gr
-from gnuradio.gruimpl.freqz import freqz
+from gnuradio.gru.freqz import freqz
 
 
 def gnuplot_freqz (hw, Fs=None, logfreq=False):
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/hexint.py b/gnuradio-runtime/python/gnuradio/gru/hexint.py
index 0fb5ecde04..0fb5ecde04 100644
--- a/gnuradio-core/src/python/gnuradio/gruimpl/hexint.py
+++ b/gnuradio-runtime/python/gnuradio/gru/hexint.py
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/listmisc.py b/gnuradio-runtime/python/gnuradio/gru/listmisc.py
index 9e70eb863c..9e70eb863c 100644
--- a/gnuradio-core/src/python/gnuradio/gruimpl/listmisc.py
+++ b/gnuradio-runtime/python/gnuradio/gru/listmisc.py
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/mathmisc.py b/gnuradio-runtime/python/gnuradio/gru/mathmisc.py
index 7e6f23a346..7e6f23a346 100644
--- a/gnuradio-core/src/python/gnuradio/gruimpl/mathmisc.py
+++ b/gnuradio-runtime/python/gnuradio/gru/mathmisc.py
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/msgq_runner.py b/gnuradio-runtime/python/gnuradio/gru/msgq_runner.py
index 767a74a717..767a74a717 100644
--- a/gnuradio-core/src/python/gnuradio/gruimpl/msgq_runner.py
+++ b/gnuradio-runtime/python/gnuradio/gru/msgq_runner.py
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/os_read_exactly.py b/gnuradio-runtime/python/gnuradio/gru/os_read_exactly.py
index 40b053770e..40b053770e 100644
--- a/gnuradio-core/src/python/gnuradio/gruimpl/os_read_exactly.py
+++ b/gnuradio-runtime/python/gnuradio/gru/os_read_exactly.py
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/seq_with_cursor.py b/gnuradio-runtime/python/gnuradio/gru/seq_with_cursor.py
index def3299b69..def3299b69 100644
--- a/gnuradio-core/src/python/gnuradio/gruimpl/seq_with_cursor.py
+++ b/gnuradio-runtime/python/gnuradio/gru/seq_with_cursor.py
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/socket_stuff.py b/gnuradio-runtime/python/gnuradio/gru/socket_stuff.py
index 489b6ab255..489b6ab255 100644
--- a/gnuradio-core/src/python/gnuradio/gruimpl/socket_stuff.py
+++ b/gnuradio-runtime/python/gnuradio/gru/socket_stuff.py
diff --git a/gnuradio-runtime/swig/CMakeLists.txt b/gnuradio-runtime/swig/CMakeLists.txt
new file mode 100644
index 0000000000..57982f4947
--- /dev/null
+++ b/gnuradio-runtime/swig/CMakeLists.txt
@@ -0,0 +1,104 @@
+# Copyright 2013 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.
+
+########################################################################
+# Setup swig generation
+########################################################################
+include(GrPython)
+include(GrSwig)
+
+set(GR_SWIG_INCLUDE_DIRS
+    ${GRUEL_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${LOG4CPP_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
+)
+
+set(GR_SWIG_LIBRARIES
+    gnuradio-runtime
+    ${LOG4CPP_LIBRARIES}
+)
+
+# Only use if log4cpp is installed
+# Define ENABLE_GR_LOG for the .i file to ignore it.
+if(ENABLE_GR_LOG)
+     SET(GR_SWIG_FLAGS "-DENABLE_GR_LOG")
+endif(ENABLE_GR_LOG)
+
+if(ENABLE_GR_CTRLPORT)
+  list(APPEND GR_SWIG_FLAGS -DGR_CTRLPORT)
+  list(APPEND GR_SWIG_LIBRARIES ${ICE_LIBRARIES})
+  list(APPEND GR_SWIG_INCLUDE_DIRS ${ICE_INCLUDE_DIR})
+endif(ENABLE_GR_CTRLPORT)
+
+set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/runtime_swig_doc.i)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
+
+link_directories(${Boost_LIBRARY_DIRS})
+
+set(GR_SWIG_TARGET_DEPS 
+  pmt_swig
+  ${CMAKE_CURRENT_BINARY_DIR}/runtime_swig_doc.i
+)
+
+GR_SWIG_MAKE(runtime_swig runtime_swig.i)
+
+GR_SWIG_INSTALL(
+    TARGETS runtime_swig
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/gr
+    COMPONENT "runtime_python"
+)
+
+install(
+    FILES
+    gnuradio_swig_bug_workaround.h
+    complex_vec_test.i
+    gnuradio.i
+    gr_basic_block.i
+    gr_block_detail.i
+    gr_block.i
+    gr_buffer.i
+    gr_constants.i
+    gr_dispatcher.i
+    gr_error_handler.i
+    gr_feval.i
+    gr_hier_block2.i
+    gr_io_signature.i
+    gr_logger.i
+    gr_message.i
+    gr_msg_handler.i
+    gr_msg_queue.i
+    gr_prefs.i
+    gr_realtime.i
+    gr_shared_ptr.i
+    gr_single_threaded_scheduler.i
+    gr_swig_block_magic.i
+    gr_sync_block.i
+    gr_sync_decimator.i
+    gr_sync_interpolator.i
+    gr_tagged_stream_block.i
+    gr_tags.i
+    gr_top_block.i
+    runtime_swig.i
+    ${CMAKE_CURRENT_BINARY_DIR}/runtime_swig_doc.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "runtime_swig"
+)
diff --git a/gnuradio-core/src/lib/general/complex_vec_test.i b/gnuradio-runtime/swig/complex_vec_test.i
index 4b95633be7..4b95633be7 100644
--- a/gnuradio-core/src/lib/general/complex_vec_test.i
+++ b/gnuradio-runtime/swig/complex_vec_test.i
diff --git a/gnuradio-core/src/lib/swig/gen-swig-bug-fix b/gnuradio-runtime/swig/gen-swig-bug-fix
index 5e9f82e7d7..5e9f82e7d7 100755
--- a/gnuradio-core/src/lib/swig/gen-swig-bug-fix
+++ b/gnuradio-runtime/swig/gen-swig-bug-fix
diff --git a/gnuradio-core/src/lib/swig/gnuradio.i b/gnuradio-runtime/swig/gnuradio.i
index 03b7817e22..d85082aae2 100644
--- a/gnuradio-core/src/lib/swig/gnuradio.i
+++ b/gnuradio-runtime/swig/gnuradio.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003,2004,2009 Free Software Foundation, Inc.
+ * Copyright 2003,2004,2009,2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -38,7 +38,6 @@
 #include <gr_types.h>
 #include <stddef.h>		// size_t
 #include <complex>
-#include <string.h>
 %}
 
 %feature("autodoc","1");
@@ -50,7 +49,6 @@
 %include <std_vector.i>
 %include <stl.i>
 %include <std_except.i>
-%include <std_string.i>
 
 typedef std::complex<float>		gr_complex;
 typedef std::complex<double>		gr_complexd;
@@ -67,8 +65,7 @@ namespace std {
   %template()	  vector<int>;
   %template()	  vector<float>;
   %template()	  vector<double>;
-  %template()     vector<std::string>;
-  %template()	  vector<gr_tag_t>;
+  // %template()	  std::complex<float>;
 
   %template() 	  vector< std::complex<float> >;
   %template()     vector< std::vector< unsigned char > >;
@@ -83,8 +80,8 @@ namespace std {
 ////////////////////////////////////////////////////////////////////////
 
 #ifndef SW_RUNTIME
-// import runtime.i for all but sw_runtime, since it needs to %include
-%import <runtime.i>
+// import runtime_swig.i for all but sw_runtime, since it needs to %include
+%import <runtime_swig.i>
 #endif
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_bug_workaround.h b/gnuradio-runtime/swig/gnuradio_swig_bug_workaround.h
index bbbabaf07b..1994f06609 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig_bug_workaround.h
+++ b/gnuradio-runtime/swig/gnuradio_swig_bug_workaround.h
@@ -40,7 +40,6 @@ class gr_msg_queue;
 class gr_sync_block;
 class gr_sync_decimator;
 class gr_sync_interpolator;
-class gr_tagged_stream_block;
 class gr_top_block;
 
 #endif /* INCLUDED_GNURADIO_SWIG_BUG_WORKAROUND_H */
diff --git a/gnuradio-core/src/lib/runtime/gr_basic_block.i b/gnuradio-runtime/swig/gr_basic_block.i
index 62f16462d6..62f16462d6 100644
--- a/gnuradio-core/src/lib/runtime/gr_basic_block.i
+++ b/gnuradio-runtime/swig/gr_basic_block.i
diff --git a/gnuradio-core/src/lib/runtime/gr_block.i b/gnuradio-runtime/swig/gr_block.i
index a80f64d027..a80f64d027 100644
--- a/gnuradio-core/src/lib/runtime/gr_block.i
+++ b/gnuradio-runtime/swig/gr_block.i
diff --git a/gnuradio-core/src/lib/runtime/gr_block_detail.i b/gnuradio-runtime/swig/gr_block_detail.i
index 74ff463604..74ff463604 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_detail.i
+++ b/gnuradio-runtime/swig/gr_block_detail.i
diff --git a/gnuradio-core/src/lib/general/gr_block_gateway.i b/gnuradio-runtime/swig/gr_block_gateway.i
index 8adafdfea3..1595839ff7 100644
--- a/gnuradio-core/src/lib/general/gr_block_gateway.i
+++ b/gnuradio-runtime/swig/gr_block_gateway.i
@@ -27,20 +27,21 @@
 %include <gr_feval.i>
 
 ////////////////////////////////////////////////////////////////////////
+// data type support
+////////////////////////////////////////////////////////////////////////
+%template(int_vector_t) std::vector<int>;
+%template(void_star_vector_t) std::vector<void *>;
+
+////////////////////////////////////////////////////////////////////////
 // block headers
 ////////////////////////////////////////////////////////////////////////
 %{
 #include <gr_block_gateway.h>
 %}
 
-////////////////////////////////////////////////////////////////////////
-// data type support
-////////////////////////////////////////////////////////////////////////
-%template(int_vector_t) std::vector<int>;
-%template(void_star_vector_t) std::vector<void *>;
+%include <gr_block_gateway.h>
 
 ////////////////////////////////////////////////////////////////////////
 // block magic
 ////////////////////////////////////////////////////////////////////////
 GR_SWIG_BLOCK_MAGIC(gr,block_gateway);
-%include <gr_block_gateway.h>
diff --git a/gnuradio-core/src/lib/runtime/gr_buffer.i b/gnuradio-runtime/swig/gr_buffer.i
index 390a94e050..390a94e050 100644
--- a/gnuradio-core/src/lib/runtime/gr_buffer.i
+++ b/gnuradio-runtime/swig/gr_buffer.i
diff --git a/gnuradio-core/src/lib/general/gr_constants.i b/gnuradio-runtime/swig/gr_constants.i
index a5aef14925..a5aef14925 100644
--- a/gnuradio-core/src/lib/general/gr_constants.i
+++ b/gnuradio-runtime/swig/gr_constants.i
diff --git a/gnuradio-core/src/lib/runtime/gr_dispatcher.i b/gnuradio-runtime/swig/gr_dispatcher.i
index 28737cd317..28737cd317 100644
--- a/gnuradio-core/src/lib/runtime/gr_dispatcher.i
+++ b/gnuradio-runtime/swig/gr_dispatcher.i
diff --git a/gnuradio-core/src/lib/runtime/gr_error_handler.i b/gnuradio-runtime/swig/gr_error_handler.i
index 072394a727..072394a727 100644
--- a/gnuradio-core/src/lib/runtime/gr_error_handler.i
+++ b/gnuradio-runtime/swig/gr_error_handler.i
diff --git a/gnuradio-core/src/lib/general/gr_feval.i b/gnuradio-runtime/swig/gr_feval.i
index bcf4f1e646..ccca8433d2 100644
--- a/gnuradio-core/src/lib/general/gr_feval.i
+++ b/gnuradio-runtime/swig/gr_feval.i
@@ -154,67 +154,11 @@ public:
   virtual void calleval(pmt_t x);
 };
 
-/*
- * These are the ones to derive from in Python.  They have the magic shim
- * that ensures that we're holding the Python GIL when we enter Python land...
- */
-
-%inline %{
-#include <gruel/pmt.h>
-
-class gr_py_feval_dd : public gr_feval_dd
-{
- public:
-  double calleval(double x)
-  {
-    ensure_py_gil_state _lock;
-    return eval(x);
-  }
-};
-
-class gr_py_feval_cc : public gr_feval_cc
-{
- public:
-  gr_complex calleval(gr_complex x)
-  {
-    ensure_py_gil_state _lock;
-    return eval(x);
-  }
-};
-
-class gr_py_feval_ll : public gr_feval_ll
-{
- public:
-  long calleval(long x)
-  {
-    ensure_py_gil_state _lock;
-    return eval(x);
-  }
-};
-
-class gr_py_feval : public gr_feval
-{
- public:
-  void calleval()
-  {
-    ensure_py_gil_state _lock;
-    eval();
-  }
-};
-
-class gr_py_feval_p : public gr_feval_p
-{
- public:
-  void calleval(pmt::pmt_t x)
-  {
-    ensure_py_gil_state _lock;
-    eval(x);
-  }
-};
-
+%{
+#include <gr_py_feval.h>
 %}
 
-
+//%include <gr_py_feval.>
 
 // examples / test cases
 
diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2.i b/gnuradio-runtime/swig/gr_hier_block2.i
index a857394ca7..a857394ca7 100644
--- a/gnuradio-core/src/lib/runtime/gr_hier_block2.i
+++ b/gnuradio-runtime/swig/gr_hier_block2.i
diff --git a/gnuradio-core/src/lib/runtime/gr_io_signature.i b/gnuradio-runtime/swig/gr_io_signature.i
index fe1707e410..fe1707e410 100644
--- a/gnuradio-core/src/lib/runtime/gr_io_signature.i
+++ b/gnuradio-runtime/swig/gr_io_signature.i
diff --git a/gnuradio-core/src/lib/runtime/gr_logger.i b/gnuradio-runtime/swig/gr_logger.i
index b43bff5a89..b43bff5a89 100644
--- a/gnuradio-core/src/lib/runtime/gr_logger.i
+++ b/gnuradio-runtime/swig/gr_logger.i
diff --git a/gnuradio-core/src/lib/runtime/gr_message.i b/gnuradio-runtime/swig/gr_message.i
index 356bba5b58..356bba5b58 100644
--- a/gnuradio-core/src/lib/runtime/gr_message.i
+++ b/gnuradio-runtime/swig/gr_message.i
diff --git a/gnuradio-core/src/lib/runtime/gr_msg_handler.i b/gnuradio-runtime/swig/gr_msg_handler.i
index f493dac1b2..f493dac1b2 100644
--- a/gnuradio-core/src/lib/runtime/gr_msg_handler.i
+++ b/gnuradio-runtime/swig/gr_msg_handler.i
diff --git a/gnuradio-core/src/lib/runtime/gr_msg_queue.i b/gnuradio-runtime/swig/gr_msg_queue.i
index 65cbe782b9..65cbe782b9 100644
--- a/gnuradio-core/src/lib/runtime/gr_msg_queue.i
+++ b/gnuradio-runtime/swig/gr_msg_queue.i
diff --git a/gnuradio-core/src/lib/general/gr_prefs.i b/gnuradio-runtime/swig/gr_prefs.i
index adf567a135..b21d47f3b0 100644
--- a/gnuradio-core/src/lib/general/gr_prefs.i
+++ b/gnuradio-runtime/swig/gr_prefs.i
@@ -28,39 +28,42 @@ public:
 
   virtual ~gr_prefs();
 
-  std::string to_string();
-  void save();
-
+  /*!
+   * \brief Does \p section exist?
+   */
   virtual bool has_section(const std::string &section);
 
+  /*!
+   * \brief Does \p option exist?
+   */
   virtual bool has_option(const std::string &section, const std::string &option);
 
+  /*!
+   * \brief If option exists return associated value; else default_val.
+   */
   virtual const std::string get_string(const std::string &section,
 				       const std::string &option,
 				       const std::string &default_val);
-  virtual void set_string(const std::string &section,
-                          const std::string &option,
-                          const std::string &val);
 
+  /*!
+   * \brief If option exists and value can be converted to bool, return it; else default_val.
+   */
   virtual bool get_bool(const std::string &section,
 			const std::string &option,
 			bool default_val);
-  virtual void set_bool(const std::string &section,
-			const std::string &option,
-			bool val);
 
+  /*!
+   * \brief If option exists and value can be converted to long, return it; else default_val.
+   */
   virtual long get_long(const std::string &section,
 			const std::string &option,
 			long default_val);
-  virtual void set_long(const std::string &section,
-			const std::string &option,
-			long val);
 
+  /*!
+   * \brief If option exists and value can be converted to double, return it; else default_val.
+   */
   virtual double get_double(const std::string &section,
 			    const std::string &option,
 			    double default_val);
-  virtual void set_double(const std::string &section,
-                          const std::string &option,
-                          double val);
 };
 
diff --git a/gnuradio-core/src/lib/runtime/gr_realtime.i b/gnuradio-runtime/swig/gr_realtime.i
index 1051d3e2b3..1051d3e2b3 100644
--- a/gnuradio-core/src/lib/runtime/gr_realtime.i
+++ b/gnuradio-runtime/swig/gr_realtime.i
diff --git a/gnuradio-core/src/lib/swig/gr_shared_ptr.i b/gnuradio-runtime/swig/gr_shared_ptr.i
index 323d33ad73..323d33ad73 100644
--- a/gnuradio-core/src/lib/swig/gr_shared_ptr.i
+++ b/gnuradio-runtime/swig/gr_shared_ptr.i
diff --git a/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.i b/gnuradio-runtime/swig/gr_single_threaded_scheduler.i
index 7305cc9ada..7305cc9ada 100644
--- a/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.i
+++ b/gnuradio-runtime/swig/gr_single_threaded_scheduler.i
diff --git a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i b/gnuradio-runtime/swig/gr_swig_block_magic.i
index 6d1af6136d..6d1af6136d 100644
--- a/gnuradio-core/src/lib/swig/gr_swig_block_magic.i
+++ b/gnuradio-runtime/swig/gr_swig_block_magic.i
diff --git a/gnuradio-core/src/lib/runtime/gr_sync_block.i b/gnuradio-runtime/swig/gr_sync_block.i
index d3e1bb9578..d3e1bb9578 100644
--- a/gnuradio-core/src/lib/runtime/gr_sync_block.i
+++ b/gnuradio-runtime/swig/gr_sync_block.i
diff --git a/gnuradio-core/src/lib/runtime/gr_sync_decimator.i b/gnuradio-runtime/swig/gr_sync_decimator.i
index af4574b193..af4574b193 100644
--- a/gnuradio-core/src/lib/runtime/gr_sync_decimator.i
+++ b/gnuradio-runtime/swig/gr_sync_decimator.i
diff --git a/gnuradio-core/src/lib/runtime/gr_sync_interpolator.i b/gnuradio-runtime/swig/gr_sync_interpolator.i
index 6f8b08252f..6f8b08252f 100644
--- a/gnuradio-core/src/lib/runtime/gr_sync_interpolator.i
+++ b/gnuradio-runtime/swig/gr_sync_interpolator.i
diff --git a/gnuradio-core/src/lib/runtime/gr_tagged_stream_block.i b/gnuradio-runtime/swig/gr_tagged_stream_block.i
index 9fc803dca1..9fc803dca1 100644
--- a/gnuradio-core/src/lib/runtime/gr_tagged_stream_block.i
+++ b/gnuradio-runtime/swig/gr_tagged_stream_block.i
diff --git a/gnuradio-core/src/lib/runtime/gr_tags.i b/gnuradio-runtime/swig/gr_tags.i
index 828d0147ce..828d0147ce 100644
--- a/gnuradio-core/src/lib/runtime/gr_tags.i
+++ b/gnuradio-runtime/swig/gr_tags.i
diff --git a/gnuradio-core/src/lib/runtime/gr_top_block.i b/gnuradio-runtime/swig/gr_top_block.i
index 1612ddf8c5..1612ddf8c5 100644
--- a/gnuradio-core/src/lib/runtime/gr_top_block.i
+++ b/gnuradio-runtime/swig/gr_top_block.i
diff --git a/gnuradio-core/src/lib/runtime/runtime.i b/gnuradio-runtime/swig/runtime_swig.i
index ac0092f917..b7fcc31954 100644
--- a/gnuradio-core/src/lib/runtime/runtime.i
+++ b/gnuradio-runtime/swig/runtime_swig.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2013 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -20,28 +20,43 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#define GR_CORE_API
+#define GR_RUNTIME_API
+%include "runtime_swig_doc.i"
+
+#ifndef SWIGIMPORTED
+%module(directors="1") gnuradio_runtime
+#endif
+
+//%feature("autodoc", "1");		// generate python docstrings
+
+#define SW_RUNTIME
+%include "gnuradio.i"				// the common stuff
 
 %{
-#include <gr_runtime_types.h>
-#include <gr_io_signature.h>
-#include <gr_buffer.h>
+#include <gr_endianness.h>
 #include <gr_block.h>
 #include <gr_block_detail.h>
+  //#include <gr_block_gateway.h>
+#include <gr_buffer.h>
+#include <gr_constants.h>
+#include <gr_dispatcher.h>
+#include <gr_error_handler.h>
+#include <gr_feval.h>
 #include <gr_hier_block2.h>
-#include <gr_single_threaded_scheduler.h>
+#include <gr_io_signature.h>
 #include <gr_message.h>
 #include <gr_msg_handler.h>
 #include <gr_msg_queue.h>
-#include <gr_dispatcher.h>
-#include <gr_error_handler.h>
+#include <gr_prefs.h>
 #include <gr_realtime.h>
+#include <gr_runtime_types.h>
+#include <gr_single_threaded_scheduler.h>
 #include <gr_sync_block.h>
 #include <gr_sync_decimator.h>
 #include <gr_sync_interpolator.h>
 #include <gr_tagged_stream_block.h>
+#include <gr_tags.h>
 #include <gr_top_block.h>
-#include <gr_logger.h>
 %}
 
 %constant int sizeof_char 	= sizeof(char);
@@ -51,26 +66,31 @@
 %constant int sizeof_double	= sizeof(double);
 %constant int sizeof_gr_complex	= sizeof(gr_complex);
 
-%include <gr_io_signature.i>
-%include <gr_buffer.i>
+%include <gr_endianness.h>
 %include <gr_basic_block.i>
 %include <gr_block.i>
 %include <gr_block_detail.i>
+ //%include <gr_block_gateway.i>
+%include <gr_buffer.i>
+%include <gr_constants.i>
+%include <gr_dispatcher.i>
+%include <gr_error_handler.i>
+%include <gr_feval.i>
 %include <gr_hier_block2.i>
-%include <gr_swig_block_magic.i>
-%include <gr_single_threaded_scheduler.i>
+%include <gr_io_signature.i>
 %include <gr_message.i>
 %include <gr_msg_handler.i>
 %include <gr_msg_queue.i>
-%include <gr_dispatcher.i>
-%include <gr_error_handler.i>
+%include <gr_prefs.i>
 %include <gr_realtime.i>
+%include <gr_single_threaded_scheduler.i>
+%include <gr_swig_block_magic.i>
 %include <gr_sync_block.i>
 %include <gr_sync_decimator.i>
 %include <gr_sync_interpolator.i>
 %include <gr_tagged_stream_block.i>
+%include <gr_tags.i>
 %include <gr_top_block.i>
-%include <gr_logger.i>
 
 #ifdef GR_CTRLPORT
 
@@ -118,7 +138,7 @@ enum KnobType {
 
 // Declare this class here but without the nested templated class
 // inside (replaces include of rpcmanager.h)
-class GR_CORE_API rpcmanager : public virtual rpcmanager_base
+class GR_RUNTIME_API rpcmanager : public virtual rpcmanager_base
 {
  public:
   rpcmanager();
diff --git a/gr-analog/CMakeLists.txt b/gr-analog/CMakeLists.txt
index 8186de0fa9..24b202dce7 100644
--- a/gr-analog/CMakeLists.txt
+++ b/gr-analog/CMakeLists.txt
@@ -29,7 +29,7 @@ include(GrComponent)
 GR_REGISTER_COMPONENT("gr-analog" ENABLE_GR_ANALOG
     Boost_FOUND
     ENABLE_VOLK
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_FFT
     ENABLE_GR_FILTER
 )
diff --git a/gr-analog/include/analog/CMakeLists.txt b/gr-analog/include/analog/CMakeLists.txt
index 9c752ee157..0343abcd85 100644
--- a/gr-analog/include/analog/CMakeLists.txt
+++ b/gr-analog/include/analog/CMakeLists.txt
@@ -26,7 +26,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
 #!${PYTHON_EXECUTABLE}
 
 import sys, os, re
-sys.path.append('${GR_CORE_PYTHONPATH}')
+sys.path.append('${GR_RUNTIME_PYTHONPATH}')
 os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
 os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
 
diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt
index c86ced6ac7..5cb00e9f94 100644
--- a/gr-analog/lib/CMakeLists.txt
+++ b/gr-analog/lib/CMakeLists.txt
@@ -28,7 +28,7 @@ include_directories(
     ${GR_FILTER_INCLUDE_DIRS}
     ${GR_FFT_INCLUDE_DIRS}
     ${GR_BLOCKS_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${VOLK_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
@@ -50,7 +50,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
 #!${PYTHON_EXECUTABLE}
 
 import sys, os, re
-sys.path.append('${GR_CORE_PYTHONPATH}')
+sys.path.append('${GR_RUNTIME_PYTHONPATH}')
 os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
 os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
 
@@ -158,7 +158,7 @@ ENDIF(MSVC)
 
 list(APPEND analog_libs
     volk
-    gnuradio-core
+    gnuradio-runtime
     gnuradio-filter
     ${Boost_LIBRARIES}
 )
@@ -187,7 +187,7 @@ if(ENABLE_TESTING)
 
   target_link_libraries(
     test-gr-analog
-    gnuradio-core
+    gnuradio-runtime
     gnuradio-analog 
     ${Boost_LIBRARIES}
     ${CPPUNIT_LIBRARIES}
diff --git a/gr-analog/swig/CMakeLists.txt b/gr-analog/swig/CMakeLists.txt
index eede32c4ec..8b56be500c 100644
--- a/gr-analog/swig/CMakeLists.txt
+++ b/gr-analog/swig/CMakeLists.txt
@@ -27,7 +27,7 @@ set(GR_SWIG_INCLUDE_DIRS
     ${GR_BLOCKS_INCLUDE_DIRS}
     ${GR_ANALOG_INCLUDE_DIRS}
     ${GR_FILTER_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-analog/swig/analog_swig.i b/gr-analog/swig/analog_swig.i
index e74a1a8d85..9ae019ad8e 100644
--- a/gr-analog/swig/analog_swig.i
+++ b/gr-analog/swig/analog_swig.i
@@ -22,7 +22,7 @@
 #define ANALOG_API
 #define BLOCKS_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 %include "stdint.i"
 
 //load generated python docstrings
diff --git a/gr-atsc/CMakeLists.txt b/gr-atsc/CMakeLists.txt
index d46f109be7..a281cc8401 100644
--- a/gr-atsc/CMakeLists.txt
+++ b/gr-atsc/CMakeLists.txt
@@ -28,7 +28,7 @@ include(GrBoost)
 include(GrComponent)
 GR_REGISTER_COMPONENT("gr-atsc" ENABLE_GR_ATSC
     Boost_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_FFT
     ENABLE_GR_BLOCKS
     ENABLE_GR_FEC
diff --git a/gr-atsc/lib/CMakeLists.txt b/gr-atsc/lib/CMakeLists.txt
index df9cc7c396..b3aa626cb5 100644
--- a/gr-atsc/lib/CMakeLists.txt
+++ b/gr-atsc/lib/CMakeLists.txt
@@ -27,7 +27,7 @@ include_directories(
     ${GR_FILTER_INCLUDE_DIRS}
     ${GR_ANALOG_INCLUDE_DIRS}
     ${GR_FEC_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
@@ -118,7 +118,7 @@ ENDIF(MSVC)
 list(APPEND atsc_libs
     gnuradio-filter
     gnuradio-analog
-    gnuradio-core
+    gnuradio-runtime
     gnuradio-fec
     ${Boost_LIBRARIES}
     ${LOG4CPP_LIBRARIES}
@@ -156,7 +156,7 @@ list(APPEND test_atsci_sources
 include(GrTest)
 list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc gnuradio-fec gnuradio-filter gnuradio-analog gnuradio-fft)
 add_executable(test_atsci ${test_atsci_sources} test_atsci.cc)
-target_link_libraries(test_atsci gnuradio-atsc gnuradio-core ${CPPUNIT_LIBRARIES})
+target_link_libraries(test_atsci gnuradio-atsc gnuradio-runtime ${CPPUNIT_LIBRARIES})
 GR_ADD_TEST(atsci-test test_atsci)
 
 endif(ENABLE_TESTING)
diff --git a/gr-atsc/swig/CMakeLists.txt b/gr-atsc/swig/CMakeLists.txt
index 71039f80aa..37da95dce1 100644
--- a/gr-atsc/swig/CMakeLists.txt
+++ b/gr-atsc/swig/CMakeLists.txt
@@ -28,7 +28,7 @@ set(GR_SWIG_INCLUDE_DIRS
     ${GR_FILTER_INCLUDE_DIRS}
     ${GR_BLOCKS_INCLUDE_DIRS}
     ${GR_ANALOG_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${FFTW3F_INCLUDE_DIRS}
diff --git a/gr-atsc/swig/atsc_swig.i b/gr-atsc/swig/atsc_swig.i
index 4711d497eb..6ca65a6c69 100644
--- a/gr-atsc/swig/atsc_swig.i
+++ b/gr-atsc/swig/atsc_swig.i
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-%include "gnuradio.i"				// the common stuff
+%include "runtime_swig.i"				// the common stuff
 
 //load generated python docstrings
 %include "atsc_swig_doc.i"
diff --git a/gr-audio/CMakeLists.txt b/gr-audio/CMakeLists.txt
index 1da6635ec0..9aa343b45e 100644
--- a/gr-audio/CMakeLists.txt
+++ b/gr-audio/CMakeLists.txt
@@ -28,7 +28,7 @@ include(GrBoost)
 include(GrComponent)
 GR_REGISTER_COMPONENT("gr-audio" ENABLE_GR_AUDIO
     Boost_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
 )
 
 GR_SET_GLOBAL(GR_AUDIO_INCLUDE_DIRS
diff --git a/gr-audio/examples/c++/CMakeLists.txt b/gr-audio/examples/c++/CMakeLists.txt
index ee98f78e72..a91dafed78 100644
--- a/gr-audio/examples/c++/CMakeLists.txt
+++ b/gr-audio/examples/c++/CMakeLists.txt
@@ -20,7 +20,7 @@
 include_directories(
 	${GR_AUDIO_INCLUDE_DIRS}
 	${GR_ANALOG_INCLUDE_DIRS}
-	${GNURADIO_CORE_INCLUDE_DIRS}
+	${GNURADIO_RUNTIME_INCLUDE_DIRS}
         ${GRUEL_INCLUDE_DIRS}
         ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt
index 73977752f3..8390f85e63 100644
--- a/gr-audio/lib/CMakeLists.txt
+++ b/gr-audio/lib/CMakeLists.txt
@@ -23,7 +23,7 @@
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${GR_AUDIO_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
@@ -32,7 +32,7 @@ include_directories(
 link_directories(${Boost_LIBRARY_DIRS})
 link_directories(${LOG4CPP_LIBRARY_DIRS})
 
-list(APPEND gr_audio_libs gnuradio-core ${Boost_LIBRARIES} ${LOG4CPP_LIBRARIES})
+list(APPEND gr_audio_libs gnuradio-runtime ${Boost_LIBRARIES} ${LOG4CPP_LIBRARIES})
 list(APPEND gr_audio_sources audio_registry.cc)
 list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/gr-audio.conf)
 
diff --git a/gr-audio/swig/CMakeLists.txt b/gr-audio/swig/CMakeLists.txt
index 4f98328a7b..e9bc9ddead 100644
--- a/gr-audio/swig/CMakeLists.txt
+++ b/gr-audio/swig/CMakeLists.txt
@@ -25,7 +25,7 @@ include(GrSwig)
 
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_AUDIO_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-audio/swig/audio_swig.i b/gr-audio/swig/audio_swig.i
index 449fb5da51..d675df0f95 100644
--- a/gr-audio/swig/audio_swig.i
+++ b/gr-audio/swig/audio_swig.i
@@ -22,7 +22,7 @@
 
 #define GR_AUDIO_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "audio_swig_doc.i"
diff --git a/gr-blocks/CMakeLists.txt b/gr-blocks/CMakeLists.txt
index c4821da2b8..c39337d0d5 100644
--- a/gr-blocks/CMakeLists.txt
+++ b/gr-blocks/CMakeLists.txt
@@ -28,7 +28,7 @@ include(GrBoost)
 include(GrComponent)
 GR_REGISTER_COMPONENT("gr-blocks" ENABLE_GR_BLOCKS
     Boost_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
 )
 
 GR_SET_GLOBAL(GR_BLOCKS_INCLUDE_DIRS
diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt
index d5dbe41253..14346f9c15 100644
--- a/gr-blocks/include/blocks/CMakeLists.txt
+++ b/gr-blocks/include/blocks/CMakeLists.txt
@@ -26,7 +26,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
 #!${PYTHON_EXECUTABLE}
 
 import sys, os, re
-sys.path.append('${GR_CORE_PYTHONPATH}')
+sys.path.append('${GR_RUNTIME_PYTHONPATH}')
 os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
 os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
 
diff --git a/gr-blocks/include/blocks/pdu.h b/gr-blocks/include/blocks/pdu.h
index de0999c574..ffcfbb9abb 100644
--- a/gr-blocks/include/blocks/pdu.h
+++ b/gr-blocks/include/blocks/pdu.h
@@ -38,7 +38,7 @@ namespace gr {
 
       BLOCKS_API size_t itemsize(vector_type type);
       BLOCKS_API bool type_matches(vector_type type, pmt::pmt_t v);
-      BLOCKS_API pmt::pmt_t make_vector(vector_type type, const uint8_t* buf, size_t items);
+      BLOCKS_API pmt::pmt_t make_pdu_vector(vector_type type, const uint8_t* buf, size_t items);
       BLOCKS_API vector_type type_from_pmt(pmt::pmt_t vector);
 
     } /* namespace pdu */
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index acf542328f..8a91c5111d 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -31,7 +31,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
 #!${PYTHON_EXECUTABLE}
 
 import sys, os, re
-sys.path.append('${GR_CORE_PYTHONPATH}')
+sys.path.append('${GR_RUNTIME_PYTHONPATH}')
 os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
 os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
 
@@ -126,7 +126,7 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}/../include
     ${GR_BLOCKS_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${VOLK_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
@@ -272,7 +272,7 @@ IF(MSVC)
 ENDIF(MSVC)
 
 list(APPEND blocks_libs
-    gnuradio-core
+    gnuradio-runtime
     volk
     ${Boost_LIBRARIES}
     ${BLOCKS_LIBRARIES}
@@ -313,7 +313,7 @@ if(ENABLE_TESTING)
 
   target_link_libraries(
     test-gr-blocks
-    gnuradio-core
+    gnuradio-runtime
     gnuradio-blocks
     ${Boost_LIBRARIES}
     ${CPPUNIT_LIBRARIES}
diff --git a/gr-blocks/lib/pdu.cc b/gr-blocks/lib/pdu.cc
index ae4b17aecc..9d5322bfe3 100644
--- a/gr-blocks/lib/pdu.cc
+++ b/gr-blocks/lib/pdu.cc
@@ -61,7 +61,7 @@ namespace gr {
       }
 
       pmt::pmt_t
-      make_vector(vector_type type, const uint8_t *buf, size_t items)
+      make_pdu_vector(vector_type type, const uint8_t *buf, size_t items)
       {
 	switch(type) {
 	case byte_t:
diff --git a/gr-blocks/lib/tagged_stream_to_pdu_impl.cc b/gr-blocks/lib/tagged_stream_to_pdu_impl.cc
index fc5c8f6424..4abc5818b0 100644
--- a/gr-blocks/lib/tagged_stream_to_pdu_impl.cc
+++ b/gr-blocks/lib/tagged_stream_to_pdu_impl.cc
@@ -93,14 +93,14 @@ namespace gr {
       // copy samples for this vector into either a pmt or our save buffer
       if (ncopy == d_pdu_remain) { // we will send this pdu
 	if (d_save.size() == 0) {
-	  d_pdu_vector = pdu::make_vector(d_type, in, ncopy);
+	  d_pdu_vector = pdu::make_pdu_vector(d_type, in, ncopy);
 	  send_message();
 	} 
 	else {
 	  size_t oldsize = d_save.size();
 	  d_save.resize((oldsize + ncopy)*d_itemsize, 0);
 	  memcpy(&d_save[oldsize*d_itemsize], in, ncopy*d_itemsize);
-	  d_pdu_vector = pdu::make_vector(d_type, &d_save[0], d_pdu_length);
+	  d_pdu_vector = pdu::make_pdu_vector(d_type, &d_save[0], d_pdu_length);
 	  send_message();
 	  d_save.clear();
         }
diff --git a/gr-blocks/python/CMakeLists.txt b/gr-blocks/python/CMakeLists.txt
index 841588799b..a9c2fe7b6f 100644
--- a/gr-blocks/python/CMakeLists.txt
+++ b/gr-blocks/python/CMakeLists.txt
@@ -37,6 +37,7 @@ if(ENABLE_TESTING)
 list(APPEND GR_TEST_PYTHON_DIRS
     ${CMAKE_BINARY_DIR}/gr-blocks/python
     ${CMAKE_BINARY_DIR}/gr-blocks/swig
+    ${CMAKE_BINARY_DIR}/gnuradio-runtime/python
 )
 list(APPEND GR_TEST_TARGET_DEPS gnuradio-blocks)
 
diff --git a/gr-blocks/swig/CMakeLists.txt b/gr-blocks/swig/CMakeLists.txt
index 1e4213fdc2..94495688d8 100644
--- a/gr-blocks/swig/CMakeLists.txt
+++ b/gr-blocks/swig/CMakeLists.txt
@@ -26,7 +26,8 @@ include(GrSwig)
 set(GR_SWIG_INCLUDE_DIRS
     ${CMAKE_CURRENT_BINARY_DIR}/../include
     ${GR_BLOCKS_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-blocks/swig/blocks_swig.i b/gr-blocks/swig/blocks_swig.i
index 72f70ac475..fa0cbf76a0 100644
--- a/gr-blocks/swig/blocks_swig.i
+++ b/gr-blocks/swig/blocks_swig.i
@@ -22,7 +22,7 @@
 
 #define BLOCKS_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 %include "blocks/pdu.h"
 
 //load generated python docstrings
diff --git a/gr-blocks/tests/CMakeLists.txt b/gr-blocks/tests/CMakeLists.txt
index ec17c017f1..0e7feec1b2 100644
--- a/gr-blocks/tests/CMakeLists.txt
+++ b/gr-blocks/tests/CMakeLists.txt
@@ -26,7 +26,7 @@ GR_CHECK_HDR_N_DEF(sys/resource.h HAVE_SYS_RESOURCE_H)
 ########################################################################
 include_directories(
     ${GR_BLOCKS_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${CPPUNIT_INCLUDE_DIRS}
@@ -51,6 +51,6 @@ set(tests_not_run #single source per test
 foreach(test_not_run_src ${tests_not_run})
     get_filename_component(name ${test_not_run_src} NAME_WE)
     add_executable(${name} ${test_not_run_src})
-    target_link_libraries(${name} test-gnuradio-core gnuradio-blocks ${LOG4CPP_LIBRARIES})
+    target_link_libraries(${name} test-gnuradio-runtime gnuradio-blocks ${LOG4CPP_LIBRARIES})
 endforeach(test_not_run_src)
 
diff --git a/gr-channels/CMakeLists.txt b/gr-channels/CMakeLists.txt
index 6a5d20edef..666a837d10 100644
--- a/gr-channels/CMakeLists.txt
+++ b/gr-channels/CMakeLists.txt
@@ -31,7 +31,7 @@ GR_REGISTER_COMPONENT("gr-channels" ENABLE_GR_CHANNELS
     ENABLE_GRUEL
     ENABLE_VOLK
     Boost_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_BLOCKS
     ENABLE_GR_FFT
     ENABLE_GR_FILTER
diff --git a/gr-channels/lib/CMakeLists.txt b/gr-channels/lib/CMakeLists.txt
index e7a4622017..30ff3ebdd2 100644
--- a/gr-channels/lib/CMakeLists.txt
+++ b/gr-channels/lib/CMakeLists.txt
@@ -27,7 +27,7 @@ include_directories(
     ${GR_BLOCKS_INCLUDE_DIRS}
     ${GR_FILTER_INCLUDE_DIRS}
     ${GR_ANALOG_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
@@ -63,7 +63,7 @@ endif(MSVC)
 
 list(APPEND channels_libs
     volk
-    gnuradio-core
+    gnuradio-runtime
     gnuradio-filter
     gnuradio-analog
     gnuradio-blocks
@@ -75,4 +75,4 @@ target_link_libraries(gnuradio-channels ${channels_libs})
 GR_LIBRARY_FOO(gnuradio-channels RUNTIME_COMPONENT "channels_runtime" DEVEL_COMPONENT "channels_devel")
 add_dependencies(gnuradio-channels
   channels_generated_includes channels_generated_swigs
-  gnuradio-core gnuradio-filter gnuradio-analog gnuradio-blocks)
+  gnuradio-runtime gnuradio-filter gnuradio-analog gnuradio-blocks)
diff --git a/gr-channels/swig/CMakeLists.txt b/gr-channels/swig/CMakeLists.txt
index 1d5028172b..c1bd4bb9f8 100644
--- a/gr-channels/swig/CMakeLists.txt
+++ b/gr-channels/swig/CMakeLists.txt
@@ -26,7 +26,7 @@ include(GrSwig)
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_CHANNELS_INCLUDE_DIRS}
     ${GR_FILTER_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-channels/swig/channels_swig.i b/gr-channels/swig/channels_swig.i
index fb284a74bd..bfd0f9a10a 100644
--- a/gr-channels/swig/channels_swig.i
+++ b/gr-channels/swig/channels_swig.i
@@ -22,7 +22,7 @@
 
 #define CHANNELS_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "channels_swig_doc.i"
diff --git a/gr-comedi/CMakeLists.txt b/gr-comedi/CMakeLists.txt
index f0ddff9d50..ac6cd203b2 100644
--- a/gr-comedi/CMakeLists.txt
+++ b/gr-comedi/CMakeLists.txt
@@ -32,7 +32,7 @@ GR_REGISTER_COMPONENT("gr-comedi" ENABLE_GR_COMEDI
     COMEDI_FOUND
     LINUX #comedi uses linux specific device noces
     Boost_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
 )
 
 GR_SET_GLOBAL(GR_COMEDI_INCLUDE_DIRS
diff --git a/gr-comedi/lib/CMakeLists.txt b/gr-comedi/lib/CMakeLists.txt
index 53a0ae9ff6..0179c8f537 100644
--- a/gr-comedi/lib/CMakeLists.txt
+++ b/gr-comedi/lib/CMakeLists.txt
@@ -22,7 +22,7 @@
 ########################################################################
 include_directories(
     ${GR_COMEDI_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${LOG4CXX_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
@@ -49,7 +49,7 @@ list(APPEND comedi_sources
 )
 
 list(APPEND comedi_libs
-    gnuradio-core
+    gnuradio-runtime
     ${Boost_LIBRARIES}
     ${COMEDI_LIBRARIES}
 )
diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
index 0dc0960016..4895c622a9 100644
--- a/gr-comedi/src/CMakeLists.txt
+++ b/gr-comedi/src/CMakeLists.txt
@@ -22,7 +22,7 @@
 ########################################################################
 include_directories(
     ${GR_COMEDI_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${COMEDI_INCLUDE_DIRS}
@@ -46,7 +46,7 @@ list(APPEND gr_comedi_sources
 )
 
 list(APPEND comedi_libs
-    gnuradio-core
+    gnuradio-runtime
     ${Boost_LIBRARIES}
     ${COMEDI_LIBRARIES}
     ${LOG4CPP_LIBRARIES}
@@ -75,7 +75,7 @@ include(GrSwig)
 
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_COMEDI_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-comedi/swig/CMakeLists.txt b/gr-comedi/swig/CMakeLists.txt
index 1c88a4eb94..5e7cc15229 100644
--- a/gr-comedi/swig/CMakeLists.txt
+++ b/gr-comedi/swig/CMakeLists.txt
@@ -25,7 +25,7 @@ include(GrSwig)
 
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_COMEDI_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-comedi/swig/comedi_swig.i b/gr-comedi/swig/comedi_swig.i
index c8a1fff392..179882991a 100644
--- a/gr-comedi/swig/comedi_swig.i
+++ b/gr-comedi/swig/comedi_swig.i
@@ -22,7 +22,7 @@
 
 #define COMEDI_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "comedi_swig_doc.i"
diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt
index 1ef84d5654..171ea635b8 100644
--- a/gr-digital/CMakeLists.txt
+++ b/gr-digital/CMakeLists.txt
@@ -29,7 +29,7 @@ include(GrComponent)
 GR_REGISTER_COMPONENT("gr-digital" ENABLE_GR_DIGITAL
     Boost_FOUND
     ENABLE_VOLK
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_FFT
     ENABLE_GR_FILTER
     ENABLE_GR_BLOCKS
diff --git a/gr-digital/include/digital/CMakeLists.txt b/gr-digital/include/digital/CMakeLists.txt
index 3babcbad44..275da16d87 100644
--- a/gr-digital/include/digital/CMakeLists.txt
+++ b/gr-digital/include/digital/CMakeLists.txt
@@ -26,7 +26,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
 #!${PYTHON_EXECUTABLE}
 
 import sys, os, re
-sys.path.append('${GR_CORE_PYTHONPATH}')
+sys.path.append('${GR_RUNTIME_PYTHONPATH}')
 os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
 os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
 
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt
index d0a9132250..faa10c6b65 100644
--- a/gr-digital/lib/CMakeLists.txt
+++ b/gr-digital/lib/CMakeLists.txt
@@ -27,7 +27,7 @@ include_directories(
     ${GR_FFT_INCLUDE_DIRS}
     ${GR_FILTER_INCLUDE_DIRS}
     ${GR_BLOCKS_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${VOLK_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${LOG4CPP_INCLUDE_DIRS}
@@ -51,7 +51,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
 #!${PYTHON_EXECUTABLE}
 
 import sys, os, re
-sys.path.append('${GR_CORE_PYTHONPATH}')
+sys.path.append('${GR_RUNTIME_PYTHONPATH}')
 os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
 os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
 
@@ -189,7 +189,7 @@ ENDIF(MSVC)
 
 list(APPEND digital_libs
     volk
-    gnuradio-core
+    gnuradio-runtime
     gnuradio-filter
     gnuradio-blocks
     gnuradio-analog
@@ -206,7 +206,7 @@ add_dependencies(
     gnuradio-digital
     digital_generated_includes
     digital_generated_swigs
-    gnuradio-core
+    gnuradio-runtime
     gnuradio-filter
     gnuradio-analog
     gnuradio-blocks
diff --git a/gr-digital/swig/CMakeLists.txt b/gr-digital/swig/CMakeLists.txt
index cbef8da888..6f49298209 100644
--- a/gr-digital/swig/CMakeLists.txt
+++ b/gr-digital/swig/CMakeLists.txt
@@ -29,7 +29,7 @@ set(GR_SWIG_INCLUDE_DIRS
     ${GR_ANALOG_INCLUDE_DIRS}
     ${GR_FFT_INCLUDE_DIRS}
     ${GR_FILTER_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i
index b9a9dd617a..275496a5c6 100644
--- a/gr-digital/swig/digital_swig.i
+++ b/gr-digital/swig/digital_swig.i
@@ -23,7 +23,7 @@
 #define ANALOG_API
 #define BLOCKS_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 %include "stdint.i"
 
 //load generated python docstrings
diff --git a/gr-fcd/CMakeLists.txt b/gr-fcd/CMakeLists.txt
index 810e79e6eb..ede4425a4c 100644
--- a/gr-fcd/CMakeLists.txt
+++ b/gr-fcd/CMakeLists.txt
@@ -34,7 +34,7 @@ include(GrComponent)
 if (LINUX)
     GR_REGISTER_COMPONENT("gr-fcd" ENABLE_GR_FCD
         Boost_FOUND
-        ENABLE_GR_CORE
+        ENABLE_GNURADIO_RUNTIME
         ENABLE_GR_BLOCKS
         ENABLE_GR_AUDIO
         LIBUSB_FOUND
@@ -42,7 +42,7 @@ if (LINUX)
 else()
     GR_REGISTER_COMPONENT("gr-fcd" ENABLE_GR_FCD
         Boost_FOUND
-        ENABLE_GR_CORE
+        ENABLE_GNURADIO_RUNTIME
         ENABLE_GR_AUDIO
     )
 endif()
diff --git a/gr-fcd/examples/c++/CMakeLists.txt b/gr-fcd/examples/c++/CMakeLists.txt
index 977e9e4e68..ff2c3d8bb2 100644
--- a/gr-fcd/examples/c++/CMakeLists.txt
+++ b/gr-fcd/examples/c++/CMakeLists.txt
@@ -22,7 +22,7 @@ include_directories(
     ${GR_FILTER_INCLUDE_DIRS}
     ${GR_ANALOG_INCLUDE_DIRS}
     ${GR_AUDIO_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-fcd/lib/CMakeLists.txt b/gr-fcd/lib/CMakeLists.txt
index 35cefedffb..f12842d6b8 100644
--- a/gr-fcd/lib/CMakeLists.txt
+++ b/gr-fcd/lib/CMakeLists.txt
@@ -29,7 +29,7 @@ include_directories(
     ${GR_FCD_INCLUDE_DIRS}
     ${GR_AUDIO_INCLUDE_DIRS}
     ${GR_BLOCKS_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${LIBUSB_INCLUDE_DIR}
@@ -56,7 +56,7 @@ list(APPEND gr_fcd_sources
 )
 
 list(APPEND fcd_libs
-    gnuradio-core
+    gnuradio-runtime
     gnuradio-blocks
     gnuradio-audio
     ${Boost_LIBRARIES}
diff --git a/gr-fcd/swig/CMakeLists.txt b/gr-fcd/swig/CMakeLists.txt
index c170f3f663..370a82bef2 100644
--- a/gr-fcd/swig/CMakeLists.txt
+++ b/gr-fcd/swig/CMakeLists.txt
@@ -28,7 +28,7 @@ include(GrSwig)
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_FCD_INCLUDE_DIRS}
     ${GR_AUDIO_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-fcd/swig/fcd_swig.i b/gr-fcd/swig/fcd_swig.i
index f4ad1b3202..d1dcca83ba 100644
--- a/gr-fcd/swig/fcd_swig.i
+++ b/gr-fcd/swig/fcd_swig.i
@@ -25,7 +25,7 @@
 //suppress 319. No access specifier given for base class name (ignored).
 #pragma SWIG nowarn=319
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "fcd_swig_doc.i"
diff --git a/gr-fec/CMakeLists.txt b/gr-fec/CMakeLists.txt
index ad9418334e..a63cf9cd14 100644
--- a/gr-fec/CMakeLists.txt
+++ b/gr-fec/CMakeLists.txt
@@ -30,7 +30,7 @@ include(GrComponent)
 GR_REGISTER_COMPONENT("gr-fec" ENABLE_GR_FEC
     Boost_FOUND
     ENABLE_GRUEL
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_BLOCKS
 )
 
diff --git a/gr-fec/include/fec/CMakeLists.txt b/gr-fec/include/fec/CMakeLists.txt
index 2d49dbe301..7ab0498000 100644
--- a/gr-fec/include/fec/CMakeLists.txt
+++ b/gr-fec/include/fec/CMakeLists.txt
@@ -26,7 +26,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
 #!${PYTHON_EXECUTABLE}
 
 import sys, os, re
-sys.path.append('${GR_CORE_PYTHONPATH}')
+sys.path.append('${GR_RUNTIME_PYTHONPATH}')
 os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
 os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
 
diff --git a/gr-fec/lib/CMakeLists.txt b/gr-fec/lib/CMakeLists.txt
index 566bb37072..d6c273aa9f 100644
--- a/gr-fec/lib/CMakeLists.txt
+++ b/gr-fec/lib/CMakeLists.txt
@@ -29,7 +29,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${GR_FEC_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
@@ -59,7 +59,7 @@ if(MSVC)
 endif(MSVC)
 
 list(APPEND gnuradio_fec_libs
-    gnuradio-core
+    gnuradio-runtime
     ${Boost_LIBRARIES}
 )
 
diff --git a/gr-fec/lib/viterbi/CMakeLists.txt b/gr-fec/lib/viterbi/CMakeLists.txt
index 6605556a84..3697787bcc 100644
--- a/gr-fec/lib/viterbi/CMakeLists.txt
+++ b/gr-fec/lib/viterbi/CMakeLists.txt
@@ -41,7 +41,7 @@ list(APPEND viterbi_sources ${CMAKE_CURRENT_BINARY_DIR}/boost_math_erf.cc)
 endif(MSVC)
 
 ########################################################################
-# Append gnuradio-core library sources
+# Append gnuradio-runtime library sources
 ########################################################################
 list(APPEND gnuradio_fec_sources ${viterbi_sources})
 
diff --git a/gr-fec/swig/CMakeLists.txt b/gr-fec/swig/CMakeLists.txt
index 60178827e5..e071386237 100644
--- a/gr-fec/swig/CMakeLists.txt
+++ b/gr-fec/swig/CMakeLists.txt
@@ -26,7 +26,7 @@ include(GrSwig)
 set(GR_SWIG_INCLUDE_DIRS
     ${CMAKE_CURRENT_BINARY_DIR}/../include
     ${GR_FEC_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-fec/swig/fec_swig.i b/gr-fec/swig/fec_swig.i
index 3ffed89d27..5a50b63777 100644
--- a/gr-fec/swig/fec_swig.i
+++ b/gr-fec/swig/fec_swig.i
@@ -22,7 +22,7 @@
 
 #define FEC_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "fec_swig_doc.i"
diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt
index 6b37bd3caa..9133303d9b 100644
--- a/gr-fft/CMakeLists.txt
+++ b/gr-fft/CMakeLists.txt
@@ -33,7 +33,7 @@ GR_REGISTER_COMPONENT("gr-fft" ENABLE_GR_FFT
     ENABLE_GRUEL
     ENABLE_VOLK
     Boost_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_BLOCKS
     FFTW3F_FOUND
 )
diff --git a/gr-fft/lib/CMakeLists.txt b/gr-fft/lib/CMakeLists.txt
index 6516ad42d4..6c0c18eaa0 100644
--- a/gr-fft/lib/CMakeLists.txt
+++ b/gr-fft/lib/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${GR_FFT_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${FFTW3F_INCLUDE_DIRS}
@@ -50,7 +50,7 @@ list(APPEND fft_sources
 )
 
 list(APPEND fft_libs
-    gnuradio-core
+    gnuradio-runtime
     ${Boost_LIBRARIES}
     ${FFTW3F_LIBRARIES}
 )
diff --git a/gr-fft/swig/CMakeLists.txt b/gr-fft/swig/CMakeLists.txt
index 13ade2c908..2545edece4 100644
--- a/gr-fft/swig/CMakeLists.txt
+++ b/gr-fft/swig/CMakeLists.txt
@@ -25,7 +25,7 @@ include(GrSwig)
 
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_FFT_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${FFTW3F_INCLUDE_DIRS}
diff --git a/gr-fft/swig/fft_swig.i b/gr-fft/swig/fft_swig.i
index 07fab34d4e..51e44cfe49 100644
--- a/gr-fft/swig/fft_swig.i
+++ b/gr-fft/swig/fft_swig.i
@@ -22,7 +22,7 @@
 
 #define FFT_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "fft_swig_doc.i"
diff --git a/gr-filter/CMakeLists.txt b/gr-filter/CMakeLists.txt
index adfb92b1c9..2b83542e6f 100644
--- a/gr-filter/CMakeLists.txt
+++ b/gr-filter/CMakeLists.txt
@@ -31,7 +31,7 @@ GR_REGISTER_COMPONENT("gr-filter" ENABLE_GR_FILTER
     ENABLE_GRUEL
     ENABLE_VOLK
     Boost_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_FFT
     ENABLE_GR_BLOCKS
 )
diff --git a/gr-filter/include/filter/CMakeLists.txt b/gr-filter/include/filter/CMakeLists.txt
index 269c2192f2..d81f6b6607 100644
--- a/gr-filter/include/filter/CMakeLists.txt
+++ b/gr-filter/include/filter/CMakeLists.txt
@@ -26,7 +26,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
 #!${PYTHON_EXECUTABLE}
 
 import sys, os, re
-sys.path.append('${GR_CORE_PYTHONPATH}')
+sys.path.append('${GR_RUNTIME_PYTHONPATH}')
 os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
 os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
 
diff --git a/gr-filter/lib/CMakeLists.txt b/gr-filter/lib/CMakeLists.txt
index 3164e7ad54..2a32debd9a 100644
--- a/gr-filter/lib/CMakeLists.txt
+++ b/gr-filter/lib/CMakeLists.txt
@@ -26,7 +26,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
 #!${PYTHON_EXECUTABLE}
 
 import sys, os, re
-sys.path.append('${GR_CORE_PYTHONPATH}')
+sys.path.append('${GR_RUNTIME_PYTHONPATH}')
 os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
 os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
 
@@ -95,7 +95,7 @@ include_directories(
     ${GR_FILTER_INCLUDE_DIRS}
     ${GR_FFT_INCLUDE_DIRS}
     ${GR_BLOCKS_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${VOLK_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${LOG4CPP_INCLUDE_DIRS}
@@ -162,7 +162,7 @@ if(MSVC)
 endif(MSVC)
 
 list(APPEND filter_libs
-    gnuradio-core
+    gnuradio-runtime
     gnuradio-fft
     gnuradio-blocks
     volk
@@ -175,7 +175,7 @@ target_link_libraries(gnuradio-filter ${filter_libs})
 GR_LIBRARY_FOO(gnuradio-filter RUNTIME_COMPONENT "filter_runtime" DEVEL_COMPONENT "filter_devel")
 add_dependencies(gnuradio-filter
   filter_generated_includes filter_generated_swigs
-  gnuradio-core gnuradio-fft)
+  gnuradio-runtime gnuradio-fft)
 
 ########################################################################
 # QA C++ Code for gr-filter
@@ -201,7 +201,7 @@ if(ENABLE_TESTING)
 
   target_link_libraries(
     test-gr-filter
-    gnuradio-core
+    gnuradio-runtime
     gnuradio-filter
     ${Boost_LIBRARIES}
     ${CPPUNIT_LIBRARIES}
diff --git a/gr-filter/swig/CMakeLists.txt b/gr-filter/swig/CMakeLists.txt
index ea8c010e07..5656c07877 100644
--- a/gr-filter/swig/CMakeLists.txt
+++ b/gr-filter/swig/CMakeLists.txt
@@ -26,13 +26,13 @@ include(GrSwig)
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_FILTER_INCLUDE_DIRS}
     ${GR_FFT_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${FFTW3F_INCLUDE_DIRS}
 )
 
-# FIXME: rename to filter_swig_doc.i when gnuradio-core is updated
+# FIXME: rename to filter_swig_doc.i when gnuradio-runtime is updated
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/gr_filter_swig_doc.i)
 set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
 set(GR_SWIG_TARGET_DEPS filter_generated_includes)
diff --git a/gr-filter/swig/filter_swig.i b/gr-filter/swig/filter_swig.i
index bb4eab381a..066a2e2aab 100644
--- a/gr-filter/swig/filter_swig.i
+++ b/gr-filter/swig/filter_swig.i
@@ -22,7 +22,7 @@
 
 #define FILTER_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "gr_filter_swig_doc.i"
diff --git a/gr-howto-write-a-block/CMakeLists.txt b/gr-howto-write-a-block/CMakeLists.txt
index 760a7b62ea..b49c1e0034 100644
--- a/gr-howto-write-a-block/CMakeLists.txt
+++ b/gr-howto-write-a-block/CMakeLists.txt
@@ -108,7 +108,7 @@ GR_LOGGING()
 ########################################################################
 include_directories(
     ${CMAKE_SOURCE_DIR}/include
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
diff --git a/gr-howto-write-a-block/cmake/Modules/FindGnuradioCore.cmake b/gr-howto-write-a-block/cmake/Modules/FindGnuradioCore.cmake
index 3773588a70..f32bf5c392 100644
--- a/gr-howto-write-a-block/cmake/Modules/FindGnuradioCore.cmake
+++ b/gr-howto-write-a-block/cmake/Modules/FindGnuradioCore.cmake
@@ -2,7 +2,7 @@ INCLUDE(FindPkgConfig)
 PKG_CHECK_MODULES(PC_GNURADIO_CORE gnuradio-core)
 
 FIND_PATH(
-    GNURADIO_CORE_INCLUDE_DIRS
+    GNURADIO_RUNTIME_INCLUDE_DIRS
     NAMES gr_random.h
     HINTS $ENV{GNURADIO_CORE_DIR}/include/gnuradio
         ${PC_GNURADIO_CORE_INCLUDEDIR}
@@ -22,5 +22,5 @@ FIND_LIBRARY(
 )
 
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_CORE DEFAULT_MSG GNURADIO_CORE_LIBRARIES GNURADIO_CORE_INCLUDE_DIRS)
-MARK_AS_ADVANCED(GNURADIO_CORE_LIBRARIES GNURADIO_CORE_INCLUDE_DIRS)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_CORE DEFAULT_MSG GNURADIO_CORE_LIBRARIES GNURADIO_RUNTIME_INCLUDE_DIRS)
+MARK_AS_ADVANCED(GNURADIO_CORE_LIBRARIES GNURADIO_RUNTIME_INCLUDE_DIRS)
diff --git a/gr-howto-write-a-block/swig/CMakeLists.txt b/gr-howto-write-a-block/swig/CMakeLists.txt
index 4d5f1156e3..6e0df5336a 100644
--- a/gr-howto-write-a-block/swig/CMakeLists.txt
+++ b/gr-howto-write-a-block/swig/CMakeLists.txt
@@ -31,7 +31,7 @@ include(GrPython)
 ########################################################################
 # Setup swig generation
 ########################################################################
-foreach(incdir ${GNURADIO_CORE_INCLUDE_DIRS})
+foreach(incdir ${GNURADIO_RUNTIME_INCLUDE_DIRS})
     list(APPEND GR_SWIG_INCLUDE_DIRS ${incdir}/swig)
 endforeach(incdir)
 
diff --git a/gr-howto-write-a-block/swig/howto_swig.i b/gr-howto-write-a-block/swig/howto_swig.i
index 162bc6a901..0c806daa40 100644
--- a/gr-howto-write-a-block/swig/howto_swig.i
+++ b/gr-howto-write-a-block/swig/howto_swig.i
@@ -2,7 +2,7 @@
 
 #define HOWTO_API
 
-%include "gnuradio.i"			// the common stuff
+%include "runtime_swig.i"			// the common stuff
 
 //load generated python docstrings
 %include "howto_swig_doc.i"
diff --git a/gr-noaa/CMakeLists.txt b/gr-noaa/CMakeLists.txt
index 3da763c7f8..5a73c57d8b 100644
--- a/gr-noaa/CMakeLists.txt
+++ b/gr-noaa/CMakeLists.txt
@@ -28,7 +28,7 @@ include(GrBoost)
 include(GrComponent)
 GR_REGISTER_COMPONENT("gr-noaa" ENABLE_GR_NOAA
     Boost_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_BLOCKS
 )
 
diff --git a/gr-noaa/lib/CMakeLists.txt b/gr-noaa/lib/CMakeLists.txt
index df0eafb0f3..a5a5cfbb8f 100644
--- a/gr-noaa/lib/CMakeLists.txt
+++ b/gr-noaa/lib/CMakeLists.txt
@@ -22,7 +22,7 @@
 ########################################################################
 include_directories(
     ${GR_NOAA_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
@@ -60,7 +60,7 @@ if(MSVC)
 endif(MSVC)
 
 list(APPEND noaa_libs
-    gnuradio-core
+    gnuradio-runtime
     ${Boost_LIBRARIES}
     ${LOG4CPP_LIBRARIES}
 )
diff --git a/gr-noaa/swig/CMakeLists.txt b/gr-noaa/swig/CMakeLists.txt
index b89b3a7680..cc471a56c8 100644
--- a/gr-noaa/swig/CMakeLists.txt
+++ b/gr-noaa/swig/CMakeLists.txt
@@ -25,7 +25,7 @@ include(GrSwig)
 
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_NOAA_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-noaa/swig/noaa_swig.i b/gr-noaa/swig/noaa_swig.i
index 63859103e6..a7d3879369 100644
--- a/gr-noaa/swig/noaa_swig.i
+++ b/gr-noaa/swig/noaa_swig.i
@@ -22,7 +22,7 @@
 
 #define NOAA_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "noaa_swig_doc.i"
diff --git a/gr-pager/CMakeLists.txt b/gr-pager/CMakeLists.txt
index 4bd25af8c3..a92886cf30 100644
--- a/gr-pager/CMakeLists.txt
+++ b/gr-pager/CMakeLists.txt
@@ -28,7 +28,7 @@ include(GrBoost)
 include(GrComponent)
 GR_REGISTER_COMPONENT("gr-pager" ENABLE_GR_PAGER
     Boost_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_FILTER
     ENABLE_GR_ANALOG
 )
diff --git a/gr-pager/lib/CMakeLists.txt b/gr-pager/lib/CMakeLists.txt
index 3349d2d785..ca64bf38ef 100644
--- a/gr-pager/lib/CMakeLists.txt
+++ b/gr-pager/lib/CMakeLists.txt
@@ -23,7 +23,7 @@
 include_directories(
     ${GR_PAGER_INCLUDE_DIRS}
     ${GR_BLOCKS_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
@@ -62,7 +62,7 @@ if(MSVC)
 endif(MSVC)
 
 list(APPEND pager_libs
-    gnuradio-core
+    gnuradio-runtime
     gnuradio-blocks
     ${Boost_LIBRARIES}
     ${LOG4CPP_LIBRARIES}
diff --git a/gr-pager/swig/CMakeLists.txt b/gr-pager/swig/CMakeLists.txt
index b6eee8b1eb..5fba4fa19a 100644
--- a/gr-pager/swig/CMakeLists.txt
+++ b/gr-pager/swig/CMakeLists.txt
@@ -25,7 +25,7 @@ include(GrSwig)
 
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_PAGER_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-pager/swig/pager_swig.i b/gr-pager/swig/pager_swig.i
index ac4fa0278e..b558d5a6cd 100644
--- a/gr-pager/swig/pager_swig.i
+++ b/gr-pager/swig/pager_swig.i
@@ -21,7 +21,7 @@
 
 #define PAGER_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "pager_swig_doc.i"
diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt
index a2485b8921..046fb3ca19 100644
--- a/gr-qtgui/CMakeLists.txt
+++ b/gr-qtgui/CMakeLists.txt
@@ -48,7 +48,7 @@ GR_REGISTER_COMPONENT("gr-qtgui" ENABLE_GR_QTGUI
     QWT_FOUND
     ENABLE_GRUEL
     ENABLE_VOLK
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_FFT
     ENABLE_GR_FILTER
     PYTHONLIBS_FOUND
diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt
index fb58c8e097..7c60eb7018 100644
--- a/gr-qtgui/lib/CMakeLists.txt
+++ b/gr-qtgui/lib/CMakeLists.txt
@@ -104,7 +104,7 @@ include_directories(
     ${GR_QTGUI_INCLUDE_DIRS}
     ${GR_FFT_INCLUDE_DIRS}
     ${GR_FILTER_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${VOLK_INCLUDE_DIRS}
     ${QWT_INCLUDE_DIRS}
@@ -133,7 +133,7 @@ endif(ENABLE_GR_CTRLPORT)
 # Setup library
 ########################################################################
 list(APPEND qtgui_libs
-    gnuradio-core
+    gnuradio-runtime
     gnuradio-fft
     gnuradio-filter
     volk
diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
index d17130597e..7232d05a8f 100644
--- a/gr-qtgui/swig/CMakeLists.txt
+++ b/gr-qtgui/swig/CMakeLists.txt
@@ -27,7 +27,7 @@ set(GR_SWIG_INCLUDE_DIRS
     ${GR_QTGUI_INCLUDE_DIRS}
     ${GR_FFT_INCLUDE_DIRS}
     ${GR_FILTER_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${QWT_INCLUDE_DIRS}
     ${QT_INCLUDE_DIRS}
diff --git a/gr-qtgui/swig/qtgui_swig.i b/gr-qtgui/swig/qtgui_swig.i
index 4e1d1969e2..e57f931552 100644
--- a/gr-qtgui/swig/qtgui_swig.i
+++ b/gr-qtgui/swig/qtgui_swig.i
@@ -23,7 +23,7 @@
 #define QTGUI_API
 #define FILTER_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "qtgui_swig_doc.i"
diff --git a/gr-shd/CMakeLists.txt b/gr-shd/CMakeLists.txt
index dfd3ad5c01..05474dd8c5 100644
--- a/gr-shd/CMakeLists.txt
+++ b/gr-shd/CMakeLists.txt
@@ -57,7 +57,7 @@ include(GrComponent)
 GR_REGISTER_COMPONENT("gr-shd" ENABLE_GR_SHD
     Boost_FOUND
     SHD_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_ANALOG
 )
 
diff --git a/gr-shd/lib/CMakeLists.txt b/gr-shd/lib/CMakeLists.txt
index 0f75726ad8..e71efd0ea0 100644
--- a/gr-shd/lib/CMakeLists.txt
+++ b/gr-shd/lib/CMakeLists.txt
@@ -22,7 +22,7 @@
 ########################################################################
 include_directories(
     ${GR_SHD_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${SHD_INCLUDE_DIRS}
@@ -57,7 +57,7 @@ if(MSVC)
 endif(MSVC)
 
 list(APPEND shd_libs
-    gnuradio-core
+    gnuradio-runtime
     ${Boost_LIBRARIES}
     ${SHD_LIBRARIES}
     ${LOG4CPP_LIBRARIES}
diff --git a/gr-shd/swig/CMakeLists.txt b/gr-shd/swig/CMakeLists.txt
index 8044c45e72..eb33845f96 100644
--- a/gr-shd/swig/CMakeLists.txt
+++ b/gr-shd/swig/CMakeLists.txt
@@ -27,7 +27,7 @@ set(GR_SWIG_FLAGS -DGR_HAVE_SHD) #needed to parse shd_swig.i
 
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_SHD_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${SHD_INCLUDE_DIRS}
diff --git a/gr-shd/swig/shd_swig.i b/gr-shd/swig/shd_swig.i
index 9d5dae51cc..3169d02966 100644
--- a/gr-shd/swig/shd_swig.i
+++ b/gr-shd/swig/shd_swig.i
@@ -50,7 +50,7 @@
 ////////////////////////////////////////////////////////////////////////
 // standard includes
 ////////////////////////////////////////////////////////////////////////
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 ////////////////////////////////////////////////////////////////////////
 // block headers
diff --git a/gr-trellis/CMakeLists.txt b/gr-trellis/CMakeLists.txt
index b764998e8c..245f3f9c25 100644
--- a/gr-trellis/CMakeLists.txt
+++ b/gr-trellis/CMakeLists.txt
@@ -28,7 +28,7 @@ include(GrBoost)
 include(GrComponent)
 GR_REGISTER_COMPONENT("gr-trellis" ENABLE_GR_TRELLIS
     Boost_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_ANALOG
     ENABLE_GR_BLOCKS
     ENABLE_GR_DIGITAL
diff --git a/gr-trellis/include/trellis/CMakeLists.txt b/gr-trellis/include/trellis/CMakeLists.txt
index 6abb93a6f4..b7ceea179e 100644
--- a/gr-trellis/include/trellis/CMakeLists.txt
+++ b/gr-trellis/include/trellis/CMakeLists.txt
@@ -26,7 +26,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
 #!${PYTHON_EXECUTABLE}
 
 import sys, os, re
-sys.path.append('${GR_CORE_PYTHONPATH}')
+sys.path.append('${GR_RUNTIME_PYTHONPATH}')
 os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
 os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
 
diff --git a/gr-trellis/lib/CMakeLists.txt b/gr-trellis/lib/CMakeLists.txt
index 1d4a9e7080..099db57734 100644
--- a/gr-trellis/lib/CMakeLists.txt
+++ b/gr-trellis/lib/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}/../include
     ${GR_TRELLIS_INCLUDE_DIRS}
     ${GR_DIGITAL_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${LOG4CXX_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
@@ -47,7 +47,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
 #!${PYTHON_EXECUTABLE}
 
 import sys, os, re
-sys.path.append('${GR_CORE_PYTHONPATH}')
+sys.path.append('${GR_RUNTIME_PYTHONPATH}')
 os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
 os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
 
@@ -130,7 +130,7 @@ list(APPEND trellis_sources
 )
 
 list(APPEND trellis_libs
-    gnuradio-core
+    gnuradio-runtime
     gnuradio-digital
     ${Boost_LIBRARIES}
 )
@@ -140,4 +140,4 @@ target_link_libraries(gnuradio-trellis ${trellis_libs})
 GR_LIBRARY_FOO(gnuradio-trellis RUNTIME_COMPONENT "trellis_runtime" DEVEL_COMPONENT "trellis_devel")
 add_dependencies(gnuradio-trellis
   trellis_generated_includes trellis_generated_swigs
-  gnuradio-core gnuradio-digital)
+  gnuradio-runtime gnuradio-digital)
diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt
index d2e5fb19ff..c20f4df101 100644
--- a/gr-trellis/src/lib/CMakeLists.txt
+++ b/gr-trellis/src/lib/CMakeLists.txt
@@ -25,7 +25,7 @@ include(GrPython)
 include_directories(
     ${GR_TRELLIS_INCLUDE_DIRS}
     ${GR_DIGITAL_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
@@ -42,7 +42,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
 #!${PYTHON_EXECUTABLE}
 
 import sys, os, re
-sys.path.append('${GR_CORE_PYTHONPATH}')
+sys.path.append('${GR_RUNTIME_PYTHONPATH}')
 sys.path.append('${CMAKE_CURRENT_SOURCE_DIR}')
 os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
 os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
@@ -165,7 +165,7 @@ if(MSVC)
 endif(MSVC)
 
 list(APPEND trellis_libs
-    gnuradio-core
+    gnuradio-runtime
     ${Boost_LIBRARIES}
     ${LOG4CPP_LIBRARIES}
 )
@@ -224,7 +224,7 @@ set(GR_SWIG_SOURCE_DEPS
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_TRELLIS_INCLUDE_DIRS}
     ${GR_DIGITAL_SWIG_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-trellis/swig/CMakeLists.txt b/gr-trellis/swig/CMakeLists.txt
index c2bbf3bc69..8e15fc8858 100644
--- a/gr-trellis/swig/CMakeLists.txt
+++ b/gr-trellis/swig/CMakeLists.txt
@@ -26,7 +26,7 @@ include(GrSwig)
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_TRELLIS_INCLUDE_DIRS}
     ${GR_DIGITAL_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-trellis/swig/trellis_swig.i b/gr-trellis/swig/trellis_swig.i
index 5732aca1fb..d593926b0d 100644
--- a/gr-trellis/swig/trellis_swig.i
+++ b/gr-trellis/swig/trellis_swig.i
@@ -22,7 +22,7 @@
 #define TRELLIS_API
 #define DIGITAL_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "trellis_swig_doc.i"
diff --git a/gr-uhd/CMakeLists.txt b/gr-uhd/CMakeLists.txt
index b0407cb8c8..30dcba141d 100644
--- a/gr-uhd/CMakeLists.txt
+++ b/gr-uhd/CMakeLists.txt
@@ -31,7 +31,7 @@ include(GrComponent)
 GR_REGISTER_COMPONENT("gr-uhd" ENABLE_GR_UHD
     Boost_FOUND
     UHD_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_FILTER
     ENABLE_GR_BLOCKS
     ENABLE_GR_ANALOG
diff --git a/gr-uhd/examples/c++/CMakeLists.txt b/gr-uhd/examples/c++/CMakeLists.txt
index a6c9891d73..aa50c589fc 100644
--- a/gr-uhd/examples/c++/CMakeLists.txt
+++ b/gr-uhd/examples/c++/CMakeLists.txt
@@ -23,7 +23,7 @@
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${GR_UHD_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${UHD_INCLUDE_DIRS}
diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt
index 07ea657093..fe95fcb7ef 100644
--- a/gr-uhd/lib/CMakeLists.txt
+++ b/gr-uhd/lib/CMakeLists.txt
@@ -23,7 +23,7 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${GR_UHD_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${LOG4CXX_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
@@ -68,7 +68,7 @@ if(MSVC)
 endif(MSVC)
 
 list(APPEND uhd_libs
-    gnuradio-core
+    gnuradio-runtime
     ${Boost_LIBRARIES}
     ${UHD_LIBRARIES}
     ${LOG4CPP_LIBRARIES}
diff --git a/gr-uhd/swig/CMakeLists.txt b/gr-uhd/swig/CMakeLists.txt
index 3a5132e7fd..5f25bb87fd 100644
--- a/gr-uhd/swig/CMakeLists.txt
+++ b/gr-uhd/swig/CMakeLists.txt
@@ -27,7 +27,7 @@ set(GR_SWIG_FLAGS -DGR_HAVE_UHD) #needed to parse uhd_swig.i
 
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_UHD_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${UHD_INCLUDE_DIRS}
diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i
index 8ab4d59f3e..478d8d7d2d 100644
--- a/gr-uhd/swig/uhd_swig.i
+++ b/gr-uhd/swig/uhd_swig.i
@@ -32,7 +32,7 @@
 ////////////////////////////////////////////////////////////////////////
 // standard includes
 ////////////////////////////////////////////////////////////////////////
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "uhd_swig_doc.i"
diff --git a/gr-utils/CMakeLists.txt b/gr-utils/CMakeLists.txt
index e4d64d54c0..19981ab68b 100644
--- a/gr-utils/CMakeLists.txt
+++ b/gr-utils/CMakeLists.txt
@@ -26,7 +26,7 @@
 ########################################################################
 include(GrComponent)
 GR_REGISTER_COMPONENT("gr-utils" ENABLE_GR_UTILS
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_PYTHON
 )
 
diff --git a/gnuradio-core/src/utils/cic_comp_taps.m b/gr-utils/octave/cic_comp_taps.m
index 9ae5cb1674..9ae5cb1674 100644
--- a/gnuradio-core/src/utils/cic_comp_taps.m
+++ b/gr-utils/octave/cic_comp_taps.m
diff --git a/gnuradio-core/src/utils/cool.m b/gr-utils/octave/cool.m
index f8b8a5cea6..f8b8a5cea6 100644
--- a/gnuradio-core/src/utils/cool.m
+++ b/gr-utils/octave/cool.m
diff --git a/gnuradio-core/src/utils/db_width.m b/gr-utils/octave/db_width.m
index e9c64cc795..e9c64cc795 100644
--- a/gnuradio-core/src/utils/db_width.m
+++ b/gr-utils/octave/db_width.m
diff --git a/gnuradio-core/src/utils/filter_tools.m b/gr-utils/octave/filter_tools.m
index 552791e334..552791e334 100644
--- a/gnuradio-core/src/utils/filter_tools.m
+++ b/gr-utils/octave/filter_tools.m
diff --git a/gnuradio-core/src/utils/is_complex.m b/gr-utils/octave/is_complex.m
index 4700467b15..4700467b15 100644
--- a/gnuradio-core/src/utils/is_complex.m
+++ b/gr-utils/octave/is_complex.m
diff --git a/gnuradio-core/src/utils/lp_to_bp.m b/gr-utils/octave/lp_to_bp.m
index 4e73f6cc73..4e73f6cc73 100644
--- a/gnuradio-core/src/utils/lp_to_bp.m
+++ b/gr-utils/octave/lp_to_bp.m
diff --git a/gnuradio-core/src/utils/plot_cic_decimator_response.m b/gr-utils/octave/plot_cic_decimator_response.m
index 8f06aeafed..8f06aeafed 100644
--- a/gnuradio-core/src/utils/plot_cic_decimator_response.m
+++ b/gr-utils/octave/plot_cic_decimator_response.m
diff --git a/gnuradio-core/src/utils/plot_freq_response.m b/gr-utils/octave/plot_freq_response.m
index 335c51d626..335c51d626 100644
--- a/gnuradio-core/src/utils/plot_freq_response.m
+++ b/gr-utils/octave/plot_freq_response.m
diff --git a/gnuradio-core/src/utils/plot_freq_response_db.m b/gr-utils/octave/plot_freq_response_db.m
index 10ce7d6e17..10ce7d6e17 100644
--- a/gnuradio-core/src/utils/plot_freq_response_db.m
+++ b/gr-utils/octave/plot_freq_response_db.m
diff --git a/gnuradio-core/src/utils/plot_freq_response_phase.m b/gr-utils/octave/plot_freq_response_phase.m
index 591bd5b948..591bd5b948 100644
--- a/gnuradio-core/src/utils/plot_freq_response_phase.m
+++ b/gr-utils/octave/plot_freq_response_phase.m
diff --git a/gnuradio-core/src/utils/plotfft.m b/gr-utils/octave/plotfft.m
index 20a2efd4c2..20a2efd4c2 100644
--- a/gnuradio-core/src/utils/plotfft.m
+++ b/gr-utils/octave/plotfft.m
diff --git a/gnuradio-core/src/utils/plotfftavgk.m b/gr-utils/octave/plotfftavgk.m
index c82c540f39..c82c540f39 100644
--- a/gnuradio-core/src/utils/plotfftavgk.m
+++ b/gr-utils/octave/plotfftavgk.m
diff --git a/gnuradio-core/src/utils/plotfftavgk_db.m b/gr-utils/octave/plotfftavgk_db.m
index 73cee140d0..73cee140d0 100644
--- a/gnuradio-core/src/utils/plotfftavgk_db.m
+++ b/gr-utils/octave/plotfftavgk_db.m
diff --git a/gnuradio-core/src/utils/plotfftk.m b/gr-utils/octave/plotfftk.m
index df2bf3aca0..df2bf3aca0 100644
--- a/gnuradio-core/src/utils/plotfftk.m
+++ b/gr-utils/octave/plotfftk.m
diff --git a/gnuradio-core/src/utils/plotfftk_db.m b/gr-utils/octave/plotfftk_db.m
index b2c85412f7..b2c85412f7 100644
--- a/gnuradio-core/src/utils/plotfftk_db.m
+++ b/gr-utils/octave/plotfftk_db.m
diff --git a/gnuradio-core/src/utils/put_markers.m b/gr-utils/octave/put_markers.m
index 1244d31aaf..1244d31aaf 100644
--- a/gnuradio-core/src/utils/put_markers.m
+++ b/gr-utils/octave/put_markers.m
diff --git a/gnuradio-core/src/utils/rainbow.m b/gr-utils/octave/rainbow.m
index 35fab19b89..35fab19b89 100644
--- a/gnuradio-core/src/utils/rainbow.m
+++ b/gr-utils/octave/rainbow.m
diff --git a/gnuradio-core/src/utils/read_char_binary.m b/gr-utils/octave/read_char_binary.m
index 029cea7834..029cea7834 100644
--- a/gnuradio-core/src/utils/read_char_binary.m
+++ b/gr-utils/octave/read_char_binary.m
diff --git a/gnuradio-core/src/utils/read_complex_binary.m b/gr-utils/octave/read_complex_binary.m
index eb81f0fa08..eb81f0fa08 100644
--- a/gnuradio-core/src/utils/read_complex_binary.m
+++ b/gr-utils/octave/read_complex_binary.m
diff --git a/gnuradio-core/src/utils/read_cshort_binary.m b/gr-utils/octave/read_cshort_binary.m
index 149b6ca88c..149b6ca88c 100644
--- a/gnuradio-core/src/utils/read_cshort_binary.m
+++ b/gr-utils/octave/read_cshort_binary.m
diff --git a/gnuradio-core/src/utils/read_float_binary.m b/gr-utils/octave/read_float_binary.m
index d27d09b9c1..d27d09b9c1 100644
--- a/gnuradio-core/src/utils/read_float_binary.m
+++ b/gr-utils/octave/read_float_binary.m
diff --git a/gnuradio-core/src/utils/read_int_binary.m b/gr-utils/octave/read_int_binary.m
index cd83bb6636..cd83bb6636 100644
--- a/gnuradio-core/src/utils/read_int_binary.m
+++ b/gr-utils/octave/read_int_binary.m
diff --git a/gnuradio-core/src/utils/read_short_binary.m b/gr-utils/octave/read_short_binary.m
index 7b42f5e2be..7b42f5e2be 100644
--- a/gnuradio-core/src/utils/read_short_binary.m
+++ b/gr-utils/octave/read_short_binary.m
diff --git a/gnuradio-core/src/utils/read_xambi.m b/gr-utils/octave/read_xambi.m
index 5adb94264e..5adb94264e 100644
--- a/gnuradio-core/src/utils/read_xambi.m
+++ b/gr-utils/octave/read_xambi.m
diff --git a/gnuradio-core/src/utils/runsum.m b/gr-utils/octave/runsum.m
index 0f530b0159..0f530b0159 100644
--- a/gnuradio-core/src/utils/runsum.m
+++ b/gr-utils/octave/runsum.m
diff --git a/gnuradio-core/src/utils/single_pole_iir.m b/gr-utils/octave/single_pole_iir.m
index 12e21f2acf..12e21f2acf 100644
--- a/gnuradio-core/src/utils/single_pole_iir.m
+++ b/gr-utils/octave/single_pole_iir.m
diff --git a/gnuradio-core/src/utils/split_vect.m b/gr-utils/octave/split_vect.m
index aef5c5c383..aef5c5c383 100644
--- a/gnuradio-core/src/utils/split_vect.m
+++ b/gr-utils/octave/split_vect.m
diff --git a/gnuradio-core/src/utils/write_float_binary.m b/gr-utils/octave/write_float_binary.m
index 79414878b6..79414878b6 100644
--- a/gnuradio-core/src/utils/write_float_binary.m
+++ b/gr-utils/octave/write_float_binary.m
diff --git a/gnuradio-core/src/utils/write_short_binary.m b/gr-utils/octave/write_short_binary.m
index 72b3c408eb..72b3c408eb 100644
--- a/gnuradio-core/src/utils/write_short_binary.m
+++ b/gr-utils/octave/write_short_binary.m
diff --git a/gr-utils/python/modtool/gr-newmod/swig/howto_swig.i b/gr-utils/python/modtool/gr-newmod/swig/howto_swig.i
index 4627d48d34..1946fb47a8 100644
--- a/gr-utils/python/modtool/gr-newmod/swig/howto_swig.i
+++ b/gr-utils/python/modtool/gr-newmod/swig/howto_swig.i
@@ -2,7 +2,7 @@
 
 #define HOWTO_API
 
-%include "gnuradio.i"			// the common stuff
+%include "runtime_swig.i"			// the common stuff
 
 //load generated python docstrings
 %include "howto_swig_doc.i"
diff --git a/gr-video-sdl/CMakeLists.txt b/gr-video-sdl/CMakeLists.txt
index 6dfec7d671..91005269bf 100644
--- a/gr-video-sdl/CMakeLists.txt
+++ b/gr-video-sdl/CMakeLists.txt
@@ -31,7 +31,7 @@ include(GrComponent)
 GR_REGISTER_COMPONENT("gr-video-sdl" ENABLE_GR_VIDEO_SDL
     SDL_FOUND
     Boost_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
 )
 
 GR_SET_GLOBAL(GR_VIDEO_SDL_INCLUDE_DIRS
diff --git a/gr-video-sdl/lib/CMakeLists.txt b/gr-video-sdl/lib/CMakeLists.txt
index 7df22e949c..5b0b9fdfae 100644
--- a/gr-video-sdl/lib/CMakeLists.txt
+++ b/gr-video-sdl/lib/CMakeLists.txt
@@ -22,7 +22,7 @@
 ########################################################################
 include_directories(
     ${GR_VIDEO_SDL_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${LOG4CXX_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
@@ -46,7 +46,7 @@ list(APPEND video_sdl_sources
 )
 
 list(APPEND video_sdl_libs
-    gnuradio-core
+    gnuradio-runtime
     ${Boost_LIBRARIES}
     ${SDL_LIBRARY}
 )
@@ -56,4 +56,4 @@ add_library(gnuradio-video-sdl SHARED ${video_sdl_sources})
 target_link_libraries(gnuradio-video-sdl ${video_sdl_libs})
 GR_LIBRARY_FOO(gnuradio-video-sdl RUNTIME_COMPONENT "video_sdl_runtime" DEVEL_COMPONENT "video_sdl_devel")
 add_dependencies(gnuradio-video-sdl 
-  gnuradio-core)
+  gnuradio-runtime)
diff --git a/gr-video-sdl/src/CMakeLists.txt b/gr-video-sdl/src/CMakeLists.txt
index 8053182239..636b34d6df 100644
--- a/gr-video-sdl/src/CMakeLists.txt
+++ b/gr-video-sdl/src/CMakeLists.txt
@@ -22,7 +22,7 @@
 ########################################################################
 include_directories(
     ${GR_VIDEO_SDL_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${LOG4CPP_INCLUDE_DIRS}
@@ -54,7 +54,7 @@ if(MSVC)
 endif(MSVC)
 
 list(APPEND video_sdl_libs
-    gnuradio-core
+    gnuradio-runtime
     ${Boost_LIBRARIES}
     ${SDL_LIBRARY}
     ${LOG4CPP_LIBRARIES}
@@ -84,7 +84,7 @@ include(GrSwig)
 
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_COMEDI_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-video-sdl/swig/CMakeLists.txt b/gr-video-sdl/swig/CMakeLists.txt
index 4c16be3ad5..00bb8755d5 100644
--- a/gr-video-sdl/swig/CMakeLists.txt
+++ b/gr-video-sdl/swig/CMakeLists.txt
@@ -25,7 +25,7 @@ include(GrSwig)
 
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_VIDEO_SDL_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-video-sdl/swig/video_sdl_swig.i b/gr-video-sdl/swig/video_sdl_swig.i
index 8561565901..d66201d670 100644
--- a/gr-video-sdl/swig/video_sdl_swig.i
+++ b/gr-video-sdl/swig/video_sdl_swig.i
@@ -22,7 +22,7 @@
 
 #define VIDEO_SDL_API
 
-%include "gnuradio.i"				// the common stuff
+%include "runtime_swig.i"				// the common stuff
 
 //load generated python docstrings
 %include "video_sdl_swig_doc.i"
diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt
index f8f7a20b46..03f77376a9 100644
--- a/gr-vocoder/CMakeLists.txt
+++ b/gr-vocoder/CMakeLists.txt
@@ -28,7 +28,7 @@ include(GrBoost)
 include(GrComponent)
 GR_REGISTER_COMPONENT("gr-vocoder" ENABLE_GR_VOCODER
     Boost_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_FFT
     ENABLE_GR_BLOCKS
     ENABLE_GR_FILTER
diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt
index 32f1ef0fb1..4512c19704 100644
--- a/gr-vocoder/lib/CMakeLists.txt
+++ b/gr-vocoder/lib/CMakeLists.txt
@@ -22,7 +22,7 @@
 ########################################################################
 include_directories(
     ${GR_VOCODER_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${LOG4CXX_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
@@ -83,7 +83,7 @@ GR_INCLUDE_SUBDIRECTORY(g7xx)
 GR_INCLUDE_SUBDIRECTORY(gsm)
 
 list(APPEND vocoder_libs
-    gnuradio-core
+    gnuradio-runtime
     ${Boost_LIBRARIES}
     ${LOG4CPP_LIBRARIES}
 )
diff --git a/gr-vocoder/swig/CMakeLists.txt b/gr-vocoder/swig/CMakeLists.txt
index 3a60cdf7bb..1fa5c0abb7 100644
--- a/gr-vocoder/swig/CMakeLists.txt
+++ b/gr-vocoder/swig/CMakeLists.txt
@@ -25,7 +25,7 @@ include(GrSwig)
 
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_VOCODER_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-vocoder/swig/vocoder_swig.i b/gr-vocoder/swig/vocoder_swig.i
index 6c3f3fe422..b3dd436868 100644
--- a/gr-vocoder/swig/vocoder_swig.i
+++ b/gr-vocoder/swig/vocoder_swig.i
@@ -22,7 +22,7 @@
 
 #define VOCODER_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "vocoder_swig_doc.i"
diff --git a/gr-wavelet/CMakeLists.txt b/gr-wavelet/CMakeLists.txt
index 1eb536f9d9..11a7eb2689 100644
--- a/gr-wavelet/CMakeLists.txt
+++ b/gr-wavelet/CMakeLists.txt
@@ -31,7 +31,7 @@ include(GrComponent)
 
 GR_REGISTER_COMPONENT("gr-wavelet" ENABLE_GR_WAVELET
     Boost_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_BLOCKS
     ENABLE_GR_ANALOG
     GSL_FOUND
diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt
index a78a24e22a..d25245f0cc 100644
--- a/gr-wavelet/lib/CMakeLists.txt
+++ b/gr-wavelet/lib/CMakeLists.txt
@@ -25,7 +25,7 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${GR_WAVELET_INCLUDE_DIRS}
     ${GR_BLOCKS_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${LOG4CXX_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
@@ -72,7 +72,7 @@ if(MSVC)
 endif(MSVC)
 
 list(APPEND wavelet_libs
-    gnuradio-core
+    gnuradio-runtime
     gnuradio-blocks
     ${Boost_LIBRARIES}
     ${WAVELET_LIBRARIES}
@@ -85,4 +85,4 @@ target_link_libraries(gnuradio-wavelet ${wavelet_libs})
 GR_LIBRARY_FOO(gnuradio-wavelet RUNTIME_COMPONENT "wavelet_runtime" DEVEL_COMPONENT "wavelet_devel")
 add_dependencies(gnuradio-wavelet
   wavelet_generated_includes wavelet_generated_swigs
-  gnuradio-core)
+  gnuradio-runtime)
diff --git a/gr-wavelet/swig/CMakeLists.txt b/gr-wavelet/swig/CMakeLists.txt
index 0c78c8936f..38f9b0a016 100644
--- a/gr-wavelet/swig/CMakeLists.txt
+++ b/gr-wavelet/swig/CMakeLists.txt
@@ -26,7 +26,7 @@ include(GrSwig)
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_WAVELET_INCLUDE_DIRS}
     ${GR_BLOCKS_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${GSL_INCLUDE_DIRS}
diff --git a/gr-wavelet/swig/wavelet_swig.i b/gr-wavelet/swig/wavelet_swig.i
index 40fe3f9b5e..d9b8e3144b 100644
--- a/gr-wavelet/swig/wavelet_swig.i
+++ b/gr-wavelet/swig/wavelet_swig.i
@@ -22,7 +22,7 @@
 
 #define WAVELET_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "wavelet_swig_doc.i"
diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt
index 500bb44474..a265b688cf 100644
--- a/gr-wxgui/CMakeLists.txt
+++ b/gr-wxgui/CMakeLists.txt
@@ -38,7 +38,7 @@ if(NOT CMAKE_CROSSCOMPILING)
 endif(NOT CMAKE_CROSSCOMPILING)
 
 GR_REGISTER_COMPONENT("gr-wxgui" ENABLE_GR_WXGUI
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_FFT
     ENABLE_GR_FILTER
     ENABLE_GR_ANALOG
diff --git a/gr-wxgui/lib/CMakeLists.txt b/gr-wxgui/lib/CMakeLists.txt
index 8c7c56fdcc..dc4dbbc40b 100644
--- a/gr-wxgui/lib/CMakeLists.txt
+++ b/gr-wxgui/lib/CMakeLists.txt
@@ -25,7 +25,7 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}/../include
     ${GR_WXGUI_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${VOLK_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
@@ -63,7 +63,7 @@ IF(MSVC)
 ENDIF(MSVC)
 
 list(APPEND wxgui_libs
-    gnuradio-core
+    gnuradio-runtime
     volk
     ${Boost_LIBRARIES}
     ${BLOCKS_LIBRARIES}
diff --git a/gr-wxgui/swig/CMakeLists.txt b/gr-wxgui/swig/CMakeLists.txt
index 16e7d65050..aa0750f44b 100644
--- a/gr-wxgui/swig/CMakeLists.txt
+++ b/gr-wxgui/swig/CMakeLists.txt
@@ -26,7 +26,7 @@ include(GrSwig)
 set(GR_SWIG_INCLUDE_DIRS
     ${CMAKE_CURRENT_BINARY_DIR}/../include
     ${GR_WXGUI_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
diff --git a/gr-wxgui/swig/wxgui_swig.i b/gr-wxgui/swig/wxgui_swig.i
index 1151b17ee5..69c1887a46 100644
--- a/gr-wxgui/swig/wxgui_swig.i
+++ b/gr-wxgui/swig/wxgui_swig.i
@@ -22,7 +22,7 @@
 
 #define WXGUI_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "wxgui_swig_doc.i"
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index 1156f1d760..daf874b264 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -43,7 +43,7 @@ if(NOT CMAKE_CROSSCOMPILING)
 endif(NOT CMAKE_CROSSCOMPILING)
 
 GR_REGISTER_COMPONENT("gnuradio-companion" ENABLE_GRC
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_PYTHON
     ${grc_python_deps}
 )
diff --git a/gruel/CMakeLists.txt b/gruel/CMakeLists.txt
index 627135abe9..3bdb7406ed 100644
--- a/gruel/CMakeLists.txt
+++ b/gruel/CMakeLists.txt
@@ -37,6 +37,8 @@ include(GrMiscUtils)
 GR_SET_GLOBAL(GRUEL_INCLUDE_DIRS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/include
     ${CMAKE_CURRENT_BINARY_DIR}/src/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/swig
+    ${CMAKE_CURRENT_BINARY_DIR}/src/swig
 )
 
 ########################################################################
diff --git a/gruel/src/python/CMakeLists.txt b/gruel/src/python/CMakeLists.txt
index ba8e8d68a9..e91a6babdf 100644
--- a/gruel/src/python/CMakeLists.txt
+++ b/gruel/src/python/CMakeLists.txt
@@ -47,7 +47,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
         ${CMAKE_BINARY_DIR}/gruel/src/python
         ${CMAKE_BINARY_DIR}/gruel/src/swig
     )
-    set(GR_TEST_TARGET_DEPS gruel gnuradio-core)
+    set(GR_TEST_TARGET_DEPS gruel gnuradio-runtime)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
 endforeach(py_qa_test_file)
 endif(ENABLE_TESTING)
author	Johnathan Corgan <johnathan@corganlabs.com>	2013-03-26 20:18:53 -0700
committer	Johnathan Corgan <johnathan@corganlabs.com>	2013-03-26 20:18:53 -0700
commit	26dceecc80390f10cedb94bd9e4fd655827d7f17 (patch)
tree	f88cb2995133048b4a2191bae688fa09b33a19ae
parent	9bbbda510c265b211b5b571db79ba259c67ee049 (diff)