7 files changed, 39 insertions, 21 deletions
diff --git a/xfa/src/fxjse/src/class.h b/xfa/src/fxjse/src/class.h
index d1c8852a74..763b3236ec 100644
--- a/xfa/src/fxjse/src/class.h
+++ b/xfa/src/fxjse/src/class.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJSE_CLASS_H_
-#define FXJSE_CLASS_H_
+#ifndef XFA_SRC_FXJSE_SRC_CLASS_H_
+#define XFA_SRC_FXJSE_SRC_CLASS_H_
+
 class CFXJSE_Context;
 class CFXJSE_Value;
 class CFXJSE_Class {
@@ -43,4 +44,5 @@ struct CFXJSE_ArgumentsImpl {
   const v8::FunctionCallbackInfo<v8::Value>* m_pInfo;
   CFXJSE_Value* m_pRetValue;
 };
-#endif
+
+#endif  // XFA_SRC_FXJSE_SRC_CLASS_H_
diff --git a/xfa/src/fxjse/src/context.h b/xfa/src/fxjse/src/context.h
index d0267fc852..1b83ebb6d1 100644
--- a/xfa/src/fxjse/src/context.h
+++ b/xfa/src/fxjse/src/context.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJSE_CONTEXT_H_
-#define FXJSE_CONTEXT_H_
+#ifndef XFA_SRC_FXJSE_SRC_CONTEXT_H_
+#define XFA_SRC_FXJSE_SRC_CONTEXT_H_
+
 class CFXJSE_Class;
 class CFXJSE_Value;
 class CFXJSE_Context {
@@ -38,4 +39,5 @@ class CFXJSE_Context {
 };
 v8::Local<v8::Object> FXJSE_CreateReturnValue(v8::Isolate* pIsolate,
                                               v8::TryCatch& trycatch);
-#endif
+
+#endif  // XFA_SRC_FXJSE_SRC_CONTEXT_H_
diff --git a/xfa/src/fxjse/src/fxv8.h b/xfa/src/fxjse/src/fxv8.h
index 4cc7b3f406..433003c4b5 100644
--- a/xfa/src/fxjse/src/fxv8.h
+++ b/xfa/src/fxjse/src/fxv8.h
@@ -4,8 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FX_V8_H_
-#define _FX_V8_H_
+// TODO(thestig): Remove this file and do IWYU.
+
+#ifndef XFA_SRC_FXJSE_SRC_FXV8_H_
+#define XFA_SRC_FXJSE_SRC_FXV8_H_
+
 #include <v8.h>
 #include <libplatform/libplatform.h>
-#endif
+
+#endif  // XFA_SRC_FXJSE_SRC_FXV8_H_
diff --git a/xfa/src/fxjse/src/runtime.h b/xfa/src/fxjse/src/runtime.h
index 8c867ee328..64a3a9454f 100644
--- a/xfa/src/fxjse/src/runtime.h
+++ b/xfa/src/fxjse/src/runtime.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJSE_RUNTIME_H_
-#define FXJSE_RUNTIME_H_
+#ifndef XFA_SRC_FXJSE_SRC_RUNTIME_H_
+#define XFA_SRC_FXJSE_SRC_RUNTIME_H_
+
 class CFXJSE_RuntimeList;
 class CFXJSE_RuntimeData {
  protected:
@@ -41,4 +42,5 @@ class CFXJSE_RuntimeList {
  protected:
   CFX_ArrayTemplate<v8::Isolate*> m_RuntimeList;
 };
-#endif
+
+#endif  // XFA_SRC_FXJSE_SRC_RUNTIME_H_
diff --git a/xfa/src/fxjse/src/scope_inline.h b/xfa/src/fxjse/src/scope_inline.h
index f7e1cdf146..fdce7b37b5 100644
--- a/xfa/src/fxjse/src/scope_inline.h
+++ b/xfa/src/fxjse/src/scope_inline.h
@@ -4,10 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJSE_SCOPE_INLINE_H_
-#define FXJSE_SCOPE_INLINE_H_
+#ifndef XFA_SRC_FXJSE_SRC_SCOPE_INLINE_H_
+#define XFA_SRC_FXJSE_SRC_SCOPE_INLINE_H_
+
 #include "runtime.h"
 #include "context.h"
+
 class CFXJSE_ScopeUtil_IsolateHandle {
  protected:
   v8::Isolate* m_isolate;
@@ -102,4 +104,5 @@ class CFXJSE_ScopeUtil_IsolateHandleRootOrNormalContext {
   void* operator new(size_t size);
   void operator delete(void*, size_t);
 };
-#endif
+
+#endif  // XFA_SRC_FXJSE_SRC_SCOPE_INLINE_H_
diff --git a/xfa/src/fxjse/src/util_inline.h b/xfa/src/fxjse/src/util_inline.h
index 3ab12c1ef4..b6d66ad4f2 100644
--- a/xfa/src/fxjse/src/util_inline.h
+++ b/xfa/src/fxjse/src/util_inline.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJSE_UTIL_INLINE_H_
-#define FXJSE_UTIL_INLINE_H_
+#ifndef XFA_SRC_FXJSE_SRC_UTIL_INLINE_H_
+#define XFA_SRC_FXJSE_SRC_UTIL_INLINE_H_
+
 static V8_INLINE v8::Local<v8::Object> FXJSE_GetGlobalObjectFromContext(
     const v8::Local<v8::Context>& hContext) {
   return hContext->Global()->GetPrototype().As<v8::Object>();
@@ -44,4 +45,5 @@ static V8_INLINE void* FXJSE_RetrieveObjectBinding(
   }
   return hObject->GetAlignedPointerFromInternalField(0);
 }
-#endif
+
+#endif  // XFA_SRC_FXJSE_SRC_UTIL_INLINE_H_
diff --git a/xfa/src/fxjse/src/value.h b/xfa/src/fxjse/src/value.h
index 856bd9c099..ad79e9f0c0 100644
--- a/xfa/src/fxjse/src/value.h
+++ b/xfa/src/fxjse/src/value.h
@@ -4,9 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJSE_VALUE_H_
-#define FXJSE_VALUE_H_
+#ifndef XFA_SRC_FXJSE_SRC_VALUE_H_
+#define XFA_SRC_FXJSE_SRC_VALUE_H_
+
 #include "scope_inline.h"
+
 class CFXJSE_Value {
  public:
   CFXJSE_Value(v8::Isolate* pIsolate) : m_pIsolate(pIsolate) {}
@@ -235,4 +237,5 @@ class CFXJSE_Value {
   friend class CFXJSE_Context;
   friend class CFXJSE_Class;
 };
-#endif
+
+#endif  // XFA_SRC_FXJSE_SRC_VALUE_H_