1 files changed, 5 insertions, 3 deletions
diff --git a/gfx/angle/src/compiler/preprocessor/ExpressionParser.h b/gfx/angle/src/compiler/preprocessor/ExpressionParser.h
index 0f2901b87..841c67b61 100755
--- a/gfx/angle/src/compiler/preprocessor/ExpressionParser.h
+++ b/gfx/angle/src/compiler/preprocessor/ExpressionParser.h
@@ -7,8 +7,8 @@
 #ifndef COMPILER_PREPROCESSOR_EXPRESSIONPARSER_H_
 #define COMPILER_PREPROCESSOR_EXPRESSIONPARSER_H_
 
-#include "common/angleutils.h"
-#include "compiler/preprocessor/DiagnosticsBase.h"
+#include "DiagnosticsBase.h"
+#include "pp_utils.h"
 
 namespace pp
 {
@@ -16,7 +16,7 @@ namespace pp
 class Lexer;
 struct Token;
 
-class ExpressionParser : angle::NonCopyable
+class ExpressionParser
 {
   public:
     struct ErrorSettings
@@ -34,6 +34,8 @@ class ExpressionParser : angle::NonCopyable
                bool *valid);
 
   private:
+    PP_DISALLOW_COPY_AND_ASSIGN(ExpressionParser);
+
     Lexer *mLexer;
     Diagnostics *mDiagnostics;
 };