11 files changed, 51 insertions, 33 deletions
diff --git a/xfa/include/fwl/lightwidget/app.h b/xfa/include/fwl/lightwidget/app.h
index 5a8cc89775..1049e8abcd 100644
--- a/xfa/include/fwl/lightwidget/app.h
+++ b/xfa/include/fwl/lightwidget/app.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_LIGHTWIDGET_APP_H_
-#define FWL_LIGHTWIDGET_APP_H_
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_APP_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_APP_H_
 
 class CFWL_Theme;
 class IFWL_App;
@@ -25,4 +25,5 @@ class CFWL_App {
   IFWL_App* m_pIface;
   CFWL_Theme* m_pTheme;
 };
-#endif  // FWL_LIGHTWIDGET_APP_H_
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_APP_H_
diff --git a/xfa/include/fwl/lightwidget/barcode.h b/xfa/include/fwl/lightwidget/barcode.h
index 99a3713955..32505f16d5 100644
--- a/xfa/include/fwl/lightwidget/barcode.h
+++ b/xfa/include/fwl/lightwidget/barcode.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_BARCODE_LIGHT_H
-#define _FWL_BARCODE_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_BARCODE_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_BARCODE_H_
+
 class CFWL_Widget;
 class CFWL_WidgetProperties;
 class IFWL_BarcodeDP;
@@ -114,4 +115,5 @@ class CFWL_Barcode : public CFWL_Edit {
   };
   CFWL_BarcodeDP m_barcodeData;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_BARCODE_H_
diff --git a/xfa/include/fwl/lightwidget/caret.h b/xfa/include/fwl/lightwidget/caret.h
index d7284dff43..db7e09d188 100644
--- a/xfa/include/fwl/lightwidget/caret.h
+++ b/xfa/include/fwl/lightwidget/caret.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_CARET_LIGHT_H
-#define _FWL_CARET_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_CARET_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_CARET_H_
+
 class CFWL_Widget;
 class CFWL_WidgetProperties;
 class CFWL_Caret;
