diff --git a/libraries/eosiolib/CMakeLists.txt b/libraries/eosiolib/CMakeLists.txt
index ef5c3c50f20..bf384e148b3 100644
--- a/libraries/eosiolib/CMakeLists.txt
+++ b/libraries/eosiolib/CMakeLists.txt
@@ -18,3 +18,4 @@ install(TARGETS eosio EXPORT EosioLib
    ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../eosiolib DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/core_symbol.hpp DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
diff --git a/libraries/eosiolib/core_symbol.hpp b/libraries/eosiolib/core_symbol.hpp
deleted file mode 100644
index b4b86071f70..00000000000
--- a/libraries/eosiolib/core_symbol.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-/** @file 
- *    @copyright defined in eos/LICENSE.txt 
- *
- * \warning This file is machine generated. DO NOT EDIT.  See core_symbol.hpp.in for changes.
- */
-
-#define CORE_SYMBOL S(4,SYS)
diff --git a/modules/EosioWasmToolchainBuild.cmake.in b/modules/EosioWasmToolchainBuild.cmake.in
index ba85d2587b8..b9b2a4a0415 100644
--- a/modules/EosioWasmToolchainBuild.cmake.in
+++ b/modules/EosioWasmToolchainBuild.cmake.in
@@ -8,8 +8,8 @@ set(CLANG_DIR @CMAKE_BINARY_DIR@/EosioClang-prefix/src/EosioClang-build)
 set(CMAKE_C_COMPILER "${CLANG_DIR}/bin/eosio-cc")
 set(CMAKE_CXX_COMPILER "${CLANG_DIR}/bin/eosio-cpp")
 
-set(CMAKE_C_FLAGS " -O3 -I@CMAKE_SOURCE_DIR@/libraries/boost/include -I@CMAKE_SOURCE_DIR@/libraries/libc++/libcxx/include -I@CMAKE_SOURCE_DIR@/libraries/libc/musl/include -I@CMAKE_SOURCE_DIR@/libraries -I@BOOST_ROOT@/include")
-set(CMAKE_CXX_FLAGS " -O3 -I@CMAKE_SOURCE_DIR@/libraries/boost/include -I@CMAKE_SOURCE_DIR@/libraries/libc++/libcxx/include -I@CMAKE_SOURCE_DIR@/libraries/libc/musl/include -I@CMAKE_SOURCE_DIR@/libraries -I@BOOST_ROOT@/include --std=c++14 ")
+set(CMAKE_C_FLAGS " -O3 -I@CMAKE_BINARY_DIR@/libraries/ -I@CMAKE_SOURCE_DIR@/libraries/boost/include -I@CMAKE_SOURCE_DIR@/libraries/libc++/libcxx/include -I@CMAKE_SOURCE_DIR@/libraries/libc/musl/include -I@CMAKE_SOURCE_DIR@/libraries -I@BOOST_ROOT@/include")
+set(CMAKE_CXX_FLAGS " -O3 -I@CMAKE_BINARY_DIR@/libraries/ -I@CMAKE_SOURCE_DIR@/libraries/boost/include -I@CMAKE_SOURCE_DIR@/libraries/libc++/libcxx/include -I@CMAKE_SOURCE_DIR@/libraries/libc/musl/include -I@CMAKE_SOURCE_DIR@/libraries -I@BOOST_ROOT@/include --std=c++14 ")
 
 set(WASM_LINKER "${CLANG_DIR}/bin/eosio-ld ")