diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index a5698a0724..454ea7c085 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -263,11 +263,18 @@ if(GTSAM_UNSTABLE_BUILD_PYTHON)
 endif()
 
 # Add custom target so we can install with `make python-install`
-set(GTSAM_PYTHON_INSTALL_TARGET python-install)
-add_custom_target(${GTSAM_PYTHON_INSTALL_TARGET}
+if (NOT WIN32) # WIN32=1 is target platform is Windows
+    add_custom_target(python-install
+        COMMAND stubgen -q -p gtsam -o ./stubs && cp -a stubs/gtsam/ gtsam && ${PYTHON_EXECUTABLE} -m pip install --user .
+        DEPENDS ${GTSAM_PYTHON_DEPENDENCIES}
+        WORKING_DIRECTORY ${GTSAM_PYTHON_BUILD_DIRECTORY})
+else()
+    #TODO(Varun) Find equivalent cp on Windows
+    add_custom_target(python-install
         COMMAND ${PYTHON_EXECUTABLE} -m pip install --user .
         DEPENDS ${GTSAM_PYTHON_DEPENDENCIES}
         WORKING_DIRECTORY ${GTSAM_PYTHON_BUILD_DIRECTORY})
+endif()
 
 # Custom make command to run all GTSAM Python tests
 add_custom_target(
diff --git a/python/dev_requirements.txt b/python/dev_requirements.txt
index 6970ee6139..6a5e7f9241 100644
--- a/python/dev_requirements.txt
+++ b/python/dev_requirements.txt
@@ -1,2 +1,3 @@
 -r requirements.txt
-pyparsing>=2.4.2
\ No newline at end of file
+pyparsing>=2.4.2
+mypy==1.4.1  #TODO(Varun) A bug in mypy>=1.5.0 causes an unresolved placeholder error when importing numpy>=2.0.0 (https://github.com/python/mypy/issues/17396)
\ No newline at end of file
diff --git a/python/setup.py.in b/python/setup.py.in
index 824a6656ed..b9d7392c7e 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -13,6 +13,7 @@ package_data = {
         "./*.so",
         "./*.dll",
         "./*.pyd",
+        "*.pyi", "**/*.pyi",  # Add the type hints
     ]
 }