diff --git a/setup.py b/setup.py
index 3abc811be..44d3eaae5 100644
--- a/setup.py
+++ b/setup.py
@@ -177,14 +177,12 @@ def tail_is(*suffixes):
             "License :: OSI Approved :: MIT License",
         ],
         package_dir={"": "src"},
-        packages=[
-            "debugpy",
-            "debugpy.adapter",
-            "debugpy.common",
-            "debugpy.launcher",
-            "debugpy.server",
-            "debugpy._vendored",
-        ],
+        packages=setuptools.find_namespace_packages(
+            include=[
+                "debugpy",
+                "debugpy.*",
+            ]
+        ),
         package_data={
             "debugpy": ["ThirdPartyNotices.txt"],
             "debugpy._vendored": [
diff --git a/src/debugpy/_vendored/pydevd/pydevd_plugins/__init__.py b/src/debugpy/_vendored/pydevd/pydevd_plugins/__init__.py
deleted file mode 100644
index f471804c7..000000000
--- a/src/debugpy/_vendored/pydevd/pydevd_plugins/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import warnings
-with warnings.catch_warnings():
-    warnings.filterwarnings("ignore", category=DeprecationWarning)
-    try:
-        __import__('pkg_resources').declare_namespace(__name__)
-    except ImportError:
-        import pkgutil
-        __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/src/debugpy/_vendored/pydevd/pydevd_plugins/extensions/__init__.py b/src/debugpy/_vendored/pydevd/pydevd_plugins/extensions/__init__.py
deleted file mode 100644
index 274d7bc4f..000000000
--- a/src/debugpy/_vendored/pydevd/pydevd_plugins/extensions/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import warnings
-with warnings.catch_warnings():
-    try:
-        __import__('pkg_resources').declare_namespace(__name__)
-    except ImportError:
-        import pkgutil
-        __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/src/debugpy/_vendored/pydevd/pydevd_plugins/extensions/types/__init__.py b/src/debugpy/_vendored/pydevd/pydevd_plugins/extensions/types/__init__.py
deleted file mode 100644
index 274d7bc4f..000000000
--- a/src/debugpy/_vendored/pydevd/pydevd_plugins/extensions/types/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import warnings
-with warnings.catch_warnings():
-    try:
-        __import__('pkg_resources').declare_namespace(__name__)
-    except ImportError:
-        import pkgutil
-        __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/src/debugpy/_vendored/pydevd/tests_python/my_extensions/pydevd_plugins/__init__.py b/src/debugpy/_vendored/pydevd/tests_python/my_extensions/pydevd_plugins/__init__.py
deleted file mode 100644
index 274d7bc4f..000000000
--- a/src/debugpy/_vendored/pydevd/tests_python/my_extensions/pydevd_plugins/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import warnings
-with warnings.catch_warnings():
-    try:
-        __import__('pkg_resources').declare_namespace(__name__)
-    except ImportError:
-        import pkgutil
-        __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/src/debugpy/_vendored/pydevd/tests_python/my_extensions/pydevd_plugins/extensions/__init__.py b/src/debugpy/_vendored/pydevd/tests_python/my_extensions/pydevd_plugins/extensions/__init__.py
deleted file mode 100644
index 274d7bc4f..000000000
--- a/src/debugpy/_vendored/pydevd/tests_python/my_extensions/pydevd_plugins/extensions/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import warnings
-with warnings.catch_warnings():
-    try:
-        __import__('pkg_resources').declare_namespace(__name__)
-    except ImportError:
-        import pkgutil
-        __path__ = pkgutil.extend_path(__path__, __name__)