diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index 0ba9ea4..9906d1c 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest]
+        os: [windows-2022]
         compiler:
           - name: cl
             cmd: cl
diff --git a/.github/workflows/conda/conda-env.yml b/.github/workflows/conda/conda-env.yml
index 5a8ad82..ccdbce8 100644
--- a/.github/workflows/conda/conda-env.yml
+++ b/.github/workflows/conda/conda-env.yml
@@ -4,6 +4,7 @@ channels:
 dependencies:
   - libboost-devel
   - libboost-python-devel
+  - eigen
   - eigenpy
   - python
   - cppad
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07f0d47..da5664f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,8 +118,8 @@ TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME} PUBLIC)
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC ${cppad_LIBRARY} eigenpy::eigenpy)
 IF(BUILD_WITH_CPPAD_CODEGEN_BINDINGS)
   TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME}
-    SYSTEM PUBLIC
-    ${cppadcg_INCLUDE_DIR}
+    SYSTEM INTERFACE
+    $<BUILD_INTERFACE:${cppadcg_INCLUDE_DIR}>
   )
   TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS})
 ENDIF(BUILD_WITH_CPPAD_CODEGEN_BINDINGS)
@@ -140,11 +140,15 @@ IF(WIN32)
 ENDIF(WIN32)
 
 TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME}
-  SYSTEM PUBLIC
+  SYSTEM PRIVATE
   ${Boost_INCLUDE_DIRS}
   ${EIGEN3_INCLUDE_DIR}
-  ${PYTHON_INCLUDE_DIRS}
-  $<INSTALL_INTERFACE:include>)
+  ${PYTHON_INCLUDE_DIR}
+)
+TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME}
+  PUBLIC
+  $<INSTALL_INTERFACE:include>
+)
 TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
 
 INSTALL(TARGETS ${PROJECT_NAME}