From 19922bbc0d62b81e0fdd6a01da39e9b875c53c68 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Thu, 28 May 2015 13:23:12 -0700
Subject: Merge to XFA: Fix ALL the include guards.

Original Review URL: https://codereview.chromium.org/1160443004
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1162013003
---
 fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h  |  6 +++---
 fpdfsdk/include/formfiller/FFL_CheckBox.h     |  6 +++---
 fpdfsdk/include/formfiller/FFL_ComboBox.h     |  8 +++----
 fpdfsdk/include/formfiller/FFL_FormFiller.h   |  8 +++----
 fpdfsdk/include/formfiller/FFL_IFormFiller.h  |  7 ++++---
 fpdfsdk/include/formfiller/FFL_ListBox.h      |  7 +++----
 fpdfsdk/include/formfiller/FFL_Notify.h       |  7 +++----
 fpdfsdk/include/formfiller/FFL_PushButton.h   |  7 +++----
 fpdfsdk/include/formfiller/FFL_RadioButton.h  |  7 +++----
 fpdfsdk/include/formfiller/FFL_TextField.h    |  6 +++---
 fpdfsdk/include/formfiller/FFL_Utils.h        |  6 +++---
 fpdfsdk/include/formfiller/FormFiller.h       |  6 +++---
 fpdfsdk/include/fsdk_actionhandler.h          |  7 +++----
 fpdfsdk/include/fsdk_annothandler.h           |  9 +++-----
 fpdfsdk/include/fsdk_baseannot.h              |  9 +++-----
 fpdfsdk/include/fsdk_baseform.h               |  7 +++----
 fpdfsdk/include/fsdk_common.h                 |  7 +++----
 fpdfsdk/include/fsdk_define.h                 |  6 +++---
 fpdfsdk/include/fsdk_mgr.h                    |  7 +++----
 fpdfsdk/include/fsdk_rendercontext.h          |  6 +++---
 fpdfsdk/include/fx_systemhandler.h            |  7 +++----
 fpdfsdk/include/fxedit/fx_edit.h              |  7 +++----
 fpdfsdk/include/fxedit/fxet_edit.h            |  7 +++----
 fpdfsdk/include/fxedit/fxet_list.h            |  6 +++---
 fpdfsdk/include/fxedit/fxet_stub.h            | 26 +++++++----------------
 fpdfsdk/include/javascript/Consts.h           |  7 +++----
 fpdfsdk/include/javascript/Document.h         |  7 +++----
 fpdfsdk/include/javascript/Field.h            |  7 +++----
 fpdfsdk/include/javascript/IJavaScript.h      |  7 +++----
 fpdfsdk/include/javascript/Icon.h             |  7 +++----
 fpdfsdk/include/javascript/JS_Context.h       | 14 +++----------
 fpdfsdk/include/javascript/JS_Define.h        |  7 +++----
 fpdfsdk/include/javascript/JS_EventHandler.h  |  7 +++----
 fpdfsdk/include/javascript/JS_GlobalData.h    |  6 +++---
 fpdfsdk/include/javascript/JS_Object.h        |  7 ++++---
 fpdfsdk/include/javascript/JS_Runtime.h       |  7 +++----
 fpdfsdk/include/javascript/JS_Value.h         |  9 ++++----
 fpdfsdk/include/javascript/JavaScript.h       |  6 +++---
 fpdfsdk/include/javascript/PublicMethods.h    |  6 +++---
 fpdfsdk/include/javascript/app.h              |  6 +++---
 fpdfsdk/include/javascript/color.h            |  7 +++----
 fpdfsdk/include/javascript/console.h          |  7 +++----
 fpdfsdk/include/javascript/event.h            |  6 +++---
 fpdfsdk/include/javascript/global.h           |  6 +++---
 fpdfsdk/include/javascript/report.h           |  7 +++----
 fpdfsdk/include/javascript/util.h             |  7 ++++---
 fpdfsdk/include/jsapi/fxjs_v8.h               |  6 +++---
 fpdfsdk/include/pdfwindow/IPDFWindow.h        |  6 +++---
 fpdfsdk/include/pdfwindow/PDFWindow.h         |  6 +++---
 fpdfsdk/include/pdfwindow/PWL_Button.h        |  6 +++---
 fpdfsdk/include/pdfwindow/PWL_Caret.h         |  7 +++----
 fpdfsdk/include/pdfwindow/PWL_ComboBox.h      |  7 +++----
 fpdfsdk/include/pdfwindow/PWL_Edit.h          |  7 +++----
 fpdfsdk/include/pdfwindow/PWL_EditCtrl.h      |  7 +++----
 fpdfsdk/include/pdfwindow/PWL_FontMap.h       |  6 +++---
 fpdfsdk/include/pdfwindow/PWL_Icon.h          |  8 +++----
 fpdfsdk/include/pdfwindow/PWL_IconList.h      |  8 +++----
 fpdfsdk/include/pdfwindow/PWL_Label.h         |  8 +++----
 fpdfsdk/include/pdfwindow/PWL_ListBox.h       |  8 +++----
 fpdfsdk/include/pdfwindow/PWL_ListCtrl.h      |  7 +++----
 fpdfsdk/include/pdfwindow/PWL_Note.h          |  7 +++----
 fpdfsdk/include/pdfwindow/PWL_ScrollBar.h     |  8 +++----
 fpdfsdk/include/pdfwindow/PWL_Signature.h     |  8 +++----
 fpdfsdk/include/pdfwindow/PWL_SpecialButton.h |  8 +++----
 fpdfsdk/include/pdfwindow/PWL_Utils.h         |  8 +++----
 fpdfsdk/include/pdfwindow/PWL_Wnd.h           | 30 +++------------------------
 fpdfsdk/src/resource.h                        |  8 +++++--
 67 files changed, 213 insertions(+), 303 deletions(-)

(limited to 'fpdfsdk')

diff --git a/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h b/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h
index 8601b98194..5e596657ec 100644
--- a/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h
+++ b/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _RAO_FONTMAP_H_
-#define _RAO_FONTMAP_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_
 
 #include "../pdfwindow/PWL_FontMap.h"
 
@@ -47,4 +47,4 @@ private:
 	CFX_ByteString				m_sAPType;
 };
 
