8 files changed, 42 insertions, 9 deletions
diff --git a/src/s60main/qts60main.cpp b/src/s60main/qts60main.cpp
index 6690878c7..e3ab46d81 100644
--- a/src/s60main/qts60main.cpp
+++ b/src/s60main/qts60main.cpp
@@ -42,7 +42,7 @@
 // INCLUDE FILES
 #include <exception>
 #include <eikstart.h>
-#include "qts60mainapplication.h"
+#include "qts60mainapplication_p.h"
 
 /**
  * factory function to create the QtS60Main application class
diff --git a/src/s60main/qts60mainapplication.cpp b/src/s60main/qts60mainapplication.cpp
index 1e94af4dc..52b15d64a 100644
--- a/src/s60main/qts60mainapplication.cpp
+++ b/src/s60main/qts60mainapplication.cpp
@@ -41,8 +41,8 @@
 
 // INCLUDE FILES
 #include <exception>
-#include "qts60maindocument.h"
-#include "qts60mainapplication.h"
+#include "qts60maindocument_p.h"
+#include "qts60mainapplication_p.h"
 #include <bautils.h>
 #include <coemain.h>
 
diff --git a/src/s60main/qts60mainapplication.h b/src/s60main/qts60mainapplication_p.h
index 3014e81e9..b35b38e22 100644
--- a/src/s60main/qts60mainapplication.h
+++ b/src/s60main/qts60mainapplication_p.h
@@ -42,6 +42,17 @@
 #ifndef __QtS60MainAPPLICATION_H__
 #define __QtS60MainAPPLICATION_H__
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 // INCLUDES
 #include <aknapp.h>
 
diff --git a/src/s60main/qts60mainappui.cpp b/src/s60main/qts60mainappui.cpp
index 73a47c57b..45673504a 100644
--- a/src/s60main/qts60mainappui.cpp
+++ b/src/s60main/qts60mainappui.cpp
@@ -48,7 +48,7 @@
 #include <s60main.rsg>
 #include <avkon.rsg>
 
-#include "qts60mainappui.h"
+#include "qts60mainappui_p.h"
 #include <QtGui/qapplication.h>
 #include <QtGui/qmenu.h>
 #include <QtGui/private/qt_s60_p.h>
diff --git a/src/s60main/qts60mainappui.h b/src/s60main/qts60mainappui_p.h
index bea6406c5..943d61d49 100644
--- a/src/s60main/qts60mainappui.h
+++ b/src/s60main/qts60mainappui_p.h
@@ -42,6 +42,17 @@
 #ifndef __QtS60MainAPPUI_H__
 #define __QtS60MainAPPUI_H__
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 // INCLUDES
 #include <aknappui.h>
 
diff --git a/src/s60main/qts60maindocument.cpp b/src/s60main/qts60maindocument.cpp
index 4ba91e116..1fd3e3eab 100644
--- a/src/s60main/qts60maindocument.cpp
+++ b/src/s60main/qts60maindocument.cpp
@@ -41,8 +41,8 @@
 
 // INCLUDE FILES
 #include <exception>
-#include "qts60mainappui.h"
-#include "qts60maindocument.h"
+#include "qts60mainappui_p.h"
+#include "qts60maindocument_p.h"
 
 // ============================ MEMBER FUNCTIONS ===============================
 
diff --git a/src/s60main/qts60maindocument.h b/src/s60main/qts60maindocument_p.h
index dcec8ec6b..a7e1fd2d5 100644
--- a/src/s60main/qts60maindocument.h
+++ b/src/s60main/qts60maindocument_p.h
@@ -42,6 +42,17 @@
 #ifndef __QTS60MAINDOCUMENT_H__
 #define __QTS60MAINDOCUMENT_H__
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 // INCLUDES
 #include <akndoc.h>
 
diff --git a/src/s60main/s60main.pro b/src/s60main/s60main.pro
index 57c99495d..a4833aff8 100644
--- a/src/s60main/s60main.pro
+++ b/src/s60main/s60main.pro
@@ -18,9 +18,9 @@ symbian {
                     qts60mainappui.cpp \
                     qts60maindocument.cpp
 
-    HEADERS      =  qts60mainapplication.h \
-                    qts60mainappui.h \
-                    qts60maindocument.h
+    HEADERS      =  qts60mainapplication_p.h \
+                    qts60mainappui_p.h \
+                    qts60maindocument_p.h
 
     # This block serves the minimalistic resource file for S60 3.1 platforms.
     # Note there is no way to ifdef S60 version in mmp file, that is why the resource