Stopped #include-ing extraneous files