-#endif // _RAO_FONTMAP_H_
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_
diff --git a/fpdfsdk/include/formfiller/FFL_CheckBox.h b/fpdfsdk/include/formfiller/FFL_CheckBox.h
index 240e748ea3..bac1b9394b 100644
--- a/fpdfsdk/include/formfiller/FFL_CheckBox.h
+++ b/fpdfsdk/include/formfiller/FFL_CheckBox.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_CHECKBOX_H_
-#define _FFL_CHECKBOX_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_CHECKBOX_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_CHECKBOX_H_
 
 #include "FFL_FormFiller.h"
 
@@ -25,5 +25,5 @@ public:
 	virtual void				SaveData(CPDFSDK_PageView* pPageView);
 };
 
-#endif //_FFL_CHECKBOX_H_
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_CHECKBOX_H_
 
diff --git a/fpdfsdk/include/formfiller/FFL_ComboBox.h b/fpdfsdk/include/formfiller/FFL_ComboBox.h
index df7ca55cc5..5f0aaa1440 100644
--- a/fpdfsdk/include/formfiller/FFL_ComboBox.h
+++ b/fpdfsdk/include/formfiller/FFL_ComboBox.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_COMBOBOX_H_
-#define _FFL_COMBOBOX_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
 
 #include "../../../core/include/fxcrt/fx_string.h"
 #include "FFL_FormFiller.h"
@@ -69,8 +69,6 @@ private:
 private:
 	CBA_FontMap*				m_pFontMap;
 	FFL_ComboBoxState				m_State;
-	//CFFL_IM_BOX					m_IMBox;
 };
 
-#endif //_FFL_COMBOBOX_H_
-
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_
diff --git a/fpdfsdk/include/formfiller/FFL_FormFiller.h b/fpdfsdk/include/formfiller/FFL_FormFiller.h
index 18426a91ba..08dd25b27f 100644
--- a/fpdfsdk/include/formfiller/FFL_FormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_FormFiller.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_FORMFILLER_H_
-#define _FFL_FORMFILLER_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
 
 #include "FFL_IFormFiller.h"
 #include "FFL_CBA_Fontmap.h"
@@ -174,6 +174,4 @@ protected:
 	FX_BOOL						m_bMouseDown;
 };
 
-//#define CFFL_IM_BOX				CFX_ArrayTemplate<CBA_EditInput*>
-
-#endif
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
index 1b33edd4e8..6e3e58139d 100644
--- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
@@ -4,10 +4,11 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_IFORMFILLER_H_
-#define _FFL_IFORMFILLER_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_IFORMFILLER_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_IFORMFILLER_H_
 
 #include "FormFiller.h"
+
 class CFFL_FormFiller;
 class CFFL_PrivateData;
 
@@ -146,5 +147,5 @@ public:
 	int					nValueAge;
 };
 
-#endif //_FFL_IFORMFILLER_H_
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_IFORMFILLER_H_
 
diff --git a/fpdfsdk/include/formfiller/FFL_ListBox.h b/fpdfsdk/include/formfiller/FFL_ListBox.h
index 03f71df5b9..b95ad725c2 100644
--- a/fpdfsdk/include/formfiller/FFL_ListBox.h
+++ b/fpdfsdk/include/formfiller/FFL_ListBox.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_LISTBOX_H_
-#define _FFL_LISTBOX_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_LISTBOX_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_LISTBOX_H_
 
 #include "FFL_FormFiller.h"
 
@@ -43,5 +43,4 @@ private:
 };
 
 
-#endif //_FFL_LISTBOX_H_
-
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_LISTBOX_H_
diff --git a/fpdfsdk/include/formfiller/FFL_Notify.h b/fpdfsdk/include/formfiller/FFL_Notify.h
index bd21ffc496..4e66c3a991 100644
--- a/fpdfsdk/include/formfiller/FFL_Notify.h
+++ b/fpdfsdk/include/formfiller/FFL_Notify.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_NOTIFY_H_
-#define _FFL_NOTIFY_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_NOTIFY_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_NOTIFY_H_
 
 #include "../../../core/include/fpdfdoc/fpdf_doc.h"
 #include "../../../core/include/fxcrt/fx_string.h"
@@ -53,5 +53,4 @@ private:
 	FX_INT32								m_nNotifyFlag;
 };
 
-#endif
-
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_NOTIFY_H_
diff --git a/fpdfsdk/include/formfiller/FFL_PushButton.h b/fpdfsdk/include/formfiller/FFL_PushButton.h
index 5d115c0771..4cf61a82d0 100644
--- a/fpdfsdk/include/formfiller/FFL_PushButton.h
+++ b/fpdfsdk/include/formfiller/FFL_PushButton.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_PUSHBUTTON_H_
-#define _FFL_PUSHBUTTON_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_PUSHBUTTON_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_PUSHBUTTON_H_
 
 #include "FFL_FormFiller.h"
 
@@ -23,5 +23,4 @@ public:
 									FX_DWORD dwFlags);
 };
 
-#endif //_FFL_PUSHBUTTON_H_
-
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_PUSHBUTTON_H_
diff --git a/fpdfsdk/include/formfiller/FFL_RadioButton.h b/fpdfsdk/include/formfiller/FFL_RadioButton.h
index 2049a45345..8dba93307a 100644
--- a/fpdfsdk/include/formfiller/FFL_RadioButton.h
+++ b/fpdfsdk/include/formfiller/FFL_RadioButton.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_RADIOBUTTON_H_
-#define _FFL_RADIOBUTTON_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_RADIOBUTTON_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_RADIOBUTTON_H_
 
 #include "FFL_FormFiller.h"
 
@@ -23,5 +23,4 @@ public:
 	virtual void				SaveData(CPDFSDK_PageView* pPageView);
 };
 
-#endif //_FFL_RADIOBUTTON_H_
-
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_RADIOBUTTON_H_
diff --git a/fpdfsdk/include/formfiller/FFL_TextField.h b/fpdfsdk/include/formfiller/FFL_TextField.h
index 8351878522..fc7a2f8f34 100644
--- a/fpdfsdk/include/formfiller/FFL_TextField.h
+++ b/fpdfsdk/include/formfiller/FFL_TextField.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#if !defined(AFX_FFL_EDIT_H__8E0C9456_CBA2_4EFB_9F31_53C6D8C1A8AC__INCLUDED_)
-#define AFX_FFL_EDIT_H__8E0C9456_CBA2_4EFB_9F31_53C6D8C1A8AC__INCLUDED_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_TEXTFIELD_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_TEXTFIELD_H_
 
 #include "FFL_FormFiller.h"
 
@@ -72,4 +72,4 @@ private:
 
 };
 
