Merge "Purge underscored header file barriers" into devel/master