Kdrefactor

Implementation should not be in header file.