diff --git a/.clang-tidy b/.clang-tidy
index 3079b3b3c..9098e77ff 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -2,12 +2,17 @@ FormatStyle: file
 
 Checks: '
 llvm-namespace-comment,
-modernize-use-override,
-readability-container-size-empty,
-modernize-use-using,
-modernize-use-equals-default,
+modernize-avoid-bind,
+modernize-replace-auto-ptr,
+modernize-replace-disallow-copy-and-assign-macro,
+modernize-shrink-to-fit,
 modernize-use-auto,
+modernize-use-equals-default,
+modernize-use-equals-delete,
 modernize-use-emplace,
+modernize-use-override,
+modernize-use-using,
+readability-container-size-empty,
 '
 
 CheckOptions:
@@ -15,3 +20,5 @@ CheckOptions:
   value:           'exception_ptr$;'
 
 HeaderFilterRegex: 'pybind11/.*h'
+
+WarningsAsErrors: '*'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0f156fbc4..06ec49a1a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -152,7 +152,7 @@ jobs:
     # MSVC, but for now, this action works:
     - name: Prepare compiler environment for Windows 🐍 2.7
       if: matrix.python == 2.7 && runner.os == 'Windows'
-      uses: ilammy/msvc-dev-cmd@v1.8.1
+      uses: ilammy/msvc-dev-cmd@v1.9.0
       with:
         arch: x64
 
@@ -742,7 +742,7 @@ jobs:
       uses: jwlawson/actions-setup-cmake@v1.9
 
     - name: Prepare MSVC
-      uses: ilammy/msvc-dev-cmd@v1.8.1
+      uses: ilammy/msvc-dev-cmd@v1.9.0
       with:
         arch: x86
 
@@ -788,7 +788,7 @@ jobs:
       uses: jwlawson/actions-setup-cmake@v1.9
 
     - name: Prepare MSVC
-      uses: ilammy/msvc-dev-cmd@v1.8.1
+      uses: ilammy/msvc-dev-cmd@v1.9.0
       with:
         toolset: 14.0
 
diff --git a/tests/test_factory_constructors.cpp b/tests/test_factory_constructors.cpp
index db1a1b18a..0dd25b190 100644
--- a/tests/test_factory_constructors.cpp
+++ b/tests/test_factory_constructors.cpp
@@ -20,12 +20,12 @@ class TestFactory1 {
     TestFactory1() : value("(empty)") { print_default_created(this); }
     TestFactory1(int v) : value(std::to_string(v)) { print_created(this, value); }
     TestFactory1(std::string v) : value(std::move(v)) { print_created(this, value); }
+public:
+    std::string value;
     TestFactory1(TestFactory1 &&) = delete;
     TestFactory1(const TestFactory1 &) = delete;
     TestFactory1 &operator=(TestFactory1 &&) = delete;
     TestFactory1 &operator=(const TestFactory1 &) = delete;
-public:
-    std::string value;
     ~TestFactory1() { print_destroyed(this); }
 };
 // Non-public construction, but moveable:
diff --git a/tools/pybind11Config.cmake.in b/tools/pybind11Config.cmake.in
index 0f136005b..6fa03a0f2 100644
--- a/tools/pybind11Config.cmake.in
+++ b/tools/pybind11Config.cmake.in
@@ -201,7 +201,7 @@ Using ``find_package`` with version info is not recommended except for release v
 @PACKAGE_INIT@
 
 # Location of pybind11/pybind11.h
-set(pybind11_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@")
+set(pybind11_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
 
 set(pybind11_LIBRARY "")
 set(pybind11_DEFINITIONS USING_pybind11)