-#endif // !defined(AFX_FFL_EDIT_H__8E0C9456_CBA2_4EFB_9F31_53C6D8C1A8AC__INCLUDED_)
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_TEXTFIELD_H_
diff --git a/fpdfsdk/include/formfiller/FFL_Utils.h b/fpdfsdk/include/formfiller/FFL_Utils.h
index e64cce9ea4..ff06a347e8 100644
--- a/fpdfsdk/include/formfiller/FFL_Utils.h
+++ b/fpdfsdk/include/formfiller/FFL_Utils.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FFL_UTILS_H_
-#define _FFL_UTILS_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_UTILS_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FFL_UTILS_H_
 
 #include "../../../core/include/fpdfapi/fpdf_parser.h"
 #include "../../../core/include/fxcrt/fx_memory.h"
@@ -21,4 +21,4 @@ public:
 	static FX_BOOL					TraceObject(CPDF_Object* pObj);
 };
 
-#endif  // _FFL_UTILS_H_
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_UTILS_H_
diff --git a/fpdfsdk/include/formfiller/FormFiller.h b/fpdfsdk/include/formfiller/FormFiller.h
index d8df542179..fdca1ff940 100644
--- a/fpdfsdk/include/formfiller/FormFiller.h
+++ b/fpdfsdk/include/formfiller/FormFiller.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FORMFILLER_H_
-#define FORMFILLER_H_
+#ifndef FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_
+#define FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_
 
 #include "../../../core/include/fpdfapi/fpdf_module.h"
 #include "../../../core/include/fpdfdoc/fpdf_doc.h"
@@ -15,4 +15,4 @@
 #include "../fxedit/fx_edit.h"
 #include "../pdfwindow/IPDFWindow.h"
 
-#endif  // FORMFILLER_H_
+#endif  // FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_
diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/include/fsdk_actionhandler.h
index 1ec7c09904..2b38a5d5f6 100644
--- a/fpdfsdk/include/fsdk_actionhandler.h
+++ b/fpdfsdk/include/fsdk_actionhandler.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FSDK_ACTIONHANDLER_H_
-#define _FSDK_ACTIONHANDLER_H_
+#ifndef FPDFSDK_INCLUDE_FSDK_ACTIONHANDLER_H_
+#define FPDFSDK_INCLUDE_FSDK_ACTIONHANDLER_H_
 
 #include "../../core/include/fpdfdoc/fpdf_doc.h"
 #include "../../core/include/fxcrt/fx_string.h"
@@ -85,5 +85,4 @@ private:
 	CPDFSDK_MediaActionHandler*		m_pMediaActionHandler;
 };
 
-#endif //_BA_ACTIONHANDLER_H_
-
+#endif  // FPDFSDK_INCLUDE_FSDK_ACTIONHANDLER_H_
diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h
index f4b88f2984..fa73cd1795 100644
--- a/fpdfsdk/include/fsdk_annothandler.h
+++ b/fpdfsdk/include/fsdk_annothandler.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FSDK_ANNOTHANDLER_H_
-#define _FSDK_ANNOTHANDLER_H_
+#ifndef FPDFSDK_INCLUDE_FSDK_ANNOTHANDLER_H_
+#define FPDFSDK_INCLUDE_FSDK_ANNOTHANDLER_H_
 
 #include "../../core/include/fxcrt/fx_basic.h"
 
@@ -342,7 +342,4 @@ protected:
 	FX_BOOL              m_bCircle;
 };
 
-
-
-#endif
-
+#endif  // FPDFSDK_INCLUDE_FSDK_ANNOTHANDLER_H_
diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h
index efa7c0be52..250ce7f591 100644
--- a/fpdfsdk/include/fsdk_baseannot.h
+++ b/fpdfsdk/include/fsdk_baseannot.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FSDK_BASEANNOT_H_
-#define _FSDK_BASEANNOT_H_
+#ifndef FPDFSDK_INCLUDE_FSDK_BASEANNOT_H_
+#define FPDFSDK_INCLUDE_FSDK_BASEANNOT_H_
 
 #if _FX_OS_ == _FX_ANDROID_
 #include "time.h"
@@ -213,7 +213,4 @@ protected:
 	CPDF_Annot*			m_pAnnot;
 };
 
-
-
-#endif
-
+#endif  // FPDFSDK_INCLUDE_FSDK_BASEANNOT_H_
diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h
index 615be4507c..333bb30a78 100644
--- a/fpdfsdk/include/fsdk_baseform.h
+++ b/fpdfsdk/include/fsdk_baseform.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FSDK_BASEFORM_H_
-#define _FSDK_BASEFORM_H_
+#ifndef FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
+#define FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
 
 #if _FX_OS_ == _FX_ANDROID_
 #include "time.h"
@@ -357,5 +357,4 @@ private:
 	CPDFSDK_Annots						m_Annots;
 };
 
-#endif //#define _FSDK_BASEFORM_H_
-
+#endif  // FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
diff --git a/fpdfsdk/include/fsdk_common.h b/fpdfsdk/include/fsdk_common.h
index 197917c567..bc7cbcb711 100644
--- a/fpdfsdk/include/fsdk_common.h
+++ b/fpdfsdk/include/fsdk_common.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FSDK_COMMON_H_
-#define _FSDK_COMMON_H_
+#ifndef FPDFSDK_INCLUDE_FSDK_COMMON_H_
+#define FPDFSDK_INCLUDE_FSDK_COMMON_H_
 
 #define BFFT_SIGNATURE				"Signature"
 
@@ -42,5 +42,4 @@
 #define BBS_INSET					3
 #define BBS_UNDERLINE				4
 
-
-#endif
+#endif  // FPDFSDK_INCLUDE_FSDK_COMMON_H_
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index 7171540596..528801795b 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDFSDK_DEFINE_H
-#define _FPDFSDK_DEFINE_H
+#ifndef FPDFSDK_INCLUDE_FSDK_DEFINE_H_
+#define FPDFSDK_INCLUDE_FSDK_DEFINE_H_
 
 #ifdef _WIN32
 #include <tchar.h>
@@ -122,4 +122,4 @@ void		FSDK_SetSandBoxPolicy(FPDF_DWORD policy, FPDF_BOOL enable);
 FPDF_BOOL	FSDK_IsSandBoxPolicyEnabled(FPDF_DWORD policy);
 
 
-#endif//_FPDFSDK_DEFINE_H
+#endif  // FPDFSDK_INCLUDE_FSDK_DEFINE_H_
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index 906662d8ff..abcb24dd91 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FPDFSDK_MGR_H
-#define _FPDFSDK_MGR_H
+#ifndef FPDFSDK_INCLUDE_FSDK_MGR_H_
+#define FPDFSDK_INCLUDE_FSDK_MGR_H_
 
 #include "../../public/fpdf_formfill.h"
 #include "../../public/fpdf_fwlevent.h" // cross platform keycode and events define.
