Removed ifndef X_CPPs due to bad style.