Fixed common header references in p1b