This is part 2 of #2119. The parent commit only moved files to retain their correct history, this commit fixes all the includes and build files. Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
This fixes #1940.
Co-authored-by: bi4k8 <bi4k8@github>