Historic Scotland was an executive agency of the Scottish Office and later the Scottish Government from 1991 to 2015, responsible for safeguarding Scotland's built heritage and promoting its understanding and enjoyment. Under the terms of a Bill of the Scottish Parliament published on 3 March 2014, Historic Scotland was dissolved and its functions were transferred to Historic Environment Scotland (HES) on 1 October 2015. HES also took over the functions of the Royal Commission on the Ancient and Historical Monuments of Scotland.

Historic Environment Scotland (HES) is an executive non-departmental public body responsible for investigating, caring for and promoting Scotland's historic environment. HES was formed in 2015 from the merger of government agency Historic Scotland with the Royal Commission on the Ancient and Historical Monuments of Scotland (RCAHMS). Among other duties, Historic Environment Scotland maintains more than 300 properties of national importance including Edinburgh Castle, Skara Brae and Fort George.