FInally fix the multiple definitions error

Change-Id: Ifb7abf1c63f5f702047e81a4aaccbf319cd43bff
Signed-off-by: Evan Anderson <evan1124@gmail.com>