diff --git a/src/Cedar/Account.h b/src/Cedar/Account.h
index 2c5ee586..8dbb12df 100644
--- a/src/Cedar/Account.h
+++ b/src/Cedar/Account.h
@@ -111,8 +111,8 @@
 // Account.h
 // Header of Account.c
 
-#ifndef	ACCOUNT_H
-#define	ACCOUNT_H
+#ifndef	SE_ACCOUNT_H
+#define	SE_ACCOUNT_H
 
 // Policy item
 struct POLICY_ITEM
@@ -314,6 +314,6 @@ void FormatPolicyValue(wchar_t *str, UINT size, UINT id, UINT value);
 char *NormalizePolicyName(char *name);
 
 
-#endif	// ACCOUNT_H
+#endif	// SE_ACCOUNT_H
 
 
diff --git a/src/Cedar/Admin.h b/src/Cedar/Admin.h
index 04968a8a..4d93de47 100644
--- a/src/Cedar/Admin.h
+++ b/src/Cedar/Admin.h
@@ -111,8 +111,8 @@
 // Admin.h
 // Header of Admin.c
 
-#ifndef	ADMIN_H
-#define	ADMIN_H
+#ifndef	SE_ADMIN_H
+#define	SE_ADMIN_H
 
 // Windows version
 struct RPC_WINVER
@@ -1530,6 +1530,6 @@ void OutRpcAzureStatus(PACK *p, RPC_AZURE_STATUS *t);
 void InRpcInternetSetting(INTERNET_SETTING *t, PACK *p);
 void OutRpcInternetSetting(PACK *p, INTERNET_SETTING *t);
 
-#endif	// ADMIN_H
+#endif	// SE_ADMIN_H
 
 
diff --git a/src/Cedar/AzureClient.h b/src/Cedar/AzureClient.h
index ac246205..f4f7bb12 100644
--- a/src/Cedar/AzureClient.h
+++ b/src/Cedar/AzureClient.h
@@ -111,8 +111,8 @@
 // AzureClient.h
 // Header of AzureClient.c
 
-#ifndef	AZURE_CLIENT_H
-#define	AZURE_CLIENT_H
+#ifndef	SE_AZURE_CLIENT_H
+#define	SE_AZURE_CLIENT_H
 
 // Constants
 #define	AZURE_SERVER_PORT					443
@@ -170,6 +170,6 @@ bool AcGetEnable(AZURE_CLIENT *ac);
 void AcWaitForRequest(AZURE_CLIENT *ac, SOCK *s, AZURE_PARAM *param);
 
 
-#endif	// AZURE_CLIENT_H
+#endif	// SE_AZURE_CLIENT_H
 
 
diff --git a/src/Cedar/AzureServer.h b/src/Cedar/AzureServer.h
index e09d7fcf..5b21f9dd 100644
--- a/src/Cedar/AzureServer.h
+++ b/src/Cedar/AzureServer.h
@@ -111,10 +111,10 @@
 // AzureServer.h
 // Header of AzureServer.c
 
-#ifndef	AZURE_SERVER_H
-#define	AZURE_SERVER_H
+#ifndef	SE_AZURE_SERVER_H
+#define	SE_AZURE_SERVER_H
 
 
-#endif	// AZURE_SERVER_H
+#endif	// SE_AZURE_SERVER_H
 
 
diff --git a/src/Cedar/Bridge.h b/src/Cedar/Bridge.h
index e4f9a0fa..fa0f7cbb 100644
--- a/src/Cedar/Bridge.h
+++ b/src/Cedar/Bridge.h
@@ -111,8 +111,8 @@
 // Bridge.h
 // Header of Bridge.c
 
-#ifndef	BRIDGE_H
-#define	BRIDGE_H
+#ifndef	SE_BRIDGE_H
+#define	SE_BRIDGE_H
 
 #ifdef	OS_WIN32
 
@@ -176,7 +176,7 @@ bool IsNeedWinPcap();
 UINT GetEthDeviceHash();
 bool IsRawIpBridgeSupported();
 
-#endif	// BRIDGE_H
+#endif	// SE_BRIDGE_H
 
 
 
diff --git a/src/Cedar/BridgeUnix.h b/src/Cedar/BridgeUnix.h
index 7f9b0890..2987496c 100644
--- a/src/Cedar/BridgeUnix.h
+++ b/src/Cedar/BridgeUnix.h
@@ -111,8 +111,8 @@
 // BridgeUnix.h
 // Header of BridgeUnix.c
 
-#ifndef	BRIDGEUNIX_H
-#define	BRIDGEUNIX_H
+#ifndef	SE_BRIDGEUNIX_H
+#define	SE_BRIDGEUNIX_H
 
 // Macro
 #ifndef SOL_PACKET
@@ -235,6 +235,6 @@ bool DlipBindRequest(int fd);
 
 int UnixEthOpenRawSocket();
 
-#endif	// BRIDGEUNIX_H
+#endif	// SE_BRIDGEUNIX_H
 
 
diff --git a/src/Cedar/BridgeWin32.h b/src/Cedar/BridgeWin32.h
index ba67e014..c94041c9 100644
--- a/src/Cedar/BridgeWin32.h
+++ b/src/Cedar/BridgeWin32.h
@@ -111,8 +111,8 @@
 // BridgeWin32.h
 // Header of BridgeWin32.c
 
-#ifndef	BRIDGEWIN32_H
-#define	BRIDGEWIN32_H
+#ifndef	SE_BRIDGEWIN32_H
+#define	SE_BRIDGEWIN32_H
 
 #define	BRIDGE_WIN32_PACKET_DLL		"Packet.dll"
 #define	BRIDGE_WIN32_PCD_DLL		"|see.dll"
@@ -263,6 +263,6 @@ bool Win32IsUsingSeLow();
 void Win32SetEnableSeLow(bool b);
 bool Win32GetEnableSeLow();
 
-#endif	// BRIDGEWIN32_H
+#endif	// SE_BRIDGEWIN32_H
 
 
diff --git a/src/Cedar/CM.h b/src/Cedar/CM.h
index 072a6b2a..941343b2 100644
--- a/src/Cedar/CM.h
+++ b/src/Cedar/CM.h
@@ -111,8 +111,8 @@
 // CM.h
 // Header of CM.c
 
-#ifndef	CM_H
-#define	CM_H
+#ifndef	SE_CM_H
+#define	SE_CM_H
 
 // Constants
 #define	CM_REG_KEY			"Software\\" GC_REG_COMPANY_NAME "\\" CEDAR_PRODUCT_STR " VPN\\Client Manager"
@@ -153,6 +153,6 @@ void CmStopUacHelper(void *p);
 void *CmExecUiHelperMain();
 UINT CmGetSecureBitmapId(char *dest_hostname);
 
-#endif	// CM_H
+#endif	// SE_CM_H
 
 
diff --git a/src/Cedar/CMInner.h b/src/Cedar/CMInner.h
index b789df46..5baa5ed6 100644
--- a/src/Cedar/CMInner.h
+++ b/src/Cedar/CMInner.h
@@ -113,6 +113,7 @@
 // CMInner.h
 // Internal header for the CM.c
 
+
 #define STARTUP_MUTEX_NAME	GC_SW_SOFTETHER_PREFIX "vpncmgr_startup_mutex"
 
 #define	NAME_OF_VPN_CLIENT_MANAGER	"vpncmgr"
@@ -638,4 +639,3 @@ void CmProxyDlgSet(HWND hWnd, CLIENT_OPTION *o, CM_INTERNET_SETTING *setting);
 bool CmGetProxyServerNameAndPortFromIeProxyRegStr(char *name, UINT name_size, UINT *port, char *str, char *server_type);
 void *CmUpdateJumpList(UINT start_id);
 
-
diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h
index bc15b32f..e2f577ea 100644
--- a/src/Cedar/Cedar.h
+++ b/src/Cedar/Cedar.h
@@ -111,8 +111,8 @@
 // Cedar.h
 // Header of Cedar.c
 
-#ifndef	CEDAR_H
-#define	CEDAR_H
+#ifndef	SE_CEDAR_H
+#define	SE_CEDAR_H
 
 
 //////////////////////////////////////////////////////////////////////
@@ -1263,5 +1263,5 @@ bool CedarIsThereAnyEapEnabledRadiusConfig(CEDAR *c);
 
 
 
-#endif	// CEDAR_H
+#endif	// SE_CEDAR_H
 
diff --git a/src/Cedar/CedarType.h b/src/Cedar/CedarType.h
index 7ae8fd9f..055ead81 100644
--- a/src/Cedar/CedarType.h
+++ b/src/Cedar/CedarType.h
@@ -111,8 +111,8 @@
 // CedarType.h
 // List of types that Cedar using
 
-#ifndef	CEDARTYPE_H
-#define	CEDARTYPE_H
+#ifndef	SE_CEDARTYPE_H
+#define	SE_CEDARTYPE_H
 
 
 // ==============================================================
