--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/asynchrequestmanager.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/asynchrequestmanager.h	Sat Apr 10 13:41:45 2010 +0100
@@ -120,4 +120,4 @@
 
       };
 
-#endif __ASYNCHREQUESTMANAGER_H
+#endif // __ASYNCHREQUESTMANAGER_H

--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgclfoperationobserver.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgclfoperationobserver.h	Sat Apr 10 13:41:45 2010 +0100
@@ -140,4 +140,4 @@
          MCLFSortingStyle* iSortingStyle;
 	};
 
-#endif __MGCLFOPERATIONOBSERVER_H
\ No newline at end of file
+#endif // __MGCLFOPERATIONOBSERVER_H

--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgconsts.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgconsts.h	Sat Apr 10 13:41:45 2010 +0100
@@ -38,4 +38,4 @@
 _LIT8( KMgComposer, "Composer" );
 _LIT8( KMgLinkFirstURL, "LinkFirstURL" );
 	
-#endif __MGCONSTS_H
\ No newline at end of file
+#endif // __MGCONSTS_H

--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgoperationobserver.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgoperationobserver.h	Sat Apr 10 13:41:45 2010 +0100
@@ -61,4 +61,4 @@
 
 	};
 
-#endif __MGOPERATIONOBSERVER_H
\ No newline at end of file
+#endif // __MGOPERATIONOBSERVER_H

--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgpostfilter.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgpostfilter.h	Sat Apr 10 13:41:45 2010 +0100
@@ -155,4 +155,4 @@
     };
 
 
-#endif __CMGPOSTFILTER_H
\ No newline at end of file
+#endif // __CMGPOSTFILTER_H

--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgservice.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgservice.h	Sat Apr 10 13:41:45 2010 +0100
@@ -330,4 +330,4 @@
     	
       };
 
-#endif __CMGSERVICE_H
\ No newline at end of file
+#endif // __CMGSERVICE_H

--- a/serviceproviders/sapi_sysinfo/inc/errormsgs.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_sysinfo/inc/errormsgs.h	Sat Apr 10 13:41:45 2010 +0100
@@ -40,4 +40,4 @@
 _LIT16(KErrCallbackNotPresent,"Callback object not found");
 _LIT16(KErrReadingGetInfo,"Output Data Not found");
 
-#endif __SYSINFO_ERRMSG_H__
+#endif // __SYSINFO_ERRMSG_H__

--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/activerequests.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/activerequests.h	Sat Apr 10 13:41:45 2010 +0100
@@ -454,4 +454,4 @@
     };
 
 
-#endif __ACTIVE_REQUESTS_H__
\ No newline at end of file
+#endif // __ACTIVE_REQUESTS_H__

--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/deviceinfo.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/deviceinfo.h	Sat Apr 10 13:41:45 2010 +0100
@@ -126,4 +126,4 @@
         TInt        iMachineId;
     };
 
-#endif __DEVICE_INFO_H__
\ No newline at end of file
+#endif // __DEVICE_INFO_H__

--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/entitykeys.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/entitykeys.h	Sat Apr 10 13:41:45 2010 +0100
@@ -134,4 +134,4 @@
 	
 }
 
-#endif __ENTITYKEYS_H__
+#endif // __ENTITYKEYS_H__

--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysaccessoryrequest.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysaccessoryrequest.h	Sat Apr 10 13:41:45 2010 +0100
@@ -94,4 +94,4 @@
     CAccessoryInfo::TAccessoryState iAccState;
     };
 
-#endif __SYSACCESSORYREQUEST_H__
\ No newline at end of file
+#endif // __SYSACCESSORYREQUEST_H__

--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysconnectionrequest.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysconnectionrequest.h	Sat Apr 10 13:41:45 2010 +0100
@@ -205,4 +205,4 @@
     TBool                   iConnectionInit;
     };
 
-#endif __SYSCONNECTIONREQUEST_H__
\ No newline at end of file
+#endif // __SYSCONNECTIONREQUEST_H__

--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfo.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfo.h	Sat Apr 10 13:41:45 2010 +0100
@@ -984,4 +984,4 @@
     RArray<CVideoDecData *>    iDecData;
     TInt            iCount;
 };
-#endif __SYSINFO_H__
+#endif // __SYSINFO_H__

--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfoservice.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfoservice.h	Sat Apr 10 13:41:45 2010 +0100
@@ -335,5 +335,5 @@
     virtual void MdvpoStreamEnd() {}
     };
 
-#endif __CSYSINFOSERVICE_H__
+#endif // __CSYSINFOSERVICE_H__
 

--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfoutils.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfoutils.h	Sat Apr 10 13:41:45 2010 +0100
@@ -77,4 +77,4 @@
                                                             TDes& aValue);
     };
 
-#endif __SYSINFO_UTILS_H__
\ No newline at end of file
+#endif // __SYSINFO_UTILS_H__

--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysnetworkrequest.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysnetworkrequest.h	Sat Apr 10 13:41:45 2010 +0100
@@ -132,4 +132,4 @@
 
 
 // CLASS DECLARATION
-#endif __SYSNETWORKREQUEST_H__
\ No newline at end of file
+#endif // __SYSNETWORKREQUEST_H__

--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysrange.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysrange.h	Sat Apr 10 13:41:45 2010 +0100
@@ -35,4 +35,4 @@
 const TInt KLightTimeoutMax(60);
 const TInt KLightTimeoutMin(5);
 
-#endif __SYSRANGE_H__
+#endif // __SYSRANGE_H__

--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysrequest.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysrequest.h	Sat Apr 10 13:41:45 2010 +0100
@@ -124,6 +124,6 @@
 
 #include "sysrequest.inl"
 
-#endif _SYSREQUEST_H_
+#endif // _SYSREQUEST_H_
 
 //End of file

--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysuseractivity.h	Sun Mar 28 16:38:04 2010 +0100
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysuseractivity.h	Sat Apr 10 13:41:45 2010 +0100
@@ -100,4 +100,4 @@
     TInt                        iTimeout;
     };
 
-#endif __SYSUSERACTIVITY_H__
\ No newline at end of file
+#endif // __SYSUSERACTIVITY_H__