fixing source file inclusions