Trying a fix found in another fork that adds includes