Abarenbō Shōgun
Despite this, "jidaigeki" movies (such as "Abarenbō Shōgun") set in Edo usually depict Edo Castle as having a keep, and substitute Himeji Castle for that purpose.