This commit introduced conditional includes which is not the preferred method. Will do it in the makefile instead. This reverts commit 7148556979793c56e69dabf7e31813930a0e979a.