Revert "Modified original header files to allow the C++ to D converter to handle them."

This reverts commit b7dc0bdf26d01542f4ff9489be9ff5d842320d98.