@@ -912,5 +912,4 @@ private:
 	}
 };
 
-
-#endif //_FPDFSDK_MGR_H
+#endif  // FPDFSDK_INCLUDE_FSDK_MGR_H_
diff --git a/fpdfsdk/include/fsdk_rendercontext.h b/fpdfsdk/include/fsdk_rendercontext.h
index 4c006c3754..fff7031b55 100644
--- a/fpdfsdk/include/fsdk_rendercontext.h
+++ b/fpdfsdk/include/fsdk_rendercontext.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FSDK_RENDERCONTEXT_H_
-#define FSDK_RENDERCONTEXT_H_
+#ifndef FPDFSDK_INCLUDE_FSDK_RENDERCONTEXT_H_
+#define FPDFSDK_INCLUDE_FSDK_RENDERCONTEXT_H_
 
 #include "../../public/fpdf_progressive.h"
 #include "fsdk_define.h"
@@ -40,4 +40,4 @@ private:
 	IFSDK_PAUSE* m_IPause;
 };
 
-#endif  // FSDK_RENDERCONTEXT_H_
+#endif  // FPDFSDK_INCLUDE_FSDK_RENDERCONTEXT_H_
diff --git a/fpdfsdk/include/fx_systemhandler.h b/fpdfsdk/include/fx_systemhandler.h
index e0c362276c..f8df723ad0 100644
--- a/fpdfsdk/include/fx_systemhandler.h
+++ b/fpdfsdk/include/fx_systemhandler.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_SYSTEMHANDLER_H_
-#define _FX_SYSTEMHANDLER_H_
+#ifndef FPDFSDK_INCLUDE_FX_SYSTEMHANDLER_H_
+#define FPDFSDK_INCLUDE_FX_SYSTEMHANDLER_H_
 
 typedef FX_LPVOID				FX_HWND;
 typedef FX_LPVOID				FX_HMENU;
@@ -90,5 +90,4 @@ public:
 	virtual void 				SetCharSet(FX_INT32 nCharSet) = 0;
 };
 
-#endif //_FX_SYSTEMHANDLER_H_
-
+#endif  // FPDFSDK_INCLUDE_FX_SYSTEMHANDLER_H_
diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/include/fxedit/fx_edit.h
index bf00995ea9..31ede0564b 100644
--- a/fpdfsdk/include/fxedit/fx_edit.h
+++ b/fpdfsdk/include/fxedit/fx_edit.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_EDIT_H_
-#define _FX_EDIT_H_
+#ifndef FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_
+#define FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_
 
 #include "../../../core/include/fxcrt/fx_basic.h"
 #include "../../../core/include/fxge/fx_dib.h"
@@ -492,5 +492,4 @@ protected:
         ~IFX_List() { }
 };
 
-#endif
-
+#endif  // FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_
diff --git a/fpdfsdk/include/fxedit/fxet_edit.h b/fpdfsdk/include/fxedit/fxet_edit.h
index 9e5c40f5ff..237aa66b53 100644
--- a/fpdfsdk/include/fxedit/fxet_edit.h
+++ b/fpdfsdk/include/fxedit/fxet_edit.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXET_EDIT_H_
-#define _FXET_EDIT_H_
+#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_
+#define FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_
 
 #include "../../../core/include/fpdfdoc/fpdf_vt.h"
 #include "fx_edit.h"
@@ -814,5 +814,4 @@ private:
 	IFX_Edit_FontMap*			m_pFontMap;
 };
 
-#endif //_FXET_EDIT_H_
-
+#endif  // FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_
diff --git a/fpdfsdk/include/fxedit/fxet_list.h b/fpdfsdk/include/fxedit/fxet_list.h
index 6b634ffeec..5c689ed439 100644
--- a/fpdfsdk/include/fxedit/fxet_list.h
+++ b/fpdfsdk/include/fxedit/fxet_list.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXET_LIST_H_
-#define _FXET_LIST_H_
+#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_
+#define FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_
 
 #include "../../../core/include/fpdfapi/fpdf_parser.h"  // For CPDF_Point.
 #include "fx_edit.h"
@@ -360,4 +360,4 @@ private:
 	FX_INT32						m_nCaretIndex;	//for multiple
 };
 
-#endif
+#endif  // FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_
diff --git a/fpdfsdk/include/fxedit/fxet_stub.h b/fpdfsdk/include/fxedit/fxet_stub.h
index a1aa2e25ca..8fe2f0cd95 100644
--- a/fpdfsdk/include/fxedit/fxet_stub.h
+++ b/fpdfsdk/include/fxedit/fxet_stub.h
@@ -1,26 +1,16 @@
 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
- 
+
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXET_STUB_H_
-#define _FXET_STUB_H_
+#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_
+#define FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_
 
-#include "../../../core/include/fpdfapi/fpdf_module.h" 
-#include "../../../core/include/fpdfapi/fpdf_render.h" 
-#include "../../../core/include/fpdfapi/fpdf_pageobj.h" 
-#include "../../../core/include/fpdfdoc/fpdf_vt.h" 
+#include "../../../core/include/fpdfapi/fpdf_module.h"
+#include "../../../core/include/fpdfapi/fpdf_render.h"
+#include "../../../core/include/fpdfapi/fpdf_pageobj.h"
+#include "../../../core/include/fpdfdoc/fpdf_vt.h"
 #include "../fx_systemhandler.h"
-#ifdef FX_READER_DLL
-	#ifdef _DEBUG
-		#pragma comment(lib, "X:/pdf/fxcore/Lib/dbg_w32_vc6/fxcoredll[dbg,w32,vc6].lib")
-		#pragma comment(lib, "X:/pdf/fxcore/Lib/dbg_w32_vc6/fpdfdocdll[dbg,w32,vc6].lib")
-	#else
-		#pragma comment(lib, "X:/pdf/fxcore/Lib/rel_w32_vc6/fxcoredll[rel,w32,vc6].lib")
-		#pragma comment(lib, "X:/pdf/fxcore/Lib/rel_w32_vc6/fpdfdocdll[rel,w32,vc6].lib")
-	#endif
-#endif
-
-#endif 
 
