simplify include guards

Change-Id: Id4210229b20a1d54b680ff1a2ccbcdd3684ecf5f

5 files changed, 9 insertions, 6 deletions

diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index 542eacec5482..c35d624c900e 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#if !defined INCLUDED_JVMFWK_ELEMENTS_HXX
+#ifndef INCLUDED_JVMFWK_ELEMENTS_HXX
 #define INCLUDED_JVMFWK_ELEMENTS_HXX
 
 #include <vector>
diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index 3f8891bca541..4ac6c63af78b 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -16,8 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#if !defined INCLUDED_JVMFWK_LOCAL_FRAMEWORK_HXX
+#ifndef INCLUDED_JVMFWK_LOCAL_FRAMEWORK_HXX
 #define INCLUDED_JVMFWK_LOCAL_FRAMEWORK_HXX
+
 #include "rtl/ustring.hxx"
 #include "rtl/byteseq.hxx"
 #include "jvmfwk/framework.h"
diff --git a/jvmfwk/source/fwkbase.hxx b/jvmfwk/source/fwkbase.hxx
index c4b1464e11d0..51bd4bb0d5f5 100644
--- a/jvmfwk/source/fwkbase.hxx
+++ b/jvmfwk/source/fwkbase.hxx
@@ -16,10 +16,12 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#if !defined INCLUDED_JVMFWK_FWKBASE_HXX
+#ifndef INCLUDED_JVMFWK_FWKBASE_HXX
 #define INCLUDED_JVMFWK_FWKBASE_HXX
+
 #include "rtl/ustring.hxx"
 #include "libxmlutil.hxx"
+
 namespace jfw
 {
 
diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx
index 26be25e8b7e0..1509fb74e89d 100644
--- a/jvmfwk/source/fwkutil.hxx
+++ b/jvmfwk/source/fwkutil.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#if !defined INCLUDED_JVMFWK_FWKUTIL_HXX
+#ifndef INCLUDED_JVMFWK_FWKUTIL_HXX
 #define INCLUDED_JVMFWK_FWKUTIL_HXX
 
 #include "sal/config.h"
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index c27f8d03f8c1..7035f2ed9698 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -16,13 +16,13 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#if !defined INCLUDED_JVMFWK_LIBXMLUTIL_HXX
+#ifndef INCLUDED_JVMFWK_LIBXMLUTIL_HXX
 #define INCLUDED_JVMFWK_LIBXMLUTIL_HXX
 
-
 #include "libxml/parser.h"
 #include "libxml/xpath.h"
 #include "rtl/ustring.hxx"
+
 namespace jfw
 {
 class CXPathObjectPtr