Header file inclusion reorganized