Restructure of program,

Includes of in-project header files moved to .cpp files. More permanent
solution needed.