diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8ad41a..ee21aa6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,13 +35,24 @@ xo_export_cmake_config(${PROJECT_NAME} ${PROJECT_VERSION} ${PROJECT_NAME}Targets
 
 # ----------------------------------------------------------------
 
-# Install the generator script
+# Install the generator script:
 install(
     PROGRAMS codegen/genfacet
     DESTINATION share/xo-facet/codegen
     COMPONENT codegen
 )
 
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/genfacet-bin
+"#!/bin/bash
+exec \"${CMAKE_INSTALL_FULL_DATADIR}/xo-facet/codegen/genfacet\" \"\$@\"
+")
+
+install(
+    PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/genfacet-bin
+    DESTINATION bin
+    RENAME genfacet
+)
+
 # Install all .j2 template files
 install(
     DIRECTORY codegen/
diff --git a/cmake/xo_facetConfig.cmake.in b/cmake/xo_facetConfig.cmake.in
index 2348394..d4ded16 100644
--- a/cmake/xo_facetConfig.cmake.in
+++ b/cmake/xo_facetConfig.cmake.in
@@ -5,4 +5,5 @@ include(CMakeFindDependencyMacro)
 find_dependency(xo_arena)
 find_dependency(xo_reflectutil)
 include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Share.cmake")
 check_required_components("@PROJECT_NAME@")
diff --git a/codegen/iface_facet_any.cpp.j2 b/codegen/iface_facet_any.cpp.j2
index 6ad2d07..0c8d000 100644
--- a/codegen/iface_facet_any.cpp.j2
+++ b/codegen/iface_facet_any.cpp.j2
@@ -4,6 +4,7 @@
 
 #include "{{impl_hpp_subdir}}/{{iface_facet_any_hpp_fname}}"
 #include <iostream>
+#include <exception>
 
 namespace {{facet_ns1}} {
 namespace {{facet_ns2}} {