Fix data types
Adding missing header file
Adding missing header files