@@ -22,4 +23,5 @@ class CFWL_Caret : public CFWL_Widget {
   CFWL_Caret();
   virtual ~CFWL_Caret();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_CARET_H_
diff --git a/xfa/include/fwl/lightwidget/checkbox.h b/xfa/include/fwl/lightwidget/checkbox.h
index c0d5aaaa55..c357de9f81 100644
--- a/xfa/include/fwl/lightwidget/checkbox.h
+++ b/xfa/include/fwl/lightwidget/checkbox.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_CHECKBOX_LIGHT_H
-#define _FWL_CHECKBOX_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_CHECKBOX_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_CHECKBOX_H_
+
 class CFWL_Widget;
 class CFWL_WidgetProperties;
 class IFWL_CheckBoxDP;
@@ -35,4 +36,5 @@ class CFWL_CheckBox : public CFWL_Widget {
   };
   CFWL_CheckBoxDP m_checkboxData;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_CHECKBOX_H_
diff --git a/xfa/include/fwl/lightwidget/datetimepicker.h b/xfa/include/fwl/lightwidget/datetimepicker.h
index 6b7a6b017c..e29e51879b 100644
--- a/xfa/include/fwl/lightwidget/datetimepicker.h
+++ b/xfa/include/fwl/lightwidget/datetimepicker.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_DATETIMEPICKER_LIGHT_H
-#define _FWL_DATETIMEPICKER_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_DATETIMEPICKER_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_DATETIMEPICKER_H_
+
 class CFWL_Widget;
 class CFWL_WidgetProperties;
 class IFWL_DateTimePickerDP;
@@ -58,4 +59,5 @@ class CFWL_DateTimePicker : public CFWL_Widget {
   };
   CFWL_DateTimePickerDP m_DateTimePickerDP;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_DATETIMEPICKER_H_
diff --git a/xfa/include/fwl/lightwidget/edit.h b/xfa/include/fwl/lightwidget/edit.h
index b1dc79cfc7..24a04a35eb 100644
--- a/xfa/include/fwl/lightwidget/edit.h
+++ b/xfa/include/fwl/lightwidget/edit.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_LIGHTWIDGET_EDIT_H_
-#define FWL_LIGHTWIDGET_EDIT_H_
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_EDIT_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_EDIT_H_
 
 #include <vector>
 
@@ -64,4 +64,4 @@ class CFWL_Edit : public CFWL_Widget {
   virtual ~CFWL_Edit();
 };
 
-#endif  // FWL_LIGHTWIDGET_EDIT_H_
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_EDIT_H_
diff --git a/xfa/include/fwl/lightwidget/picturebox.h b/xfa/include/fwl/lightwidget/picturebox.h
index 11c0e3badb..bd994ac1e8 100644
--- a/xfa/include/fwl/lightwidget/picturebox.h
+++ b/xfa/include/fwl/lightwidget/picturebox.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_PICTUREBOX_LIGHT_H
-#define _FWL_PICTUREBOX_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_PICTUREBOX_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_PICTUREBOX_H_
+
 class CFWL_Widget;
 class CFWL_WidgetProperties;
 class IFWL_PictureBoxDP;
@@ -60,4 +61,5 @@ class CFWL_PictureBox : public CFWL_Widget {
   };
   CFWL_PictureBoxDP m_PictureBoxDP;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_PICTUREBOX_H_
diff --git a/xfa/include/fwl/lightwidget/pushbutton.h b/xfa/include/fwl/lightwidget/pushbutton.h
index 3874289a02..709a52710a 100644
--- a/xfa/include/fwl/lightwidget/pushbutton.h
+++ b/xfa/include/fwl/lightwidget/pushbutton.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_PUSHBUTTON_LIGHT_H
-#define _FWL_PUSHBUTTON_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_PUSHBUTTON_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_PUSHBUTTON_H_
+
 class CFWL_Widget;
 class CFWL_WidgetProperties;
 class IFWL_PushButtonDP;
@@ -33,4 +34,5 @@ class CFWL_PushButton : public CFWL_Widget {
   };
   CFWL_PushButtonDP m_buttonData;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_PUSHBUTTON_H_
diff --git a/xfa/include/fwl/lightwidget/scrollbar.h b/xfa/include/fwl/lightwidget/scrollbar.h
index e28bdaaae8..e835bdeb5a 100644
--- a/xfa/include/fwl/lightwidget/scrollbar.h
+++ b/xfa/include/fwl/lightwidget/scrollbar.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_SCROLLBAR_LIGHT_H
-#define _FWL_SCROLLBAR_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_SCROLLBAR_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_SCROLLBAR_H_
+
 class CFWL_Widget;
 class CFWL_WidgetProperties;
 class CFWL_ScrollBar;
@@ -28,4 +29,5 @@ class CFWL_ScrollBar : public CFWL_Widget {
   CFWL_ScrollBar();
   virtual ~CFWL_ScrollBar();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_SCROLLBAR_H_
diff --git a/xfa/include/fwl/lightwidget/tooltipctrl.h b/xfa/include/fwl/lightwidget/tooltipctrl.h
index ed8396e7e6..fb82548ca0 100644
--- a/xfa/include/fwl/lightwidget/tooltipctrl.h
+++ b/xfa/include/fwl/lightwidget/tooltipctrl.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_ToolTip_LIGHT_H
-#define _FWL_ToolTip_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIP_CTRL_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIP_CTRL_H_
+
 class CFWL_Widget;
 class CFWL_WidgetProperties;
 class IFWL_ToolTipDP;
@@ -50,4 +51,5 @@ class CFWL_ToolTip : public CFWL_Widget {
   };
   CFWL_ToolTipDP m_tooltipData;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_TOOLTIP_CTRL_H_
diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h
index a375ee72fd..c10428e505 100644
--- a/xfa/include/fwl/lightwidget/widget.h
+++ b/xfa/include/fwl/lightwidget/widget.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_WIDGET_LIGHT_H
-#define _FWL_WIDGET_LIGHT_H
+#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_WIDGET_H_
+#define XFA_INCLUDE_FWL_LIGHTWIDGET_WIDGET_H_
 
 #include "xfa/include/fwl/core/fwl_widget.h"
 
@@ -104,4 +104,5 @@ class CFWL_WidgetDelegate {
   virtual FWL_ERR OnDrawWidget(CFX_Graphics* pGraphics,
                                const CFX_Matrix* pMatrix = NULL);
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_WIDGET_H_