diff --git a/panda/src/collide/CMakeLists.txt b/panda/src/collide/CMakeLists.txt
index c906122e33..9306e805c6 100644
--- a/panda/src/collide/CMakeLists.txt
+++ b/panda/src/collide/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(P3COLLIDE_HEADERS
   collisionBox.I collisionBox.h
+  collisionCapsule.I collisionCapsule.h
   collisionEntry.I collisionEntry.h
   collisionGeom.I collisionGeom.h
   collisionHandler.I collisionHandler.h
@@ -26,12 +27,13 @@ set(P3COLLIDE_HEADERS
   collisionSolid.I collisionSolid.h
   collisionSphere.I collisionSphere.h
   collisionTraverser.I collisionTraverser.h
-  collisionTube.I collisionTube.h
+  collisionTube.h
   collisionVisualizer.I collisionVisualizer.h
   config_collide.h
 )
 set(P3COLLIDE_SOURCES
   collisionBox.cxx
+  collisionCapsule.cxx
   collisionEntry.cxx
   collisionGeom.cxx
   collisionHandler.cxx
@@ -58,7 +60,6 @@ set(P3COLLIDE_SOURCES
   collisionSolid.cxx
   collisionSphere.cxx
   collisionTraverser.cxx
-  collisionTube.cxx
   collisionVisualizer.cxx
   config_collide.cxx
 )
diff --git a/panda/src/device/CMakeLists.txt b/panda/src/device/CMakeLists.txt
index 7051f7248f..c6b47b608e 100644
--- a/panda/src/device/CMakeLists.txt
+++ b/panda/src/device/CMakeLists.txt
@@ -1,37 +1,69 @@
 set(P3DEVICE_HEADERS
-  analogNode.I analogNode.h
-  buttonNode.I buttonNode.h
-  clientAnalogDevice.I clientAnalogDevice.h clientBase.I
-  clientBase.h clientButtonDevice.I clientButtonDevice.h
-  clientDevice.I clientDevice.h clientDialDevice.I
-  clientDialDevice.h clientTrackerDevice.I
-  clientTrackerDevice.h config_device.h
-  dialNode.I dialNode.h
-  mouseAndKeyboard.h
-  trackerData.I trackerData.h
-  trackerNode.I trackerNode.h
+  analogNode.h analogNode.I
+  buttonNode.h buttonNode.I
+  clientAnalogDevice.h clientAnalogDevice.I
+  clientBase.h clientBase.I
+  clientButtonDevice.h clientButtonDevice.I
+  clientDevice.h clientDevice.I
+  clientDialDevice.h clientDialDevice.I
+  clientTrackerDevice.h clientTrackerDevice.I
+  config_device.h
+  dialNode.h dialNode.I
+  evdevInputDevice.h evdevInputDevice.I
+  inputDevice.h inputDevice.I
+  inputDeviceManager.h inputDeviceManager.I
+  inputDeviceNode.h
+  inputDeviceSet.h inputDeviceSet.I
+  ioKitInputDevice.h
+  ioKitInputDeviceManager.h
+  linuxInputDeviceManager.h
+  linuxJoystickDevice.h linuxJoystickDevice.I
+  trackerData.h trackerData.I
+  trackerNode.h trackerNode.I
   virtualMouse.h
+  winInputDeviceManager.h
+  winRawInputDevice.h
+  xInputDevice.h
 )
+
 set(P3DEVICE_SOURCES
   analogNode.cxx
   buttonNode.cxx
   clientAnalogDevice.cxx
-  clientBase.cxx clientButtonDevice.cxx clientDevice.cxx
-  clientDialDevice.cxx clientTrackerDevice.cxx
+  clientBase.cxx
+  clientButtonDevice.cxx
+  clientDevice.cxx
+  clientDialDevice.cxx
+  clientTrackerDevice.cxx
   config_device.cxx
   dialNode.cxx
-  mouseAndKeyboard.cxx
+  evdevInputDevice.cxx
+  inputDevice.cxx
+  inputDeviceManager.cxx
+  inputDeviceNode.cxx
+  inputDeviceSet.cxx
+  ioKitInputDevice.cxx
+  ioKitInputDeviceManager.cxx
+  linuxInputDeviceManager.cxx
+  linuxJoystickDevice.cxx
   trackerData.cxx
   trackerNode.cxx
   virtualMouse.cxx
+  winInputDeviceManager.cxx
+  winRawInputDevice.cxx
+  xInputDevice.cxx
 )
 
 composite_sources(p3device P3DEVICE_SOURCES)
 add_component_library(p3device SYMBOL BUILDING_PANDA_DEVICE
   ${P3DEVICE_HEADERS} ${P3DEVICE_SOURCES})
-target_link_libraries(p3device p3dgraph p3display)
+target_link_libraries(p3device p3dgraph)
 target_interrogate(p3device ALL)
 
+if(WIN32)
+  target_link_libraries(p3device Cfgmgr32.lib)
+endif()
+
 if(NOT BUILD_METALIBS)
   install(TARGETS p3device
     EXPORT Core COMPONENT Core
diff --git a/panda/src/display/CMakeLists.txt b/panda/src/display/CMakeLists.txt
index 0298ef9974..a369b7f4e7 100644
--- a/panda/src/display/CMakeLists.txt
+++ b/panda/src/display/CMakeLists.txt
@@ -20,6 +20,7 @@ set(P3DISPLAY_HEADERS
   graphicsWindowInputDevice.I graphicsWindowInputDevice.h
   graphicsWindowProc.h
   graphicsWindowProcCallbackData.I graphicsWindowProcCallbackData.h
+  mouseAndKeyboard.h
   nativeWindowHandle.I nativeWindowHandle.h
   parasiteBuffer.I parasiteBuffer.h
   pStatGPUTimer.I pStatGPUTimer.h
@@ -55,6 +56,7 @@ set(P3DISPLAY_SOURCES
   graphicsWindowProc.cxx
   graphicsWindowProcCallbackData.cxx
   graphicsDevice.cxx
+  mouseAndKeyboard.cxx
   nativeWindowHandle.cxx
   parasiteBuffer.cxx
   windowHandle.cxx
@@ -91,7 +93,7 @@ endif()
 composite_sources(p3display P3DISPLAY_SOURCES)
 add_component_library(p3display SYMBOL BUILDING_PANDA_DISPLAY
   ${P3DISPLAY_HEADERS} ${P3DISPLAY_SOURCES})
-target_link_libraries(p3display p3cull p3pgraphnodes
+target_link_libraries(p3display p3cull p3device p3pgraphnodes
   PKG::X11)
 target_interrogate(p3display ALL EXTENSIONS ${P3DISPLAY_IGATEEXT})
 
diff --git a/panda/src/putil/CMakeLists.txt b/panda/src/putil/CMakeLists.txt
index f79df878f3..6547cac759 100644
--- a/panda/src/putil/CMakeLists.txt
+++ b/panda/src/putil/CMakeLists.txt
@@ -36,6 +36,7 @@ set(P3PUTIL_HEADERS
   factoryParams.h
   firstOfPairCompare.I firstOfPairCompare.h
   firstOfPairLess.I firstOfPairLess.h
+  gamepadButton.h
   globalPointerRegistry.I globalPointerRegistry.h
   indirectCompareNames.I indirectCompareNames.h
   indirectCompareSort.I indirectCompareSort.h
@@ -46,11 +47,13 @@ set(P3PUTIL_HEADERS
   linkedListNode.I linkedListNode.h
   load_prc_file.h
   loaderOptions.I loaderOptions.h
-  modifierButtons.I modifierButtons.h mouseButton.h
-  mouseData.I mouseData.h nameUniquifier.I nameUniquifier.h
+  modifierButtons.I modifierButtons.h
+  mouseButton.h mouseData.h
+  nameUniquifier.I nameUniquifier.h
   nodeCachedReferenceCount.h nodeCachedReferenceCount.I
   paramValue.I paramValue.h
   pbitops.I pbitops.h
+  pointerData.h pointerData.I
   portalMask.h
   pta_ushort.h
   simpleHashMap.I simpleHashMap.h
@@ -62,7 +65,6 @@ set(P3PUTIL_HEADERS
   vector_typedWritable.h
   vector_ulong.h
   vector_ushort.h vector_writable.h
-  weakKeyHashMap.h weakKeyHashMap.I
   writableConfigurable.h
   writableParam.I writableParam.h
 )
@@ -93,6 +95,7 @@ set(P3PUTIL_SOURCES
   doubleBitMask.cxx
   factoryBase.cxx
   factoryParam.cxx factoryParams.cxx
+  gamepadButton.cxx
   globalPointerRegistry.cxx
   ioPtaDatagramFloat.cxx
   ioPtaDatagramInt.cxx ioPtaDatagramShort.cxx
@@ -100,11 +103,13 @@ set(P3PUTIL_SOURCES
   linkedListNode.cxx
   load_prc_file.cxx
   loaderOptions.cxx
-  modifierButtons.cxx mouseButton.cxx mouseData.cxx
+  modifierButtons.cxx
+  mouseButton.cxx
   nameUniquifier.cxx
   nodeCachedReferenceCount.cxx
   paramValue.cxx
   pbitops.cxx
+  pointerData.cxx
   pta_ushort.cxx
   simpleHashMap.cxx
   sparseArray.cxx
@@ -114,7 +119,6 @@ set(P3PUTIL_SOURCES
   vector_typedWritable.cxx
   vector_ulong.cxx
   vector_ushort.cxx vector_writable.cxx
-  weakKeyHashMap.cxx
   writableConfigurable.cxx writableParam.cxx
 )