Use our standard include guard naming convention

Change-Id: Ida8aed52b57ca27cd7af7c3dd117345127efeb3c

include/LibreOfficeKit/LibreOfficeKit.h

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_H
-#define INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_H
+#ifndef INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_H
+#define INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_H
 
 #include <stddef.h>
 
@@ -177,5 +177,6 @@ struct _LibreOfficeKitDocumentClass
 }
 #endif
 
-#endif
+#endif // INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_H
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/LibreOfficeKit/LibreOfficeKit.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_HXX
-#define INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_HXX
+#ifndef INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_HXX
+#define INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_HXX
 
 #include "LibreOfficeKit.h"
 
@@ -169,5 +169,7 @@ inline Office* lok_cpp_init(const char* pInstallPath)
 }
 
 }
-#endif
+
+#endif // INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_HXX
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/LibreOfficeKit/LibreOfficeKitGtk.h

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_DESKTOP_INC_LIBREOFFICEKITGTK_H
-#define INCLUDED_DESKTOP_INC_LIBREOFFICEKITGTK_H
+#ifndef INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKITGTK_H
+#define INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKITGTK_H
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
@@ -73,4 +73,6 @@ void            lok_docview_set_edit        (LOKDocView* pDocView,
 }
 #endif
 
-#endif
+#endif // INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKITGTK_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/LibreOfficeKit/LibreOfficeKitInit.h

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_INIT_H
-#define INCLUDED_DESKTOP_INC_LIBREOFFICEKIT_INIT_H
+#ifndef INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKITINIT_H
+#define INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKITINIT_H
 
 #include "LibreOfficeKit.h"
 
@@ -186,6 +186,6 @@ static LibreOfficeKit *lok_init( const char *install_path )
 }
 #endif
 
-#endif
+#endif // INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKITINIT_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */