Small reorganization.
Make requires this header file.