Revert "Move common types into .hrl file"

This reverts commit 3806a8504dcc5fe0b6ec72f63f4add7c81d67f52.