Spain is included in Hispanic, as the term originally applied to things/people related to Hispania, which was essentially the ancient Roman name for the Iberian Peninsula. So Spain would be included in the original definition of Hispanic. But it is more common to think of Hispanic as being from Latin America, but that's not the correct definition.
I’m more than familiar with this subject. However, you will never find a Spaniard identify as a Hispanic.