Fix string memory allocation. Reorder header file.