The classification and diagnostic criteria of the primary headaches--migraine, tension-type headache, and cluster headache--have been reviewed. Additional features of these conditions may enhance diagnostic accuracy. Modification of the classification and diagnostic criteria will take place as epidemiologic and pathophysiologic data continue to develop.