could some current.h files be simplified?