Added Lib header to header files
Updatet export statements