Yes I agree, and it should be counted everywhere.
Manufacturing energy costs are especially important for solar, which requires important amounts of energy for silicon purification and "monocrystallinization" (there must be a more adequate word). Wind power manufacturing costs are on par with other technologies.
[1] https://www.climatexchange.org.uk/media/1461/main_report_-_l...