diff --git a/.gitignore b/.gitignore
index d6bd1a25..9648517d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
-# typical build location
-build
+# symlink to ${mybuilddirectory}/compile_commands.json for LSP
+compile_commands.json
+# LSP keeps state here
+.cache
+# typical build directories
+.build*
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 766058b1..9d6fef68 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,7 @@ cmake_minimum_required(VERSION 3.10)
 project(subsys VERSION 0.1)
 enable_language(CXX)
 
-include(xo_macros/xo_cxx)
-include(xo_macros/code-coverage)
+include(cmake/xo-bootstrap-macros.cmake)
 
 enable_testing()
 # activate code coverage for all executables + libraries (when -DCODE_COVERAGE=ON)
diff --git a/cmake/xo-bootstrap-macros.cmake b/cmake/xo-bootstrap-macros.cmake
new file mode 100644
index 00000000..16644435
--- /dev/null
+++ b/cmake/xo-bootstrap-macros.cmake
@@ -0,0 +1,12 @@
+if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL "prefix"))
+    # default to typical install location for xo-project-macros
+    set(CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake)
+endif()
+
+message("-- CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
+message("-- CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}")
+
+# needs to have been installed somewhere on CMAKE_MODULE_PATH,
+# (e.g. from xo-cmake with the same value for CMAKE_INSTALL_PREFIX)
+#
+include(xo_macros/xo-project-macros)