@@ -764,4 +764,4 @@ typedef struct SU_ADAPTER_LIST SU_ADAPTER_LIST;
 
 
 
-#endif	// CEDARTYPE_H
+#endif	// SE_CEDARTYPE_H
diff --git a/src/Cedar/Client.h b/src/Cedar/Client.h
index 263036ed..76c82dfe 100644
--- a/src/Cedar/Client.h
+++ b/src/Cedar/Client.h
@@ -111,8 +111,8 @@
 // Client.h
 // Header of Client.c
 
-#ifndef	CLIENT_H
-#define	CLIENT_H
+#ifndef	SE_CLIENT_H
+#define	SE_CLIENT_H
 
 #define	CLIENT_CONFIG_PORT					GC_CLIENT_CONFIG_PORT		// Client port number
 #define	CLIENT_NOTIFY_PORT					GC_CLIENT_NOTIFY_PORT		// Client notification port number
@@ -875,6 +875,6 @@ void InRpcCmSetting(CM_SETTING *c, PACK *p);
 void CiInitDriverVerStruct(MS_DRIVER_VER *ver);
 #endif	// OS_EIN32
 
-#endif	// CLIENT_H
+#endif	// SE_CLIENT_H
 
 
diff --git a/src/Cedar/Command.h b/src/Cedar/Command.h
index 6708fc92..3bf607bf 100644
--- a/src/Cedar/Command.h
+++ b/src/Cedar/Command.h
@@ -111,8 +111,8 @@
 // Command.h
 // Header of Command.c
 
-#ifndef	COMMAND_H
-#define	COMMAND_H
+#ifndef	SE_COMMAND_H
+#define	SE_COMMAND_H
 
 // Constants
 #define	TRAFFIC_DEFAULT_PORT		9821
@@ -697,6 +697,6 @@ UINT PsVpnAzureSetEnable(CONSOLE *c, char *cmd_name, wchar_t *str, void *param);
 UINT PsVpnAzureGetStatus(CONSOLE *c, char *cmd_name, wchar_t *str, void *param);
 
 
-#endif	// COMMAND_H
+#endif	// SE_COMMAND_H
 
 
diff --git a/src/Cedar/Connection.h b/src/Cedar/Connection.h
index e96ff8ff..cdff7002 100644
--- a/src/Cedar/Connection.h
+++ b/src/Cedar/Connection.h
@@ -111,8 +111,8 @@
 // Connection.h
 // Header of Connection.c
 
-#ifndef	CONNECTION_H
-#define	CONNECTION_H
+#ifndef	SE_CONNECTION_H
+#define	SE_CONNECTION_H
 
 // Magic number indicating that the packet is compressed
 #define	CONNECTION_BULK_COMPRESS_SIGNATURE	0xDEADBEEFCAFEFACEULL
@@ -371,4 +371,4 @@ UINT GetMachineRand();
 
 
 
-#endif	// CONNECTION_H
+#endif	// SE_CONNECTION_H
diff --git a/src/Cedar/Console.h b/src/Cedar/Console.h
index a5001968..60aca2c5 100644
--- a/src/Cedar/Console.h
+++ b/src/Cedar/Console.h
@@ -111,8 +111,8 @@
 // Console.h
 // Header of Console.c
 
-#ifndef	CONSOLE_H
-#define	CONSOLE_H
+#ifndef	SE_CONSOLE_H
+#define	SE_CONSOLE_H
 
 // Constant
 #define	MAX_PROMPT_STRSIZE			65536
@@ -244,7 +244,7 @@ wchar_t *ConsoleReadNextFromInFile(CONSOLE *c);
 UINT ConsoleLocalGetWidth(CONSOLE *c);
 
 
-#endif	// CONSOLE_H
+#endif	// SE_CONSOLE_H
 
 
 
diff --git a/src/Cedar/DDNS.h b/src/Cedar/DDNS.h
index f7138fca..69869241 100644
--- a/src/Cedar/DDNS.h
+++ b/src/Cedar/DDNS.h
@@ -111,8 +111,8 @@
 // DDNS.h
 // Header of DDNS.c
 
-#ifndef	DDNS_H
-#define	DDNS_H
+#ifndef	SE_DDNS_H
+#define	SE_DDNS_H
 
 // Certificate hash
 #define	DDNS_CERT_HASH		"78BF0499A99396907C9F49DD13571C81FE26E6F5" \
@@ -245,6 +245,6 @@ void DCGetInternetSetting(DDNS_CLIENT *c, INTERNET_SETTING *t);
 
 
 
-#endif	// DDNS_H
+#endif	// SE_DDNS_H
 
 
diff --git a/src/Cedar/Database.h b/src/Cedar/Database.h
index 651ba0e2..562b69b1 100644
--- a/src/Cedar/Database.h
+++ b/src/Cedar/Database.h
@@ -111,14 +111,14 @@
 // Database.h
 // Header of Database.c
 
-#ifndef	DATABASE_H
-#define	DATABASE_H
+#ifndef	SE_DATABASE_H
+#define	SE_DATABASE_H
 
 wchar_t *LiGetLicenseStatusStr(UINT i);
 bool LiIsLicenseKey(char *str);
 bool LiStrToKeyBit(UCHAR *keybit, char *keystr);
 
 
-#endif	// DATABASE_H
+#endif	// SE_DATABASE_H
 
 
diff --git a/src/Cedar/EM.h b/src/Cedar/EM.h
index 812e3d4a..2f23ddd3 100644
--- a/src/Cedar/EM.h
+++ b/src/Cedar/EM.h
@@ -111,12 +111,12 @@
 // EM.h
 // Header of EM.c
 
-#ifndef	EM_H
-#define	EM_H
+#ifndef	SE_EM_H
+#define	SE_EM_H
 
 // Public function
 void EMExec();
 
-#endif	// EM_H
+#endif	// SE_EM_H
 
 
diff --git a/src/Cedar/EMInner.h b/src/Cedar/EMInner.h
index 7c2fcbcd..7ac67f17 100644
--- a/src/Cedar/EMInner.h
+++ b/src/Cedar/EMInner.h
@@ -111,6 +111,9 @@
 // EMInner.h
 // Inner header of EM.c
 
+#ifndef SE_EM_INNER_H
+#define SE_EM_INNER_H
+
 // Constants
 #define	EM_REG_KEY			"Software\\" GC_REG_COMPANY_NAME "\\EtherLogger\\Manager"
 
@@ -147,3 +150,5 @@ void EmLicenseAddDlgUpdate(HWND hWnd, RPC *s);
 void EmLicenseAddDlgShiftTextItem(HWND hWnd, UINT id1, UINT id2, UINT *next_focus);
 void EmLicenseAddDlgGetText(HWND hWnd, char *str, UINT size);
 void EmLicenseAddDlgOnOk(HWND hWnd, RPC *s);
+
+#endif // SE_EM_INNER_H
diff --git a/src/Cedar/EtherLog.h b/src/Cedar/EtherLog.h
index beb707f6..775ec9b9 100644
--- a/src/Cedar/EtherLog.h
+++ b/src/Cedar/EtherLog.h
@@ -111,8 +111,8 @@
 // EtherLog.h
 // Header of EtherLog.c
 
-#ifndef	ETHERLOG_H
-#define	ETHERLOG_H
+#ifndef	SE_ETHERLOG_H
+#define	SE_ETHERLOG_H
 
 // Whether this is a beta version
 #define	ELOG_IS_BETA						true
@@ -276,6 +276,6 @@ void FreeRpcEnumLicenseKey(RPC_ENUM_LICENSE_KEY *t);
 void InRpcElLicenseStatus(RPC_EL_LICENSE_STATUS *t, PACK *p);
 void OutRpcElLicenseStatus(PACK *p, RPC_EL_LICENSE_STATUS *t);
 
-#endif	// ETHERLOG_H
+#endif	// SE_ETHERLOG_H
 
 
diff --git a/src/Cedar/Hub.h b/src/Cedar/Hub.h
index 7def47bb..44fa17b6 100644
--- a/src/Cedar/Hub.h
+++ b/src/Cedar/Hub.h
@@ -111,8 +111,8 @@
 // Hub.h
 // Header of Hub.c
 
-#ifndef	HUB_H
-#define	HUB_H
+#ifndef	SE_HUB_H
+#define	SE_HUB_H
 
 
 // Prefix in the access list for investigating whether the user name which is contained in a particular file 
@@ -645,6 +645,6 @@ void VgsSetUserAgentValue(char *str);
 void VgsSetEmbTag(bool b);
 EAP_CLIENT *HubNewEapClient(CEDAR *cedar, char *hubname, char *client_ip_str, char *username);
 
-#endif	// HUB_H
+#endif	// SE_HUB_H
 
 
diff --git a/src/Cedar/IPsec.h b/src/Cedar/IPsec.h
index 29fde830..f23d8922 100644
--- a/src/Cedar/IPsec.h
+++ b/src/Cedar/IPsec.h
@@ -111,8 +111,8 @@
 // IPsec.h
 // Header of IPsec.c
 
