171 files changed, 406 insertions, 247 deletions

diff --git a/Makefile.common b/Makefile.common
index fabe8eb2a..f7c88b0d9 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -101,7 +101,7 @@ GCELL_SPU_INCLUDES = @gcell_spu_INCLUDES@
 GCELL_SPU_LA = @gcell_spu_LA@
 
 # libtool aware wrapper for ppu-embedspu
-GCELL_EMBEDSPU_LIBTOOL = @abs_top_srcdir@/gcell/src/lib/runtime/gcell-embedspu-libtool
+GCELL_EMBEDSPU_LIBTOOL = @abs_top_srcdir@/gcell/lib/runtime/gcell-embedspu-libtool
 
 # This used to be set in configure.ac but is now defined here for all 
 # Makefiles when this fragment is included.
diff --git a/config/Makefile.am b/config/Makefile.am
index bdc79a5fa..22de44b9f 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -79,6 +79,7 @@ m4macros = \
 	grc_gr_msdd6000.m4 \
 	gr_doxygen.m4 \
 	gr_fortran.m4 \
+	gr_gcell.m4 \
 	gr_gprof.m4 \
 	gr_lib64.m4 \
 	gr_libgnuradio_core_extra_ldflags.m4 \
diff --git a/config/gr_gcell.m4 b/config/gr_gcell.m4
new file mode 100644
index 000000000..0b8b97802
--- /dev/null
+++ b/config/gr_gcell.m4
@@ -0,0 +1,36 @@
+#
+# Copyright 2008 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+AC_DEFUN([GR_GCELL],[
+  passed=yes
+  PKG_CHECK_MODULES(GCELL, gcell >= 3.1, [],
+    [passed=no; AC_MSG_RESULT([gcell not found])])
+  PKG_CHECK_MODULES(GCELL_SPU, gcell_spu >= 3.1, [],
+    [passed=no; AC_MSG_RESULT([gcell_spu not found])])
+
+  GCELL_EMBEDSPU_LIBTOOL=
+  if test $passed = yes; then
+    GCELL_EMBEDSPU_LIBTOOL=`$PKG_CONFIG --variable=gcell_embedspu_libtool gcell 2>/dev/null`
+    AC_DEFINE(HAVE_GCELL,[1],[Define if you have gcell installed])
+  fi
+  AC_SUBST([GCELL_EMBEDSPU_LIBTOOL])
+
+  AM_CONDITIONAL([HAVE_GCELL], [test "$passed" = "yes"])
+])
diff --git a/config/gr_standalone.m4 b/config/gr_standalone.m4
index 097445420..370f7fb03 100644
--- a/config/gr_standalone.m4
+++ b/config/gr_standalone.m4
@@ -70,6 +70,17 @@ m4_define([GR_STANDALONE],
   GR_NO_UNDEFINED	dnl do we need the -no-undefined linker flag
   GR_SCRIPTING		dnl Locate python, SWIG, etc
 
+  AC_ARG_WITH([python],
+    AC_HELP_STRING([--with-python], [Should we use python? [[default=yes]]]),
+    [case "$with_python" in
+      (no | yes) ;;
+      (*) AC_MSG_ERROR([Invalid argument ($with_python) to --with-python]) ;;
+     esac],
+    [with_python=yes])
+
+  AM_CONDITIONAL([USE_PYTHON], [test "$with_python" = yes])
+
+
   dnl Set the c++ compiler that we use for the build system when cross compiling
   if test "x$CXX_FOR_BUILD" = x
   then
@@ -93,6 +104,13 @@ m4_define([GR_STANDALONE],
   AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
   AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
 
+  dnl Define where to look for cppunit includes and libs
+  dnl sets CPPUNIT_CFLAGS and CPPUNIT_LIBS
+  dnl Try using pkg-config first, then fall back to cppunit-config.
+  PKG_CHECK_EXISTS(cppunit,
+    [PKG_CHECK_MODULES(CPPUNIT, cppunit >= 1.9.14)],
+    [AM_PATH_CPPUNIT([1.9.14],[],
+		     [AC_MSG_ERROR([GNU Radio requires cppunit.  Stop])])])
+
   PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core >= 3)
-  LIBS="$LIBS $GNURADIO_CORE_LIBS"
 ])
