Got rid of unnecessary header file ap.h