remove unecessary #ifndef
add new data source protocols. beginning #319