diff --git a/config/grc_gcell.m4 b/config/grc_gcell.m4
index 38854b95b..ff289d1ae 100644
--- a/config/grc_gcell.m4
+++ b/config/grc_gcell.m4
@@ -50,40 +50,30 @@ AC_DEFUN([GRC_GCELL],[
 
     if test $passed != with; then
 	dnl how and where to find INCLUDES and LA
-	gcell_INCLUDES="-I\${abs_top_srcdir}/gcell/src/include \
-		 -I\${abs_top_srcdir}/gcell/src/lib/runtime \
-		 -I\${abs_top_srcdir}/gcell/src/lib/general \
-		 -I\${abs_top_srcdir}/gcell/src/lib/wrapper"
-        gcell_LA="\${abs_top_builddir}/gcell/src/lib/libgcell.la"
-	gcell_spu_INCLUDES="-I\${abs_top_srcdir}/gcell/src/include/spu \
-		 -I\${abs_top_srcdir}/gcell/src/include \
-		 -I\${abs_top_srcdir}/gcell/src/lib/runtime/spu \
-		 -I\${abs_top_srcdir}/gcell/src/lib/general/spu \
-		 -I\${abs_top_srcdir}/gcell/src/lib/wrapper/spu"
-	gcell_spu_LA="\${abs_top_builddir}/gcell/src/lib/spu/libgcell_spu.a"
+	gcell_INCLUDES="-I\${abs_top_srcdir}/gcell/include"
+        gcell_LA="\${abs_top_builddir}/gcell/lib/libgcell.la"
+	gcell_spu_INCLUDES="-I\${abs_top_srcdir}/gcell/include"
+	gcell_spu_LA="\${abs_top_builddir}/gcell/lib/spu/libgcell_spu.a"
 	AC_SUBST(gcell_spu_INCLUDES)
 	AC_SUBST(gcell_spu_LA)
 
-        dnl kludge up initial swig dependency files
-        AC_CONFIG_COMMANDS([swig_gcell_deps], [
-            touch gr-gcell/src/gcell.d
-        ])
     fi
 
     AC_CONFIG_FILES([ \
         gcell/Makefile \
         gcell/gcell.pc \
-        gcell/src/Makefile \
-        gcell/src/include/Makefile \
-        gcell/src/include/spu/Makefile \
-        gcell/src/lib/Makefile \
-        gcell/src/lib/spu/Makefile \
-        gcell/src/lib/general/Makefile \
-        gcell/src/lib/wrapper/Makefile \
-        gcell/src/lib/runtime/Makefile \
-        gcell/src/apps/Makefile \
-	gcell/src/apps/spu/Makefile \
-	gcell/src/ibm/Makefile \
+        gcell/gcell_spu.pc \
+	gcell/include/Makefile \
+        gcell/include/gcell/Makefile \
+        gcell/include/gcell/spu/Makefile \
+        gcell/lib/Makefile \
+        gcell/lib/spu/Makefile \
+        gcell/lib/general/Makefile \
+        gcell/lib/wrapper/Makefile \
+        gcell/lib/runtime/Makefile \
+        gcell/apps/Makefile \
+	gcell/apps/spu/Makefile \
+	gcell/ibm/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(gcell)
diff --git a/config/grc_gr_gcell.m4 b/config/grc_gr_gcell.m4
index d425337ef..191afdc08 100644
--- a/config/grc_gr_gcell.m4
+++ b/config/grc_gr_gcell.m4
@@ -31,6 +31,12 @@ AC_DEFUN([GRC_GR_GCELL],[
         gr-gcell/src/run_tests \
     ])
 
+    dnl kludge up initial swig dependency files
+    AC_CONFIG_COMMANDS([swig_gcell_deps], [
+        touch gr-gcell/src/gcell.d
+    ])
+
+
     GRC_BUILD_CONDITIONAL(gr-gcell,[
 	dnl run_tests is created from run_tests.in.  Make it executable.
 	AC_CONFIG_COMMANDS([run_tests_gcell], [chmod +x gr-gcell/src/run_tests])
diff --git a/config/lf_warnings.m4 b/config/lf_warnings.m4
index e18288013..7bb8b60fc 100644
--- a/config/lf_warnings.m4
+++ b/config/lf_warnings.m4
@@ -115,7 +115,7 @@ AC_DEFUN([LF_SET_WARNINGS],[
      
   dnl Warnings for the two main compilers
   dnl add -Wextra when you're got time to fix a bunch of them ;-)
-  cc_warning_flags="-Wall $lf_warnings_as_errors"
+  cc_warning_flags="-Wall -Werror-implicit-function-declaration $lf_warnings_as_errors"
   cxx_warning_flags="-Wall -Woverloaded-virtual $lf_warnings_as_errors"
   if test -n "${CC}"
   then
diff --git a/config/pkg.m4 b/config/pkg.m4
index 80bdfed4c..2d4d96109 100644
--- a/config/pkg.m4
+++ b/config/pkg.m4
@@ -111,8 +111,11 @@ fi[]dnl
 # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 #
 # --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_DEFUN([PKG_CHECK_MODULES],[
+AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_INCLUDEDIR], [includedir for $1, overriding pkg-config])dnl
@@ -124,7 +127,17 @@ _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 
 if test x$cross_compiling = xyes
 then
-  _PKG_CONFIG([$1][_LIBS], [libs-only-l --static], [$2])
+  dnl _PKG_CONFIG([$1][_LIBS], [libs-only-l --static], [$2])
+  _PKG_CONFIG([$1][_LIBS], [libs --static], [$2])
+  dnl prune out any -L/lib or -L/usr/lib since they're pointing to the wrong filesystem root
+  _pkg_tmp=
+  for flag in [$]pkg_cv_[$1][_LIBS]; do
+    case $flag in
+    (-L/lib* | -L/usr/lib* )	   ;; # ignore
+    (*) _pkg_tmp="$_pkg_tmp $flag" ;;
+    esac
+  done
+  pkg_cv_[$1][_LIBS]="$_pkg_tmp"
 else
   _PKG_CONFIG([$1][_LIBS], [libs --static], [$2])
 fi
diff --git a/gcell/Makefile.am b/gcell/Makefile.am
index 959d3563d..fe222e5fb 100644
--- a/gcell/Makefile.am
+++ b/gcell/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2007,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,7 +20,9 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = src
+SUBDIRS = include lib apps ibm
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA =
+pkgconfig_DATA = \
+	gcell.pc \
+	gcell_spu.pc
diff --git a/gcell/src/apps/Makefile.am b/gcell/apps/Makefile.am
index 7dd695653..e6768523c 100644
--- a/gcell/src/apps/Makefile.am
+++ b/gcell/apps/Makefile.am
@@ -26,7 +26,7 @@ AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) \
 	$(GCELL_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
 
 
-GCELL_QA_LA = $(top_builddir)/gcell/src/lib/libgcell-qa.la
+GCELL_QA_LA = $(top_builddir)/gcell/lib/libgcell-qa.la
 
 TESTS = test_all
 
diff --git a/gcell/src/apps/benchmark_dma.cc b/gcell/apps/benchmark_dma.cc
index 7dfaa4c22..bce1953a3 100644
--- a/gcell/src/apps/benchmark_dma.cc
+++ b/gcell/apps/benchmark_dma.cc
@@ -22,7 +22,7 @@
 #if defined(HAVE_CONFIG_H)
 #include <config.h>
 #endif
-#include "gc_job_manager.h"
+#include <gcell/gc_job_manager.h>
 #include <omni_time.h>
 #include <getopt.h>
 #include <stdlib.h>
diff --git a/gcell/src/apps/benchmark_nop.cc b/gcell/apps/benchmark_nop.cc
index f427c85d8..10f9d4c5a 100644
--- a/gcell/src/apps/benchmark_nop.cc
+++ b/gcell/apps/benchmark_nop.cc
@@ -22,7 +22,7 @@
 #if defined(HAVE_CONFIG_H)
 #include <config.h>
 #endif
-#include "gc_job_manager.h"
+#include <gcell/gc_job_manager.h>
 #include <omni_time.h>
 #include <getopt.h>
 #include <stdlib.h>
diff --git a/gcell/src/apps/gen_script.py b/gcell/apps/gen_script.py
index e4bbc7480..e4bbc7480 100755
--- a/gcell/src/apps/gen_script.py
+++ b/gcell/apps/gen_script.py
diff --git a/gcell/src/apps/plot_speedup.py b/gcell/apps/plot_speedup.py
index 96277f85c..96277f85c 100755
--- a/gcell/src/apps/plot_speedup.py
+++ b/gcell/apps/plot_speedup.py
diff --git a/gcell/src/apps/results-071223 b/gcell/apps/results-071223
index 271617121..271617121 100644
--- a/gcell/src/apps/results-071223
+++ b/gcell/apps/results-071223
diff --git a/gcell/src/apps/split_and_avg_results.py b/gcell/apps/split_and_avg_results.py
index 8a750fac9..8a750fac9 100755
--- a/gcell/src/apps/split_and_avg_results.py
+++ b/gcell/apps/split_and_avg_results.py
diff --git a/gcell/src/apps/spu/Makefile.am b/gcell/apps/spu/Makefile.am
index c07a2c398..c07a2c398 100644
--- a/gcell/src/apps/spu/Makefile.am
+++ b/gcell/apps/spu/Makefile.am
diff --git a/gcell/src/apps/spu/benchmark_procs.c b/gcell/apps/spu/benchmark_procs.c
index 0fddb2d1a..fbc703349 100644
--- a/gcell/src/apps/spu/benchmark_procs.c
+++ b/gcell/apps/spu/benchmark_procs.c
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <gc_delay.h>
-#include <gc_declare_proc.h>
+#include <gcell/gc_declare_proc.h>
+#include <gcell/spu/gc_delay.h>
 #include <string.h>
 
 static void
diff --git a/gcell/src/apps/test_all.cc b/gcell/apps/test_all.cc
index 798549be1..9823960c4 100644
--- a/gcell/src/apps/test_all.cc
+++ b/gcell/apps/test_all.cc
@@ -21,8 +21,8 @@
 
 #include <cppunit/TextTestRunner.h>
 
-#include <qa_gcell_runtime.h>
-#include <qa_gcell_wrapper.h>
+#include "../lib/runtime/qa_gcell_runtime.h"
+#include "../lib/wrapper/qa_gcell_wrapper.h"
 
 int 
 main(int argc, char **argv)
diff --git a/gcell/gcell.pc.in b/gcell/gcell.pc.in
index 2b6101d13..d88d0fb67 100644
--- a/gcell/gcell.pc.in
+++ b/gcell/gcell.pc.in
@@ -2,10 +2,11 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+gcell_embedspu_libtool=@bindir@/gcell-embedspu-libtool
 
 Name: gcell
 Description: The GNU Radio SPE scheduler and RPC mechanism
-Requires: gnuradio-omnithread mblock
+Requires: gnuradio-omnithread
 Version: @VERSION@
 Libs: -L${libdir} -lgcell
 Cflags: -I${includedir} @DEFINES@
diff --git a/gcell/gcell_spu.pc.in b/gcell/gcell_spu.pc.in
new file mode 100644
index 000000000..b59043b9b
--- /dev/null
+++ b/gcell/gcell_spu.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@spu
+includedir=@includedir@
+
+Name: gcell_spu
+Description: The GNU Radio SPE scheduler and RPC mechanism (SPU components)
+Requires: 
+Version: @VERSION@
+Libs: -L${libdir} -lgcell_spu
+Cflags: -I${includedir}
diff --git a/gcell/src/ibm/Makefile.am b/gcell/ibm/Makefile.am
index 8013e6a3a..8013e6a3a 100644
--- a/gcell/src/ibm/Makefile.am
+++ b/gcell/ibm/Makefile.am
diff --git a/gcell/src/ibm/README b/gcell/ibm/README
index 9420fcc46..9420fcc46 100644
--- a/gcell/src/ibm/README
+++ b/gcell/ibm/README
diff --git a/gcell/src/ibm/sync/ppu_source/atomic.h b/gcell/ibm/sync/ppu_source/atomic.h
index 105f7bf37..105f7bf37 100644
--- a/gcell/src/ibm/sync/ppu_source/atomic.h
+++ b/gcell/ibm/sync/ppu_source/atomic.h
diff --git a/gcell/src/ibm/sync/ppu_source/atomic_add.h b/gcell/ibm/sync/ppu_source/atomic_add.h
index dd7a5b25a..dd7a5b25a 100644
--- a/gcell/src/ibm/sync/ppu_source/atomic_add.h
+++ b/gcell/ibm/sync/ppu_source/atomic_add.h
diff --git a/gcell/src/ibm/sync/ppu_source/atomic_add_return.h b/gcell/ibm/sync/ppu_source/atomic_add_return.h
index 0fe127565..0fe127565 100644
--- a/gcell/src/ibm/sync/ppu_source/atomic_add_return.h
+++ b/gcell/ibm/sync/ppu_source/atomic_add_return.h
diff --git a/gcell/src/ibm/sync/ppu_source/atomic_dec.h b/gcell/ibm/sync/ppu_source/atomic_dec.h
index 4f82f04e0..4f82f04e0 100644
--- a/gcell/src/ibm/sync/ppu_source/atomic_dec.h
+++ b/gcell/ibm/sync/ppu_source/atomic_dec.h
diff --git a/gcell/src/ibm/sync/ppu_source/atomic_dec_and_test.h b/gcell/ibm/sync/ppu_source/atomic_dec_and_test.h
index 5093d4059..5093d4059 100644
--- a/gcell/src/ibm/sync/ppu_source/atomic_dec_and_test.h
+++ b/gcell/ibm/sync/ppu_source/atomic_dec_and_test.h
diff --git a/gcell/src/ibm/sync/ppu_source/atomic_dec_if_positive.h b/gcell/ibm/sync/ppu_source/atomic_dec_if_positive.h
index c4d113bfd..c4d113bfd 100644
--- a/gcell/src/ibm/sync/ppu_source/atomic_dec_if_positive.h
+++ b/gcell/ibm/sync/ppu_source/atomic_dec_if_positive.h
diff --git a/gcell/src/ibm/sync/ppu_source/atomic_dec_return.h b/gcell/ibm/sync/ppu_source/atomic_dec_return.h
index cd87893fa..cd87893fa 100644
--- a/gcell/src/ibm/sync/ppu_source/atomic_dec_return.h
+++ b/gcell/ibm/sync/ppu_source/atomic_dec_return.h
diff --git a/gcell/src/ibm/sync/ppu_source/atomic_inc.h b/gcell/ibm/sync/ppu_source/atomic_inc.h
index 714aecbc0..714aecbc0 100644
--- a/gcell/src/ibm/sync/ppu_source/atomic_inc.h
+++ b/gcell/ibm/sync/ppu_source/atomic_inc.h
diff --git a/gcell/src/ibm/sync/ppu_source/atomic_inc_return.h b/gcell/ibm/sync/ppu_source/atomic_inc_return.h
index 95178f50d..95178f50d 100644
--- a/gcell/src/ibm/sync/ppu_source/atomic_inc_return.h
+++ b/gcell/ibm/sync/ppu_source/atomic_inc_return.h
diff --git a/gcell/src/ibm/sync/ppu_source/atomic_read.h b/gcell/ibm/sync/ppu_source/atomic_read.h
index 258fd516c..258fd516c 100644
--- a/gcell/src/ibm/sync/ppu_source/atomic_read.h
+++ b/gcell/ibm/sync/ppu_source/atomic_read.h
diff --git a/gcell/src/ibm/sync/ppu_source/atomic_set.h b/gcell/ibm/sync/ppu_source/atomic_set.h
index e624af40d..e624af40d 100644
--- a/gcell/src/ibm/sync/ppu_source/atomic_set.h
+++ b/gcell/ibm/sync/ppu_source/atomic_set.h
diff --git a/gcell/src/ibm/sync/ppu_source/atomic_sub.h b/gcell/ibm/sync/ppu_source/atomic_sub.h
index b8d35975a..b8d35975a 100644
--- a/gcell/src/ibm/sync/ppu_source/atomic_sub.h
+++ b/gcell/ibm/sync/ppu_source/atomic_sub.h
diff --git a/gcell/src/ibm/sync/ppu_source/atomic_sub_and_test.h b/gcell/ibm/sync/ppu_source/atomic_sub_and_test.h
index 37ba58896..37ba58896 100644
--- a/gcell/src/ibm/sync/ppu_source/atomic_sub_and_test.h
+++ b/gcell/ibm/sync/ppu_source/atomic_sub_and_test.h
diff --git a/gcell/src/ibm/sync/ppu_source/atomic_sub_return.h b/gcell/ibm/sync/ppu_source/atomic_sub_return.h
index 084bfa6b1..084bfa6b1 100644
--- a/gcell/src/ibm/sync/ppu_source/atomic_sub_return.h
+++ b/gcell/ibm/sync/ppu_source/atomic_sub_return.h
diff --git a/gcell/src/ibm/sync/ppu_source/complete.h b/gcell/ibm/sync/ppu_source/complete.h
index 8633463f7..8633463f7 100644
--- a/gcell/src/ibm/sync/ppu_source/complete.h
+++ b/gcell/ibm/sync/ppu_source/complete.h
diff --git a/gcell/src/ibm/sync/ppu_source/complete_all.h b/gcell/ibm/sync/ppu_source/complete_all.h
index c12eb7f03..c12eb7f03 100644
--- a/gcell/src/ibm/sync/ppu_source/complete_all.h
+++ b/gcell/ibm/sync/ppu_source/complete_all.h
diff --git a/gcell/src/ibm/sync/ppu_source/completion.h b/gcell/ibm/sync/ppu_source/completion.h
index b74bdaae7..b74bdaae7 100644
--- a/gcell/src/ibm/sync/ppu_source/completion.h
+++ b/gcell/ibm/sync/ppu_source/completion.h
diff --git a/gcell/src/ibm/sync/ppu_source/cond.h b/gcell/ibm/sync/ppu_source/cond.h
index 9a38f71a4..9a38f71a4 100644
--- a/gcell/src/ibm/sync/ppu_source/cond.h
+++ b/gcell/ibm/sync/ppu_source/cond.h
diff --git a/gcell/src/ibm/sync/ppu_source/cond_broadcast.h b/gcell/ibm/sync/ppu_source/cond_broadcast.h
index b93bf7b37..b93bf7b37 100644
--- a/gcell/src/ibm/sync/ppu_source/cond_broadcast.h
+++ b/gcell/ibm/sync/ppu_source/cond_broadcast.h
diff --git a/gcell/src/ibm/sync/ppu_source/cond_init.h b/gcell/ibm/sync/ppu_source/cond_init.h
index 0dfbd6349..0dfbd6349 100644
--- a/gcell/src/ibm/sync/ppu_source/cond_init.h
+++ b/gcell/ibm/sync/ppu_source/cond_init.h
diff --git a/gcell/src/ibm/sync/ppu_source/cond_signal.h b/gcell/ibm/sync/ppu_source/cond_signal.h
index dd4874827..dd4874827 100644
--- a/gcell/src/ibm/sync/ppu_source/cond_signal.h
+++ b/gcell/ibm/sync/ppu_source/cond_signal.h
diff --git a/gcell/src/ibm/sync/ppu_source/cond_wait.h b/gcell/ibm/sync/ppu_source/cond_wait.h
index ed5fbecb1..ed5fbecb1 100644
--- a/gcell/src/ibm/sync/ppu_source/cond_wait.h
+++ b/gcell/ibm/sync/ppu_source/cond_wait.h
diff --git a/gcell/src/ibm/sync/ppu_source/init_completion.h b/gcell/ibm/sync/ppu_source/init_completion.h
index 8e7081111..8e7081111 100644
--- a/gcell/src/ibm/sync/ppu_source/init_completion.h
+++ b/gcell/ibm/sync/ppu_source/init_completion.h
diff --git a/gcell/src/ibm/sync/ppu_source/libsync.h b/gcell/ibm/sync/ppu_source/libsync.h
index bd2e04347..bd2e04347 100644
--- a/gcell/src/ibm/sync/ppu_source/libsync.h
+++ b/gcell/ibm/sync/ppu_source/libsync.h
diff --git a/gcell/src/ibm/sync/ppu_source/mutex.h b/gcell/ibm/sync/ppu_source/mutex.h
index 364bb2249..364bb2249 100644
--- a/gcell/src/ibm/sync/ppu_source/mutex.h
+++ b/gcell/ibm/sync/ppu_source/mutex.h
diff --git a/gcell/src/ibm/sync/ppu_source/mutex_init.h b/gcell/ibm/sync/ppu_source/mutex_init.h
index 105dc2c57..105dc2c57 100644
--- a/gcell/src/ibm/sync/ppu_source/mutex_init.h
+++ b/gcell/ibm/sync/ppu_source/mutex_init.h
diff --git a/gcell/src/ibm/sync/ppu_source/mutex_lock.h b/gcell/ibm/sync/ppu_source/mutex_lock.h
index 75240a141..75240a141 100644
--- a/gcell/src/ibm/sync/ppu_source/mutex_lock.h
+++ b/gcell/ibm/sync/ppu_source/mutex_lock.h
diff --git a/gcell/src/ibm/sync/ppu_source/mutex_trylock.h b/gcell/ibm/sync/ppu_source/mutex_trylock.h
index 445196c74..445196c74 100644
--- a/gcell/src/ibm/sync/ppu_source/mutex_trylock.h
+++ b/gcell/ibm/sync/ppu_source/mutex_trylock.h
diff --git a/gcell/src/ibm/sync/ppu_source/mutex_unlock.h b/gcell/ibm/sync/ppu_source/mutex_unlock.h
index e5255be02..e5255be02 100644
--- a/gcell/src/ibm/sync/ppu_source/mutex_unlock.h
+++ b/gcell/ibm/sync/ppu_source/mutex_unlock.h
diff --git a/gcell/src/ibm/sync/ppu_source/pdt_libsync.xml b/gcell/ibm/sync/ppu_source/pdt_libsync.xml
index d9ea2ce9f..d9ea2ce9f 100644
--- a/gcell/src/ibm/sync/ppu_source/pdt_libsync.xml
+++ b/gcell/ibm/sync/ppu_source/pdt_libsync.xml
diff --git a/gcell/src/ibm/sync/ppu_source/pdt_libsync_config.xml b/gcell/ibm/sync/ppu_source/pdt_libsync_config.xml
index a0b848d84..a0b848d84 100644
--- a/gcell/src/ibm/sync/ppu_source/pdt_libsync_config.xml
+++ b/gcell/ibm/sync/ppu_source/pdt_libsync_config.xml
diff --git a/gcell/src/ibm/sync/ppu_source/sync_utils.h b/gcell/ibm/sync/ppu_source/sync_utils.h
index c7120a3cc..c7120a3cc 100644
--- a/gcell/src/ibm/sync/ppu_source/sync_utils.h
+++ b/gcell/ibm/sync/ppu_source/sync_utils.h
diff --git a/gcell/src/ibm/sync/ppu_source/trace_libsync.h b/gcell/ibm/sync/ppu_source/trace_libsync.h
index 6d6f036e5..6d6f036e5 100644
--- a/gcell/src/ibm/sync/ppu_source/trace_libsync.h
+++ b/gcell/ibm/sync/ppu_source/trace_libsync.h
diff --git a/gcell/src/ibm/sync/ppu_source/wait_for_completion.h b/gcell/ibm/sync/ppu_source/wait_for_completion.h
index f2b04275a..f2b04275a 100644
--- a/gcell/src/ibm/sync/ppu_source/wait_for_completion.h
+++ b/gcell/ibm/sync/ppu_source/wait_for_completion.h
diff --git a/gcell/src/ibm/sync/spu_source/atomic.h b/gcell/ibm/sync/spu_source/atomic.h
index 951c26e3f..951c26e3f 100644
--- a/gcell/src/ibm/sync/spu_source/atomic.h
+++ b/gcell/ibm/sync/spu_source/atomic.h
diff --git a/gcell/src/ibm/sync/spu_source/atomic_add.h b/gcell/ibm/sync/spu_source/atomic_add.h
index 7606ae05b..7606ae05b 100644
--- a/gcell/src/ibm/sync/spu_source/atomic_add.h
+++ b/gcell/ibm/sync/spu_source/atomic_add.h
diff --git a/gcell/src/ibm/sync/spu_source/atomic_add_return.h b/gcell/ibm/sync/spu_source/atomic_add_return.h
index 35f07adf6..35f07adf6 100644
--- a/gcell/src/ibm/sync/spu_source/atomic_add_return.h
+++ b/gcell/ibm/sync/spu_source/atomic_add_return.h
diff --git a/gcell/src/ibm/sync/spu_source/atomic_dec.h b/gcell/ibm/sync/spu_source/atomic_dec.h
index 30ca7c514..30ca7c514 100644
--- a/gcell/src/ibm/sync/spu_source/atomic_dec.h
+++ b/gcell/ibm/sync/spu_source/atomic_dec.h
diff --git a/gcell/src/ibm/sync/spu_source/atomic_dec_and_test.h b/gcell/ibm/sync/spu_source/atomic_dec_and_test.h
index b3c829820..b3c829820 100644
--- a/gcell/src/ibm/sync/spu_source/atomic_dec_and_test.h
+++ b/gcell/ibm/sync/spu_source/atomic_dec_and_test.h
diff --git a/gcell/src/ibm/sync/spu_source/atomic_dec_if_positive.h b/gcell/ibm/sync/spu_source/atomic_dec_if_positive.h
index 2a01ec307..2a01ec307 100644
--- a/gcell/src/ibm/sync/spu_source/atomic_dec_if_positive.h
+++ b/gcell/ibm/sync/spu_source/atomic_dec_if_positive.h
diff --git a/gcell/src/ibm/sync/spu_source/atomic_dec_return.h b/gcell/ibm/sync/spu_source/atomic_dec_return.h
index 45effb689..45effb689 100644
--- a/gcell/src/ibm/sync/spu_source/atomic_dec_return.h
+++ b/gcell/ibm/sync/spu_source/atomic_dec_return.h
diff --git a/gcell/src/ibm/sync/spu_source/atomic_inc.h b/gcell/ibm/sync/spu_source/atomic_inc.h
index 6800efea3..6800efea3 100644
--- a/gcell/src/ibm/sync/spu_source/atomic_inc.h
+++ b/gcell/ibm/sync/spu_source/atomic_inc.h
diff --git a/gcell/src/ibm/sync/spu_source/atomic_inc_return.h b/gcell/ibm/sync/spu_source/atomic_inc_return.h
index 89361a0a1..89361a0a1 100644
--- a/gcell/src/ibm/sync/spu_source/atomic_inc_return.h
+++ b/gcell/ibm/sync/spu_source/atomic_inc_return.h
diff --git a/gcell/src/ibm/sync/spu_source/atomic_read.h b/gcell/ibm/sync/spu_source/atomic_read.h
index 711a0ad26..711a0ad26 100644
--- a/gcell/src/ibm/sync/spu_source/atomic_read.h
+++ b/gcell/ibm/sync/spu_source/atomic_read.h
diff --git a/gcell/src/ibm/sync/spu_source/atomic_set.h b/gcell/ibm/sync/spu_source/atomic_set.h
index 261d28a3d..261d28a3d 100644
--- a/gcell/src/ibm/sync/spu_source/atomic_set.h
+++ b/gcell/ibm/sync/spu_source/atomic_set.h
diff --git a/gcell/src/ibm/sync/spu_source/atomic_sub.h b/gcell/ibm/sync/spu_source/atomic_sub.h
index f366e1dee..f366e1dee 100644
--- a/gcell/src/ibm/sync/spu_source/atomic_sub.h
+++ b/gcell/ibm/sync/spu_source/atomic_sub.h
diff --git a/gcell/src/ibm/sync/spu_source/atomic_sub_and_test.h b/gcell/ibm/sync/spu_source/atomic_sub_and_test.h
index fe5824a43..fe5824a43 100644
--- a/gcell/src/ibm/sync/spu_source/atomic_sub_and_test.h
+++ b/gcell/ibm/sync/spu_source/atomic_sub_and_test.h
diff --git a/gcell/src/ibm/sync/spu_source/atomic_sub_return.h b/gcell/ibm/sync/spu_source/atomic_sub_return.h
index 5dbed5b85..5dbed5b85 100644
--- a/gcell/src/ibm/sync/spu_source/atomic_sub_return.h
+++ b/gcell/ibm/sync/spu_source/atomic_sub_return.h
diff --git a/gcell/src/ibm/sync/spu_source/complete.h b/gcell/ibm/sync/spu_source/complete.h
index 6a7808650..6a7808650 100644
--- a/gcell/src/ibm/sync/spu_source/complete.h
+++ b/gcell/ibm/sync/spu_source/complete.h
diff --git a/gcell/src/ibm/sync/spu_source/complete_all.h b/gcell/ibm/sync/spu_source/complete_all.h
index 5f9c3dcfa..5f9c3dcfa 100644
--- a/gcell/src/ibm/sync/spu_source/complete_all.h
+++ b/gcell/ibm/sync/spu_source/complete_all.h
diff --git a/gcell/src/ibm/sync/spu_source/completion.h b/gcell/ibm/sync/spu_source/completion.h
index 4a302d25c..4a302d25c 100644
--- a/gcell/src/ibm/sync/spu_source/completion.h
+++ b/gcell/ibm/sync/spu_source/completion.h
diff --git a/gcell/src/ibm/sync/spu_source/cond.h b/gcell/ibm/sync/spu_source/cond.h
index ceb3285d9..ceb3285d9 100644
--- a/gcell/src/ibm/sync/spu_source/cond.h
+++ b/gcell/ibm/sync/spu_source/cond.h
diff --git a/gcell/src/ibm/sync/spu_source/cond_broadcast.h b/gcell/ibm/sync/spu_source/cond_broadcast.h
index 15a1da330..15a1da330 100644
--- a/gcell/src/ibm/sync/spu_source/cond_broadcast.h
+++ b/gcell/ibm/sync/spu_source/cond_broadcast.h
diff --git a/gcell/src/ibm/sync/spu_source/cond_init.h b/gcell/ibm/sync/spu_source/cond_init.h
index 7202e5352..7202e5352 100644
--- a/gcell/src/ibm/sync/spu_source/cond_init.h
+++ b/gcell/ibm/sync/spu_source/cond_init.h
diff --git a/gcell/src/ibm/sync/spu_source/cond_signal.h b/gcell/ibm/sync/spu_source/cond_signal.h
index a035d2875..a035d2875 100644
--- a/gcell/src/ibm/sync/spu_source/cond_signal.h
+++ b/gcell/ibm/sync/spu_source/cond_signal.h
diff --git a/gcell/src/ibm/sync/spu_source/cond_wait.h b/gcell/ibm/sync/spu_source/cond_wait.h
index cf4b880f5..cf4b880f5 100644
--- a/gcell/src/ibm/sync/spu_source/cond_wait.h
+++ b/gcell/ibm/sync/spu_source/cond_wait.h
diff --git a/gcell/src/ibm/sync/spu_source/init_completion.h b/gcell/ibm/sync/spu_source/init_completion.h
index bf93e72af..bf93e72af 100644
--- a/gcell/src/ibm/sync/spu_source/init_completion.h
+++ b/gcell/ibm/sync/spu_source/init_completion.h
diff --git a/gcell/src/ibm/sync/spu_source/libsync.h b/gcell/ibm/sync/spu_source/libsync.h
index 48cc722bd..48cc722bd 100644
--- a/gcell/src/ibm/sync/spu_source/libsync.h
+++ b/gcell/ibm/sync/spu_source/libsync.h
diff --git a/gcell/src/ibm/sync/spu_source/mutex.h b/gcell/ibm/sync/spu_source/mutex.h
index 37f2b4d62..37f2b4d62 100644
--- a/gcell/src/ibm/sync/spu_source/mutex.h
+++ b/gcell/ibm/sync/spu_source/mutex.h
diff --git a/gcell/src/ibm/sync/spu_source/mutex_init.h b/gcell/ibm/sync/spu_source/mutex_init.h
index 9bddb1456..9bddb1456 100644
--- a/gcell/src/ibm/sync/spu_source/mutex_init.h
+++ b/gcell/ibm/sync/spu_source/mutex_init.h
diff --git a/gcell/src/ibm/sync/spu_source/mutex_lock.h b/gcell/ibm/sync/spu_source/mutex_lock.h
index 63bdbc36a..63bdbc36a 100644
--- a/gcell/src/ibm/sync/spu_source/mutex_lock.h
+++ b/gcell/ibm/sync/spu_source/mutex_lock.h
diff --git a/gcell/src/ibm/sync/spu_source/mutex_trylock.h b/gcell/ibm/sync/spu_source/mutex_trylock.h
index 3c8df4662..3c8df4662 100644
--- a/gcell/src/ibm/sync/spu_source/mutex_trylock.h
+++ b/gcell/ibm/sync/spu_source/mutex_trylock.h
diff --git a/gcell/src/ibm/sync/spu_source/mutex_unlock.h b/gcell/ibm/sync/spu_source/mutex_unlock.h
index 87d6bbaef..87d6bbaef 100644
--- a/gcell/src/ibm/sync/spu_source/mutex_unlock.h
+++ b/gcell/ibm/sync/spu_source/mutex_unlock.h
diff --git a/gcell/src/ibm/sync/spu_source/read_lock.h b/gcell/ibm/sync/spu_source/read_lock.h
index 0e1d97182..0e1d97182 100644
--- a/gcell/src/ibm/sync/spu_source/read_lock.h
+++ b/gcell/ibm/sync/spu_source/read_lock.h
diff --git a/gcell/src/ibm/sync/spu_source/read_trylock.h b/gcell/ibm/sync/spu_source/read_trylock.h
index d03278351..d03278351 100644
--- a/gcell/src/ibm/sync/spu_source/read_trylock.h
+++ b/gcell/ibm/sync/spu_source/read_trylock.h
diff --git a/gcell/src/ibm/sync/spu_source/read_unlock.h b/gcell/ibm/sync/spu_source/read_unlock.h
index f011550e5..f011550e5 100644
--- a/gcell/src/ibm/sync/spu_source/read_unlock.h
+++ b/gcell/ibm/sync/spu_source/read_unlock.h
diff --git a/gcell/src/ibm/sync/spu_source/rwlock_init.h b/gcell/ibm/sync/spu_source/rwlock_init.h
index 6b05533bb..6b05533bb 100644
--- a/gcell/src/ibm/sync/spu_source/rwlock_init.h
+++ b/gcell/ibm/sync/spu_source/rwlock_init.h
diff --git a/gcell/src/ibm/sync/spu_source/sync_irq.h b/gcell/ibm/sync/spu_source/sync_irq.h
index feae65e50..feae65e50 100644
--- a/gcell/src/ibm/sync/spu_source/sync_irq.h
+++ b/gcell/ibm/sync/spu_source/sync_irq.h
diff --git a/gcell/src/ibm/sync/spu_source/sync_utils.h b/gcell/ibm/sync/spu_source/sync_utils.h
index 516b41f74..516b41f74 100644
--- a/gcell/src/ibm/sync/spu_source/sync_utils.h
+++ b/gcell/ibm/sync/spu_source/sync_utils.h
diff --git a/gcell/src/ibm/sync/spu_source/trace_libsync.h b/gcell/ibm/sync/spu_source/trace_libsync.h
index 47887c9dc..47887c9dc 100644
--- a/gcell/src/ibm/sync/spu_source/trace_libsync.h
+++ b/gcell/ibm/sync/spu_source/trace_libsync.h
diff --git a/gcell/src/ibm/sync/spu_source/wait_for_completion.h b/gcell/ibm/sync/spu_source/wait_for_completion.h
index ea7bdbe6d..ea7bdbe6d 100644
--- a/gcell/src/ibm/sync/spu_source/wait_for_completion.h
+++ b/gcell/ibm/sync/spu_source/wait_for_completion.h
diff --git a/gcell/src/ibm/sync/spu_source/write_lock.h b/gcell/ibm/sync/spu_source/write_lock.h
index 7af5175f0..7af5175f0 100644
--- a/gcell/src/ibm/sync/spu_source/write_lock.h
+++ b/gcell/ibm/sync/spu_source/write_lock.h
diff --git a/gcell/src/ibm/sync/spu_source/write_trylock.h b/gcell/ibm/sync/spu_source/write_trylock.h
index b3799b37e..b3799b37e 100644
--- a/gcell/src/ibm/sync/spu_source/write_trylock.h
+++ b/gcell/ibm/sync/spu_source/write_trylock.h
diff --git a/gcell/src/ibm/sync/spu_source/write_unlock.h b/gcell/ibm/sync/spu_source/write_unlock.h
index 25b24e181..25b24e181 100644
--- a/gcell/src/ibm/sync/spu_source/write_unlock.h
+++ b/gcell/ibm/sync/spu_source/write_unlock.h
diff --git a/gcell/src/Makefile.am b/gcell/include/Makefile.am
index af76eb67e..c96c6f0a3 100644
--- a/gcell/src/Makefile.am
+++ b/gcell/include/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2007,2008 Free Software Foundation, Inc.
+# Copyright 2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,4 +20,5 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = include lib apps ibm
+SUBDIRS = gcell
+
diff --git a/gcell/src/include/Makefile.am b/gcell/include/gcell/Makefile.am
index 1e65282d7..03255e516 100644
--- a/gcell/src/include/Makefile.am
+++ b/gcell/include/gcell/Makefile.am
@@ -24,9 +24,11 @@ SUBDIRS = spu
 
 gcellinclude_HEADERS = \
 	compiler.h \
+	gc_aligned_alloc.h \
 	gc_atomic.h \
 	gc_cdefs.h \
 	gc_declare_proc.h \
+	gc_job_manager.h \
 	gc_jd_queue_data.h \
 	gc_jd_queue.h \
 	gc_jd_stack.h \
@@ -36,4 +38,5 @@ gcellinclude_HEADERS = \
 	gc_mbox.h \
 	gc_spu_args.h \
 	gc_types.h \
+	gcp_fft_1d_r2.h \
 	memory_barrier.h
diff --git a/gcell/src/include/compiler.h b/gcell/include/gcell/compiler.h
index 5f1c99c58..d1adcd129 100644
--- a/gcell/src/include/compiler.h
+++ b/gcell/include/gcell/compiler.h
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef INCLUDED_COMPILER_H
-#define INCLUDED_COMPILER_H
+#ifndef INCLUDED_GCELL_COMPILER_H
+#define INCLUDED_GCELL_COMPILER_H
 
 /*!
  * \brief Compiler specific hackery.  These are for GCC.
@@ -42,4 +42,4 @@
 #endif
 
 
-#endif /* INCLUDED_COMPILER_H */
+#endif /* INCLUDED_GCELL_COMPILER_H */
diff --git a/gcell/src/lib/runtime/gc_aligned_alloc.h b/gcell/include/gcell/gc_aligned_alloc.h
index bdc21c278..bdc21c278 100644
--- a/gcell/src/lib/runtime/gc_aligned_alloc.h
+++ b/gcell/include/gcell/gc_aligned_alloc.h
diff --git a/gcell/src/include/gc_atomic.h b/gcell/include/gcell/gc_atomic.h
index 01737cd03..51d38af48 100644
--- a/gcell/src/include/gc_atomic.h
+++ b/gcell/include/gcell/gc_atomic.h
@@ -18,12 +18,12 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef INCLUDED_GC_ATOMIC_H
-#define INCLUDED_GC_ATOMIC_H
+#ifndef INCLUDED_GCELL_GC_ATOMIC_H
+#define INCLUDED_GCELL_GC_ATOMIC_H
 
 #include <stdint.h>
 
 typedef uint32_t	gc_atomic_t;
 
 
-#endif /* INCLUDED_GC_ATOMIC_H */
+#endif /* INCLUDED_GCELL_GC_ATOMIC_H */
diff --git a/gcell/src/include/gc_cdefs.h b/gcell/include/gcell/gc_cdefs.h
index 93084bae4..0c5fc4ad8 100644
--- a/gcell/src/include/gc_cdefs.h
+++ b/gcell/include/gcell/gc_cdefs.h
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef INCLUDED_GC_CDEFS_H
-#define INCLUDED_GC_CDEFS_H
+#ifndef INCLUDED_GCELL_GC_CDEFS_H
+#define INCLUDED_GCELL_GC_CDEFS_H
 
 /* C++ needs to know that types and declarations are C, not C++.  */
 #ifdef	__cplusplus
@@ -31,4 +31,4 @@
 # define __GC_END_DECLS
 #endif
 
-#endif /* INCLUDED_GC_CDEFS_H */
+#endif /* INCLUDED_GCELL_GC_CDEFS_H */
diff --git a/gcell/src/include/gc_declare_proc.h b/gcell/include/gcell/gc_declare_proc.h
index 37af5bab7..ba77e0fb0 100644
--- a/gcell/src/include/gc_declare_proc.h
+++ b/gcell/include/gcell/gc_declare_proc.h
@@ -18,11 +18,11 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef INCLUDED_GC_DECLARE_PROC_H
-#define INCLUDED_GC_DECLARE_PROC_H
+#ifndef INCLUDED_GCELL_GC_DECLARE_PROC_H
+#define INCLUDED_GCELL_GC_DECLARE_PROC_H
 
 #include <stdint.h>
-#include <gc_job_desc.h>
+#include <gcell/gc_job_desc.h>
 
 /*
  * This is C, not C++ code...
@@ -61,4 +61,4 @@ static struct gc_proc_def \
 
 __GC_END_DECLS
 
-#endif /* INCLUDED_GC_DECLARE_PROC_H */
+#endif /* INCLUDED_GCELL_GC_DECLARE_PROC_H */
diff --git a/gcell/src/include/gc_jd_queue.h b/gcell/include/gcell/gc_jd_queue.h
index f5f8a1a0d..50777a394 100644
--- a/gcell/src/include/gc_jd_queue.h
+++ b/gcell/include/gcell/gc_jd_queue.h
@@ -19,10 +19,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef INCLUDED_GC_JD_QUEUE_H
-#define INCLUDED_GC_JD_QUEUE_H
+#ifndef INCLUDED_GCELL_GC_JD_QUEUE_H
+#define INCLUDED_GCELL_GC_JD_QUEUE_H
 
-#include "gc_jd_queue_data.h"
+#include <gcell/gc_jd_queue_data.h>
 
 __GC_BEGIN_DECLS
 
@@ -49,4 +49,4 @@ gc_jd_queue_dequeue(gc_jd_queue_t *q);
 __GC_END_DECLS
 
 
-#endif /* INCLUDED_GC_JD_QUEUE_H */
+#endif /* INCLUDED_GCELL_GC_JD_QUEUE_H */
diff --git a/gcell/src/include/gc_jd_queue_data.h b/gcell/include/gcell/gc_jd_queue_data.h
index 3fd7270d5..819b3712e 100644
--- a/gcell/src/include/gc_jd_queue_data.h
+++ b/gcell/include/gcell/gc_jd_queue_data.h
@@ -19,11 +19,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef INCLUDED_GC_JD_QUEUE_DATA_H
-#define INCLUDED_GC_JD_QUEUE_DATA_H
+#ifndef INCLUDED_GCELL_GC_JD_QUEUE_DATA_H
+#define INCLUDED_GCELL_GC_JD_QUEUE_DATA_H
 
-#include "gc_types.h"
-#include "gc_job_desc.h"
+#include <gcell/gc_types.h>
+#include <gcell/gc_job_desc.h>
 
 __GC_BEGIN_DECLS
 
@@ -47,6 +47,6 @@ typedef struct gc_jd_queue
 
 __GC_END_DECLS
 
-#endif /* INCLUDED_GC_JD_QUEUE_DATA_H */
+#endif /* INCLUDED_GCELL_GC_JD_QUEUE_DATA_H */
 
 
diff --git a/gcell/src/include/gc_jd_stack.h b/gcell/include/gcell/gc_jd_stack.h
index 72e9435ce..9eab4e402 100644
--- a/gcell/src/include/gc_jd_stack.h
+++ b/gcell/include/gcell/gc_jd_stack.h
@@ -19,11 +19,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef INCLUDED_GC_JD_STACK_H
-#define INCLUDED_GC_JD_STACK_H
+#ifndef INCLUDED_GCELL_GC_JD_STACK_H
+#define INCLUDED_GCELL_GC_JD_STACK_H
 
-#include "gc_types.h"
-#include "gc_job_desc.h"
+#include <gcell/gc_types.h>
+#include <gcell/gc_job_desc.h>
 
 __GC_BEGIN_DECLS
 
@@ -67,4 +67,4 @@ gc_jd_stack_pop(gc_jd_stack_t *stack);
 __GC_END_DECLS
 
 
-#endif /* INCLUDED_GC_JD_STACK_H */
+#endif /* INCLUDED_GCELL_GC_JD_STACK_H */
diff --git a/gcell/src/include/gc_job_desc.h b/gcell/include/gcell/gc_job_desc.h
index b79150678..5ff99e2e2 100644
--- a/gcell/src/include/gc_job_desc.h
+++ b/gcell/include/gcell/gc_job_desc.h
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef INCLUDED_GC_JOB_DESC_H
-#define INCLUDED_GC_JOB_DESC_H
+#ifndef INCLUDED_GCELL_GC_JOB_DESC_H
+#define INCLUDED_GCELL_GC_JOB_DESC_H
 
 /*!
  * This file contains the structures that are used to describe how to
@@ -42,8 +42,8 @@
  * notify the entity that submitted the job.
  */
 
-#include "gc_types.h"
-#include "gc_job_desc_private.h"
+#include <gcell/gc_types.h>
+#include <gcell/gc_job_desc_private.h>
 
 /*
  * This is C, not C++ code...
@@ -210,4 +210,4 @@ jdp_to_ea(gc_job_desc_t *item)
 
 __GC_END_DECLS
 
-#endif /* INCLUDED_GC_JOB_DESC_H */
+#endif /* INCLUDED_GCELL_GC_JOB_DESC_H */
diff --git a/gcell/src/include/gc_job_desc_private.h b/gcell/include/gcell/gc_job_desc_private.h
index 1f76d862b..fa831a88e 100644
--- a/gcell/src/include/gc_job_desc_private.h
+++ b/gcell/include/gcell/gc_job_desc_private.h
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef INCLUDED_GC_JOB_DESC_PRIVATE_H
-#define INCLUDED_GC_JOB_DESC_PRIVATE_H
+#ifndef INCLUDED_GCELL_GC_JOB_DESC_PRIVATE_H
+#define INCLUDED_GCELL_GC_JOB_DESC_PRIVATE_H
 
 // #include <libsync.h>
 
@@ -35,5 +35,5 @@ typedef struct gc_job_desc_private
   uint32_t	direction_union;    // union of all gc_job_ea_arg.direction fields
 } gc_job_desc_private_t;
 
-#endif /* INCLUDED_GC_JOB_PRIVATE_H */
+#endif /* INCLUDED_GCELL_GC_JOB_PRIVATE_H */
 
diff --git a/gcell/src/lib/runtime/gc_job_manager.h b/gcell/include/gcell/gc_job_manager.h
index 67abce7ed..67abce7ed 100644
--- a/gcell/src/lib/runtime/gc_job_manager.h
+++ b/gcell/include/gcell/gc_job_manager.h
diff --git a/gcell/src/include/gc_logging.h b/gcell/include/gcell/gc_logging.h
index b98c283a2..9cc6fa77b 100644
--- a/gcell/src/include/gc_logging.h
+++ b/gcell/include/gcell/gc_logging.h
@@ -18,10 +18,10 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef INCLUDED_GC_LOGGING_H
-#define INCLUDED_GC_LOGGING_H
+#ifndef INCLUDED_GCELL_GC_LOGGING_H
+#define INCLUDED_GCELL_GC_LOGGING_H
 
-#include <gc_types.h>
+#include <gcell/gc_types.h>
 #include <string.h>
 
 __GC_BEGIN_DECLS
@@ -163,4 +163,4 @@ _gc_log_init(gc_log_t log_info);
 
 __GC_END_DECLS
 
-#endif /* INCLUDED_GC_LOGGING_H */
+#endif /* INCLUDED_GCELL_GC_LOGGING_H */
diff --git a/gcell/src/include/gc_mbox.h b/gcell/include/gcell/gc_mbox.h
index 32b23c6fa..1d577ff8f 100644
--- a/gcell/src/include/gc_mbox.h
+++ b/gcell/include/gcell/gc_mbox.h
@@ -18,8 +18,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef INCLUDED_GC_MBOX_H
-#define INCLUDED_GC_MBOX_H
+#ifndef INCLUDED_GCELL_GC_MBOX_H
+#define INCLUDED_GCELL_GC_MBOX_H
 
 /*
  * The PPE and SPE exchange a few 32-bit messages via mailboxes.
@@ -49,4 +49,4 @@
 #define	OP_SPU_BUFSIZE	        0x3	// arg is max number of bytes
 
 
-#endif /* INCLUDED_GC_MBOX_H */
+#endif /* INCLUDED_GCELL_GC_MBOX_H */
diff --git a/gcell/src/include/gc_spu_args.h b/gcell/include/gcell/gc_spu_args.h
index f5a21227c..3719bac22 100644
--- a/gcell/src/include/gc_spu_args.h
+++ b/gcell/include/gcell/gc_spu_args.h
@@ -18,11 +18,11 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef INCLUDED_GC_SPU_ARGS_H
-#define INCLUDED_GC_SPU_ARGS_H
+#ifndef INCLUDED_GCELL_GC_SPU_ARGS_H
+#define INCLUDED_GCELL_GC_SPU_ARGS_H
 
-#include <gc_types.h>
-#include <gc_logging.h>
+#include <gcell/gc_types.h>
+#include <gcell/gc_logging.h>
 
 // args passed to SPE at initialization time
 
@@ -57,4 +57,4 @@ typedef struct gc_comp_info {
   uint16_t	job_id[GC_CI_NJOBS];	// job_id's of completed jobs
 } _AL128 gc_comp_info_t;
 
-#endif /* INCLUDED_GC_SPU_ARGS_H */
+#endif /* INCLUDED_GCELL_GC_SPU_ARGS_H */
diff --git a/gcell/src/include/gc_types.h b/gcell/include/gcell/gc_types.h
index 9a4d0546e..b75bcd8d7 100644
--- a/gcell/src/include/gc_types.h
+++ b/gcell/include/gcell/gc_types.h
@@ -19,12 +19,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef INCLUDED_GC_TYPES_H
-#define INCLUDED_GC_TYPES_H
+#ifndef INCLUDED_GCELL_GC_TYPES_H
+#define INCLUDED_GCELL_GC_TYPES_H
 
 #include <stdint.h>
-#include <gc_cdefs.h>
-#include "compiler.h"
+#include <gcell/gc_cdefs.h>
+#include <gcell/compiler.h>
 
 __GC_BEGIN_DECLS
 
@@ -60,4 +60,4 @@ ptr_to_ea(void *p)
 
 __GC_END_DECLS
 
-#endif /* INCLUDED_GC_TYPES_H */
+#endif /* INCLUDED_GCELL_GC_TYPES_H */
diff --git a/gcell/src/lib/wrapper/gcp_fft_1d_r2.h b/gcell/include/gcell/gcp_fft_1d_r2.h
index 1207a5f36..c1d331833 100644
--- a/gcell/src/lib/wrapper/gcp_fft_1d_r2.h
+++ b/gcell/include/gcell/gcp_fft_1d_r2.h
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GCP_FFT_1D_R2_H
 #define INCLUDED_GCP_FFT_1D_R2_H
 
-#include <gc_job_manager.h>
+#include <gcell/gc_job_manager.h>
 #include <complex>
 
 /*!
diff --git a/gcell/src/include/memory_barrier.h b/gcell/include/gcell/memory_barrier.h
index b373ffd91..4a1f87000 100644
--- a/gcell/src/include/memory_barrier.h
+++ b/gcell/include/gcell/memory_barrier.h
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef INCLUDED_MEMORY_BARRIER_H
-#define INCLUDED_MEMORY_BARRIER_H
+#ifndef INCLUDED_GCELL_MEMORY_BARRIER_H
+#define INCLUDED_GCELL_MEMORY_BARRIER_H
 
 /*
  * powerpc memory barriers
@@ -45,22 +45,20 @@
  * Control Instructions." (site:ibm.com)
  */
 
-#include <ppu_intrinsics.h>
-
 static inline void smp_mb(void)
 {
-  __sync();
+  __asm__ volatile ("sync" : : : "memory");
 }
 
 static inline void smp_rmb(void)
 {
-  __lwsync();
+  __asm__ volatile ("lwsync" : : : "memory");
 }
 
 static inline void smp_wmb(void)
 {
-  __eieio();
+  __asm__ volatile ("eieio" : : : "memory");
 }
 
 
-#endif /* INCLUDED_MEMORY_BARRIER_H */
+#endif /* INCLUDED_GCELL_MEMORY_BARRIER_H */
diff --git a/gcell/src/include/spu/Makefile.am b/gcell/include/gcell/spu/Makefile.am
index 81a8bfdf4..58816819d 100644
--- a/gcell/src/include/spu/Makefile.am
+++ b/gcell/include/gcell/spu/Makefile.am
@@ -21,6 +21,10 @@
 include $(top_srcdir)/Makefile.common
 
 gcellspuinclude_HEADERS = \
+	fft_1d.h \
+	fft_1d_r2.h \
 	gc_delay.h \
 	gc_jd_queue.h \
-	gc_random.h
+	gc_random.h \
+	gc_spu_macs.h \
+	libfft.h
diff --git a/gcell/src/lib/general/spu/fft_1d.h b/gcell/include/gcell/spu/fft_1d.h
index 355b84bf1..355b84bf1 100644
--- a/gcell/src/lib/general/spu/fft_1d.h
+++ b/gcell/include/gcell/spu/fft_1d.h
diff --git a/gcell/src/lib/general/spu/fft_1d_r2.h b/gcell/include/gcell/spu/fft_1d_r2.h
index a51cbc341..a51cbc341 100644
--- a/gcell/src/lib/general/spu/fft_1d_r2.h
+++ b/gcell/include/gcell/spu/fft_1d_r2.h
diff --git a/gcell/src/include/spu/gc_delay.h b/gcell/include/gcell/spu/gc_delay.h
index 78f16fb28..e995b3a94 100644
--- a/gcell/src/include/spu/gc_delay.h
+++ b/gcell/include/gcell/spu/gc_delay.h
@@ -18,10 +18,10 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef INCLUDED_GC_DELAY_H
-#define INCLUDED_GC_DELAY_H
+#ifndef INCLUDED_GCELL_SPU_GC_DELAY_H
+#define INCLUDED_GCELL_SPU_GC_DELAY_H
 
 void gc_udelay(unsigned int usecs);
 void gc_cdelay(unsigned int cpu_cycles);
 
-#endif /* INCLUDED_GC_DELAY_H */
+#endif /* INCLUDED_GCELL_SPU_GC_DELAY_H */
diff --git a/gcell/src/include/spu/gc_jd_queue.h b/gcell/include/gcell/spu/gc_jd_queue.h
index b65b15feb..ce1977c94 100644
--- a/gcell/src/include/spu/gc_jd_queue.h
+++ b/gcell/include/gcell/spu/gc_jd_queue.h
@@ -19,10 +19,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef INCLUDED_SPU_GC_JD_QUEUE_H
-#define INCLUDED_SPU_GC_JD_QUEUE_H
+#ifndef INCLUDED_GCELL_SPU_GC_JD_QUEUE_H
+#define INCLUDED_GCELL_SPU_GC_JD_QUEUE_H
 
-#include "gc_jd_queue_data.h"
+#include <gcell/gc_jd_queue_data.h>
 
 /*
  * Declarations for SPU side of job queue interface
@@ -50,4 +50,4 @@ gc_jd_queue_dequeue(gc_eaddr_t q, gc_eaddr_t *item_ea,
 __GC_END_DECLS
 
 
-#endif /* INCLUDED_SPU_GC_JD_QUEUE_H */
+#endif /* INCLUDED_GCELL_SPU_GC_JD_QUEUE_H */
diff --git a/gcell/src/include/spu/gc_random.h b/gcell/include/gcell/spu/gc_random.h
index ccb564731..f51b187d4 100644
--- a/gcell/src/include/spu/gc_random.h
+++ b/gcell/include/gcell/spu/gc_random.h
@@ -18,8 +18,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef INCLUDED_GC_RANDOM_H
-#define INCLUDED_GC_RANDOM_H
+#ifndef INCLUDED_GCELL_SPU_GC_RANDOM_H
+#define INCLUDED_GCELL_SPU_GC_RANDOM_H
 
 /*!
  * \brief Return a uniformly distributed value in the range [0, 1.0)
@@ -29,4 +29,4 @@
 float gc_uniform_deviate(void);
 void gc_set_seed(int seed);
 
-#endif /* INCLUDED_GC_RANDOM_H */
+#endif /* INCLUDED_GCELL_SPU_GC_RANDOM_H */
diff --git a/gcell/src/lib/general/spu/gc_spu_macs.h b/gcell/include/gcell/spu/gc_spu_macs.h
index 8e3e3f2a6..0d7dc9978 100644
--- a/gcell/src/lib/general/spu/gc_spu_macs.h
+++ b/gcell/include/gcell/spu/gc_spu_macs.h
@@ -182,7 +182,7 @@
 
 //  r3 -  r74 are volatile (caller saves)
 // r74 -  r79 are volatile (scratch regs possibly destroyed by fct prolog/epilog)
-// r80 - r127 are non-volatile (caller-saves)
+// r80 - r127 are non-volatile (callee-saves)
 
 // scratch registers reserved for use by the macros in this file.
 
diff --git a/gcell/src/lib/general/spu/libfft.h b/gcell/include/gcell/spu/libfft.h
index dd387be0c..dd387be0c 100644
--- a/gcell/src/lib/general/spu/libfft.h
+++ b/gcell/include/gcell/spu/libfft.h
diff --git a/gcell/src/lib/Makefile.am b/gcell/lib/Makefile.am
index e7b349331..e7b349331 100644
--- a/gcell/src/lib/Makefile.am
+++ b/gcell/lib/Makefile.am
diff --git a/gcell/src/lib/general/Makefile.am b/gcell/lib/general/Makefile.am
index bd5a4de62..bd5a4de62 100644
--- a/gcell/src/lib/general/Makefile.am
+++ b/gcell/lib/general/Makefile.am
diff --git a/gcell/src/lib/general/spu/fft_1d_r2.c b/gcell/lib/general/spu/fft_1d_r2.c
index a0660b307..0a87e74a8 100644
--- a/gcell/src/lib/general/spu/fft_1d_r2.c
+++ b/gcell/lib/general/spu/fft_1d_r2.c
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <libfft.h>
-#include <fft_1d_r2.h>
+#include <gcell/spu/libfft.h>
+#include <gcell/spu/fft_1d_r2.h>
 #include <assert.h>
 
 /*
diff --git a/gcell/src/lib/general/spu/memset.S b/gcell/lib/general/spu/memset.S
index 88e2dbea1..39eabce02 100644
--- a/gcell/src/lib/general/spu/memset.S
+++ b/gcell/lib/general/spu/memset.S
@@ -19,7 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <gc_spu_macs.h>
+#include <gcell/spu/gc_spu_macs.h>
 
 	.file "memset.S"
 
diff --git a/gcell/src/lib/general/spu/qa_memset.c b/gcell/lib/general/spu/qa_memset.c
index 0d35a423f..e51b02c9a 100644
--- a/gcell/src/lib/general/spu/qa_memset.c
+++ b/gcell/lib/general/spu/qa_memset.c
@@ -19,11 +19,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <gc_declare_proc.h>
-#include <string.h>
-#include <stdio.h>
+#include <gcell/gc_declare_proc.h>
 #include <spu_intrinsics.h>
 #include <spu_mfcio.h>
+#include <string.h>
+#include <stdio.h>
 
 
 #define MAX_QA_BYTES  1024
diff --git a/gcell/src/lib/runtime/Makefile.am b/gcell/lib/runtime/Makefile.am
index 89d6f1bb9..2c653918e 100644
--- a/gcell/src/lib/runtime/Makefile.am
+++ b/gcell/lib/runtime/Makefile.am
@@ -20,7 +20,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-IBM_PPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/src/ibm/sync/ppu_source
+IBM_PPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/ibm/sync/ppu_source
 
 
 AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) $(MBLOCK_INCLUDES) $(CPPUNIT_INCLUDES) \
@@ -46,10 +46,6 @@ libruntime_qa_la_SOURCES = \
 	qa_job_manager.cc
 
 
-gcellinclude_HEADERS = \
-	gc_aligned_alloc.h \
-	gc_job_manager.h
-
 noinst_HEADERS = \
 	gc_client_thread_info.h \
 	gc_job_manager_impl.h \
@@ -61,7 +57,7 @@ noinst_HEADERS = \
 
 # generate a libtool.lo that contains an embeded SPU executable
 gcell_runtime_qa.lo: ../spu/gcell_runtime_qa
-	$(GCELL_EMBEDSPU_LIBTOOL) $@ $<
+	$(GCELL_EMBEDSPU_LIBTOOL) $< $@
 
 libruntime_qa_la_LIBADD = \
 	gcell_runtime_qa.lo \
diff --git a/gcell/src/lib/runtime/gc_aligned_alloc.cc b/gcell/lib/runtime/gc_aligned_alloc.cc
index 6f9a999b9..905154e3d 100644
--- a/gcell/src/lib/runtime/gc_aligned_alloc.cc
+++ b/gcell/lib/runtime/gc_aligned_alloc.cc
@@ -22,7 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <gc_aligned_alloc.h>
+#include <gcell/gc_aligned_alloc.h>
 #include <stdlib.h>
 #include <stdexcept>
 #include <string.h>
diff --git a/gcell/src/lib/runtime/gc_client_thread_info.h b/gcell/lib/runtime/gc_client_thread_info.h
index fbb35d966..fbb35d966 100644
--- a/gcell/src/lib/runtime/gc_client_thread_info.h
+++ b/gcell/lib/runtime/gc_client_thread_info.h
diff --git a/gcell/src/lib/runtime/gc_jd_queue.c b/gcell/lib/runtime/gc_jd_queue.c
index b5cdcac9b..aeabd305a 100644
--- a/gcell/src/lib/runtime/gc_jd_queue.c
+++ b/gcell/lib/runtime/gc_jd_queue.c
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "gc_jd_queue.h"
-#include "memory_barrier.h"
+#include <gcell/gc_jd_queue.h>
+#include <gcell/memory_barrier.h>
 #include <mutex_init.h>
 #include <mutex_lock.h>
 #include <mutex_unlock.h>
diff --git a/gcell/src/lib/runtime/gc_jd_stack.c b/gcell/lib/runtime/gc_jd_stack.c
index 0fffc0d1f..4d865acf0 100644
--- a/gcell/src/lib/runtime/gc_jd_stack.c
+++ b/gcell/lib/runtime/gc_jd_stack.c
@@ -19,8 +19,68 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "gc_jd_stack.h"
-#include "memory_barrier.h"
+#include <gcell/gc_jd_stack.h>
+#include <gcell/memory_barrier.h>
+
+/*
+ * begin extract from ppu_intrinics.h
+ * FIXME handle this a different way
+ */
+
+#if !defined(__PPU__) && !defined(__ppc__) && !defined(__ppc64__)
+    && !defined(__GNUC__)
+  #error ppu_intrinsics.h included on wrong platform/compiler
+#endif
+
+#define __lwarx(base) __extension__		\
+  ({unsigned int result;	       		\
+    typedef  struct {char a[4];} wordsize;	\
+    wordsize *ptrp = (wordsize*)(base);		\
+  __asm__ volatile ("lwarx %0,%y1"		\
+	   : "=r" (result)			\
+	   : "Z" (*ptrp));			\
+  result; })
+
+#ifdef __powerpc64__
+#define __ldarx(base) __extension__			\
+  ({unsigned long long result;	       			\
+    typedef  struct {char a[8];} doublewordsize;	\
+    doublewordsize *ptrp = (doublewordsize*)(base);	\
+  __asm__ volatile ("ldarx %0,%y1"		       	\
+	   : "=r" (result)				\
+	   : "Z" (*ptrp));				\
+  result; })
+#endif /* __powerpc64__ */
+
+#define __stwcx(base, value) __extension__	\
+  ({unsigned int result;			\
+    typedef  struct {char a[4];} wordsize;	\
+    wordsize *ptrp = (wordsize*)(base);		\
+  __asm__ volatile ("stwcx. %2,%y1\n"		\
+	   "\tmfocrf %0,0x80"			\
+	   : "=r" (result),			\
+	     "=Z" (*ptrp)			\
+	   : "r" (value));			\
+  ((result & 0x20000000) >> 29); })
+
+
+#ifdef __powerpc64__
+#define __stdcx(base, value) __extension__		\
+  ({unsigned long long result;				\
+    typedef  struct {char a[8];} doublewordsize;	\
+    doublewordsize *ptrp = (doublewordsize*)(base);	\
+  __asm__ volatile ("stdcx. %2,%y1\n"			\
+	   "\tmfocrf %0,0x80"				\
+	   : "=r" (result),				\
+	     "=Z" (*ptrp)				\
+	   : "r" (value));				\
+  ((result & 0x20000000) >> 29); })
+#endif /* __powerpc64__ */
+
+
+/*
+ * --- end extract from ppu_intrinics.h --
+ */
 
 
 void 
diff --git a/gcell/src/lib/runtime/gc_job_manager.cc b/gcell/lib/runtime/gc_job_manager.cc
index ac2e989a4..d96bc5381 100644
--- a/gcell/src/lib/runtime/gc_job_manager.cc
+++ b/gcell/lib/runtime/gc_job_manager.cc
@@ -22,7 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "gc_job_manager.h"
+#include <gcell/gc_job_manager.h>
 #include "gc_job_manager_impl.h"
 #include <boost/weak_ptr.hpp>
 #include <stdio.h>
diff --git a/gcell/src/lib/runtime/gc_job_manager_impl.cc b/gcell/lib/runtime/gc_job_manager_impl.cc
index 2b4b83f4f..629019f4d 100644
--- a/gcell/src/lib/runtime/gc_job_manager_impl.cc
+++ b/gcell/lib/runtime/gc_job_manager_impl.cc
@@ -22,15 +22,15 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <gc_job_manager_impl.h>
-#include <gc_mbox.h>
+#include "gc_job_manager_impl.h"
+#include <gcell/gc_mbox.h>
+#include <gcell/gc_aligned_alloc.h>
+#include <gcell/memory_barrier.h>
 #include <gc_proc_def_utils.h>
-#include <gc_aligned_alloc.h>
+#include <atomic_dec_if_positive.h>
 #include <stdio.h>
 #include <stdexcept>
 #include <stdlib.h>
-#include <atomic_dec_if_positive.h>
-#include <memory_barrier.h>
 #include <unistd.h>
 #include <sys/mman.h>
 #include <sys/types.h>
diff --git a/gcell/src/lib/runtime/gc_job_manager_impl.h b/gcell/lib/runtime/gc_job_manager_impl.h
index fcc24dc0c..dad7873ab 100644
--- a/gcell/src/lib/runtime/gc_job_manager_impl.h
+++ b/gcell/lib/runtime/gc_job_manager_impl.h
@@ -22,11 +22,11 @@
 #ifndef INCLUDED_GC_JOB_MANAGER_IMPL_H
 #define INCLUDED_GC_JOB_MANAGER_IMPL_H
 
-#include "gc_job_manager.h"
+#include <gcell/gc_job_manager.h>
+#include <gcell/gc_jd_stack.h>
+#include <gcell/gc_jd_queue.h>
+#include <gcell/gc_spu_args.h>
 #include "gc_client_thread_info.h"
-#include "gc_jd_stack.h"
-#include "gc_jd_queue.h"
-#include "gc_spu_args.h"
 #include <libspe2.h>
 #include <vector>
 #include <boost/scoped_array.hpp>
diff --git a/gcell/src/lib/runtime/gc_proc_def_utils.cc b/gcell/lib/runtime/gc_proc_def_utils.cc
index c5b9848fc..0250d677a 100644
--- a/gcell/src/lib/runtime/gc_proc_def_utils.cc
+++ b/gcell/lib/runtime/gc_proc_def_utils.cc
@@ -24,7 +24,7 @@
 #endif
 
 #include <gc_proc_def_utils.h>
-#include <gc_declare_proc.h>
+#include <gcell/gc_declare_proc.h>
 #include <elf.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/gcell/src/lib/runtime/gc_proc_def_utils.h b/gcell/lib/runtime/gc_proc_def_utils.h
index c59e472af..79c9b51aa 100644
--- a/gcell/src/lib/runtime/gc_proc_def_utils.h
+++ b/gcell/lib/runtime/gc_proc_def_utils.h
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_GC_PROC_DEF_UTILS_H
 #define INCLUDED_GC_PROC_DEF_UTILS_H
 
-#include <gc_declare_proc.h>
+#include <gcell/gc_declare_proc.h>
 #include <libspe2.h>
 
 /*!
diff --git a/gcell/lib/runtime/gcell-embedspu-libtool b/gcell/lib/runtime/gcell-embedspu-libtool
new file mode 100755
index 000000000..c206086a4
--- /dev/null
+++ b/gcell/lib/runtime/gcell-embedspu-libtool
@@ -0,0 +1,40 @@
+#!/bin/bash
+#
+# Take a spu executable and turn into into a libtool compatible .lo (and .o) file.
+# This is needed when you want to embed a SPU executable into a shared library.
+#
+# The symbol assigned to the embedded executable is the basename of the
+# output file with an _spx appended.  E.g., if the output filename is
+# my_spe_tricks.lo the symbol name is my_spe_tricks_spx.
+# ("_spx" stands for SPE executable)
+
+if [ $# -ne 2 ]; then
+  echo "usage: gcell-embedspu-libtool spu_executable output_file.lo " 1>&2
+  exit 1
+fi
+
+spu_executable=$1
+lo_file=$2
+symbol_name=${lo_file%%.lo}_spx
+
+# try to make .libs in case it's not there
+mkdir .libs >/dev/null 2>/dev/null
+
+# generate the .o file that wraps the SPU executable
+ppu-embedspu -m32 -fpic ${symbol_name} ${spu_executable} .libs/${symbol_name}.o
+
+# generate the .lo libtool file that points at all the right places
+rm -f $lo_file
+cat >$lo_file.new <<EOF
+# $lo_file - a libtool object file
+# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+pic_object='.libs/${symbol_name}.o'
+non_pic_object=none
+EOF
+
+mv $lo_file.new $lo_file
+
diff --git a/gcell/src/lib/runtime/qa_gcell_runtime.cc b/gcell/lib/runtime/qa_gcell_runtime.cc
index fef9a7fb4..fef9a7fb4 100644
--- a/gcell/src/lib/runtime/qa_gcell_runtime.cc
+++ b/gcell/lib/runtime/qa_gcell_runtime.cc
diff --git a/gcell/src/lib/runtime/qa_gcell_runtime.h b/gcell/lib/runtime/qa_gcell_runtime.h
index 36180c919..36180c919 100644
--- a/gcell/src/lib/runtime/qa_gcell_runtime.h
+++ b/gcell/lib/runtime/qa_gcell_runtime.h
diff --git a/gcell/src/lib/runtime/qa_jd_queue.cc b/gcell/lib/runtime/qa_jd_queue.cc
index 267d4cfb7..35ab9d82f 100644
--- a/gcell/src/lib/runtime/qa_jd_queue.cc
+++ b/gcell/lib/runtime/qa_jd_queue.cc
@@ -21,7 +21,7 @@
 
 #include "qa_jd_queue.h"
 #include <cppunit/TestAssert.h>
-#include "gc_jd_queue.h"
+#include <gcell/gc_jd_queue.h>
 #include <stdio.h>
 
 
diff --git a/gcell/src/lib/runtime/qa_jd_queue.h b/gcell/lib/runtime/qa_jd_queue.h
index 5e1aab84f..5e1aab84f 100644
--- a/gcell/src/lib/runtime/qa_jd_queue.h
+++ b/gcell/lib/runtime/qa_jd_queue.h
diff --git a/gcell/src/lib/runtime/qa_jd_stack.cc b/gcell/lib/runtime/qa_jd_stack.cc
index 67e97c9a3..ce4ce2d0d 100644
--- a/gcell/src/lib/runtime/qa_jd_stack.cc
+++ b/gcell/lib/runtime/qa_jd_stack.cc
@@ -21,7 +21,7 @@
 
 #include "qa_jd_stack.h"
 #include <cppunit/TestAssert.h>
-#include "gc_jd_stack.h"
+#include <gcell/gc_jd_stack.h>
 #include <stdio.h>
 
 
diff --git a/gcell/src/lib/runtime/qa_jd_stack.h b/gcell/lib/runtime/qa_jd_stack.h
index 1546bbf9f..1546bbf9f 100644
--- a/gcell/src/lib/runtime/qa_jd_stack.h
+++ b/gcell/lib/runtime/qa_jd_stack.h
diff --git a/gcell/src/lib/runtime/qa_job_manager.cc b/gcell/lib/runtime/qa_job_manager.cc
index e37e3c37f..45cf26cfc 100644
--- a/gcell/src/lib/runtime/qa_job_manager.cc
+++ b/gcell/lib/runtime/qa_job_manager.cc
@@ -21,7 +21,7 @@
 
 #include "qa_job_manager.h"
 #include <cppunit/TestAssert.h>
-#include "gc_job_manager.h"
+#include <gcell/gc_job_manager.h>
 #include <stdexcept>
 #include <stdio.h>
 #include <time.h>
@@ -31,7 +31,7 @@
 #include <malloc.h>
 
 // handle to embedded SPU executable w/ QA routines
-extern spe_program_handle_t gcell_runtime_qa;
+extern spe_program_handle_t gcell_runtime_qa_spx;
 
 #if 0
 static void
@@ -177,7 +177,7 @@ qa_job_manager::t1_body()
 {
   gc_job_manager_sptr mgr;
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa);
+  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
   mgr = gc_make_job_manager(&opts);
 }
 
@@ -186,7 +186,7 @@ qa_job_manager::t2_body()
 {
   gc_job_manager_sptr mgr;
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa);
+  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
   opts.nspes = 100;
   opts.gang_schedule = false;
   mgr = gc_make_job_manager(&opts);
@@ -202,7 +202,7 @@ qa_job_manager::t3_body()
 #if 0
   gc_job_manager_sptr mgr;
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa);
+  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
   opts.nspes = 100;
   opts.gang_schedule = true;
   CPPUNIT_ASSERT_THROW(mgr = gc_make_job_manager(&opts), std::out_of_range);
@@ -223,7 +223,7 @@ qa_job_manager::t4_body()
 {
   gc_job_manager_sptr mgr;
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa);
+  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
   opts.nspes = 1;
   mgr = gc_make_job_manager(&opts);
   //mgr->set_debug(-1);
@@ -262,7 +262,7 @@ qa_job_manager::t5_body()
 {
   gc_job_manager_sptr mgr;
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa);
+  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
   opts.nspes = 0;	// use them all
   mgr = gc_make_job_manager(&opts);
   //mgr->set_debug(-1);
@@ -297,7 +297,7 @@ qa_job_manager::t6_body()
 {
   gc_job_manager_sptr mgr;
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa);
+  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
   opts.nspes = 1;	
   mgr = gc_make_job_manager(&opts);
   gc_proc_id_t gcp_qa_nop = mgr->lookup_proc("qa_nop");
@@ -375,7 +375,7 @@ qa_job_manager::t7_body()
 {
   gc_job_manager_sptr mgr;
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa);
+  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
   opts.nspes = 1;
   mgr = gc_make_job_manager(&opts);
 
@@ -404,7 +404,7 @@ qa_job_manager::t8_body()
 {
   gc_job_manager_sptr mgr;
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa);
+  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
   opts.nspes = 1;
   mgr = gc_make_job_manager(&opts);
   gc_job_desc *jd = mgr->alloc_job_desc();
@@ -437,7 +437,7 @@ qa_job_manager::t9_body()
   static const int M = 201;
   gc_job_manager_sptr mgr;
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa);
+  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
   opts.nspes = 1;
   mgr = gc_make_job_manager(&opts);
   gc_job_desc *jd = mgr->alloc_job_desc();
@@ -548,7 +548,7 @@ qa_job_manager::t10_body()
 {
   gc_job_manager_sptr mgr;
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa);
+  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
   opts.nspes = 1;
   mgr = gc_make_job_manager(&opts);
 
@@ -576,7 +576,7 @@ qa_job_manager::t11_body()
 {
   gc_job_manager_sptr mgr;
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa);
+  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
   opts.nspes = 1;
   mgr = gc_make_job_manager(&opts);
   gc_job_desc *jd = mgr->alloc_job_desc();
@@ -611,7 +611,7 @@ qa_job_manager::t12_body()
   static const int M = 201;
   gc_job_manager_sptr mgr;
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa);
+  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
   opts.nspes = 1;
   mgr = gc_make_job_manager(&opts);
   gc_job_desc *jd = mgr->alloc_job_desc();
@@ -659,7 +659,7 @@ qa_job_manager::t13_body()
 {
   gc_job_manager_sptr mgr;
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa);
+  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
   opts.nspes = 1;
   mgr = gc_make_job_manager(&opts);
 
@@ -729,7 +729,7 @@ qa_job_manager::t14_body()
 
   gc_job_manager_sptr mgr;
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa);
+  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
   opts.nspes = 1;
   mgr = gc_make_job_manager(&opts);
 
@@ -778,7 +778,7 @@ void
 qa_job_manager::t15_body()
 {
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa);
+  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
   opts.nspes = 1;
   gc_job_manager_sptr mgr = gc_make_job_manager(&opts);
 
diff --git a/gcell/src/lib/runtime/qa_job_manager.h b/gcell/lib/runtime/qa_job_manager.h
index ab3325b73..ab3325b73 100644
--- a/gcell/src/lib/runtime/qa_job_manager.h
+++ b/gcell/lib/runtime/qa_job_manager.h
diff --git a/gcell/src/lib/runtime/spu/gc_delay.c b/gcell/lib/runtime/spu/gc_delay.c
index 21ee587f8..4d58935aa 100644
--- a/gcell/src/lib/runtime/spu/gc_delay.c
+++ b/gcell/lib/runtime/spu/gc_delay.c
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "gc_delay.h"
-#include <compiler.h>
+#include <gcell/spu/gc_delay.h>
+#include <gcell/compiler.h>
 
 inline static void
 gc_udelay_1us(void)
diff --git a/gcell/src/lib/runtime/spu/gc_logging.c b/gcell/lib/runtime/spu/gc_logging.c
index 65a537504..48b7e5f25 100644
--- a/gcell/src/lib/runtime/spu/gc_logging.c
+++ b/gcell/lib/runtime/spu/gc_logging.c
@@ -19,10 +19,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <gc_logging.h>
+#include <gcell/gc_logging.h>
+#include <gcell/gc_spu_args.h>
 #include <spu_intrinsics.h>
 #include <spu_mfcio.h>
-#include <gc_spu_args.h>
 
 static gc_eaddr_t     log_base_ea;	// base address of log entries in EA
 static uint32_t	      log_idx_mask;	// nentries - 1
diff --git a/gcell/src/lib/runtime/spu/gc_main.c b/gcell/lib/runtime/spu/gc_main.c
index 1e5b03de2..0866c3c3d 100644
--- a/gcell/src/lib/runtime/spu/gc_main.c
+++ b/gcell/lib/runtime/spu/gc_main.c
@@ -25,14 +25,15 @@
 #include <spu_mfcio.h>
 #include <sync_utils.h>
 #include "gc_spu_config.h"
-#include "gc_spu_args.h"
-#include "gc_job_desc.h"
-#include "gc_mbox.h"
-#include "gc_jd_queue.h"
-#include "gc_delay.h"
-#include "gc_declare_proc.h"
-#include "gc_random.h"
 #include "spu_buffers.h"
+#include <gcell/gc_spu_args.h>
+#include <gcell/gc_job_desc.h>
+#include <gcell/gc_mbox.h>
+#include <gcell/gc_declare_proc.h>
+#include <gcell/spu/gc_jd_queue.h>
+#include <gcell/spu/gc_random.h>
+#include <gcell/spu/gc_delay.h>
+
 #include <string.h>
 #include <assert.h>
 #include <stdio.h>
diff --git a/gcell/src/lib/runtime/spu/gc_random.c b/gcell/lib/runtime/spu/gc_random.c
index 618cc7eba..214309b53 100644
--- a/gcell/src/lib/runtime/spu/gc_random.c
+++ b/gcell/lib/runtime/spu/gc_random.c
@@ -18,7 +18,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include <gc_random.h>
+#include <gcell/spu/gc_random.h>
 
 static int last_val = 0;
 
diff --git a/gcell/src/lib/runtime/spu/gc_spu_config.h b/gcell/lib/runtime/spu/gc_spu_config.h
index 6eff71060..d0b131e82 100644
--- a/gcell/src/lib/runtime/spu/gc_spu_config.h
+++ b/gcell/lib/runtime/spu/gc_spu_config.h
@@ -18,10 +18,10 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef INCLUDED_GC_SPU_CONFIG_H
-#define INCLUDED_GC_SPU_CONFIG_H
+#ifndef INCLUDED_GCELL_GC_SPU_CONFIG_H
+#define INCLUDED_GCELL_GC_SPU_CONFIG_H
 
-#include <gc_job_desc.h>
+#include <gcell/gc_job_desc.h>
 
 #define CACHE_LINE_SIZE	     128	      // in bytes
 #define	GC_SPU_BUFSIZE_BASE  (40 * 1024)      //  must be multiple of CACHE_LINE_SIZE
@@ -30,4 +30,4 @@
 #define NGETBUFS	1	// single buffer job arg gets
 #define	NPUTBUFS	2	// double buffer job arg puts
 
-#endif /* INCLUDED_GC_SPU_CONFIG_H */
+#endif /* INCLUDED_GCELL_GC_SPU_CONFIG_H */
diff --git a/gcell/src/lib/runtime/spu/gc_spu_jd_queue.c b/gcell/lib/runtime/spu/gc_spu_jd_queue.c
index 6fa2d6af0..42deac34e 100644
--- a/gcell/src/lib/runtime/spu/gc_spu_jd_queue.c
+++ b/gcell/lib/runtime/spu/gc_spu_jd_queue.c
@@ -19,11 +19,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "gc_jd_queue.h"
+#include <gcell/spu/gc_jd_queue.h>
+#include <gcell/spu/gc_delay.h>
+#include <gcell/spu/gc_random.h>
 #include "mutex_lock.h"
 #include "mutex_unlock.h"
-#include "gc_delay.h"
-#include "gc_random.h"
 
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 
diff --git a/gcell/src/lib/runtime/spu/gcell_runtime_qa.c b/gcell/lib/runtime/spu/gcell_runtime_qa.c
index ac442731b..47a4b5b5b 100644
--- a/gcell/src/lib/runtime/spu/gcell_runtime_qa.c
+++ b/gcell/lib/runtime/spu/gcell_runtime_qa.c
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <gc_delay.h>
-#include <gc_declare_proc.h>
+#include <gcell/gc_declare_proc.h>
+#include <gcell/spu/gc_delay.h>
 #include <string.h>
 
 
diff --git a/gcell/src/lib/runtime/spu/spu_buffers.c b/gcell/lib/runtime/spu/spu_buffers.c
index 58b405931..29ae99d9f 100644
--- a/gcell/src/lib/runtime/spu/spu_buffers.c
+++ b/gcell/lib/runtime/spu/spu_buffers.c
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <spu_buffers.h>
-#include <compiler.h>
+#include "spu_buffers.h"
+#include <gcell/compiler.h>
 
 static unsigned char _getbuf[NGETBUFS][GC_SPU_BUFSIZE] _AL128;
 static unsigned char _putbuf[NPUTBUFS][GC_SPU_BUFSIZE] _AL128;
diff --git a/gcell/src/lib/runtime/spu/spu_buffers.h b/gcell/lib/runtime/spu/spu_buffers.h
index 24811dc38..24811dc38 100644
--- a/gcell/src/lib/runtime/spu/spu_buffers.h
+++ b/gcell/lib/runtime/spu/spu_buffers.h
diff --git a/gcell/src/lib/spu/Makefile.am b/gcell/lib/spu/Makefile.am
index 7c8e411f7..5afa40e36 100644
--- a/gcell/src/lib/spu/Makefile.am
+++ b/gcell/lib/spu/Makefile.am
@@ -29,10 +29,10 @@
 
 include $(top_srcdir)/Makefile.common.spu
 
-IBM_SPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/src/ibm/sync/spu_source
+IBM_SPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/ibm/sync/spu_source
 AM_CPPFLAGS = $(GCELL_SPU_INCLUDES) $(IBM_SPU_SYNC_INCLUDES)
 
-lib_LIBRARIES = libgcell_spu.a
+libspu_LIBRARIES = libgcell_spu.a
 
 # ----------------------------------------------------------------
 # files in the lib/runtime/spu directory
@@ -63,13 +63,17 @@ general_spu_sources = \
 	$(general_srcdir)/fft_1d_r2.c \
 	$(general_srcdir)/memset.S
 
-general_spu_headers = \
-	$(general_srcdir)/gc_spu_macs.h \
-	$(general_srcdir)/libfft.h
+general_spu_headers =
+# These now live in include/gcell/spu
+#general_spu_headers = \
+#	$(general_srcdir)/gc_spu_macs.h \
+#	$(general_srcdir)/libfft.h
 
-general_spu_noinst_headers = \
-	$(general_srcdir)/fft_1d.h \
-	$(general_srcdir)/fft_1d_r2.h
+general_spu_noinst_headers =
+# As do these
+#general_spu_noinst_headers = \
+#	$(general_srcdir)/fft_1d.h \
+#	$(general_srcdir)/fft_1d_r2.h
 
 # The QA code for (usually) non-PPE visible support routines in lib/general/spu
 general_spu_qa_sources = \
@@ -108,8 +112,10 @@ noinst_HEADERS = \
 # ----------------------------------------------------------------
 # build some SPU executables
 
+libspu_PROGRAMS = \
+	gcell_all
+
 noinst_PROGRAMS = \
-	gcell_all \
 	gcell_runtime_qa \
 	gcell_general_qa
 
diff --git a/gcell/src/lib/wrapper/Makefile.am b/gcell/lib/wrapper/Makefile.am
index 8d92b7b0a..5a8e328c2 100644
--- a/gcell/src/lib/wrapper/Makefile.am
+++ b/gcell/lib/wrapper/Makefile.am
@@ -28,10 +28,10 @@ noinst_LTLIBRARIES = libwrapper.la libwrapper-qa.la
 # generate libtool.lo's that contain embedded SPU executables
 #
 gcell_all.lo: ../spu/gcell_all
-	$(GCELL_EMBEDSPU_LIBTOOL) $@ $<
+	$(GCELL_EMBEDSPU_LIBTOOL) $< $@ 
 
 gcell_general_qa.lo: ../spu/gcell_general_qa
-	$(GCELL_EMBEDSPU_LIBTOOL) $@ $<
+	$(GCELL_EMBEDSPU_LIBTOOL) $< $@
 
 
 
@@ -57,8 +57,9 @@ libwrapper_qa_la_LIBADD = \
 
 # Headers
 
-gcellinclude_HEADERS = \
-	gcp_fft_1d_r2.h
+# Moved to include/gcell
+#gcellinclude_HEADERS = \
+#	gcp_fft_1d_r2.h
 
 noinst_HEADERS = \
 	qa_gcell_general.h \
diff --git a/gcell/src/lib/wrapper/gcp_fft_1d_r2.cc b/gcell/lib/wrapper/gcp_fft_1d_r2.cc
index 07267e303..9e7e00f49 100644
--- a/gcell/src/lib/wrapper/gcp_fft_1d_r2.cc
+++ b/gcell/lib/wrapper/gcp_fft_1d_r2.cc
@@ -21,7 +21,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <gcp_fft_1d_r2.h>
+#include <gcell/gcp_fft_1d_r2.h>
 #include <stdint.h>
 #include <stdexcept>
 #include <math.h>
diff --git a/gcell/src/lib/wrapper/qa_gcell_general.cc b/gcell/lib/wrapper/qa_gcell_general.cc
index de48201ea..af9719812 100644
--- a/gcell/src/lib/wrapper/qa_gcell_general.cc
+++ b/gcell/lib/wrapper/qa_gcell_general.cc
@@ -26,11 +26,11 @@
 #include <stdlib.h>	// random, posix_memalign
 #include <algorithm>
 #include <string.h>
-#include <gc_job_manager.h>
+#include <gcell/gc_job_manager.h>
 
 
 // handle to embedded SPU executable
-extern spe_program_handle_t gcell_general_qa;
+extern spe_program_handle_t gcell_general_qa_spx;
 
 gc_job_desc_sptr
 gcp_qa_general_submit(gc_job_manager_sptr mgr, const std::string &proc_name)
@@ -55,7 +55,7 @@ bool
 qa_gcell_general::generic_test_body(const std::string &proc_name)
 {
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_general_qa);
+  opts.program_handle = gc_program_handle_from_address(&gcell_general_qa_spx);
   opts.nspes = 1;
   gc_job_manager_sptr mgr = gc_make_job_manager(&opts);
 
diff --git a/gcell/src/lib/wrapper/qa_gcell_general.h b/gcell/lib/wrapper/qa_gcell_general.h
index f1e64e717..f1e64e717 100644
--- a/gcell/src/lib/wrapper/qa_gcell_general.h
+++ b/gcell/lib/wrapper/qa_gcell_general.h
diff --git a/gcell/src/lib/wrapper/qa_gcell_wrapper.cc b/gcell/lib/wrapper/qa_gcell_wrapper.cc
index d53c61057..d53c61057 100644
--- a/gcell/src/lib/wrapper/qa_gcell_wrapper.cc
+++ b/gcell/lib/wrapper/qa_gcell_wrapper.cc
diff --git a/gcell/src/lib/wrapper/qa_gcell_wrapper.h b/gcell/lib/wrapper/qa_gcell_wrapper.h
index cb29db883..cb29db883 100644
--- a/gcell/src/lib/wrapper/qa_gcell_wrapper.h
+++ b/gcell/lib/wrapper/qa_gcell_wrapper.h
diff --git a/gcell/src/lib/wrapper/qa_gcp_fft_1d_r2.cc b/gcell/lib/wrapper/qa_gcp_fft_1d_r2.cc
index dbbe05fbc..742c624dc 100644
--- a/gcell/src/lib/wrapper/qa_gcp_fft_1d_r2.cc
+++ b/gcell/lib/wrapper/qa_gcp_fft_1d_r2.cc
@@ -21,7 +21,7 @@
 
 #include "qa_gcp_fft_1d_r2.h"
 #include <cppunit/TestAssert.h>
-#include <gcp_fft_1d_r2.h>
+#include <gcell/gcp_fft_1d_r2.h>
 #include <fftw3.h>
 #include <stdio.h>
 #include <stdlib.h>	// random, posix_memalign
@@ -31,7 +31,7 @@
 typedef boost::shared_ptr<void> void_sptr;
 
 // handle to embedded SPU executable
-extern spe_program_handle_t gcell_all;
+extern spe_program_handle_t gcell_all_spx;
 
 /*
  * Return pointer to cache-aligned chunk of storage of size size bytes.
@@ -68,7 +68,7 @@ void
 qa_gcp_fft_1d_r2::t1()
 {
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_all);
+  opts.program_handle = gc_program_handle_from_address(&gcell_all_spx);
   opts.nspes = 1;
   gc_job_manager_sptr mgr = gc_make_job_manager(&opts);
 
@@ -86,7 +86,7 @@ void
 qa_gcp_fft_1d_r2::t2()
 {
   gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_all);
+  opts.program_handle = gc_program_handle_from_address(&gcell_all_spx);
   opts.nspes = 1;
   gc_job_manager_sptr mgr = gc_make_job_manager(&opts);
 
diff --git a/gcell/src/lib/wrapper/qa_gcp_fft_1d_r2.h b/gcell/lib/wrapper/qa_gcp_fft_1d_r2.h
index 38beafb21..339ddd25a 100644
--- a/gcell/src/lib/wrapper/qa_gcp_fft_1d_r2.h
+++ b/gcell/lib/wrapper/qa_gcp_fft_1d_r2.h
@@ -23,7 +23,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/TestCase.h>
-#include <gc_job_manager.h>
+#include <gcell/gc_job_manager.h>
 
 class qa_gcp_fft_1d_r2 : public CppUnit::TestCase {
 
diff --git a/gcell/src/lib/wrapper/spu/gcs_fft_1d_r2.c b/gcell/lib/wrapper/spu/gcs_fft_1d_r2.c
index 81e5dfd87..582757ab0 100644
--- a/gcell/src/lib/wrapper/spu/gcs_fft_1d_r2.c
+++ b/gcell/lib/wrapper/spu/gcs_fft_1d_r2.c
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <gc_declare_proc.h>
-#include <libfft.h>
+#include <gcell/gc_declare_proc.h>
+#include <gcell/spu/libfft.h>
 #include <assert.h>
 
 /*
diff --git a/gcell/src/lib/runtime/gcell-embedspu-libtool b/gcell/src/lib/runtime/gcell-embedspu-libtool
deleted file mode 100755
index a4ee53b7e..000000000
--- a/gcell/src/lib/runtime/gcell-embedspu-libtool
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-if [ $# -ne 2 ]; then
-  echo "usage: gcell-embedspu-libtool file.lo spu_executable_file" 1>&2
-  exit 1
-fi
-
-lo_file=$1
-spu_executable=$2
-symbol_name=${lo_file%%.lo}
-
-# generate the .o file that wraps the SPU executable
-ppu-embedspu -m32 -fpic ${symbol_name} ${spu_executable} .libs/${symbol_name}.o
-
-# generate the .lo libtool file that points at all the right places
-rm -f $lo_file
-cat >$lo_file.new <<EOF
-# $lo_file - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-pic_object='.libs/${symbol_name}.o'
-non_pic_object=none
-EOF
-
-mv $lo_file.new $lo_file
-
diff --git a/gr-gcell/src/gcell.i b/gr-gcell/src/gcell.i
index 23f602895..cbe7abcc7 100644
--- a/gr-gcell/src/gcell.i
+++ b/gr-gcell/src/gcell.i
@@ -28,7 +28,7 @@
 #include "gnuradio_swig_bug_workaround.h"	// mandatory bug fix
 //#include <stdexcept>
 
-#include <gc_job_manager.h>
+#include <gcell/gc_job_manager.h>
 #include <gcell_fft_vcc.h>  
 
 %}
diff --git a/gr-gcell/src/gcell_fft_vcc.cc b/gr-gcell/src/gcell_fft_vcc.cc
index b53f0c330..8bbcfb2b9 100644
--- a/gr-gcell/src/gcell_fft_vcc.cc
+++ b/gr-gcell/src/gcell_fft_vcc.cc
@@ -26,9 +26,9 @@
 
 #include <gcell_fft_vcc.h>
 #include <gr_io_signature.h>
-#include <gc_job_manager.h>
-#include <gc_aligned_alloc.h>
-#include <gcp_fft_1d_r2.h>
+#include <gcell/gc_job_manager.h>
+#include <gcell/gc_aligned_alloc.h>
+#include <gcell/gcp_fft_1d_r2.h>
 #include <math.h>
 #include <assert.h>
 #include <stdexcept>
diff --git a/gr-gcell/src/qa_fft.py b/gr-gcell/src/qa_fft.py
index d95b76c4c..88a4f5207 100755
--- a/gr-gcell/src/qa_fft.py
+++ b/gr-gcell/src/qa_fft.py
@@ -33,7 +33,7 @@ primes = (2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,
 class test_fft_filter(gr_unittest.TestCase):
 
     def setUp(self):
-        ph = gcell.program_handle_from_filename("../../gcell/src/lib/spu/gcell_all")
+        ph = gcell.program_handle_from_filename("../../gcell/lib/spu/gcell_all")
         opts = gcell.jm_options(ph, 1)
         self.mgr = gcell.job_manager(opts)
         gcell.set_singleton(self.mgr)