-#ifndef	IPSEC_H
-#define	IPSEC_H
+#ifndef	SE_IPSEC_H
+#define	SE_IPSEC_H
 
 //// Constants
 
@@ -201,5 +201,5 @@ bool IPsecCheckOsService(IPSEC_SERVER *s);
 void IPSecSetDisable(bool b);
 
 
-#endif	// IPSEC_H
+#endif	// SE_IPSEC_H
 
diff --git a/src/Cedar/IPsec_EtherIP.h b/src/Cedar/IPsec_EtherIP.h
index 3b94104a..9532d493 100644
--- a/src/Cedar/IPsec_EtherIP.h
+++ b/src/Cedar/IPsec_EtherIP.h
@@ -111,8 +111,8 @@
 // IPsec_EtherIP.h
 // Header of IPsec_EtherIP.c
 
-#ifndef	IPSEC_ETHERIP_H
-#define	IPSEC_ETHERIP_H
+#ifndef	SE_IPSEC_ETHERIP_H
+#define	SE_IPSEC_ETHERIP_H
 
 //// Macro
 
@@ -171,6 +171,6 @@ void EtherIPIpcConnectThread(THREAD *t, void *p);
 UINT CalcEtherIPTcpMss(ETHERIP_SERVER *s);
 
 
-#endif	// IPSEC_ETHERIP_H
+#endif	// SE_IPSEC_ETHERIP_H
 
 
diff --git a/src/Cedar/IPsec_IKE.h b/src/Cedar/IPsec_IKE.h
index 183f95fa..815c6851 100644
--- a/src/Cedar/IPsec_IKE.h
+++ b/src/Cedar/IPsec_IKE.h
@@ -111,8 +111,8 @@
 // IPsec_IKE.h
 // Header of IPsec_IKE.c
 
-#ifndef	IPSEC_IKE_H
-#define	IPSEC_IKE_H
+#ifndef	SE_IPSEC_IKE_H
+#define	SE_IPSEC_IKE_H
 
 //// Macro
 
@@ -472,5 +472,5 @@ void ProcL2TPv3PacketRecv(IKE_SERVER *ike, IKE_CLIENT *c, UCHAR *data, UINT data
 
 IKE_SA *SearchIkeSaByCookie(IKE_SERVER *ike, UINT64 init_cookie, UINT64 resp_cookie);
 
-#endif	// IPSEC_IKE_H
+#endif	// SE_IPSEC_IKE_H
 
diff --git a/src/Cedar/IPsec_IPC.h b/src/Cedar/IPsec_IPC.h
index f65a053e..b79990e0 100644
--- a/src/Cedar/IPsec_IPC.h
+++ b/src/Cedar/IPsec_IPC.h
@@ -111,8 +111,8 @@
 // IPsec_IPC.h
 // Header of IPsec_IPC.c
 
-#ifndef	IPSEC_IPC
-#define	IPSEC_IPC
+#ifndef	SE_IPSEC_IPC
+#define	SE_IPSEC_IPC
 
 // Constants
 #define	IPC_ARP_LIFETIME				(3 * 60 * 1000)
@@ -265,7 +265,7 @@ void FreeIPCAsync(IPC_ASYNC *a);
 
 bool ParseAndExtractMsChapV2InfoFromPassword(IPC_MSCHAP_V2_AUTHINFO *d, char *password);
 
-#endif	// IPSEC_IPC
+#endif	// SE_IPSEC_IPC
 
 
 
diff --git a/src/Cedar/IPsec_IkePacket.h b/src/Cedar/IPsec_IkePacket.h
index ba0bb686..afc2d93d 100644
--- a/src/Cedar/IPsec_IkePacket.h
+++ b/src/Cedar/IPsec_IkePacket.h
@@ -111,8 +111,8 @@
 // IPsec_IkePacket.h
 // Header of IPsec_IkePacket.c
 
-#ifndef	IPSEC_PACKET_H
-#define	IPSEC_PACKET_H
+#ifndef	SE_IPSEC_PACKET_H
+#define	SE_IPSEC_PACKET_H
 
 // Constants
 #ifdef	OS_WIN32
@@ -768,6 +768,6 @@ DH_CTX *IkeDhNewCtx(IKE_DH *d);
 void IkeDhFreeCtx(DH_CTX *dh);
 
 
-#endif	// IPSEC_PACKET_H
+#endif	// SE_IPSEC_PACKET_H
 
 
diff --git a/src/Cedar/IPsec_L2TP.h b/src/Cedar/IPsec_L2TP.h
index ae5d20b5..ac2f78e2 100644
--- a/src/Cedar/IPsec_L2TP.h
+++ b/src/Cedar/IPsec_L2TP.h
@@ -111,8 +111,8 @@
 // IPsec_L2TP.h
 // Header of IPsec_L2TP.c
 
-#ifndef	IPSEC_L2TP_H
-#define	IPSEC_L2TP_H
+#ifndef	SE_IPSEC_L2TP_H
+#define	SE_IPSEC_L2TP_H
 
 //// Macro
 
@@ -378,6 +378,6 @@ UINT GenerateNewSessionIdForL2TPv3(L2TP_SERVER *l2tp);
 L2TP_SESSION *SearchL2TPSessionById(L2TP_SERVER *l2tp, bool is_v3, UINT id);
 void L2TPSessionManageEtherIPServer(L2TP_SERVER *l2tp, L2TP_SESSION *s);
 
-#endif	// IPSEC_L2TP_H
+#endif	// SE_IPSEC_L2TP_H
 
 
diff --git a/src/Cedar/IPsec_PPP.h b/src/Cedar/IPsec_PPP.h
index 58f94519..cb3196ad 100644
--- a/src/Cedar/IPsec_PPP.h
+++ b/src/Cedar/IPsec_PPP.h
@@ -111,8 +111,8 @@
 // IPsec_PPP.h
 // Header of IPsec_PPP.c
 
-#ifndef	IPSEC_PPP_H
-#define	IPSEC_PPP_H
+#ifndef	SE_IPSEC_PPP_H
+#define	SE_IPSEC_PPP_H
 
 
 //// Macro
@@ -337,6 +337,6 @@ bool MsChapV2VerityPassword(IPC_MSCHAP_V2_AUTHINFO *d, char *password);
 char *MsChapV2DoBruteForce(IPC_MSCHAP_V2_AUTHINFO *d, LIST *password_list);
 void PPPFreeEapClient(PPP_SESSION *p);
 
-#endif	// IPSEC_PPP_H
+#endif	// SE_IPSEC_PPP_H
 
 
diff --git a/src/Cedar/IPsec_Win7.h b/src/Cedar/IPsec_Win7.h
index bd489e70..c4f7e4e9 100644
--- a/src/Cedar/IPsec_Win7.h
+++ b/src/Cedar/IPsec_Win7.h
@@ -111,8 +111,8 @@
 // IPsec_Win7.h
 // Header of IPsec_Win7.c
 
-#ifndef	IPSEC_WIN7_H
-#define	IPSEC_WIN7_H
+#ifndef	SE_IPSEC_WIN7_H
+#define	SE_IPSEC_WIN7_H
 
 // Constants
 #define	IPSEC_WIN7_SRC_SYS_X86	"|pxwfp_x86.sys"
@@ -142,7 +142,7 @@ void SetCurrentIPsecWin7DriverBuild();
 bool IPsecWin7InitApi();
 
 
-#endif	// IPSEC_WIN7_H
+#endif	// SE_IPSEC_WIN7_H
 
 
 
diff --git a/src/Cedar/IPsec_Win7Inner.h b/src/Cedar/IPsec_Win7Inner.h
index 2036aeca..41aca171 100644
--- a/src/Cedar/IPsec_Win7Inner.h
+++ b/src/Cedar/IPsec_Win7Inner.h
@@ -111,8 +111,8 @@
 // IPsec_Win7.h
 // Internal header of IPsec_Win7.c
 
-#ifndef	IPSEC_WIN7_INNER_H
-#define	IPSEC_WIN7_INNER_H
+#ifndef	SE_IPSEC_WIN7_INNER_H
+#define	SE_IPSEC_WIN7_INNER_H
 
 // API function
 typedef struct IPSEC_WIN7_FUNCTIONS
@@ -180,7 +180,7 @@ struct IPSEC_WIN7
 };
 
 
-#endif	// IPSEC_WIN7_INNER_H
+#endif	// SE_IPSEC_WIN7_INNER_H
 
 
 
diff --git a/src/Cedar/Interop_OpenVPN.h b/src/Cedar/Interop_OpenVPN.h
index d00b9605..90697113 100644
--- a/src/Cedar/Interop_OpenVPN.h
+++ b/src/Cedar/Interop_OpenVPN.h
@@ -111,8 +111,8 @@
 // Interop_OpenVPN.h
 // Header of Interop_OpenVPN.c
 
