More generic pre-processor selection of correct st.h