--- a/epoc32/include/caf/caf.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/caf/caf.h	Wed Mar 31 12:33:34 2010 +0100
@@ -18,11 +18,9 @@
 */
 
 
-
-
 /**
  @file
- @publishedPartner
+ @publishedAll
  @released
 */
 
@@ -31,38 +29,31 @@
 
 #include <e32std.h>
 
+// Enumerations
+#include <caf/caftypes.h>
+
 // Errors and Panics
 #include <caf/caferr.h>
 #include <caf/cafpanic.h>
 
-// Enumerations
-#include <caf/caftypes.h>
-
 // Client side classes for use by the general public
-#include <caf/agent.h>
+#include <caf/data.h>
 #include <caf/content.h>
-#include <caf/data.h>
-#include <caf/manager.h>
-#include <caf/supplier.h>
-#include <caf/importfile.h>
-#include <caf/rightsmanager.h>
+#include <caf/agent.h>
 
 // Utiltiy classes from CafUtils
-#include <caf/supplieroutputfile.h>
 #include <caf/metadata.h>
 #include <caf/metadataarray.h>
 #include <caf/virtualpath.h>
 #include <caf/virtualpathptr.h>
 #include <caf/embeddedobject.h>
 #include <caf/attributeset.h>
-#include <caf/rightsinfo.h>
-#include <caf/attributeset.h>
 #include <caf/stringattributeset.h>
 #include <caf/streamableptrarray.h>
 #include <caf/dirstreamable.h>
 
-// deprecated headerfiles
-#include <caf/attribute.h>
-#include <caf/cafmimeheader.h>
+#ifndef SYMBIAN_ENABLE_PUBLIC_PLATFORM_HEADER_SPLIT
+#include <caf/cafplatform.h>
+#endif // SYMBIAN_ENABLE_SPLIT_HEADERS
 
 #endif // __CAF_H__