-#ifndef	INTEROP_OPENVPN_H
-#define	INTEROP_OPENVPN_H
+#ifndef	SE_INTEROP_OPENVPN_H
+#define	SE_INTEROP_OPENVPN_H
 
 
 //// Constants
@@ -386,6 +386,6 @@ void OvsSetNoOpenVpnUdp(bool b);
 
 
 
-#endif	// INTEROP_OPENVPN_H
+#endif	// SE_INTEROP_OPENVPN_H
 
 
diff --git a/src/Cedar/Interop_SSTP.h b/src/Cedar/Interop_SSTP.h
index f6579a23..40f4fe7a 100644
--- a/src/Cedar/Interop_SSTP.h
+++ b/src/Cedar/Interop_SSTP.h
@@ -111,8 +111,8 @@
 // Interop_SSTP.h
 // Header of Interop_SSTP.c
 
-#ifndef	INTEROP_SSTP_H
-#define	INTEROP_SSTP_H
+#ifndef	SE_INTEROP_SSTP_H
+#define	SE_INTEROP_SSTP_H
 
 //// Constants
 #define	SSTP_URI				"/sra_{BA195980-CD49-458b-9E23-C84EE0ADCD75}/"		// SSTP HTTPS URI
@@ -259,6 +259,6 @@ void SstpSendPacket(SSTP_SERVER *s, SSTP_PACKET *p);
 bool GetNoSstp();
 void SetNoSstp(bool b);
 
-#endif	// INTEROP_SSTP_H
+#endif	// SE_INTEROP_SSTP_H
 
 
diff --git a/src/Cedar/Layer3.h b/src/Cedar/Layer3.h
index d4ca9d04..22c3cb90 100644
--- a/src/Cedar/Layer3.h
+++ b/src/Cedar/Layer3.h
@@ -111,8 +111,8 @@
 // Layer3.h
 // Header of Layer3.c
 
-#ifndef	LAYER3_H
-#define	LAYER3_H
+#ifndef	SE_LAYER3_H
+#define	SE_LAYER3_H
 
 // Constants
 #define	L3_USERNAME					"L3SW_"
@@ -249,7 +249,7 @@ void L3RecvIp(L3IF *f, PKT *p, bool self);
 void L3PollingIpQueue(L3IF *f);
 
 
-#endif	// LAYER3_H
+#endif	// SE_LAYER3_H
 
 
 
diff --git a/src/Cedar/Link.h b/src/Cedar/Link.h
index a2b7202a..085cb78d 100644
--- a/src/Cedar/Link.h
+++ b/src/Cedar/Link.h
@@ -111,8 +111,8 @@
 // Link.h
 // Header of Link.c
 
-#ifndef	LINK_H
-#define	LINK_H
+#ifndef	SE_LINK_H
+#define	SE_LINK_H
 
 struct LINK
 {
@@ -164,7 +164,7 @@ void CleanupLink(LINK *k);
 void ReleaseAllLink(HUB *h);
 void NormalizeLinkPolicy(POLICY *p);
 
-#endif	// LINK_H
+#endif	// SE_LINK_H
 
 
 
diff --git a/src/Cedar/Listener.h b/src/Cedar/Listener.h
index 808c97d1..8e7396a2 100644
--- a/src/Cedar/Listener.h
+++ b/src/Cedar/Listener.h
@@ -111,8 +111,8 @@
 // Listener.h
 // Header of Listener.c
 
-#ifndef	LISTENER_H
-#define	LISTENER_H
+#ifndef	SE_LISTENER_H
+#define	SE_LISTENER_H
 
 
 // Function to call when receiving a new connection
@@ -209,6 +209,6 @@ bool ListenerRUDPRpcRecvProc(RUDP_STACK *r, UDPPACKET *p);
 void ListenerSetProcRecvRpcEnable(bool b);
 
 
-#endif	// LISTENER_H
+#endif	// SE_LISTENER_H
 
 
diff --git a/src/Cedar/Logging.h b/src/Cedar/Logging.h
index 955d9f9f..71bb42c9 100644
--- a/src/Cedar/Logging.h
+++ b/src/Cedar/Logging.h
@@ -111,8 +111,8 @@
 // Logging.h
 // Header of Logging.c
 
-#ifndef	LOGGING_H
-#define	LOGGING_H
+#ifndef	SE_LOGGING_H
+#define	SE_LOGGING_H
 
 
 // Port number for HTTP monitoring
@@ -276,5 +276,5 @@ UINT GetEraserCheckInterval();
 void SetMaxLogSize(UINT64 size);
 UINT64 GetMaxLogSize();
 
-#endif	// LOGGING_G
+#endif	// SE_LOGGING_G
 
diff --git a/src/Cedar/NM.h b/src/Cedar/NM.h
index 39be93bb..c1478230 100644
--- a/src/Cedar/NM.h
+++ b/src/Cedar/NM.h
@@ -111,12 +111,12 @@
 // NM.h
 // Header of NM.c
 
-#ifndef	NM_H
-#define	NM_H
+#ifndef	SE_NM_H
+#define	SE_NM_H
 
 // External function
 void NMExec();
 
-#endif	// NM_H
+#endif	// SE_NM_H
 
 
diff --git a/src/Cedar/NMInner.h b/src/Cedar/NMInner.h
index d762ca64..0f14d5a4 100644
--- a/src/Cedar/NMInner.h
+++ b/src/Cedar/NMInner.h
@@ -111,6 +111,8 @@
 // NMInner.h
 // The internal header of NM.c
 
+#ifndef SE_NM_INNER_H
+#define  SE_NM_INNER_H
 
 // Constants
 #define	NM_REG_KEY			"Software\\" GC_REG_COMPANY_NAME "\\PacketiX VPN\\User-mode Router Manager"
@@ -176,3 +178,4 @@ bool NmEditPushRoute(HWND hWnd, SM_HUB *r);
 UINT NmEditPushRouteProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *param);
 
 
+#endif SE_NM_INNER_H
diff --git a/src/Cedar/Nat.h b/src/Cedar/Nat.h
index 9fdcaa66..0998689c 100644
--- a/src/Cedar/Nat.h
+++ b/src/Cedar/Nat.h
@@ -111,8 +111,8 @@
 // Nat.h
 // Header of Nat.c
 
-#ifndef	NAT_H
-#define	NAT_H
+#ifndef	SE_NAT_H
+#define	SE_NAT_H
 
 // Constants
 #define	NAT_CONFIG_FILE_NAME			"@vpn_router.config"	// NAT configuration file
@@ -313,6 +313,6 @@ void OutRpcDummy(PACK *p, RPC_DUMMY *t);
 
 
 
-#endif	// NAT_H
+#endif	// SE_NAT_H
 
 
diff --git a/src/Cedar/NativeStack.h b/src/Cedar/NativeStack.h
index 7e84175c..135bc413 100644
--- a/src/Cedar/NativeStack.h
+++ b/src/Cedar/NativeStack.h
@@ -111,8 +111,8 @@
 // NativeStack.h
 // Header of NativeStack.c
 
-#ifndef	NATIVESTACK_H
-#define	NATIVESTACK_H
+#ifndef	SE_NATIVESTACK_H
+#define	SE_NATIVESTACK_H
 
 //// Constants
 #define	NS_MAC_ADDRESS_BYTE_1		0xDA		// First byte of the MAC address
@@ -190,6 +190,6 @@ void GenerateDummyIpAndMark(void *hash_seed, IPTABLES_ENTRY *e, UINT id);
 UINT GenerateDummyMark(PRAND *p);
 void GenerateDummyIp(PRAND *p, IP *ip);
 
-#endif	// NATIVESTACK_H
+#endif	// SE_NATIVESTACK_H
 
 
diff --git a/src/Cedar/NullLan.h b/src/Cedar/NullLan.h
index 63b3b886..f03daa0c 100644
--- a/src/Cedar/NullLan.h
+++ b/src/Cedar/NullLan.h
@@ -111,8 +111,8 @@
 // NullLan.h
 // Header of NullLan.c
 
-#ifndef	NULLLAN_H
-#define	NULLLAN_H
+#ifndef	SE_NULLLAN_H
+#define	SE_NULLLAN_H
 
 
 #define	NULL_PACKET_GENERATE_INTERVAL		100000000		// Packet generation interval
@@ -139,7 +139,7 @@ void NullPaFree(SESSION *s);
 void NullPacketGenerateThread(THREAD *t, void *param);
 void NullGenerateMacAddress(UCHAR *mac, UINT id, UINT seq);
 
-#endif	// NULLAN_H
+#endif	// SE_NULLAN_H
 
 
 
diff --git a/src/Cedar/Protocol.h b/src/Cedar/Protocol.h
index 406d3777..45b118cd 100644
--- a/src/Cedar/Protocol.h
+++ b/src/Cedar/Protocol.h
@@ -111,8 +111,8 @@
 // Protocol.h
 // Header of Protocol.c
 
