Breaks gcc builds with '-nostdinc' flag.
The fix in 1a53d8f88a452847b25f9689f9a08dbcf82c86e4
(Fix for problem with undeclared intptr_t type), which is also merged
fixes the same problem, without causing breakage.
This reverts commit 6335e5c697c57d8b5854b8202de3733bcb151ca6.