diff --git a/CMakeLists.txt b/CMakeLists.txt
index a98c7438670d4..8c0c029ccb13f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -308,7 +308,6 @@ set(SWIFT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 
 set(SWIFT_RUNTIME_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin")
 set(SWIFT_LIBRARY_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib")
-set(SWIFT_INCLUDE_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/include")
 if("${SWIFT_NATIVE_SWIFT_TOOLS_PATH}" STREQUAL "")
   set(SWIFT_NATIVE_SWIFT_TOOLS_PATH "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
 endif()
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index f08ba71c59f1e..4f6ea99985d5a 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -1,9 +1,5 @@
 add_subdirectory(vim)
 
-if(SWIFT_INSTALL_TOOLS)
-  # FIXME: install gyb.
-endif()
-
 swift_install_in_component(editor-integration
     FILES swift-mode.el
     DESTINATION "share/emacs/site-lisp")