[PATCH] pid.h cleanup