9 files changed, 34 insertions, 5 deletions
diff --git a/cpp/sca/kernel/Makefile.am b/cpp/sca/kernel/Makefile.am
new file mode 100644
index 0000000000..0055ae687f
--- /dev/null
+++ b/cpp/sca/kernel/Makefile.am
@@ -0,0 +1,29 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#    
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+noinst_PROGRAMS = kernel-test xml-test
+
+nobase_include_HEADERS = *.hpp
+
+INCLUDES = -I. -I$(top_builddir)/kernel -I${LIBXML2_INCLUDE}
+
+kernel_test_SOURCES = kernel-test.cpp
+kernel_test_LDADD = -lpthread -L${LIBXML2_LIB} -lxml2
+
+xml_test_SOURCES = xml-test.cpp
+xml_test_LDADD = -lpthread -L${LIBXML2_LIB} -lxml2
+
diff --git a/cpp/sca/runtime/core/src/tuscany/function.hpp b/cpp/sca/kernel/function.hpp
index caba5211b9..caba5211b9 100644
--- a/cpp/sca/runtime/core/src/tuscany/function.hpp
+++ b/cpp/sca/kernel/function.hpp
diff --git a/cpp/sca/runtime/core/src/tuscany/gc.hpp b/cpp/sca/kernel/gc.hpp
index b0ed42a474..b0ed42a474 100644
--- a/cpp/sca/runtime/core/src/tuscany/gc.hpp
+++ b/cpp/sca/kernel/gc.hpp
diff --git a/cpp/sca/runtime/core/test/tuscany/core-test.cpp b/cpp/sca/kernel/kernel-test.cpp
index a0b32fa576..3e2793f070 100644
--- a/cpp/sca/runtime/core/test/tuscany/core-test.cpp
+++ b/cpp/sca/kernel/kernel-test.cpp
@@ -29,11 +29,11 @@
 #include <iostream>
 #include <string>
 #include <sstream>
-#include "tuscany/function.hpp"
-#include "tuscany/list.hpp"
-#include "tuscany/parallel.hpp"
-#include "tuscany/value.hpp"
-#include "tuscany/xml.hpp"
+#include "function.hpp"
+#include "list.hpp"
+#include "parallel.hpp"
+#include "value.hpp"
+#include "xml.hpp"
 
 namespace tuscany {
 
diff --git a/cpp/sca/runtime/core/src/tuscany/list.hpp b/cpp/sca/kernel/list.hpp
index ef493b19ca..ef493b19ca 100644
--- a/cpp/sca/runtime/core/src/tuscany/list.hpp
+++ b/cpp/sca/kernel/list.hpp
diff --git a/cpp/sca/runtime/core/src/tuscany/parallel.hpp b/cpp/sca/kernel/parallel.hpp
index c0d578e281..c0d578e281 100644
--- a/cpp/sca/runtime/core/src/tuscany/parallel.hpp
+++ b/cpp/sca/kernel/parallel.hpp
diff --git a/cpp/sca/runtime/core/src/tuscany/value.hpp b/cpp/sca/kernel/value.hpp
index ca4bd06ca6..ca4bd06ca6 100644
--- a/cpp/sca/runtime/core/src/tuscany/value.hpp
+++ b/cpp/sca/kernel/value.hpp
diff --git a/cpp/sca/runtime/core/test/tuscany/xml-test.cpp b/cpp/sca/kernel/xml-test.cpp
index 818c03ba68..818c03ba68 100644
--- a/cpp/sca/runtime/core/test/tuscany/xml-test.cpp
+++ b/cpp/sca/kernel/xml-test.cpp
diff --git a/cpp/sca/runtime/core/src/tuscany/xml.hpp b/cpp/sca/kernel/xml.hpp
index b4a3b87ad1..b4a3b87ad1 100644
--- a/cpp/sca/runtime/core/src/tuscany/xml.hpp
+++ b/cpp/sca/kernel/xml.hpp