clean up successor/predecessor includes, fix formatting and add BOOST_FORCEINLINE