1.1 --- a/epoc32/include/caf/caf.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/caf/caf.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -18,11 +18,9 @@
     1.4  */
     1.5  
     1.6  
     1.7 -
     1.8 -
     1.9  /**
    1.10   @file
    1.11 - @publishedPartner
    1.12 + @publishedAll
    1.13   @released
    1.14  */
    1.15  
    1.16 @@ -31,38 +29,31 @@
    1.17  
    1.18  #include <e32std.h>
    1.19  
    1.20 +// Enumerations
    1.21 +#include <caf/caftypes.h>
    1.22 +
    1.23  // Errors and Panics
    1.24  #include <caf/caferr.h>
    1.25  #include <caf/cafpanic.h>
    1.26  
    1.27 -// Enumerations
    1.28 -#include <caf/caftypes.h>
    1.29 -
    1.30  // Client side classes for use by the general public
    1.31 +#include <caf/data.h>
    1.32 +#include <caf/content.h>
    1.33  #include <caf/agent.h>
    1.34 -#include <caf/content.h>
    1.35 -#include <caf/data.h>
    1.36 -#include <caf/manager.h>
    1.37 -#include <caf/supplier.h>
    1.38 -#include <caf/importfile.h>
    1.39 -#include <caf/rightsmanager.h>
    1.40  
    1.41  // Utiltiy classes from CafUtils
    1.42 -#include <caf/supplieroutputfile.h>
    1.43  #include <caf/metadata.h>
    1.44  #include <caf/metadataarray.h>
    1.45  #include <caf/virtualpath.h>
    1.46  #include <caf/virtualpathptr.h>
    1.47  #include <caf/embeddedobject.h>
    1.48  #include <caf/attributeset.h>
    1.49 -#include <caf/rightsinfo.h>
    1.50 -#include <caf/attributeset.h>
    1.51  #include <caf/stringattributeset.h>
    1.52  #include <caf/streamableptrarray.h>
    1.53  #include <caf/dirstreamable.h>
    1.54  
    1.55 -// deprecated headerfiles
    1.56 -#include <caf/attribute.h>
    1.57 -#include <caf/cafmimeheader.h>
    1.58 +#ifndef SYMBIAN_ENABLE_PUBLIC_PLATFORM_HEADER_SPLIT
    1.59 +#include <caf/cafplatform.h>
    1.60 +#endif // SYMBIAN_ENABLE_SPLIT_HEADERS
    1.61  
    1.62  #endif // __CAF_H__