Make compilation successful with CDH4