diff --git a/Cantera/cxx/include/Cantera.mak.in b/Cantera/cxx/include/Cantera.mak.in
index 16355a5f1..b03c7c254 100644
--- a/Cantera/cxx/include/Cantera.mak.in
+++ b/Cantera/cxx/include/Cantera.mak.in
@@ -23,28 +23,107 @@
 #
 in_CanteraBuildTree = 0
 
+###############################################################################
+#        CANTERA CORE 
+###############################################################################
 #
 # The directory where Cantera include files may be found.
+#  Include files in application programs should start with:
+#     #include "cantera/thermo.h"
+#     #include "cantera/kernel/HMWSoln.h"
 #
-CANTERA_INCROOTDIR=@ct_incroot@
-
-#
-# Includes to add
-#
-CANTERA_INCLUDES=-I$(CANTERA_INCROOTDIR) -I$(CANTERA_INCROOTDIR)/cantera
-
+CANTERA_INCROOTDIR= @ct_incroot@
 #
 # Library location
 #
-CANTERA_LIBSDIR = @ct_libdir@
+CANTERA_LIBSDIR= @ct_libdir@
 
 #
 # Required Cantera libraries
 #
-CANTERA_LIBS = -L$(CANTERA_LIBDIR) @LOCAL_LIBS@ -lctcxx
+CANTERA_CORE_LIBS= -L$(CANTERA_LIBSDIR) @CANTERA_CORE_LIBS@ -lctcxx
+
+#
+# Cantera Core Lib Dependencies
+#
+CANTERA_CORE_LIBS_DEP= @CANTERA_CORE_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
+#####################################################################
+#            BOOST
+####################################################################
+#
+# Cantera Boost Include
+#
+CANTERA_BOOST_INCLUDES= @BOOST_INCLUDE@
+#
+# Location of the boost library that Cantera linked against
+#
+CANTERA_BOOST_LIB_DIR= @BOOST_LIB_DIR@
+#
+# Linkage extras for linking against boost
+#
+ifeq($(CANTERA_BOOST_LIB_DIR),"")
+CANTERA_BOOST_LIBS=
+else
+CANTERA_BOOST_LIBS= -L$(CANTERA_BOOST_LIB_DIR) -l@BOOST_LIB@
+endif
+
+#####################################################################
+#         CVODE/SUNDIALS LINKAGE
+####################################################################
+CANTERA_use_sundials = @use_sundials@
+
+#
+# Includes for Sundials - none for cvode
+#
+CANTERA_CVODE_INCLUDE=@sundials_include@
+#
+# Link line for cvode and sundials
+#
+ifeq ($(CANTERA_user_sundials), 1)
+
+else
+CANTERA_CVODE_LIBS= -L$(CANTERA_LIBSDIR) @CVODE_LIBS@
+endif
+
+
+#######################################################################
+#         BLAS LAPACK LINKAGE
+#######################################################################
+CANTERA_build_lapack= @build_lapack@
+CANTERA_build_blas= @build_blas@
+
+CANTERA_BLAS_LAPACK_DIR= @BLAS_LAPACK_DIR@
+
+CANTERA_BLAS_LAPACK_LIBS = -L$(CANTERA_BLAS_LAPACK_DIR) @BLAS_LAPACK_LIBS@
+
+#######################################################################
+#        CANTERA's F2C Linkage
+#######################################################################
+CANTERA_build_with_f2c= @build_with_f2c@
+CANTERA_build_f2c_lib= @build_f2c_lib@
+
+ifeq($(CANTERA_build_f2c_lib), 1) 
+CANTERA_F2C_LIBS= -L$(CANTERA_LIBSDIR) -lctf2c
+else
+CANTERA_F2C_LIBS= @F2C_SYSTEMLIB@
+endif
+
+
+#####################################################################
+#      COMBINATIONS OF INCLUDES AND LIBS
+####################################################################
+
+CANTERA_TOTAL_INCLUDES= $(CANTERA_INCLUDES) $(CANTERA_BOOST_INCLUDES) $(CANTERA_CVODE_INCLUDE)
+
+CANTERA_TOTAL_LIBS2 = @LOCAL_LIB_DIRS@ @LOCAL_LIBS@
+
+CANTERA_TOTAL_LIBS= $(CANTERA_LIBS) $(CANTERA_BOOST_LIBS) \
+                    $(CANTERA_CVODE_LIBS) $(CANTERA_BLAS_LAPACK_LIBS) \
+                     $(CANTERA_F2C_LIBS)
 
 #
 # Dependency Line
 #
-CANTERA_LIBS_DEP = @INSTALL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+CANTERA_LIBS_DEP= @INSTALL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a