Wehrmacht was the name of the unified armed forces of Nazi Germany from 1935 to 1945. The Wehrmacht consisted of the Heer (army), the Kriegsmarine (navy) and the Luftwaffe (air force).
The Waffen-SS, an initially small armed section of Heinrich Himmler's Allgemeine SS that grew to nearly a million strong during World War II, was not part of the Wehrmacht, but subject to its Supreme Command.