-#ifndef	PROTOCOL_H
-#define	PROTOCOL_H
+#ifndef	SE_PROTOCOL_H
+#define	SE_PROTOCOL_H
 
 // The parameters that will be passed to the certificate confirmation thread
 struct CHECK_CERT_THREAD_PROC
@@ -313,4 +313,4 @@ bool TryGetParentCertFromCertList(LIST *o, X *x, LIST *found_chain);
 bool DownloadAndSaveIntermediateCertificatesIfNecessary(X *x);
 
 
-#endif	// PROTOCOL_H
+#endif	// SE_PROTOCOL_H
diff --git a/src/Cedar/Radius.h b/src/Cedar/Radius.h
index a2d0dde6..8da7c63c 100644
--- a/src/Cedar/Radius.h
+++ b/src/Cedar/Radius.h
@@ -111,8 +111,8 @@
 // Radius.h
 // Header of Radius.c
 
-#ifndef	RADIUS_H
-#define	RADIUS_H
+#ifndef	SE_RADIUS_H
+#define	SE_RADIUS_H
 
 #define	RADIUS_DEFAULT_PORT		1812			// The default port number
 #define	RADIUS_RETRY_INTERVAL	500				// Retransmission interval
@@ -386,7 +386,7 @@ BUF *RadiusCreateNasId(char *name);
 void RadiusAddValue(BUF *b, UCHAR t, UINT v, UCHAR vt, void *data, UINT size);
 LIST *RadiusParseOptions(BUF *b);
 
-#endif	// RADIUS_H
+#endif	// SE_RADIUS_H
 
 
 
diff --git a/src/Cedar/Remote.h b/src/Cedar/Remote.h
index 819c7502..a232bc00 100644
--- a/src/Cedar/Remote.h
+++ b/src/Cedar/Remote.h
@@ -111,8 +111,8 @@
 // Remote.h
 // Header of Remote.c
 
-#ifndef	REMOTE_H
-#define	REMOTE_H
+#ifndef	SE_REMOTE_H
+#define	SE_REMOTE_H
 
 // RPC execution function
 typedef PACK *(RPC_DISPATCHER)(RPC *r, char *function_name, PACK *p);
@@ -149,5 +149,5 @@ UINT RpcGetError(PACK *p);
 void EndRpc(RPC *rpc);
 void RpcFree(RPC *rpc);
 
-#endif	// REMOTE_H
+#endif	// SE_REMOTE_H
 
diff --git a/src/Cedar/SM.h b/src/Cedar/SM.h
index c256fb9c..8027f901 100644
--- a/src/Cedar/SM.h
+++ b/src/Cedar/SM.h
@@ -111,11 +111,11 @@
 // SM.h
 // Header of SM.c
 
-#ifndef	SM_H
-#define	SM_H
+#ifndef	SE_SM_H
+#define	SE_SM_H
 
 void SMExec();
 
-#endif	// SM_H
+#endif	// SE_SM_H
 
 
diff --git a/src/Cedar/SW.h b/src/Cedar/SW.h
index ed1d2c18..d0f3c732 100644
--- a/src/Cedar/SW.h
+++ b/src/Cedar/SW.h
@@ -111,8 +111,8 @@
 // SW.h
 // Header of SW.c
 
-#ifndef	SW_H
-#define	SW_H
+#ifndef	SE_SW_H
+#define	SE_SW_H
 
 #define	SW_REG_KEY					"Software\\" GC_REG_COMPANY_NAME "\\Setup Wizard Settings"
 
@@ -126,6 +126,6 @@ bool SwCompileSfx(LIST *o, wchar_t *dst_filename);
 bool SwGenSfxModeMain(char *mode, wchar_t *dst);
 bool SwWaitForVpnClientPortReady(UINT timeout);
 
-#endif	// SW_H
+#endif	// SE_SW_H
 
 
diff --git a/src/Cedar/Sam.h b/src/Cedar/Sam.h
index bd099dc5..28f82aba 100644
--- a/src/Cedar/Sam.h
+++ b/src/Cedar/Sam.h
@@ -111,8 +111,8 @@
 // Sam.h
 // Header of Sam.c
 
-#ifndef	SAM_H
-#define	SAM_H
+#ifndef	SE_SAM_H
+#define	SE_SAM_H
 
 
 // Function prototype
@@ -128,5 +128,5 @@ void GenRamdom(void *random);
 void SecurePassword(void *secure_password, void *password, void *random);
 X *GetIssuerFromList(LIST *cert_list, X *cert);
 
-#endif	// SAM_H
+#endif	// SE_SAM_H
 
diff --git a/src/Cedar/SeLowUser.h b/src/Cedar/SeLowUser.h
index 97cd5500..f68657b8 100644
--- a/src/Cedar/SeLowUser.h
+++ b/src/Cedar/SeLowUser.h
@@ -111,8 +111,8 @@
 // SeLowUser.h
 // Header for SeLowUser.c
 
-#ifndef	SELOWUSER_H
-#define	SELOWUSER_H
+#ifndef	SE_SELOWUSER_H
+#define	SE_SELOWUSER_H
 
 #include <SeLow/SeLowCommon.h>
 
@@ -180,7 +180,7 @@ void SuDeleteGarbageInfsInner();
 bool SuLoadDriversHive();
 bool SuUnloadDriversHive();
 
-#endif	// SELOWUSER_H
+#endif	// SE_SELOWUSER_H
 
 
 
diff --git a/src/Cedar/SecureInfo.h b/src/Cedar/SecureInfo.h
index 55b9d1e0..245e1c43 100644
--- a/src/Cedar/SecureInfo.h
+++ b/src/Cedar/SecureInfo.h
@@ -111,10 +111,10 @@
 // SecureInfo.h
 // Header of SecureInfo.c
 
-#ifndef	SECUREINFO_H
-#define	SECUREINFO_H
+#ifndef	SE_SECUREINFO_H
+#define	SE_SECUREINFO_H
 
 
-#endif	// SECUREINFO_H
+#endif	// SE_SECUREINFO_H
 
 
diff --git a/src/Cedar/SecureNAT.h b/src/Cedar/SecureNAT.h
index 6dddfd89..5bb7aed6 100644
--- a/src/Cedar/SecureNAT.h
+++ b/src/Cedar/SecureNAT.h
@@ -111,8 +111,8 @@
 // SecureNAT.h
 // Header of SecureNAT.c
 