+#endif  // FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_
diff --git a/fpdfsdk/include/javascript/Consts.h b/fpdfsdk/include/javascript/Consts.h
index 5d1906428c..f7ddc5215b 100644
--- a/fpdfsdk/include/javascript/Consts.h
+++ b/fpdfsdk/include/javascript/Consts.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _CONSTS_H_
-#define _CONSTS_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_CONSTS_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_CONSTS_H_
 
 #include "JS_Define.h"
 
@@ -124,5 +124,4 @@ public:
 	static int				Init(IJS_Runtime* pRuntime);
 };
 
-#endif //_CONSTS_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_CONSTS_H_
diff --git a/fpdfsdk/include/javascript/Document.h b/fpdfsdk/include/javascript/Document.h
index 0824185aa3..ab1ddb8633 100644
--- a/fpdfsdk/include/javascript/Document.h
+++ b/fpdfsdk/include/javascript/Document.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _DOCUMENT_H_
-#define _DOCUMENT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_DOCUMENT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_DOCUMENT_H_
 
 #include "JS_Define.h"
 
@@ -272,5 +272,4 @@ public:
 	JS_STATIC_METHOD(mailDoc, Document);
 };
 
-#endif//_DOCUMENT_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_DOCUMENT_H_
diff --git a/fpdfsdk/include/javascript/Field.h b/fpdfsdk/include/javascript/Field.h
index f9e5e49f9e..0da08b6e95 100644
--- a/fpdfsdk/include/javascript/Field.h
+++ b/fpdfsdk/include/javascript/Field.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FIELD_H_
-#define _FIELD_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_FIELD_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_FIELD_H_
 
 #include <string>  // For std::wstring.
 
@@ -356,5 +356,4 @@ public:
 	JS_STATIC_METHOD(signatureValidate, Field);
 };
 
-#endif //_FIELD_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_FIELD_H_
diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h
index b0e21c915a..eea2e6a7ca 100644
--- a/fpdfsdk/include/javascript/IJavaScript.h
+++ b/fpdfsdk/include/javascript/IJavaScript.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _IJAVASCRIPT_H_
-#define _IJAVASCRIPT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
 
 #include "../../../core/include/fxcrt/fx_basic.h"
 #include "../../../xfa/include/fxjse/fxjse.h"
@@ -114,5 +114,4 @@ private:
 	FX_INT32						m_nGlobalDataCount;
 };
 
-#endif //_IJAVASCRIPT_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
diff --git a/fpdfsdk/include/javascript/Icon.h b/fpdfsdk/include/javascript/Icon.h
index 097917a5e5..20a3bb8f68 100644
--- a/fpdfsdk/include/javascript/Icon.h
+++ b/fpdfsdk/include/javascript/Icon.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _ICON_H_
-#define _ICON_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_ICON_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_ICON_H_
 
 #include "JS_Define.h"
 
@@ -37,5 +37,4 @@ public:
 	JS_STATIC_PROP(name, Icon);
 };
 
-#endif //_ICON_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_ICON_H_
diff --git a/fpdfsdk/include/javascript/JS_Context.h b/fpdfsdk/include/javascript/JS_Context.h
index b35ba3b4b2..7d9dc2c9f1 100644
--- a/fpdfsdk/include/javascript/JS_Context.h
+++ b/fpdfsdk/include/javascript/JS_Context.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_CONTEXT_H_
-#define _JS_CONTEXT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_CONTEXT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_CONTEXT_H_
 
 #include "../../../core/include/fxcrt/fx_system.h"
 #include "../../../core/include/fxcrt/fx_string.h"
@@ -94,12 +94,4 @@ private:
 	FX_BOOL						m_bMsgBoxEnable;
 };
 
-// static CFX_WideString JSGetStringFromID(CJS_Context* pContext, UINT ID)
-// {
-// 	ASSERT(pContext != NULL);
-// 
-// 	return JS_LoadString(pContext->GetReaderApp(), ID);
-// }
-
-#endif //_JS_CONTEXT_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_CONTEXT_H_
diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h
index 8310ae25fb..fc68e58755 100644
--- a/fpdfsdk/include/javascript/JS_Define.h
+++ b/fpdfsdk/include/javascript/JS_Define.h
@@ -4,12 +4,11 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_DEFINE_H_
-#define _JS_DEFINE_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_DEFINE_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_DEFINE_H_
 
 #include "../jsapi/fxjs_v8.h"
 #include "resource.h"
-
 #include "JS_Object.h"
 #include "JS_Value.h"
 
@@ -447,4 +446,4 @@ if (JS_DefineGlobalConst(pRuntime, (const wchar_t*)ArrayName, prop.ToV8Value())
 
 FXJSVALUETYPE GET_VALUE_TYPE(v8::Local<v8::Value> p);
 
-#endif //_JS_DEFINE_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_DEFINE_H_
diff --git a/fpdfsdk/include/javascript/JS_EventHandler.h b/fpdfsdk/include/javascript/JS_EventHandler.h
index a6736d319b..d6cdbe81bc 100644
--- a/fpdfsdk/include/javascript/JS_EventHandler.h
+++ b/fpdfsdk/include/javascript/JS_EventHandler.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_EVENTHANDLER_H_
-#define _JS_EVENTHANDLER_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_EVENTHANDLER_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_EVENTHANDLER_H_
 
 #include "../../../core/include/fxcrt/fx_string.h"
 #include "../../../core/include/fxcrt/fx_system.h"
@@ -170,5 +170,4 @@ public:
 	CPDFSDK_Annot*			m_pTargetAnnot;
 };
 
-#endif //_JS_EVENTHANDLER_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_EVENTHANDLER_H_
diff --git a/fpdfsdk/include/javascript/JS_GlobalData.h b/fpdfsdk/include/javascript/JS_GlobalData.h
index b21a360820..4f09d87531 100644
--- a/fpdfsdk/include/javascript/JS_GlobalData.h
+++ b/fpdfsdk/include/javascript/JS_GlobalData.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_GLOBALDATA_H_
-#define _JS_GLOBALDATA_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_GLOBALDATA_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_GLOBALDATA_H_
 
 #include "../../../core/include/fxcrt/fx_basic.h"
 
@@ -95,4 +95,4 @@ private:
 	CPDFDoc_Environment*						m_pApp;
 };
 
-#endif //_JS_GLOBALDATA_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_GLOBALDATA_H_
diff --git a/fpdfsdk/include/javascript/JS_Object.h b/fpdfsdk/include/javascript/JS_Object.h
index a9ad01835c..3b97677fa6 100644
--- a/fpdfsdk/include/javascript/JS_Object.h
+++ b/fpdfsdk/include/javascript/JS_Object.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_OBJECT_H_
-#define _JS_OBJECT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_OBJECT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_OBJECT_H_
 
 #include "../fsdk_define.h"  // For FX_UINT
 #include "../fsdk_mgr.h"  // For CPDFDoc_Environment
