9 files changed, 19 insertions, 19 deletions
diff --git a/embedserv/source/inc/common.h b/embedserv/source/inc/common.h
index e770b5064cc1..4f223e919a73 100644
--- a/embedserv/source/inc/common.h
+++ b/embedserv/source/inc/common.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMMON_H_
-#define _COMMON_H_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_COMMON_H
+#define INCLUDED_EMBEDSERV_SOURCE_INC_COMMON_H
 
 #include "stdafx.h"
 #include <initguid.h>
diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx
index 34c867c11b40..e6d0d4f0eabf 100644
--- a/embedserv/source/inc/embeddoc.hxx
+++ b/embedserv/source/inc/embeddoc.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EMBEDDOC_HXX_
-#define _EMBEDDOC_HXX_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOC_HXX
+#define INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOC_HXX
 #ifdef _MSC_VER
 #pragma warning(disable : 4917 4555)
 #endif
@@ -194,6 +194,6 @@ public:
     }
 };
 
-#endif //_EMBEDDOC_HXX_
+#endif // INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/source/inc/embeddocaccess.hxx b/embedserv/source/inc/embeddocaccess.hxx
index b094ac0b4f8b..721fe8d18a77 100644
--- a/embedserv/source/inc/embeddocaccess.hxx
+++ b/embedserv/source/inc/embeddocaccess.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EMBEDDOCACCESS_HXX_
-#define _EMBEDDOCACCESS_HXX_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOCACCESS_HXX
+#define INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOCACCESS_HXX
 
 #define OLESERV_SAVEOBJECT      1
 #define OLESERV_CLOSE           2
diff --git a/embedserv/source/inc/embservconst.h b/embedserv/source/inc/embservconst.h
index 6dac501b65e3..d65ef00aaa6c 100644
--- a/embedserv/source/inc/embservconst.h
+++ b/embedserv/source/inc/embservconst.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EMBSERVCONST_H_
-#define _EMBSERVCONST_H_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_EMBSERVCONST_H
+#define INCLUDED_EMBEDSERV_SOURCE_INC_EMBSERVCONST_H
 
 #include <guiddef.h>
 
diff --git a/embedserv/source/inc/iipaobj.hxx b/embedserv/source/inc/iipaobj.hxx
index d4f9f8b2eb02..17e97acf8341 100644
--- a/embedserv/source/inc/iipaobj.hxx
+++ b/embedserv/source/inc/iipaobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _IIPAOBJ_HXX_
-#define _IIPAOBJ_HXX_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_IIPAOBJ_HXX
+#define INCLUDED_EMBEDSERV_SOURCE_INC_IIPAOBJ_HXX
 #ifdef _MSC_VER
 #pragma warning(disable : 4917 4555)
 #endif
diff --git a/embedserv/source/inc/servprov.hxx b/embedserv/source/inc/servprov.hxx
index ac40aaac68a1..1c0a012b26c8 100644
--- a/embedserv/source/inc/servprov.hxx
+++ b/embedserv/source/inc/servprov.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SERVPROV_HXX
-#define _SERVPROV_HXX
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_SERVPROV_HXX
+#define INCLUDED_EMBEDSERV_SOURCE_INC_SERVPROV_HXX
 
 #include "common.h"
 #include <oleidl.h>
diff --git a/embedserv/source/inc/xwin.hxx b/embedserv/source/inc/xwin.hxx
index b8b02adac0b3..aa666dff0a79 100644
--- a/embedserv/source/inc/xwin.hxx
+++ b/embedserv/source/inc/xwin.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XWIN_HXX_
-#define _XWIN_HXX_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_XWIN_HXX
+#define INCLUDED_EMBEDSERV_SOURCE_INC_XWIN_HXX
 
 
 #include "common.h"
diff --git a/embedserv/source/inprocserv/inprocembobj.h b/embedserv/source/inprocserv/inprocembobj.h
index f5eb14c46611..95a28ed2f94f 100644
--- a/embedserv/source/inprocserv/inprocembobj.h
+++ b/embedserv/source/inprocserv/inprocembobj.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _INPROCEMBOBJ_HXX_
-#define _INPROCEMBOBJ_HXX_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INPROCSERV_INPROCEMBOBJ_H
+#define INCLUDED_EMBEDSERV_SOURCE_INPROCSERV_INPROCEMBOBJ_H
 
 #if defined _MSC_VER
 #pragma warning(disable : 4668)
diff --git a/embedserv/source/inprocserv/smartpointer.hxx b/embedserv/source/inprocserv/smartpointer.hxx
index 57d22216bc6f..62011df14556 100644
--- a/embedserv/source/inprocserv/smartpointer.hxx
+++ b/embedserv/source/inprocserv/smartpointer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _INPROCSERV_SMARTPOINTER_HXX_
-#define _INPROCSERV_SMARTPOINTER_HXX_
+#ifndef INCLUDED_EMBEDSERV_SOURCE_INPROCSERV_SMARTPOINTER_HXX
+#define INCLUDED_EMBEDSERV_SOURCE_INPROCSERV_SMARTPOINTER_HXX
 
 namespace inprocserv{