Moved all #includes inside inclusion guards