@@ -296,4 +296,5 @@ private:
 
 	CPDFDoc_Environment*			m_pApp;
 };
-#endif //_JS_OBJECT_H_
+
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_OBJECT_H_
diff --git a/fpdfsdk/include/javascript/JS_Runtime.h b/fpdfsdk/include/javascript/JS_Runtime.h
index 0e824f994c..91a82da375 100644
--- a/fpdfsdk/include/javascript/JS_Runtime.h
+++ b/fpdfsdk/include/javascript/JS_Runtime.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_RUNTIME_H_
-#define _JS_RUNTIME_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_RUNTIME_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_RUNTIME_H_
 
 #include "../../../third_party/base/nonstd_unique_ptr.h"
 #include "../../../core/include/fxcrt/fx_basic.h"
@@ -76,5 +76,4 @@ protected:
 	v8::Global<v8::Context> m_context;
 };
 
-#endif //_JS_RUNTIME_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_RUNTIME_H_
diff --git a/fpdfsdk/include/javascript/JS_Value.h b/fpdfsdk/include/javascript/JS_Value.h
index faa612d21e..245b736cdf 100644
--- a/fpdfsdk/include/javascript/JS_Value.h
+++ b/fpdfsdk/include/javascript/JS_Value.h
@@ -4,11 +4,11 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_VALUE_H_
-#define _JS_VALUE_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_VALUE_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_VALUE_H_
 
-#include "../jsapi/fxjs_v8.h"
 #include "../../../core/include/fxcrt/fx_basic.h"
+#include "../jsapi/fxjs_v8.h"
 
 class CJS_Array;
 class CJS_Date;
@@ -186,5 +186,4 @@ protected:
 	v8::Isolate* m_isolate;
 };
 
-#endif //_JS_VALUE_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_VALUE_H_
diff --git a/fpdfsdk/include/javascript/JavaScript.h b/fpdfsdk/include/javascript/JavaScript.h
index e43b231d30..d96c6cac42 100644
--- a/fpdfsdk/include/javascript/JavaScript.h
+++ b/fpdfsdk/include/javascript/JavaScript.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef JAVASCRIPT_H_
-#define JAVASCRIPT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JAVASCRIPT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JAVASCRIPT_H_
 
 #include <string>
 #include <vector>
@@ -24,4 +24,4 @@
 #include "../pdfwindow/IPDFWindow.h"
 #include "../fpdfxfa/fpdfxfa_app.h"
 
-#endif  // JAVASCRIPT_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JAVASCRIPT_H_
diff --git a/fpdfsdk/include/javascript/PublicMethods.h b/fpdfsdk/include/javascript/PublicMethods.h
index e7a4010016..375ae1fcfe 100644
--- a/fpdfsdk/include/javascript/PublicMethods.h
+++ b/fpdfsdk/include/javascript/PublicMethods.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PUBLICMETHODS_H_
-#define _PUBLICMETHODS_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_PUBLICMETHODS_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_PUBLICMETHODS_H_
 
 #include "JS_Define.h"
 
@@ -100,4 +100,4 @@ public:
 	static CJS_Array		AF_MakeArrayFromList(v8::Isolate* isolate, CJS_Value val);
 };
 
-#endif //_PUBLICMETHODS_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_PUBLICMETHODS_H_
diff --git a/fpdfsdk/include/javascript/app.h b/fpdfsdk/include/javascript/app.h
index a515df4770..7e51f73135 100644
--- a/fpdfsdk/include/javascript/app.h
+++ b/fpdfsdk/include/javascript/app.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _APP_H_
-#define _APP_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_APP_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_APP_H_
 
 #include "JS_Define.h"
 
@@ -220,4 +220,4 @@ public:
 
 };
 
-#endif //_APP_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_APP_H_
diff --git a/fpdfsdk/include/javascript/color.h b/fpdfsdk/include/javascript/color.h
index 6eeb37be7e..8aab76fffe 100644
--- a/fpdfsdk/include/javascript/color.h
+++ b/fpdfsdk/include/javascript/color.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _COLOR_H_
-#define _COLOR_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_COLOR_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_COLOR_H_
 
 #include "JS_Define.h"
 // TODO(tsepez): include CPWL_Color.h once its own IWYU is fixed.
@@ -77,5 +77,4 @@ public:
 
 };
 
-#endif //_COLOR_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_COLOR_H_
diff --git a/fpdfsdk/include/javascript/console.h b/fpdfsdk/include/javascript/console.h
index 60326aaf8b..d49ea418eb 100644
--- a/fpdfsdk/include/javascript/console.h
+++ b/fpdfsdk/include/javascript/console.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _CONSOLE_H_
-#define _CONSOLE_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_CONSOLE_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_CONSOLE_H_
 
 #include "JS_Define.h"
 
@@ -36,5 +36,4 @@ public:
 	JS_STATIC_METHOD(show, console);
 };
 
-#endif //_CONSOLE_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_CONSOLE_H_
diff --git a/fpdfsdk/include/javascript/event.h b/fpdfsdk/include/javascript/event.h
index b3418c2b71..f43def973a 100644
--- a/fpdfsdk/include/javascript/event.h
+++ b/fpdfsdk/include/javascript/event.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _EVENT_H_
-#define _EVENT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_EVENT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_EVENT_H_
 
 #include "JS_Define.h"
 
@@ -69,4 +69,4 @@ public:
 	JS_STATIC_PROP(willCommit, event);
 };
 
-#endif //_EVENT_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_EVENT_H_
diff --git a/fpdfsdk/include/javascript/global.h b/fpdfsdk/include/javascript/global.h
index 2690f6822c..fac93d8e5b 100644
--- a/fpdfsdk/include/javascript/global.h
+++ b/fpdfsdk/include/javascript/global.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _GLOBAL_H_
-#define _GLOBAL_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_
 
 #include "JS_Define.h"
 
@@ -86,4 +86,4 @@ public:
 
 };
 
-#endif //_GLOBAL_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_
diff --git a/fpdfsdk/include/javascript/report.h b/fpdfsdk/include/javascript/report.h
index 05e7ddd803..9705adac88 100644
--- a/fpdfsdk/include/javascript/report.h
+++ b/fpdfsdk/include/javascript/report.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _REPORT_H_
-#define _REPORT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_REPORT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_REPORT_H_
 
 #include "JS_Define.h"
 
