Update comment
Move #ifdef guard and include version-dependent hearders