3 files changed, 9 insertions, 19 deletions
diff --git a/odk/examples/OLE/activex/SOActiveX.h b/odk/examples/OLE/activex/SOActiveX.h
index f36cbe78a993..2057e43f466b 100644
--- a/odk/examples/OLE/activex/SOActiveX.h
+++ b/odk/examples/OLE/activex/SOActiveX.h
@@ -35,8 +35,8 @@
 
 // SOActiveX.h : Declaration of the CSOActiveX
 
-#ifndef __SOACTIVEX_H_
-#define __SOACTIVEX_H_
+#ifndef INCLUDED_EXAMPLES_ACTIVEX_SOACTIVEX_H
+#define INCLUDED_EXAMPLES_ACTIVEX_SOACTIVEX_H
 
 #include "resource.h"
 #include <ExDispID.h>
@@ -163,6 +163,6 @@ public:
     HRESULT Cleanup();
 };
 
-#endif //__SOACTIVEX_H_
+#endif // INCLUDED_EXAMPLES_ACTIVEX_SOACTIVEX_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/OLE/activex/SOComWindowPeer.h b/odk/examples/OLE/activex/SOComWindowPeer.h
index b03b26ca7a61..1a16bf4a0637 100644
--- a/odk/examples/OLE/activex/SOComWindowPeer.h
+++ b/odk/examples/OLE/activex/SOComWindowPeer.h
@@ -35,14 +35,8 @@
 
 // SOComWindowPeer.h: Definition of the SOComWindowPeer class
 
-
-
-#ifndef __SOCOMWINDOWPEER_H_
-#define __SOCOMWINDOWPEER_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
+#ifndef INCLUDED_EXAMPLES_ACTIVEX_SOCOMWINDOWPEER_H
+#define INCLUDED_EXAMPLES_ACTIVEX_SOCOMWINDOWPEER_H
 
 #include "resource.h"
 #include <ExDispID.h>
@@ -160,6 +154,6 @@ DECLARE_REGISTRY_RESOURCEID(IDR_SOCOMWINDOWPEER)
         void SetHWNDInternally( HWND hwnd ) { m_hwnd = hwnd; }
 };
 
-#endif // __SOCOMWINDOWPEER_H_
+#endif // INCLUDED_EXAMPLES_ACTIVEX_SOCOMWINDOWPEER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/OLE/activex/StdAfx2.h b/odk/examples/OLE/activex/StdAfx2.h
index 2767f4d4a869..df14ccf949a0 100644
--- a/odk/examples/OLE/activex/StdAfx2.h
+++ b/odk/examples/OLE/activex/StdAfx2.h
@@ -37,12 +37,8 @@
 //      or project specific include files that are used frequently,
 //      but are changed infrequently
 
-#if !defined(AFX_STDAFX_H__C1799EA0_62CC_44DE_A2DD_C9F0410FF7F1__INCLUDED_)
-#define AFX_STDAFX_H__C1799EA0_62CC_44DE_A2DD_C9F0410FF7F1__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
+#ifndef INCLUDED_EXAMPLES_ACTIVEX_STDAFX2_H
+#define INCLUDED_EXAMPLES_ACTIVEX_STDAFX2_H
 
 #define STRICT
 #ifndef _WIN32_WINNT
@@ -63,6 +59,6 @@ extern CComModule _Module;
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
 
-#endif // !defined(AFX_STDAFX_H__C1799EA0_62CC_44DE_A2DD_C9F0410FF7F1__INCLUDED)
+#endif // INCLUDED_EXAMPLES_ACTIVEX_STDAFX2_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */