clean up cpp usage for gcc; add Berkeley specific header