include/: refactor headers to allow kthread.h inclusion in psi_types.h