-#ifndef	SECURENAT_H
-#define	SECURENAT_H
+#ifndef	SE_SECURENAT_H
+#define	SE_SECURENAT_H
 
 struct SNAT
 {
@@ -130,5 +130,5 @@ void SnFreeSecureNAT(SNAT *s);
 void SnSecureNATThread(THREAD *t, void *param);
 
 
-#endif	// SECURENAT_H
+#endif	// SE_SECURENAT_H
 
diff --git a/src/Cedar/Server.h b/src/Cedar/Server.h
index 49de8fa0..aed29008 100644
--- a/src/Cedar/Server.h
+++ b/src/Cedar/Server.h
@@ -111,8 +111,8 @@
 // Server.h
 // Header of Server.c
 
-#ifndef	SERVER_H
-#define	SERVER_H
+#ifndef	SE_SERVER_H
+#define	SE_SERVER_H
 
 // Default ports
 #define	SERVER_DEF_PORTS_1				443
@@ -746,7 +746,7 @@ void SiGetCurrentRegion(CEDAR *c, char *region, UINT region_size);
 bool SiIsEnterpriseFunctionsRestrictedOnOpenSource(CEDAR *c);
 bool SiCheckCurrentRegion(CEDAR *c, char *r);
 
-#endif	// SERVER_H
+#endif	// SE_SERVER_H
 
 
 
diff --git a/src/Cedar/Session.h b/src/Cedar/Session.h
index 10b23281..68db9ccc 100644
--- a/src/Cedar/Session.h
+++ b/src/Cedar/Session.h
@@ -111,8 +111,8 @@
 // Session.h
 // Header of Session.c
 
-#ifndef	SESSION_H
-#define	SESSION_H
+#ifndef	SE_SESSION_H
+#define	SE_SESSION_H
 
 
 // Interval to increment the number of logins after the connection
@@ -439,7 +439,7 @@ bool CompareNodeInfo(NODE_INFO *a, NODE_INFO *b);
 bool IsPriorityHighestPacketForQoS(void *data, UINT size);
 UINT GetNextDelayedPacketTickDiff(SESSION *s);
 
-#endif	// SESSION_H
+#endif	// SE_SESSION_H
 
 
 
diff --git a/src/Cedar/UT.h b/src/Cedar/UT.h
index 51877e94..3cceeb29 100644
--- a/src/Cedar/UT.h
+++ b/src/Cedar/UT.h
@@ -111,8 +111,8 @@
 // UT.h
 // Header of UT.c
 
-#ifndef	UT_H
-#define	UT_H
+#ifndef	SE_UT_H
+#define	SE_UT_H
 
 // Constant
 #define	SPEED_METER_REFRESH_INTERVAL			500
@@ -134,5 +134,5 @@ void UtSpeedMeterDlgRefreshStatus(HWND hWnd);
 void UtSpeedMeter();
 void UtSpeedMeterEx(void *hWnd);
 
-#endif	// UT_H
+#endif	// SE_UT_H
 
diff --git a/src/Cedar/UdpAccel.h b/src/Cedar/UdpAccel.h
index cebaecf9..564e1de0 100644
--- a/src/Cedar/UdpAccel.h
+++ b/src/Cedar/UdpAccel.h
@@ -111,8 +111,8 @@
 // UdpAccel.h
 // Header of UdpAccel.c
 
-#ifndef	UDPACCEL_H
-#define	UDPACCEL_H
+#ifndef	SE_UDPACCEL_H
+#define	SE_UDPACCEL_H
 
 // Constants
 #define	UDP_ACCELERATION_COMMON_KEY_SIZE	20			// Common key size
@@ -217,6 +217,6 @@ void UdpAccelSendBlock(UDP_ACCEL *a, BLOCK *b);
 UINT UdpAccelCalcMss(UDP_ACCEL *a);
 void NatT_GetIpThread(THREAD *thread, void *param);
 
-#endif	// UDPACCEL_H
+#endif	// SE_UDPACCEL_H
 
 
diff --git a/src/Cedar/VG.h b/src/Cedar/VG.h
index eecc22c5..c8be7b8d 100644
--- a/src/Cedar/VG.h
+++ b/src/Cedar/VG.h
@@ -111,8 +111,8 @@
 // VG.h
 // Header for VG.c
 
-#ifndef	VG_H
-#define	VG_H
+#ifndef	SE_VG_H
+#define	SE_VG_H
 
 #define	VG_HUBNAME			"VPNGATE"
 
@@ -121,7 +121,7 @@ bool InitVg();
 void FreeVg();
 void VgUseStaticLink();
 
-#endif	// VG_H
+#endif	// SE_VG_H
 
 
 
diff --git a/src/Cedar/VLan.h b/src/Cedar/VLan.h
index 251a1d4d..e6b835e8 100644
--- a/src/Cedar/VLan.h
+++ b/src/Cedar/VLan.h
@@ -111,8 +111,8 @@
 // VLan.h
 // Header of VLan.c
 
-#ifndef	VLAN_H
-#define	VLAN_H
+#ifndef	SE_VLAN_H
+#define	SE_VLAN_H
 
 // Parameters related to VLAN
 struct VLAN_PARAM
@@ -133,6 +133,6 @@ struct VLAN_PARAM
 
 #endif	// OS_WIN32
 
-#endif	// VLAN_H
+#endif	// SE_VLAN_H
 
 
diff --git a/src/Cedar/VLanUnix.h b/src/Cedar/VLanUnix.h
index aafa3824..8434b898 100644
--- a/src/Cedar/VLanUnix.h
+++ b/src/Cedar/VLanUnix.h
@@ -111,8 +111,8 @@
 // VLanUnix.h
 // Header of VLanUnix.c
 
-#ifndef	VLANUNIX_H
-#define	VLANUNIX_H
+#ifndef	SE_VLANUNIX_H
+#define	SE_VLANUNIX_H
 
 // Constant
 #define	TAP_READ_BUF_SIZE			1600
@@ -166,5 +166,5 @@ void UnixVLanDelete(char *name);
 int UnixVLanGet(char *name);
 int UnixCompareVLan(void *p1, void *p2);
 
-#endif	// VLANUNIX_H
+#endif	// SE_VLANUNIX_H
 
diff --git a/src/Cedar/VLanWin32.h b/src/Cedar/VLanWin32.h
index 914d60d1..c9edfa4e 100644
--- a/src/Cedar/VLanWin32.h
+++ b/src/Cedar/VLanWin32.h
@@ -111,8 +111,8 @@
 // VLanWin32.h
 // Header of VLanWin32.c
 
-#ifndef	VLANWIN32_H
-#define	VLANWIN32_H
+#ifndef	SE_VLANWIN32_H
+#define	SE_VLANWIN32_H
 
 // Routing table tracking timer
 #define	TRACKING_INTERVAL_INITIAL		444		// Initial
@@ -197,4 +197,4 @@ void Win32ReleaseAllDhcp9x(bool wait);
 
 void Win32GetWinVer(RPC_WINVER *v);
 
-#endif	// VLANWIN32_H
+#endif	// SE_VLANWIN32_H
diff --git a/src/Cedar/Virtual.h b/src/Cedar/Virtual.h
index e86e07f0..93f9ce1c 100644
--- a/src/Cedar/Virtual.h
+++ b/src/Cedar/Virtual.h
@@ -111,8 +111,8 @@
 // Virtual.h
 // Header of Virtual.c
 
-#ifndef	VIRTUAL_H
-#define	VIRTUAL_H
+#ifndef	SE_VIRTUAL_H
+#define	SE_VIRTUAL_H
 
 
 #define	NN_RAW_IP_PORT_START			61001
@@ -695,6 +695,6 @@ void NnDeleteOldestNatSessionIfNecessary(NATIVE_NAT *t, UINT ip, UINT protocol);
 void NnSetSecureNatTargetHostname(char *name);
 
 
-#endif	// VIRTUAL_H
+#endif	// SE_VIRTUAL_H
 
 
diff --git a/src/Cedar/WaterMark.h b/src/Cedar/WaterMark.h
index 8764b2bb..fabdc79f 100644
--- a/src/Cedar/WaterMark.h
+++ b/src/Cedar/WaterMark.h
@@ -120,8 +120,8 @@
 #include <Mayaqua/Mayaqua.h>
 #include <Cedar/Cedar.h>
 
-#ifndef	WATERMARK_H
-#define	WATERMARK_H
+#ifndef	SE_WATERKMARK_H
+#define	SE_WATERKMARK_H
 
 // Digital watermark
 extern BYTE WaterMark[];
@@ -132,5 +132,5 @@ UINT SizeOfSaitama();
 
 #define	MAX_WATERMARK_SIZE		(SizeOfWaterMark() + HTTP_PACK_RAND_SIZE_MAX * 2)
 
-#endif	// WATERMARK_H
+#endif	// SE_WATERKMARK_H
 
diff --git a/src/Cedar/WebUI.h b/src/Cedar/WebUI.h
index ccb1d5b3..7f8e6f35 100644
--- a/src/Cedar/WebUI.h
+++ b/src/Cedar/WebUI.h
@@ -111,6 +111,9 @@
 // WebUI.h
 // Header of WebUI.c
 
+#ifndef SE_WEBUI_H
+#define SE_WEBUI_H
+
 #define WU_PASSWORD_NOCHANGE	"********"
 #define WU_CONTEXT_EXPIRE 600000
 
@@ -143,3 +146,4 @@ WEBUI *WuNewWebUI(CEDAR *cedar);
 WU_WEBPAGE *WuGetPage(char *target, WEBUI *wu);
 void WuFreeWebPage(WU_WEBPAGE *page);
 
+#endif // SE_WEBUI_H
diff --git a/src/Cedar/Win32Com.h b/src/Cedar/Win32Com.h
index 00831d7f..92a08054 100644
--- a/src/Cedar/Win32Com.h
+++ b/src/Cedar/Win32Com.h
@@ -111,8 +111,8 @@
 // Win32Com.h
 // Header of Win32Com.c
 
-#ifndef	WIN32COM_H
-#define	WIN32COM_H
+#ifndef	SE_WIN32COM_H
+#define	SE_WIN32COM_H
 
 #ifdef	WIN32COM_CPP
 
@@ -425,4 +425,4 @@ public:
 
 
 
-#endif	// WIN32COM_H
+#endif	// SE_WIN32COM_H
diff --git a/src/Cedar/Wpc.h b/src/Cedar/Wpc.h
index 99bf4cb4..b1ba8bb0 100644
--- a/src/Cedar/Wpc.h
+++ b/src/Cedar/Wpc.h
@@ -111,8 +111,8 @@
 // Wpc.h
 // Header of Wpc.c
 
-#ifndef	WPC_H
-#define	WPC_H
+#ifndef	SE_WPC_H
+#define	SE_WPC_H
 
 // Constant
 #define WPC_HTTP_POST_NAME			"POST"		// POST
@@ -234,6 +234,6 @@ PACK *WpcCallEx2(char *url, INTERNET_SETTING *setting, UINT timeout_connect, UIN
 				char *additional_header_name, char *additional_header_value, char *sni_string);
 bool IsProxyPrivateIp(INTERNET_SETTING *s);
 
-#endif	// WPC_H
+#endif	// SE_WPC_H
 
 
diff --git a/src/Cedar/winpcap/bittypes.h b/src/Cedar/winpcap/bittypes.h
index 1a2611d8..f7dac76d 100644
--- a/src/Cedar/winpcap/bittypes.h
+++ b/src/Cedar/winpcap/bittypes.h
@@ -26,8 +26,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#ifndef _BITTYPES_H
-#define _BITTYPES_H
+#ifndef _SE_BITTYPES_H
+#define _SE_BITTYPES_H
 
 #ifndef HAVE_U_INT8_T
 
diff --git a/src/Mayaqua/Cfg.h b/src/Mayaqua/Cfg.h
index d1172480..93cd3932 100644
--- a/src/Mayaqua/Cfg.h
+++ b/src/Mayaqua/Cfg.h
@@ -111,8 +111,8 @@
 // Cfg.h
 // Header of Cfg.c
 
-#ifndef	CFG_H
-#define	CFG_H
+#ifndef	SE_CFG_H
+#define	SE_CFG_H
 
 // Macro
 //#define	CHECK_CFG_NAME_EXISTS			// Check duplication of the existing name
@@ -271,7 +271,7 @@ bool CfgGetIp(FOLDER *f, char *name, struct IP *ip);
 ITEM *CfgAddIp(FOLDER *f, char *name, struct IP *ip);
 #endif
 
-#endif	// CFG_H
+#endif	// SE_CFG_H
 
 
 
diff --git a/src/Mayaqua/Encrypt.h b/src/Mayaqua/Encrypt.h
index 8bd25818..43c1f8ba 100644
--- a/src/Mayaqua/Encrypt.h
+++ b/src/Mayaqua/Encrypt.h
@@ -23,7 +23,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 // 
-// You should have received a copy of the GNU General Public License version 2
+// You should have received a copy of the GNU Gener0al Public License version 2
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 // 
@@ -111,8 +111,8 @@
 // Encrypt.h
 // Header of Encrypt.c
 
-#ifndef	ENCRYPT_H
-#define	ENCRYPT_H
+#ifndef	SE_ENCRYPT_H
+#define	SE_ENCRYPT_H
 
 // Function of OpenSSL
 void RAND_Init_For_SoftEther();
@@ -589,5 +589,5 @@ void DisableIntelAesAccel();
 
 #endif	// ENCRYPT_C
 
-#endif	// ENCRYPT_H
+#endif	// SE_ENCRYPT_H
 
diff --git a/src/Mayaqua/FileIO.h b/src/Mayaqua/FileIO.h
index 0822f2a9..57ea3c73 100644
--- a/src/Mayaqua/FileIO.h
+++ b/src/Mayaqua/FileIO.h
@@ -111,8 +111,8 @@
 // FileIO.h
 // Header of FileIO.c
 
-#ifndef	FILEIO_H
-#define	FILEIO_H
+#ifndef	SE_FILEIO_H
+#define	SE_FILEIO_H
 
 // Constant
 #define	HAMCORE_DIR_NAME			"hamcore"
@@ -384,7 +384,7 @@ bool IsFileWriteLocked(char *name);
 bool IsInLines(BUF *buf, char *str, bool instr);
 bool IsInLinesFile(wchar_t *filename, char *str, bool instr);
 
-#endif	// FILEIO_H
+#endif	// SE_FILEIO_H
 
 
 
diff --git a/src/Mayaqua/Internat.h b/src/Mayaqua/Internat.h
index fcebb916..885829da 100644
--- a/src/Mayaqua/Internat.h
+++ b/src/Mayaqua/Internat.h
@@ -111,8 +111,8 @@
 // Internat.h
 // Header of Internat.c
 
-#ifndef	INTERNAT_H
-#define	INTERNAT_H
+#ifndef	SE_INTERNAT_H
+#define	SE_INTERNAT_H
 
 // String token
 struct UNI_TOKEN_LIST
@@ -248,7 +248,7 @@ void *IconvStrToWideInternal();
 int IconvFreeInternal(void *d);
 #endif	// OS_UNIX
 
-#endif	// INTERNAT_H
+#endif	// SE_INTERNAT_H
 
 
 
diff --git a/src/Mayaqua/Kernel.h b/src/Mayaqua/Kernel.h
index 54173506..e7b81714 100644
--- a/src/Mayaqua/Kernel.h
+++ b/src/Mayaqua/Kernel.h
@@ -108,8 +108,8 @@
 // test has been passed before release this source code.
 
 
-#ifndef	KERNEL_H
-#define	KERNEL_H
+#ifndef	SE_KERNEL_H
+#define	SE_KERNEL_H
 
 // Memory usage information
 struct MEMINFO
@@ -280,5 +280,5 @@ void StopThreadList(LIST *o);
 void WaitAllThreadsWillBeStopped(LIST *o);
 UINT GetNumberOfCpu();
 
-#endif	// KERNEL_H
+#endif	// SE_KERNEL_H
 
diff --git a/src/Mayaqua/MayaType.h b/src/Mayaqua/MayaType.h
index d6de7143..a1d7e543 100644
--- a/src/Mayaqua/MayaType.h
+++ b/src/Mayaqua/MayaType.h
@@ -111,8 +111,8 @@
 // MayaType.h
 // Mayaqua Kernel type declaration header file
 
-#ifndef	MAYATYPE_H
-#define	MAYATYPE_H
+#ifndef	SE_MAYATYPE_H
+#define	SE_MAYATYPE_H
 
 // Check whether the windows.h header is included
 #ifndef	WINDOWS_H
@@ -586,5 +586,5 @@ typedef struct IKE_HEADER IKE_HEADER;
 
 
 
-#endif	// MAYATYPE_H
+#endif	// SE_MAYATYPE_H
 
diff --git a/src/Mayaqua/Mayaqua.h b/src/Mayaqua/Mayaqua.h
index 36fdc648..110a0bb5 100644
--- a/src/Mayaqua/Mayaqua.h
+++ b/src/Mayaqua/Mayaqua.h
@@ -111,8 +111,8 @@
 // Mayaqua.h
 // Mayaqua Kernel header file
 
-#ifndef	MAYAQUA_H
-#define	MAYAQUA_H
+#ifndef	SE_MAYAQUA_H
+#define	SE_MAYAQUA_H
 
 // PenCore.dll related
 #define	PENCORE_DLL_NAME		"|PenCore.dll"
@@ -624,6 +624,6 @@ USHORT CalcChecksum16(void *buf, UINT size);
 #endif
 
 
-#endif	// MAYAQUA_H
+#endif	// SE_MAYAQUA_H
 
 
diff --git a/src/Mayaqua/Memory.h b/src/Mayaqua/Memory.h
index 693386ba..c52be08f 100644
--- a/src/Mayaqua/Memory.h
+++ b/src/Mayaqua/Memory.h
@@ -111,8 +111,8 @@
 // Memory.h
 // Header of Memory.c
 
-#ifndef	MEMORY_H
-#define	MEMORY_H
+#ifndef	SE_MEMORY_H
+#define	SE_MEMORY_H
 
 // MallocFast (not implemented)
 #define	MallocFast		Malloc
@@ -477,5 +477,5 @@ void CleanupSharedBuffer(SHARED_BUFFER *b);
 void AppendBufUtf8(BUF *b, wchar_t *str);
 void AppendBufStr(BUF *b, char *str);
 
-#endif	// MEMORY_H
+#endif	// SE_MEMORY_H
 
diff --git a/src/Mayaqua/Network.h b/src/Mayaqua/Network.h
index 1c572f65..3e151015 100644
--- a/src/Mayaqua/Network.h
+++ b/src/Mayaqua/Network.h
@@ -111,8 +111,8 @@
 // Network.h
 // Header of Network.c
 
-#ifndef	NETWORK_H
-#define	NETWORK_H
+#ifndef	SE_NETWORK_H
+#define	SE_NETWORK_H
 
 // Dynamic Value
 struct DYN_VALUE
@@ -1684,5 +1684,5 @@ UINT64 GetDynValueOrDefault(char *name, UINT64 default_value, UINT64 min_value,
 UINT64 GetDynValueOrDefaultSafe(char *name, UINT64 default_value);
 
 
-#endif	// NETWORK_H
+#endif	// SE_NETWORK_H
 
diff --git a/src/Mayaqua/OS.h b/src/Mayaqua/OS.h
index 71691639..94226149 100644
--- a/src/Mayaqua/OS.h
+++ b/src/Mayaqua/OS.h
@@ -111,8 +111,8 @@
 // OS.h
 // Header of OS.c
 
-#ifndef	OS_H
-#define	OS_H
+#ifndef	SE_OS_H
+#define	SE_OS_H
 
 // Function prototype
 char *OsTypeToStr(UINT type);
@@ -242,5 +242,5 @@ typedef struct OS_DISPATCH_TABLE
 #include <Mayaqua/Unix.h>
 #endif	// OS_WIN32
 
-#endif	// OS_H
+#endif	// SE_OS_H
 
diff --git a/src/Mayaqua/Object.h b/src/Mayaqua/Object.h
index 903a6631..71790bfd 100644
--- a/src/Mayaqua/Object.h
+++ b/src/Mayaqua/Object.h
@@ -111,8 +111,8 @@
 // Object.h
 // Header of Object.c
 
-#ifndef	OBJECT_H
-#define	OBJECT_H
+#ifndef	SE_OBJECT_H
+#define	SE_OBJECT_H
 
 
 // Constants
@@ -211,5 +211,5 @@ bool WaitEx(EVENT *e, UINT timeout, volatile bool *cancel);
 void CheckDeadLock(LOCK *lock, UINT timeout, char *name);
 void CheckDeadLockThread(THREAD *t, void *param);
 
-#endif	// OBJECT_H
+#endif	// SE_OBJECT_H
 
diff --git a/src/Mayaqua/Pack.h b/src/Mayaqua/Pack.h
index 68cd74c9..6dbe5e30 100644
--- a/src/Mayaqua/Pack.h
+++ b/src/Mayaqua/Pack.h
@@ -111,8 +111,8 @@
 // Pack.h
 // Header of Pack.c
 
-#ifndef	PACK_H
-#define	PACK_H
+#ifndef	SE_PACK_H
+#define	SE_PACK_H
 
 // Constant
 #ifdef CPU_64
@@ -259,4 +259,4 @@ bool PackGetData2(PACK *p, char *name, void *data, UINT size);
 bool PackGetDataEx2(PACK *p, char *name, void *data, UINT size, UINT index);
 bool PackIsValueExists(PACK *p, char *name);
 
-#endif	// PACK_H
+#endif	// SE_PACK_H
diff --git a/src/Mayaqua/Secure.h b/src/Mayaqua/Secure.h
index 3bd99726..5355b974 100644
--- a/src/Mayaqua/Secure.h
+++ b/src/Mayaqua/Secure.h
@@ -111,8 +111,8 @@
 // Secure.h
 // Header of Secure.c
 
-#ifndef	SECURE_H
-#define	SECURE_H
+#ifndef	SE_SECURE_H
+#define	SE_SECURE_H
 
 // Constant
 #define	MAX_SEC_DATA_SIZE		4096
@@ -324,4 +324,4 @@ typedef struct SEC_DATA_WIN32
 
 #endif	// SECURE_C
 
-#endif	// SECURE_H
+#endif	// SE_SECURE_H
diff --git a/src/Mayaqua/Str.h b/src/Mayaqua/Str.h
index f5ad7769..0eb77d29 100644
--- a/src/Mayaqua/Str.h
+++ b/src/Mayaqua/Str.h
@@ -111,8 +111,8 @@
 // Str.h
 // Header of Str.c
 
-#ifndef	STR_H
-#define	STR_H
+#ifndef	SE_STR_H
+#define	SE_STR_H
 
 // String token
 struct TOKEN_LIST
@@ -250,5 +250,5 @@ void NormalizeIntListStr(char *dst, UINT dst_size, char *src, bool sorted, char
 void ClearStr(char *str, UINT str_size);
 void SetStrCaseAccordingToBits(char *str, UINT bits);
 
-#endif	// STR_H
+#endif	// SE_STR_H
 
diff --git a/src/Mayaqua/Table.h b/src/Mayaqua/Table.h
index 238b4ad9..d7dc2a52 100644
--- a/src/Mayaqua/Table.h
+++ b/src/Mayaqua/Table.h
@@ -111,8 +111,8 @@
 // Table.h
 // Header of Table.c
 
-#ifndef	TABLE_H
-#define	TABLE_H
+#ifndef	SE_TABLE_H
+#define	SE_TABLE_H
 
 #define	UNICODE_CACHE_FILE		L".unicode_cache_%s.dat"
 
@@ -208,7 +208,7 @@ UINT GetCurrentLangId();
 void GetCurrentOsLang(LANGLIST *e);
 UINT GetCurrentOsLangId();
 
-#endif	// TABLE_H
+#endif	// SE_TABLE_H
 
 
 
diff --git a/src/Mayaqua/TcpIp.h b/src/Mayaqua/TcpIp.h
index 9996f81d..eb7e4b7c 100644
--- a/src/Mayaqua/TcpIp.h
+++ b/src/Mayaqua/TcpIp.h
@@ -111,8 +111,8 @@
 // TcpIp.h
 // Header of TcpIp.c
 
-#ifndef	TCPIP_H
-#define	TCPIP_H
+#ifndef	SE_TCPIP_H
+#define	SE_TCPIP_H
 
 #ifdef	OS_WIN32
 #pragma pack(push, 1)
@@ -941,6 +941,6 @@ bool NormalizeClasslessRouteTableStr(char *dst, UINT dst_size, char *src);
 #pragma pack(pop)
 #endif	// OS_WIN32
 
-#endif	// TCPIP_H
+#endif	// SE_TCPIP_H
 
 
diff --git a/src/Mayaqua/Tick64.h b/src/Mayaqua/Tick64.h
index 58e6059f..1b1012ef 100644
--- a/src/Mayaqua/Tick64.h
+++ b/src/Mayaqua/Tick64.h
@@ -111,8 +111,8 @@
 // Tick64.h
 // Header of Tick64.c
 
-#ifndef	TICK64_H
-#define	TICK64_H
+#ifndef	SE_TICK64_H
+#define	SE_TICK64_H
 
 // Maximum number of correction list entries
 #define	MAX_ADJUST_TIME				1024
@@ -154,7 +154,7 @@ UINT64 Tick64ToTime64(UINT64 tick);
 UINT64 TickToTime(UINT64 tick);
 UINT64 TickHighres64();
 
-#endif	// TICK64_H
+#endif	// SE_TICK64_H
 
 
 
diff --git a/src/Mayaqua/Tracking.h b/src/Mayaqua/Tracking.h
index 8706c9fe..c4eafff7 100644
--- a/src/Mayaqua/Tracking.h
+++ b/src/Mayaqua/Tracking.h
@@ -111,8 +111,8 @@
 // Tracking.h
 // Header of Tracking.c
 
-#ifndef	TRACKING_H
-#define	TRACKING_H
+#ifndef	SE_TRACKING_H
+#define	SE_TRACKING_H
 
 // The number of array
 #define	TRACKING_NUM_ARRAY	1048576
@@ -192,6 +192,6 @@ void TrackingEnable();
 void TrackingDisable();
 bool IsTrackingEnabled();
 
-#endif	// TRACKING_H
+#endif	// SE_TRACKING_H
 
 
diff --git a/src/Mayaqua/TunTap.h b/src/Mayaqua/TunTap.h
index 7f23b1e1..935352a7 100644
--- a/src/Mayaqua/TunTap.h
+++ b/src/Mayaqua/TunTap.h
@@ -99,8 +99,8 @@
 // test has been passed before release this source code.
 
 
-#ifndef	TUNTAP_H
-#define	TUNTAP_H
+#ifndef	SE_TUNTAP_H
+#define	SE_TUNTAP_H
 
 #ifdef	UNIX_LINUX
 
@@ -322,4 +322,4 @@ struct tuninfo {
 
 #endif	// UNIX_LINUX
 
-#endif	// TUNTAP_H
+#endif	// SE_TUNTAP_H
diff --git a/src/Neo/NDIS5.h b/src/Neo/NDIS5.h
index 175ce14c..053d014f 100644
--- a/src/Neo/NDIS5.h
+++ b/src/Neo/NDIS5.h
@@ -111,8 +111,8 @@
 // NDIS5.h
 // Header of NDIS5.c
 
-#ifndef	NDIS5_H
-#define	NDIS5_H
+#ifndef	SE_NDIS5_H
+#define	SE_NDIS5_H
 
 // Win32 DDK related
 #ifndef	CPU_64
@@ -291,5 +291,5 @@ void NeoSetConnectState(BOOL connected);
 BOOL NeoNdisOnOpen(IRP *irp, IO_STACK_LOCATION *stack);
 BOOL NeoNdisOnClose(IRP *irp, IO_STACK_LOCATION *stack);
 
-#endif	// NDIS5_H
+#endif	// SE_NDIS5_H
 
diff --git a/src/Neo/Neo.h b/src/Neo/Neo.h
index 8c4ad9e5..de6f15fc 100644
--- a/src/Neo/Neo.h
+++ b/src/Neo/Neo.h
@@ -111,8 +111,8 @@
 // Neo.h
 // Header of Neo.c
 
-#ifndef	NEO_H
-#define	NEO_H
+#ifndef	SE_NEO_H
+#define	SE_NEO_H
 
 
 // Identification string (NDIS)
@@ -332,7 +332,7 @@ void NeoReset(NEO_EVENT *event);
 #endif	// NEO_DEVICE_DRIVER
 
 
-#endif	// NEO_H
+#endif	// SE_NEO_H