@@ -33,5 +33,4 @@ public:
 	JS_STATIC_METHOD(writeText, Report);
 };
 
-#endif //_REPORT_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_REPORT_H_
diff --git a/fpdfsdk/include/javascript/util.h b/fpdfsdk/include/javascript/util.h
index 7601f7a4e5..b621067bc3 100644
--- a/fpdfsdk/include/javascript/util.h
+++ b/fpdfsdk/include/javascript/util.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _UTIL_H_
-#define _UTIL_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_UTIL_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_UTIL_H_
 
 #include <string>  // For std::wstring.
 
@@ -46,4 +46,5 @@ public:
 };
 
 FX_INT64 FX_atoi64(const char *nptr);
-#endif //_UTIL_H_
+
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_UTIL_H_
diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h
index cc1eb6b2c1..f5d699287d 100644
--- a/fpdfsdk/include/jsapi/fxjs_v8.h
+++ b/fpdfsdk/include/jsapi/fxjs_v8.h
@@ -7,8 +7,8 @@
 // PDFium wrapper around V8 APIs. PDFium code should include this file rather
 // than including V8 headers directly.
 
-#ifndef FXJSAPI_H
-#define FXJSAPI_H
+#ifndef FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_
+#define FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_
 
 #include <v8.h>
 #include "../../../core/include/fxcrt/fx_string.h"  // For CFX_WideString
@@ -136,4 +136,4 @@ double							JS_MakeDate(double day, double time);
 bool							JS_PortIsNan(double d);
 double							JS_LocalTime(double d);
 
-#endif //FXJSAPI_H
+#endif  // FPDFSDK_INCLUDE_JSAPI_FXJS_V8_H_
diff --git a/fpdfsdk/include/pdfwindow/IPDFWindow.h b/fpdfsdk/include/pdfwindow/IPDFWindow.h
index 472737a2e3..0191cac639 100644
--- a/fpdfsdk/include/pdfwindow/IPDFWindow.h
+++ b/fpdfsdk/include/pdfwindow/IPDFWindow.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _IPDFWINDOW_H_
-#define _IPDFWINDOW_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_IPDFWINDOW_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_IPDFWINDOW_H_
 
 #include "PWL_Button.h"
 #include "PWL_Caret.h"
@@ -25,4 +25,4 @@
 #include "PWL_Utils.h"
 #include "PWL_Wnd.h"
 
-#endif //_IPDFWINDOW_H_
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_IPDFWINDOW_H_
diff --git a/fpdfsdk/include/pdfwindow/PDFWindow.h b/fpdfsdk/include/pdfwindow/PDFWindow.h
index dafc7452f2..3cd1e02878 100644
--- a/fpdfsdk/include/pdfwindow/PDFWindow.h
+++ b/fpdfsdk/include/pdfwindow/PDFWindow.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef PDFWINDOW_H_
-#define PDFWINDOW_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_
 
 #include "../../../core/include/fpdfapi/fpdf_module.h"
 #include "../../../core/include/fpdfdoc/fpdf_doc.h"
@@ -15,4 +15,4 @@
 #include "../fx_systemhandler.h"
 #include "../fxedit/fx_edit.h"
 
-#endif  // PDFWINDOW_H_
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Button.h b/fpdfsdk/include/pdfwindow/PWL_Button.h
index 72adcf9546..9141cf047c 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Button.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Button.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_BUTTON_H_
-#define _PWL_BUTTON_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_BUTTON_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_BUTTON_H_
 
 #include "PWL_Wnd.h"
 
@@ -24,4 +24,4 @@ protected:
 	FX_BOOL						m_bMouseDown;
 };
 
-#endif
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_BUTTON_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Caret.h b/fpdfsdk/include/pdfwindow/PWL_Caret.h
index 2dfef2ae92..b827f18d3f 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Caret.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Caret.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_CARET_H_
-#define _PWL_CARET_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_CARET_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_CARET_H_
 
 #include "PWL_Wnd.h"
 
@@ -50,5 +50,4 @@ private:
 	CPDF_Rect					m_rcInvalid;
 };
 
-#endif
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_CARET_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
index 0b86add467..826f4dcc3e 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_COMBOBOX_H_
-#define _PWL_COMBOBOX_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_COMBOBOX_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_COMBOBOX_H_
 
 #include "PWL_Edit.h"
 #include "PWL_ListBox.h"
@@ -115,5 +115,4 @@ private:
 	void*							m_pFormFiller;
 };
 
-#endif // !defined(AFX_PWL_COMBOBOX_H__9D6645F8_64AA_4806_94E8_95FDEDD39C17__INCLUDED_)
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_COMBOBOX_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h
index 85ed5e8f91..5b0e7dd1ff 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Edit.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_EDIT_H_
-#define _PWL_EDIT_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_
 
 #include "../../../core/include/fxcrt/fx_basic.h"
 #include "PWL_EditCtrl.h"
@@ -142,5 +142,4 @@ private:
 	void*							m_pFormFiller;
 };
 
-#endif 
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
index d179e69938..600c348446 100644
--- a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
+++ b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_EDITCTRL_H_
-#define _PWL_EDITCTRL_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
 
 #include "../../../core/include/fxcrt/fx_string.h"
 #include "../fxedit/fx_edit.h"
@@ -173,5 +173,4 @@ private:
 	FX_INT32						m_nCodePage;
 };
 
-#endif
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_FontMap.h b/fpdfsdk/include/pdfwindow/PWL_FontMap.h
index 2ff6c0f38c..cdce862b29 100644
--- a/fpdfsdk/include/pdfwindow/PWL_FontMap.h
+++ b/fpdfsdk/include/pdfwindow/PWL_FontMap.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_FONTMAP_H_
-#define _PWL_FONTMAP_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_
 
 #include "../../../public/fpdf_sysfontinfo.h"
 #include "../fxedit/fx_edit.h"
@@ -136,4 +136,4 @@ private:
 	CPDF_Document*								m_pAttachedDoc;
 };
 
-#endif
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h
index 08f3e4fd8b..cb56a9929e 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Icon.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Icon.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_ICON_H_
-#define _PWL_ICON_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_
 
 #include "../../../core/include/fxcrt/fx_string.h"
 #include "PWL_Wnd.h"
@@ -57,6 +57,4 @@ private:
 };
 
 
