@awulkiew My personal point of view here is that:
1) all headers in this file should be included in geometry.hpp (you probably do that already; I did not check)
2) inclusion of multi.hpp should be removed in geometry.hpp
3) multi.hpp should only include geometry.hpp
4) potentially add a warning that this file is deprecated (or something similar)