If you haven't already, you should look into some stretches for tension headaches. For me at least, they don't make the headache go away completely (because often dehydration is a factor as well), but they sure take the edge off.