-#endif // !defined(AFX_PWL_BUTTON_H__5A6080AA_33C5_4FC9_91FC_D9644C41120A__INCLUDED_)
-
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_IconList.h b/fpdfsdk/include/pdfwindow/PWL_IconList.h
index b85ba4955e..d074b76be1 100644
--- a/fpdfsdk/include/pdfwindow/PWL_IconList.h
+++ b/fpdfsdk/include/pdfwindow/PWL_IconList.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_IconList_H_
-#define _PWL_IconList_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_
 
 #include "../../../core/include/fxcrt/fx_string.h"
 #include "PWL_ListCtrl.h"
@@ -124,7 +124,5 @@ private:
 	CPWL_IconList_Content*				m_pListContent;
 	FX_INT32							m_nListCount;
 };
- 
-#endif //_PWL_IconList_H_
-
 
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Label.h b/fpdfsdk/include/pdfwindow/PWL_Label.h
index 811a3dae07..f724a0a82b 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Label.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Label.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_LABEL_H_
-#define _PWL_LABEL_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LABEL_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LABEL_H_
 
 #include "PWL_Wnd.h"
 
@@ -42,6 +42,4 @@ private:
 	IFX_Edit*						m_pEdit;
 };
 
-#endif
-
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_LABEL_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_ListBox.h b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
index a31818f274..e8e9036b8e 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_LISTBOX_H_
-#define _PWL_LISTBOX_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_
 
 #include "../fxedit/fx_edit.h"
 #include "PWL_Wnd.h"
@@ -101,6 +101,4 @@ private:
 	void*							m_pFormFiller;
 };
 
-#endif // !defined(AFX_PWL_LISTBOX_H__F8C0DD72_CC3C_4806_86FB_E9D02B04A34B__INCLUDED_)
-
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h
index 5a1f06045a..65df7aecfc 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_LISTCTRL_H_
-#define _PWL_LISTCTRL_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTCTRL_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTCTRL_H_
 
 #include "PWL_Wnd.h"
 
@@ -44,5 +44,4 @@ private:
 	FX_FLOAT							m_fBottomSpace;
 };
 
-#endif
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTCTRL_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Note.h b/fpdfsdk/include/pdfwindow/PWL_Note.h
index 25290928db..c5cdc4dd9c 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Note.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Note.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_NOTE_H_
-#define _PWL_NOTE_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_
 
 #include "PWL_Button.h"
 #include "PWL_Edit.h"
@@ -357,5 +357,4 @@ private:
 	CFX_WideString						m_sReplyString;
 };
 
-#endif
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
index dc1f18fce9..2f0473f1d2 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_SCROLLBAR_H_
-#define _PWL_SCROLLBAR_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_
 
 #include "PWL_Wnd.h"
 
@@ -163,6 +163,4 @@ private:
 	FX_FLOAT					m_fOldPosButton;
 };
 
-#endif // !defined(AFX_PWL_SCROLLBAR_H__DCFEC082_2651_48A4_B8F3_63F1B3CC5E10__INCLUDED_)
-
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Signature.h b/fpdfsdk/include/pdfwindow/PWL_Signature.h
index 6860d814c0..bdc1406a3d 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Signature.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Signature.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_SIGNATURE_H_
-#define _PWL_SIGNATURE_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SIGNATURE_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SIGNATURE_H_
 
 #include "PWL_Icon.h"
 #include "PWL_Wnd.h"
@@ -64,6 +64,4 @@ private:
 	FX_BOOL								m_bFlagExist;
 };
 
-#endif // _PWL_SIGNATURE_H_
-
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_SIGNATURE_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h b/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h
index 2df3d5d369..9b4ffd2341 100644
--- a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h
+++ b/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_SPECIALBUTTON_H_
-#define _PWL_SPECIALBUTTON_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SPECIALBUTTON_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SPECIALBUTTON_H_
 
 #include "PWL_Button.h"
 
@@ -53,6 +53,4 @@ private:
 	FX_BOOL						m_bChecked;
 };
 
-#endif
-
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_SPECIALBUTTON_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Utils.h b/fpdfsdk/include/pdfwindow/PWL_Utils.h
index 3eeaa7ac81..51514f2513 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Utils.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Utils.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_UTILS_H_
-#define _PWL_UTILS_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_
 
 #include "../../../core/include/fpdfapi/fpdf_parser.h"  // For CPDF_Point.
 #include "../../../core/include/fpdfdoc/fpdf_vt.h"  // For CPVT_WordRange.
@@ -240,6 +240,4 @@ private:
 	static void								GetGraphics_Foxit(CFX_ByteString& sPathData, CFX_PathData& path, const CPDF_Rect& crBBox, const PWL_PATH_TYPE type);
 };
 
-#endif // !defined(AFX_PWL_UTILS_H__D32812AD_A875_4E08_9D3C_0A57020987C6__INCLUDED_)
-
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
index 8b766ec984..4fa1c7639b 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PWL_WND_H_
-#define _PWL_WND_H_
+#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_
+#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_
 
 #include "../../../core/include/fxcrt/fx_basic.h"
 #include "../../../core/include/fpdfdoc/fpdf_doc.h"
@@ -474,28 +474,4 @@ private:
 	FX_BOOL							m_bEnabled;
 };
 
-// #ifndef VK_END
-// 
-// #define VK_END            0x23
-// #define VK_HOME           0x24
-// #define VK_LEFT           0x25
-// #define VK_UP             0x26
-// #define VK_RIGHT          0x27
-// #define VK_DOWN           0x28
-// #define VK_INSERT         0x2D
-// #define VK_DELETE         0x2E
-// 
-// #define VK_BACK           0x08
-// #define VK_TAB            0x09
-// 
-// #define VK_CLEAR          0x0C
-// #define VK_RETURN         0x0D
-// #define VK_ESCAPE         0x1B
-// #define VK_SPACE          0x20
-// #endif
-// 
-// #define VK_NONE			  0
-
-#endif // !defined(AFX_PWL_WND_H__D32812AD_A875_4E08_9D3C_0A57020987C6__INCLUDED_)
-
-
+#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_
diff --git a/fpdfsdk/src/resource.h b/fpdfsdk/src/resource.h
index b58f09272f..1ba20957a6 100644
--- a/fpdfsdk/src/resource.h
+++ b/fpdfsdk/src/resource.h
@@ -4,13 +4,15 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#ifndef FPDFSDK_SRC_RESOURCE_H_
+#define FPDFSDK_SRC_RESOURCE_H_
+
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
 // Used by fpdfsdkdll.rc
 //
-
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        104
@@ -19,3 +21,5 @@
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
+
+#endif  // FPDFSDK_SRC_RESOURCE_H_
-- 
cgit v1.2.3