Correct includes due to file renamings.
Implement the TID.
Fix the buffertest due to PID changes.