13 files changed, 64 insertions, 39 deletions
diff --git a/xfa/include/fwl/theme/barcodetp.h b/xfa/include/fwl/theme/barcodetp.h
index 7a16afcac3..8ae47979d6 100644
--- a/xfa/include/fwl/theme/barcodetp.h
+++ b/xfa/include/fwl/theme/barcodetp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_BARCODETP_H
-#define _FWL_BARCODETP_H
+#ifndef XFA_INCLUDE_FWL_THEME_BARCODETP_H_
+#define XFA_INCLUDE_FWL_THEME_BARCODETP_H_
+
 class CFWL_WidgetTP;
 class CFWL_BarcodeTP;
 class CFWL_BarcodeTP : public CFWL_WidgetTP {
@@ -15,4 +16,5 @@ class CFWL_BarcodeTP : public CFWL_WidgetTP {
   virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget);
   virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_BARCODETP_H_
diff --git a/xfa/include/fwl/theme/carettp.h b/xfa/include/fwl/theme/carettp.h
index f3f5992636..0ce0c641dd 100644
--- a/xfa/include/fwl/theme/carettp.h
+++ b/xfa/include/fwl/theme/carettp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_CARETTP_H
-#define _FWL_CARETTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_CARETTP_H_
+#define XFA_INCLUDE_FWL_THEME_CARETTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_CaretTP;
 class CFWL_CaretTP : public CFWL_WidgetTP {
@@ -22,4 +23,5 @@ class CFWL_CaretTP : public CFWL_WidgetTP {
                    CFX_Color* crFill,
                    CFX_Matrix* pMatrix = NULL);
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_CARETTP_H_
diff --git a/xfa/include/fwl/theme/checkboxtp.h b/xfa/include/fwl/theme/checkboxtp.h
index edc3f7170f..5b25379dc6 100644
--- a/xfa/include/fwl/theme/checkboxtp.h
+++ b/xfa/include/fwl/theme/checkboxtp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_CHECKBOXTP_H
-#define _FWL_CHECKBOXTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_CHECKBOXTP_H_
+#define XFA_INCLUDE_FWL_THEME_CHECKBOXTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_CheckBoxTP;
 class CFWL_CheckBoxTP : public CFWL_WidgetTP {
@@ -78,4 +79,5 @@ class CFWL_CheckBoxTP : public CFWL_WidgetTP {
   } * m_pThemeData;
   CFX_Path* m_pCheckPath;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_CHECKBOXTP_H_
diff --git a/xfa/include/fwl/theme/comboboxtp.h b/xfa/include/fwl/theme/comboboxtp.h
index 84dbdbabf3..8b6a221920 100644
--- a/xfa/include/fwl/theme/comboboxtp.h
+++ b/xfa/include/fwl/theme/comboboxtp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_COMBOBOXTP_H
-#define _FWL_COMBOBOXTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_COMBOBOXTP_H_
+#define XFA_INCLUDE_FWL_THEME_COMBOBOXTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_ComboBoxTP;
 class CFWL_ComboBoxTP : public CFWL_WidgetTP {
@@ -24,4 +25,5 @@ class CFWL_ComboBoxTP : public CFWL_WidgetTP {
                          FX_DWORD dwStates,
                          CFX_Matrix* pMatrix);
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_COMBOBOXTP_H_
diff --git a/xfa/include/fwl/theme/datetimepickertp.h b/xfa/include/fwl/theme/datetimepickertp.h
index 5fe43f3d49..400795da6e 100644
--- a/xfa/include/fwl/theme/datetimepickertp.h
+++ b/xfa/include/fwl/theme/datetimepickertp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_DATETIMEPICKERTP_H
-#define _FWL_DATETIMEPICKERTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_DATETIMEPICKERTP_H_
+#define XFA_INCLUDE_FWL_THEME_DATETIMEPICKERTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_DateTimePickerTP;
 class CFWL_DateTimePickerTP : public CFWL_WidgetTP {
@@ -22,4 +23,5 @@ class CFWL_DateTimePickerTP : public CFWL_WidgetTP {
     FX_ARGB BoxBkColor[13][2];
   } * m_pThemeData;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_DATETIMEPICKERTP_H_
diff --git a/xfa/include/fwl/theme/edittp.h b/xfa/include/fwl/theme/edittp.h
index babea93807..681e579a70 100644
--- a/xfa/include/fwl/theme/edittp.h
+++ b/xfa/include/fwl/theme/edittp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_EDITTP_H
-#define _FWL_EDITTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_EDITTP_H_
+#define XFA_INCLUDE_FWL_THEME_EDITTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_EditTP;
 class CFWL_EditTP : public CFWL_WidgetTP {
@@ -17,4 +18,5 @@ class CFWL_EditTP : public CFWL_WidgetTP {
   virtual FWL_ERR Initialize();
   virtual FWL_ERR Finalize();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_EDITTP_H_
diff --git a/xfa/include/fwl/theme/formtp.h b/xfa/include/fwl/theme/formtp.h
index 83085040b1..61a7b24ab9 100644
--- a/xfa/include/fwl/theme/formtp.h
+++ b/xfa/include/fwl/theme/formtp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_FORM_THEMEPROVIDER_H
-#define _FWL_FORM_THEMEPROVIDER_H
+#ifndef XFA_INCLUDE_FWL_THEME_FORMTP_H_
+#define XFA_INCLUDE_FWL_THEME_FORMTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_FormTP;
 class CFWL_FormTP : public CFWL_WidgetTP {
@@ -105,4 +106,5 @@ class CFWL_FormTP : public CFWL_WidgetTP {
     FX_ARGB clrTransWhite;
   } * m_pThemeData;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_FORMTP_H_
diff --git a/xfa/include/fwl/theme/listboxtp.h b/xfa/include/fwl/theme/listboxtp.h
index c44fcc72bc..efab981a0d 100644
--- a/xfa/include/fwl/theme/listboxtp.h
+++ b/xfa/include/fwl/theme/listboxtp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_LISTBOXTP_H
-#define _FWL_LISTBOXTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_LISTBOXTP_H_
+#define XFA_INCLUDE_FWL_THEME_LISTBOXTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_ScrollBarTP;
 class CFWL_ListBoxTP;
@@ -25,4 +26,5 @@ class CFWL_ListBoxTP : public CFWL_WidgetTP {
                        void* pData = NULL,
                        CFX_Matrix* pMatrix = NULL);
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_LISTBOXTP_H_
diff --git a/xfa/include/fwl/theme/monthcalendartp.h b/xfa/include/fwl/theme/monthcalendartp.h
index 27773df1e0..da9fadbcaf 100644
--- a/xfa/include/fwl/theme/monthcalendartp.h
+++ b/xfa/include/fwl/theme/monthcalendartp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_MONTHCALENDARTP_H
-#define _FWL_MONTHCALENDARTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_MONTHCALENDARTP_H_
+#define XFA_INCLUDE_FWL_THEME_MONTHCALENDARTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_MonthCalendarTP;
 class CFWL_MonthCalendarTP : public CFWL_WidgetTP {
@@ -46,4 +47,5 @@ class CFWL_MonthCalendarTP : public CFWL_WidgetTP {
   } * m_pThemeData;
   CFX_WideString wsResource;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_MONTHCALENDARTP_H_
diff --git a/xfa/include/fwl/theme/pictureboxtp.h b/xfa/include/fwl/theme/pictureboxtp.h
index f15b220093..7621d3b8f8 100644
--- a/xfa/include/fwl/theme/pictureboxtp.h
+++ b/xfa/include/fwl/theme/pictureboxtp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_PICTUREBOXTP_H
-#define _FWL_PICTUREBOXTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_PICTUREBOXTP_H_
+#define XFA_INCLUDE_FWL_THEME_PICTUREBOXTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_PictureBoxTP;
 class CFWL_PictureBoxTP : public CFWL_WidgetTP {
@@ -15,4 +16,5 @@ class CFWL_PictureBoxTP : public CFWL_WidgetTP {
   virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget);
   virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_PICTUREBOXTP_H_
diff --git a/xfa/include/fwl/theme/pushbuttontp.h b/xfa/include/fwl/theme/pushbuttontp.h
index 632ded96c7..43fcca7073 100644
--- a/xfa/include/fwl/theme/pushbuttontp.h
+++ b/xfa/include/fwl/theme/pushbuttontp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_PUSHBUTTONTP_H
-#define _FWL_PUSHBUTTONTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_PUSHBUTTONTP_H_
+#define XFA_INCLUDE_FWL_THEME_PUSHBUTTONTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_PushButtonTP;
 class CFWL_PushButtonTP : public CFWL_WidgetTP {
@@ -39,4 +40,5 @@ class CFWL_PushButtonTP : public CFWL_WidgetTP {
     FX_ARGB clrFill[5];
   } * m_pThemeData;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_PUSHBUTTONTP_H_
diff --git a/xfa/include/fwl/theme/scrollbartp.h b/xfa/include/fwl/theme/scrollbartp.h
index d708066d4d..e9bd200827 100644
--- a/xfa/include/fwl/theme/scrollbartp.h
+++ b/xfa/include/fwl/theme/scrollbartp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_SCROLLBARTP_H
-#define _FWL_SCROLLBARTP_H
+#ifndef XFA_INCLUDE_FWL_THEME_SCROLLBARTP_H_
+#define XFA_INCLUDE_FWL_THEME_SCROLLBARTP_H_
+
 class CFWL_WidgetTP;
 class CFWL_ScrollBarTP;
 class CFWL_ScrollBarTP : public CFWL_WidgetTP {
@@ -52,4 +53,5 @@ class CFWL_ScrollBarTP : public CFWL_WidgetTP {
     FX_ARGB clrTrackBKEnd;
   } * m_pThemeData;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_SCROLLBARTP_H_
diff --git a/xfa/include/fwl/theme/utils.h b/xfa/include/fwl/theme/utils.h
index bd9474351f..abbb47ef8f 100644
--- a/xfa/include/fwl/theme/utils.h
+++ b/xfa/include/fwl/theme/utils.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_THEME_UTILS_H_
-#define FWL_THEME_UTILS_H_
+#ifndef XFA_INCLUDE_FWL_THEME_UTILS_H_
+#define XFA_INCLUDE_FWL_THEME_UTILS_H_
 
 #include "core/include/fxcrt/fx_system.h"
 
@@ -72,4 +72,5 @@ typedef struct _FWLCOLOR {
 #define FWLTHEME_CAPACITY_ScrollBarWidth 17.0f
 #define FWLTHEME_CAPACITY_CXBorder 1.0f
 #define FWLTHEME_CAPACITY_CYBorder 1.0f
-#endif
+
+#endif  // XFA_INCLUDE_FWL_THEME_UTILS_H_