diff --git a/Cantera/cxx/CMakeLists.txt b/Cantera/cxx/CMakeLists.txt
deleted file mode 100644
index 32869e907..000000000
--- a/Cantera/cxx/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-add_subdirectory( include )
-add_subdirectory( src )
-add_subdirectory( demos )
diff --git a/Cantera/cxx/cmake_install.cmake b/Cantera/cxx/cmake_install.cmake
deleted file mode 100644
index 53b031cef..000000000
--- a/Cantera/cxx/cmake_install.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-# Install script for directory: /Users/dgg/dv/sf/cantera/Cantera/cxx
-
-# Set the install prefix
-IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
-  SET(CMAKE_INSTALL_PREFIX "/usr/local")
-ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX)
-STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-
-# Set the install configuration name.
-IF(NOT CMAKE_INSTALL_CONFIG_NAME)
-  IF(BUILD_TYPE)
-    STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
-           CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
-  ELSE(BUILD_TYPE)
-    SET(CMAKE_INSTALL_CONFIG_NAME "Debug")
-  ENDIF(BUILD_TYPE)
-  MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
-ENDIF(NOT CMAKE_INSTALL_CONFIG_NAME)
-
-# Set the component getting installed.
-IF(NOT CMAKE_INSTALL_COMPONENT)
-  IF(COMPONENT)
-    MESSAGE(STATUS "Install component: \"${COMPONENT}\"")
-    SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
-  ELSE(COMPONENT)
-    SET(CMAKE_INSTALL_COMPONENT)
-  ENDIF(COMPONENT)
-ENDIF(NOT CMAKE_INSTALL_COMPONENT)
-
-IF(NOT CMAKE_INSTALL_LOCAL_ONLY)
-  # Include the install script for each subdirectory.
-  INCLUDE("/Users/dgg/dv/sf/cantera/Cantera/cxx/include/cmake_install.cmake")
-  INCLUDE("/Users/dgg/dv/sf/cantera/Cantera/cxx/src/cmake_install.cmake")
-  INCLUDE("/Users/dgg/dv/sf/cantera/Cantera/cxx/demos/cmake_install.cmake")
-
-ENDIF(NOT CMAKE_INSTALL_LOCAL_ONLY)
diff --git a/Cantera/cxx/src/CMakeLists.txt b/Cantera/cxx/src/CMakeLists.txt
deleted file mode 100644
index 4f5e4bdec..000000000
--- a/Cantera/cxx/src/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-SET ( CXX_SRCS importPhase.cpp )
-
-INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR})
-INCLUDE_DIRECTORIES (${PROJECT_BINARY_DIR}/build/include/cantera/kernel)
-
-ADD_LIBRARY (ctcxx ${CXX_SRCS})
diff --git a/Cantera/src/base/Makefile.am b/Cantera/src/base/Makefile.am
index 809df5d3a..13edc9e05 100644
--- a/Cantera/src/base/Makefile.am
+++ b/Cantera/src/base/Makefile.am
@@ -13,7 +13,11 @@ INCLUDES                =
 AM_CXXFLAGS             = $(INCLUDES)
 
 lib_LTLIBRARIES         = $(top_builddir)/build/lib/libctbase.la
-library_includedir      = $(includedir)
+library_includedir      = $(top_builddir)/build/include
+library_include_HEADERS = $(h_sources)
+
+otherincludedir         = $(top_builddir)/build/include/cantera/kernel
+otherinclude_HEADERS    = $(h_sources)
 
 #-----------------------
 # Cantera Converters C/C++ library
@@ -21,3 +25,5 @@ library_includedir      = $(includedir)
 
 __top_builddir__build_lib_libctbase_la_LDFLAGS      = $(all_libraries) -release $(GENERIC_RELEASE)
 __top_builddir__build_lib_libctbase_la_SOURCES      = $(cc_sources) $(h_sources)
+
+CLEANFILES = *.o
diff --git a/examples/cxx/Makefile.am b/examples/cxx/Makefile.am
index 7b1a57d20..ac8846a1c 100644
--- a/examples/cxx/Makefile.am
+++ b/examples/cxx/Makefile.am
@@ -4,7 +4,7 @@ cc_sources = equil_example1.cpp examples.cpp flame1.cpp kinetics_example1.cpp \
 	     kinetics_example2.cpp kinetics_example3.cpp rxnpath_example1.cpp \
 	     transport_example1.cpp transport_example2.cpp
 
-INCLUDES                = -I../base -I../../Cantera/cxx/include
+INCLUDES                = -I../base -I../../build/include/
 AM_CXXFLAGS             = $(INCLUDES)
 
 bin_PROGRAMS            = cxx_examples
diff --git a/test_problems/Makefile.am b/test_problems/Makefile.am
index 412577506..a9fce954a 100644
--- a/test_problems/Makefile.am
+++ b/test_problems/Makefile.am
@@ -5,7 +5,7 @@
              ChemEquil_ionizedGas ChemEquil_red1 CpJump           \
 	     mixGasTransport multiGasTransport printUtilUnitTest 
 
-SUBDIRS    = cxx_ex
+#SUBDIRS    = cxx_ex
 #
 # would be good to add:
 #