Revert part of b755da9fae0 which is source incompatible
Revert part of b755da9fae0 which is source incompatible

Some header files are #included in qcontact.h which are not required
but must be retained for source-compatibility reasons.

KDE/android-qt-mobility,KDE/android-qt-mobility,tmcguire/qt-mobility,kaltsi/qt-mobility,tmcguire/qt-mobility,tmcguire/qt-mobility,qtproject/qt-mobility,enthought/qt-mobility,kaltsi/qt-mobility,enthought/qt-mobility,enthought/qt-mobility,kaltsi/qt-mobility,kaltsi/qt-mobility,KDE/android-qt-mobility,qtproject/qt-mobility,enthought/qt-mobility,qtproject/qt-mobility,qtproject/qt-mobility,enthought/qt-mobility,enthought/qt-mobility,kaltsi/qt-mobility,qtproject/qt-mobility,tmcguire/qt-mobility,tmcguire/qt-mobility,qtproject/qt-mobility,KDE/android-qt-mobility,kaltsi/qt-mobility