[flang] Moved public headers to include/flang (flang-compiler/f18#943)

Original-commit: flang-compiler/f18@21adbc7e05
Reviewed-on: https://github.com/flang-compiler/f18/pull/943

flang/.clang-format

@@ -18,7 +18,7 @@ IncludeCategories:
     Priority:        4
   - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
     Priority:        3
-  - Regex:           '^"\.\./'
+  - Regex:           '^"(flang|\.\.)/'
     Priority:        2
   - Regex:           '.*'
     Priority:        1

flang/include/flang/common/Fortran-features.h

@@ -1,4 +1,4 @@
-//===-- lib/common/Fortran-features.h ---------------------------*- C++ -*-===//
+//===-- include/flang/common/Fortran-features.h -----------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,9 +9,9 @@
 #ifndef FORTRAN_COMMON_FORTRAN_FEATURES_H_
 #define FORTRAN_COMMON_FORTRAN_FEATURES_H_
 
-#include "Fortran.h"
-#include "enum-set.h"
-#include "idioms.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/enum-set.h"
+#include "flang/common/idioms.h"
 
 namespace Fortran::common {
 

flang/include/flang/common/Fortran.h

@@ -1,4 +1,4 @@
-//===-- lib/common/Fortran.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/common/Fortran.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/common/bit-population-count.h

@@ -1,4 +1,4 @@
-//===-- lib/common/bit-population-count.h -----------------------*- C++ -*-===//
+//===-- include/flang/common/bit-population-count.h -------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/common/constexpr-bitset.h

@@ -1,4 +1,4 @@
-//===-- lib/common/constexpr-bitset.h ---------------------------*- C++ -*-===//
+//===-- include/flang/common/constexpr-bitset.h -----------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/common/default-kinds.h

@@ -1,4 +1,4 @@
-//===-- lib/common/default-kinds.h ------------------------------*- C++ -*-===//
+//===-- include/flang/common/default-kinds.h --------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,7 +9,7 @@
 #ifndef FORTRAN_COMMON_DEFAULT_KINDS_H_
 #define FORTRAN_COMMON_DEFAULT_KINDS_H_
 
-#include "Fortran.h"
+#include "flang/common/Fortran.h"
 #include <cstdint>
 
 namespace Fortran::common {

flang/include/flang/common/enum-set.h

@@ -1,4 +1,4 @@
-//===-- lib/common/enum-set.h -----------------------------------*- C++ -*-===//
+//===-- include/flang/common/enum-set.h -------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/common/format.h

@@ -1,4 +1,4 @@
-//===-- lib/common/format.h -------------------------------------*- C++ -*-===//
+//===-- include/flang/common/format.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,8 +9,8 @@
 #ifndef FORTRAN_COMMON_FORMAT_H_
 #define FORTRAN_COMMON_FORMAT_H_
 
-#include "Fortran.h"
 #include "enum-set.h"
+#include "flang/common/Fortran.h"
 #include <cstring>
 
 // Define a FormatValidator class template to validate a format expression

flang/include/flang/common/idioms.h

@@ -1,4 +1,4 @@
-//===-- lib/common/idioms.h -------------------------------------*- C++ -*-===//
+//===-- include/flang/common/idioms.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/common/indirection.h

@@ -1,4 +1,4 @@
-//===-- lib/common/indirection.h --------------------------------*- C++ -*-===//
+//===-- include/flang/common/indirection.h ----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/common/interval.h

@@ -1,4 +1,4 @@
-//===-- lib/common/interval.h -----------------------------------*- C++ -*-===//
+//===-- include/flang/common/interval.h -------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/common/leading-zero-bit-count.h

@@ -1,4 +1,4 @@
-//===-- lib/common/leading-zero-bit-count.h ---------------------*- C++ -*-===//
+//===-- include/flang/common/leading-zero-bit-count.h -----------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/common/reference-counted.h

@@ -1,4 +1,4 @@
-//===-- lib/common/reference-counted.h --------------------------*- C++ -*-===//
+//===-- include/flang/common/reference-counted.h ----------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/common/reference.h

@@ -1,4 +1,4 @@
-//===-- lib/common/reference.h ----------------------------------*- C++ -*-===//
+//===-- include/flang/common/reference.h ------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/common/restorer.h

@@ -1,4 +1,4 @@
-//===-- lib/common/restorer.h -----------------------------------*- C++ -*-===//
+//===-- include/flang/common/restorer.h -------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/common/template.h

@@ -1,4 +1,4 @@
-//===-- lib/common/template.h -----------------------------------*- C++ -*-===//
+//===-- include/flang/common/template.h -------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,6 +9,7 @@
 #ifndef FORTRAN_COMMON_TEMPLATE_H_
 #define FORTRAN_COMMON_TEMPLATE_H_
 
+#include "flang/common/idioms.h"
 #include <functional>
 #include <optional>
 #include <tuple>

flang/include/flang/common/uint128.h

@@ -1,4 +1,4 @@
-//===-- lib/common/uint128.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/common/uint128.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/common/unsigned-const-division.h

@@ -1,4 +1,4 @@
-//===-- lib/common/unsigned-const-division.h --------------------*- C++ -*-===//
+//===-- include/flang/common/unsigned-const-division.h ----------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/common/unwrap.h

@@ -1,4 +1,4 @@
-//===-- lib/common/unwrap.h -------------------------------------*- C++ -*-===//
+//===-- include/flang/common/unwrap.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/decimal/binary-floating-point.h

@@ -1,4 +1,4 @@
-//===-- lib/decimal/binary-floating-point.h ---------------------*- C++ -*-===//
+//===-- include/flang/decimal/binary-floating-point.h -----------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -12,7 +12,7 @@
 // Access and manipulate the fields of an IEEE-754 binary
 // floating-point value via a generalized template.
 
-#include "../common/uint128.h"
+#include "flang/common/uint128.h"
 #include <cinttypes>
 #include <climits>
 #include <cstring>

flang/include/flang/decimal/decimal.h

@@ -1,4 +1,4 @@
-/*===-- lib/decimal/decimal.h -------------------------------------*- C++ -*-===
+/*===-- include/flang/decimal/decimal.h ---------------------------*- C++ -*-===
  *
  * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
  * See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/evaluate/call.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/call.h -------------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/call.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -13,10 +13,10 @@
 #include "constant.h"
 #include "formatting.h"
 #include "type.h"
-#include "../common/indirection.h"
-#include "../common/reference.h"
-#include "../parser/char-block.h"
-#include "../semantics/attr.h"
+#include "flang/common/indirection.h"
+#include "flang/common/reference.h"
+#include "flang/parser/char-block.h"
+#include "flang/semantics/attr.h"
 #include <optional>
 #include <ostream>
 #include <vector>

flang/include/flang/evaluate/characteristics.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/characteristics.h --------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/characteristics.h ----------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -17,12 +17,12 @@
 #include "expression.h"
 #include "shape.h"
 #include "type.h"
-#include "../common/Fortran.h"
-#include "../common/enum-set.h"
-#include "../common/idioms.h"
-#include "../common/indirection.h"
-#include "../parser/char-block.h"
-#include "../semantics/symbol.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/enum-set.h"
+#include "flang/common/idioms.h"
+#include "flang/common/indirection.h"
+#include "flang/parser/char-block.h"
+#include "flang/semantics/symbol.h"
 #include <optional>
 #include <ostream>
 #include <string>

flang/include/flang/evaluate/check-expression.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/check-expression.h -------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/check-expression.h ---------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/evaluate/common.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/common.h -----------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/common.h -------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,14 +10,14 @@
 #define FORTRAN_EVALUATE_COMMON_H_
 
 #include "intrinsics-library.h"
-#include "../common/Fortran.h"
-#include "../common/default-kinds.h"
-#include "../common/enum-set.h"
-#include "../common/idioms.h"
-#include "../common/indirection.h"
-#include "../common/restorer.h"
-#include "../parser/char-block.h"
-#include "../parser/message.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/default-kinds.h"
+#include "flang/common/enum-set.h"
+#include "flang/common/idioms.h"
+#include "flang/common/indirection.h"
+#include "flang/common/restorer.h"
+#include "flang/parser/char-block.h"
+#include "flang/parser/message.h"
 #include <cinttypes>
 #include <map>
 

flang/include/flang/evaluate/complex.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/complex.h ----------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/complex.h ------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/evaluate/constant.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/constant.h ---------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/constant.h -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -11,8 +11,8 @@
 
 #include "formatting.h"
 #include "type.h"
-#include "../common/default-kinds.h"
-#include "../common/reference.h"
+#include "flang/common/default-kinds.h"
+#include "flang/common/reference.h"
 #include <map>
 #include <ostream>
 #include <vector>

flang/include/flang/evaluate/expression.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/expression.h -------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/expression.h ---------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -21,11 +21,11 @@
 #include "formatting.h"
 #include "type.h"
 #include "variable.h"
-#include "../common/Fortran.h"
-#include "../common/idioms.h"
-#include "../common/indirection.h"
-#include "../common/template.h"
-#include "../parser/char-block.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/idioms.h"
+#include "flang/common/indirection.h"
+#include "flang/common/template.h"
+#include "flang/parser/char-block.h"
 #include <algorithm>
 #include <list>
 #include <ostream>

flang/include/flang/evaluate/fold.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/fold.h -------------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/fold.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/evaluate/formatting.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/formatting.h -------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/formatting.h ---------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -19,7 +19,7 @@
 // This header is meant to be included by the headers that define the several
 // representational class templates that need it, not by external clients.
 
-#include "../common/indirection.h"
+#include "flang/common/indirection.h"
 #include <optional>
 #include <ostream>
 #include <type_traits>

flang/include/flang/evaluate/integer.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/integer.h ----------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/integer.h ------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -17,9 +17,9 @@
 // (*"Signed" here means two's-complement, just to be clear.  Ones'-complement
 // and signed-magnitude encodings appear to be extinct in 2018.)
 
-#include "common.h"
-#include "../common/bit-population-count.h"
-#include "../common/leading-zero-bit-count.h"
+#include "flang/common/bit-population-count.h"
+#include "flang/common/leading-zero-bit-count.h"
+#include "flang/evaluate/common.h"
 #include <cinttypes>
 #include <climits>
 #include <cstddef>

flang/include/flang/evaluate/intrinsics-library.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/intrinsics-library.h -----------------------*- C++ -*-===//
+//===-- include/flang/evaluate/intrinsics-library.h -------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/evaluate/intrinsics.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/intrinsics.h -------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/intrinsics.h ---------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -12,9 +12,9 @@
 #include "call.h"
 #include "characteristics.h"
 #include "type.h"
-#include "../common/default-kinds.h"
-#include "../parser/char-block.h"
-#include "../parser/message.h"
+#include "flang/common/default-kinds.h"
+#include "flang/parser/char-block.h"
+#include "flang/parser/message.h"
 #include <optional>
 #include <ostream>
 #include <string>

flang/include/flang/evaluate/logical.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/logical.h ----------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/logical.h ------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/evaluate/real.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/real.h -------------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/real.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,10 +9,10 @@
 #ifndef FORTRAN_EVALUATE_REAL_H_
 #define FORTRAN_EVALUATE_REAL_H_
 
-#include "common.h"
 #include "formatting.h"
 #include "integer.h"
 #include "rounding-bits.h"
+#include "flang/evaluate/common.h"
 #include <cinttypes>
 #include <limits>
 #include <ostream>

flang/include/flang/evaluate/rounding-bits.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/rounding-bits.h ----------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/rounding-bits.h ------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/evaluate/shape.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/shape.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/shape.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -13,11 +13,11 @@
 #define FORTRAN_EVALUATE_SHAPE_H_
 
 #include "expression.h"
-#include "tools.h"
 #include "traverse.h"
-#include "type.h"
 #include "variable.h"
-#include "../common/indirection.h"
+#include "flang/common/indirection.h"
+#include "flang/evaluate/tools.h"
+#include "flang/evaluate/type.h"
 #include <optional>
 #include <variant>
 

flang/include/flang/evaluate/static-data.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/static-data.h ------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/static-data.h --------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -13,7 +13,7 @@
 
 #include "formatting.h"
 #include "type.h"
-#include "../common/idioms.h"
+#include "flang/common/idioms.h"
 #include <cinttypes>
 #include <memory>
 #include <optional>

flang/include/flang/evaluate/tools.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/tools.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/tools.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,15 +9,15 @@
 #ifndef FORTRAN_EVALUATE_TOOLS_H_
 #define FORTRAN_EVALUATE_TOOLS_H_
 
-#include "constant.h"
-#include "expression.h"
 #include "traverse.h"
-#include "../common/idioms.h"
-#include "../common/template.h"
-#include "../common/unwrap.h"
-#include "../parser/message.h"
-#include "../semantics/attr.h"
-#include "../semantics/symbol.h"
+#include "flang/common/idioms.h"
+#include "flang/common/template.h"
+#include "flang/common/unwrap.h"
+#include "flang/evaluate/constant.h"
+#include "flang/evaluate/expression.h"
+#include "flang/parser/message.h"
+#include "flang/semantics/attr.h"
+#include "flang/semantics/symbol.h"
 #include <array>
 #include <optional>
 #include <set>

flang/include/flang/evaluate/traverse.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/traverse.h ---------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/traverse.h -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -35,8 +35,8 @@
 // - Overloads of operator() in each visitor handle the cases of interest.
 
 #include "expression.h"
-#include "../semantics/symbol.h"
-#include "../semantics/type.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/type.h"
 #include <set>
 #include <type_traits>
 

flang/include/flang/evaluate/type.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/type.h -------------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/type.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -22,9 +22,9 @@
 #include "integer.h"
 #include "logical.h"
 #include "real.h"
-#include "../common/Fortran.h"
-#include "../common/idioms.h"
-#include "../common/template.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/idioms.h"
+#include "flang/common/template.h"
 #include <cinttypes>
 #include <optional>
 #include <string>

flang/include/flang/evaluate/variable.h

@@ -1,4 +1,4 @@
-//===-- lib/evaluate/variable.h ---------------------------------*- C++ -*-===//
+//===-- include/flang/evaluate/variable.h -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -20,10 +20,10 @@
 #include "formatting.h"
 #include "static-data.h"
 #include "type.h"
-#include "../common/idioms.h"
-#include "../common/reference.h"
-#include "../common/template.h"
-#include "../parser/char-block.h"
+#include "flang/common/idioms.h"
+#include "flang/common/reference.h"
+#include "flang/common/template.h"
+#include "flang/parser/char-block.h"
 #include <optional>
 #include <ostream>
 #include <variant>

flang/include/flang/parser/char-block.h

@@ -1,4 +1,4 @@
-//===-- lib/parser/char-block.h ---------------------------------*- C++ -*-===//
+//===-- include/flang/parser/char-block.h -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -11,7 +11,7 @@
 
 // Describes a contiguous block of characters; does not own their storage.
 
-#include "../common/interval.h"
+#include "flang/common/interval.h"
 #include <algorithm>
 #include <cstddef>
 #include <cstring>

flang/include/flang/parser/char-buffer.h

@@ -1,4 +1,4 @@
-//===-- lib/parser/char-buffer.h --------------------------------*- C++ -*-===//
+//===-- include/flang/parser/char-buffer.h ----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/parser/char-set.h

@@ -1,4 +1,4 @@
-//===-- lib/parser/char-set.h -----------------------------------*- C++ -*-===//
+//===-- include/flang/parser/char-set.h -------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/parser/characters.h

@@ -1,4 +1,4 @@
-//===-- lib/parser/characters.h ---------------------------------*- C++ -*-===//
+//===-- include/flang/parser/characters.h -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/parser/dump-parse-tree.h

@@ -1,4 +1,4 @@
-//===-- lib/parser/dump-parse-tree.h ----------------------------*- C++ -*-===//
+//===-- include/flang/parser/dump-parse-tree.h ------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -13,8 +13,8 @@
 #include "parse-tree-visitor.h"
 #include "parse-tree.h"
 #include "unparse.h"
-#include "../common/idioms.h"
-#include "../common/indirection.h"
+#include "flang/common/idioms.h"
+#include "flang/common/indirection.h"
 #include <ostream>
 #include <sstream>
 #include <string>

flang/include/flang/parser/format-specification.h

@@ -1,4 +1,4 @@
-//===-- lib/parser/format-specification.h -----------------------*- C++ -*-===//
+//===-- include/flang/parser/format-specification.h -------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/parser/instrumented-parser.h

@@ -1,4 +1,4 @@
-//===-- lib/parser/instrumented-parser.h ------------------------*- C++ -*-===//
+//===-- include/flang/parser/instrumented-parser.h --------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,10 +9,10 @@
 #ifndef FORTRAN_PARSER_INSTRUMENTED_PARSER_H_
 #define FORTRAN_PARSER_INSTRUMENTED_PARSER_H_
 
-#include "message.h"
 #include "parse-state.h"
-#include "provenance.h"
 #include "user-state.h"
+#include "flang/parser/message.h"
+#include "flang/parser/provenance.h"
 #include <cstddef>
 #include <map>
 #include <ostream>

flang/include/flang/parser/message.h

@@ -1,4 +1,4 @@
-//===-- lib/parser/message.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/parser/message.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -15,9 +15,9 @@
 #include "char-block.h"
 #include "char-set.h"
 #include "provenance.h"
-#include "../common/idioms.h"
-#include "../common/reference-counted.h"
-#include "../common/restorer.h"
+#include "flang/common/idioms.h"
+#include "flang/common/reference-counted.h"
+#include "flang/common/restorer.h"
 #include <cstddef>
 #include <cstring>
 #include <forward_list>

flang/include/flang/parser/parse-state.h

@@ -1,4 +1,4 @@
-//===-- lib/parser/parse-state.h --------------------------------*- C++ -*-===//
+//===-- include/flang/parser/parse-state.h ----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -15,12 +15,12 @@
 // attempts.  Must be efficient to duplicate and assign for backtracking
 // and recovery during parsing!
 
-#include "characters.h"
-#include "message.h"
-#include "provenance.h"
 #include "user-state.h"
-#include "../common/Fortran-features.h"
-#include "../common/idioms.h"
+#include "flang/common/Fortran-features.h"
+#include "flang/common/idioms.h"
+#include "flang/parser/characters.h"
+#include "flang/parser/message.h"
+#include "flang/parser/provenance.h"
 #include <cstddef>
 #include <cstring>
 #include <list>

flang/include/flang/parser/parse-tree-visitor.h

@@ -1,4 +1,4 @@
-//===-- lib/parser/parse-tree-visitor.h -------------------------*- C++ -*-===//
+//===-- include/flang/parser/parse-tree-visitor.h ---------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/parser/parse-tree.h

@@ -1,4 +1,4 @@
-//===-- lib/parser/parse-tree.h ---------------------------------*- C++ -*-===//
+//===-- include/flang/parser/parse-tree.h -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -22,9 +22,9 @@
 #include "format-specification.h"
 #include "message.h"
 #include "provenance.h"
-#include "../common/Fortran.h"
-#include "../common/idioms.h"
-#include "../common/indirection.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/idioms.h"
+#include "flang/common/indirection.h"
 #include <cinttypes>
 #include <list>
 #include <memory>

flang/include/flang/parser/parsing.h

@@ -1,4 +1,4 @@
-//===-- lib/parser/parsing.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/parser/parsing.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -14,7 +14,7 @@
 #include "message.h"
 #include "parse-tree.h"
 #include "provenance.h"
-#include "../common/Fortran-features.h"
+#include "flang/common/Fortran-features.h"
 #include <optional>
 #include <ostream>
 #include <string>

flang/include/flang/parser/provenance.h

@@ -1,4 +1,4 @@
-//===-- lib/parser/provenance.h ---------------------------------*- C++ -*-===//
+//===-- include/flang/parser/provenance.h -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -13,8 +13,8 @@
 #include "char-buffer.h"
 #include "characters.h"
 #include "source.h"
-#include "../common/idioms.h"
-#include "../common/interval.h"
+#include "flang/common/idioms.h"
+#include "flang/common/interval.h"
 #include <cstddef>
 #include <map>
 #include <memory>

flang/include/flang/parser/source.h

@@ -1,4 +1,4 @@
-//===-- lib/parser/source.h -------------------------------------*- C++ -*-===//
+//===-- include/flang/parser/source.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/parser/tools.h

@@ -1,4 +1,4 @@
-//===-- lib/parser/tools.h --------------------------------------*- C++ -*-===//
+//===-- include/flang/parser/tools.h ----------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/parser/unparse.h

@@ -1,4 +1,4 @@
-//===-- lib/parser/unparse.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/parser/unparse.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

flang/include/flang/parser/user-state.h

@@ -1,4 +1,4 @@
-//===-- lib/parser/user-state.h ---------------------------------*- C++ -*-===//
+//===-- include/flang/parser/user-state.h -----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -14,10 +14,10 @@
 // parse tree construction so as to avoid any need for representing
 // state in static data.
 
-#include "char-block.h"
-#include "parse-tree.h"
-#include "../common/Fortran-features.h"
-#include "../common/idioms.h"
+#include "flang/common/Fortran-features.h"
+#include "flang/common/idioms.h"
+#include "flang/parser/char-block.h"
+#include "flang/parser/parse-tree.h"
 #include <cinttypes>
 #include <optional>
 #include <ostream>

flang/include/flang/semantics/attr.h

@@ -1,4 +1,4 @@
-//===-- lib/semantics/attr.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/semantics/attr.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,8 +9,8 @@
 #ifndef FORTRAN_SEMANTICS_ATTR_H_
 #define FORTRAN_SEMANTICS_ATTR_H_
 
-#include "../common/enum-set.h"
-#include "../common/idioms.h"
+#include "flang/common/enum-set.h"
+#include "flang/common/idioms.h"
 #include <cinttypes>
 #include <string>
 

flang/include/flang/semantics/expression.h

@@ -1,4 +1,4 @@
-//===-- lib/semantics/expression.h ------------------------------*- C++ -*-===//
+//===-- include/flang/semantics/expression.h --------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,17 +10,17 @@
 #define FORTRAN_SEMANTICS_EXPRESSION_H_
 
 #include "semantics.h"
-#include "../common/Fortran.h"
-#include "../common/indirection.h"
-#include "../evaluate/characteristics.h"
-#include "../evaluate/check-expression.h"
-#include "../evaluate/expression.h"
-#include "../evaluate/fold.h"
-#include "../evaluate/tools.h"
-#include "../evaluate/type.h"
-#include "../parser/char-block.h"
-#include "../parser/parse-tree-visitor.h"
-#include "../parser/parse-tree.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/indirection.h"
+#include "flang/evaluate/characteristics.h"
+#include "flang/evaluate/check-expression.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/tools.h"
+#include "flang/evaluate/type.h"
+#include "flang/parser/char-block.h"
+#include "flang/parser/parse-tree-visitor.h"
+#include "flang/parser/parse-tree.h"
 #include <map>
 #include <optional>
 #include <variant>

flang/include/flang/semantics/scope.h

@@ -1,4 +1,4 @@
-//===-- lib/semantics/scope.h -----------------------------------*- C++ -*-===//
+//===-- include/flang/semantics/scope.h -------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -11,11 +11,11 @@
 
 #include "attr.h"
 #include "symbol.h"
-#include "../common/Fortran.h"
-#include "../common/idioms.h"
-#include "../common/reference.h"
-#include "../parser/message.h"
-#include "../parser/provenance.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/idioms.h"
+#include "flang/common/reference.h"
+#include "flang/parser/message.h"
+#include "flang/parser/provenance.h"
 #include <list>
 #include <map>
 #include <optional>

flang/include/flang/semantics/semantics.h

@@ -1,4 +1,4 @@
-//===-- lib/semantics/semantics.h -------------------------------*- C++ -*-===//
+//===-- include/flang/semantics/semantics.h ---------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -11,10 +11,10 @@
 
 #include "scope.h"
 #include "symbol.h"
-#include "../common/Fortran-features.h"
-#include "../evaluate/common.h"
-#include "../evaluate/intrinsics.h"
-#include "../parser/message.h"
+#include "flang/common/Fortran-features.h"
+#include "flang/evaluate/common.h"
+#include "flang/evaluate/intrinsics.h"
+#include "flang/parser/message.h"
 #include <iosfwd>
 #include <string>
 #include <vector>

flang/include/flang/semantics/symbol.h

@@ -1,4 +1,4 @@
-//===-- lib/semantics/symbol.h ----------------------------------*- C++ -*-===//
+//===-- include/flang/semantics/symbol.h ------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,9 +10,9 @@
 #define FORTRAN_SEMANTICS_SYMBOL_H_
 
 #include "type.h"
-#include "../common/Fortran.h"
-#include "../common/enum-set.h"
-#include "../common/reference.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/enum-set.h"
+#include "flang/common/reference.h"
 #include <list>
 #include <optional>
 #include <set>

flang/include/flang/semantics/tools.h

@@ -1,4 +1,4 @@
-//===-- lib/semantics/tools.h -----------------------------------*- C++ -*-===//
+//===-- include/flang/semantics/tools.h -------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -12,15 +12,15 @@
 // Simple predicates and look-up functions that are best defined
 // canonically for use in semantic checking.
 
-#include "attr.h"
-#include "expression.h"
-#include "semantics.h"
-#include "../common/Fortran.h"
-#include "../evaluate/expression.h"
-#include "../evaluate/type.h"
-#include "../evaluate/variable.h"
-#include "../parser/message.h"
-#include "../parser/parse-tree.h"
+#include "flang/common/Fortran.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/type.h"
+#include "flang/evaluate/variable.h"
+#include "flang/parser/message.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/semantics/attr.h"
+#include "flang/semantics/expression.h"
+#include "flang/semantics/semantics.h"
 #include <functional>
 
 namespace Fortran::semantics {

flang/include/flang/semantics/type.h

@@ -1,4 +1,4 @@
-//===-- lib/semantics/type.h ------------------------------------*- C++ -*-===//
+//===-- include/flang/semantics/type.h --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,10 +9,10 @@
 #ifndef FORTRAN_SEMANTICS_TYPE_H_
 #define FORTRAN_SEMANTICS_TYPE_H_
 
-#include "../common/Fortran.h"
-#include "../common/idioms.h"
-#include "../evaluate/expression.h"
-#include "../parser/char-block.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/idioms.h"
+#include "flang/evaluate/expression.h"
+#include "flang/parser/char-block.h"
 #include <algorithm>
 #include <iosfwd>
 #include <map>

flang/include/flang/semantics/unparse-with-symbols.h

@@ -1,4 +1,4 @@
-//===-- lib/semantics/unparse-with-symbols.h --------------------*- C++ -*-===//
+//===-- include/flang/semantics/unparse-with-symbols.h ----------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -9,7 +9,7 @@
 #ifndef FORTRAN_SEMANTICS_UNPARSE_WITH_SYMBOLS_H_
 #define FORTRAN_SEMANTICS_UNPARSE_WITH_SYMBOLS_H_
 
-#include "../parser/characters.h"
+#include "flang/parser/characters.h"
 #include <iosfwd>
 
 namespace Fortran::parser {

flang/lib/common/Fortran-features.cc

@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Fortran-features.h"
-#include "Fortran.h"
-#include "idioms.h"
+#include "flang/common/Fortran-features.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/idioms.h"
 
 namespace Fortran::common {
 

flang/lib/common/Fortran.cc

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Fortran.h"
+#include "flang/common/Fortran.h"
 
 namespace Fortran::common {
 

flang/lib/common/default-kinds.cc

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "default-kinds.h"
-#include "idioms.h"
+#include "flang/common/default-kinds.h"
+#include "flang/common/idioms.h"
 
 namespace Fortran::common {
 

flang/lib/common/idioms.cc

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "idioms.h"
+#include "flang/common/idioms.h"
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>

flang/lib/decimal/big-radix-floating-point.h

@@ -21,12 +21,12 @@
 // for conversions between binary and decimal representations; it is not
 // a general-purpose facility.
 
-#include "binary-floating-point.h"
-#include "decimal.h"
-#include "../common/bit-population-count.h"
-#include "../common/leading-zero-bit-count.h"
-#include "../common/uint128.h"
-#include "../common/unsigned-const-division.h"
+#include "flang/common/bit-population-count.h"
+#include "flang/common/leading-zero-bit-count.h"
+#include "flang/common/uint128.h"
+#include "flang/common/unsigned-const-division.h"
+#include "flang/decimal/binary-floating-point.h"
+#include "flang/decimal/decimal.h"
 #include <cinttypes>
 #include <limits>
 #include <type_traits>

flang/lib/decimal/binary-to-decimal.cc

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "big-radix-floating-point.h"
-#include "../decimal/decimal.h"
+#include "flang/decimal/decimal.h"
 
 namespace Fortran::decimal {
 

flang/lib/decimal/decimal-to-binary.cc

@@ -7,10 +7,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "big-radix-floating-point.h"
-#include "binary-floating-point.h"
-#include "decimal.h"
-#include "../common/bit-population-count.h"
-#include "../common/leading-zero-bit-count.h"
+#include "flang/common/bit-population-count.h"
+#include "flang/common/leading-zero-bit-count.h"
+#include "flang/decimal/binary-floating-point.h"
+#include "flang/decimal/decimal.h"
 #include <cinttypes>
 #include <cstring>
 #include <ctype.h>

flang/lib/evaluate/call.cc

@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "call.h"
-#include "characteristics.h"
-#include "expression.h"
-#include "tools.h"
-#include "../common/idioms.h"
-#include "../semantics/symbol.h"
+#include "flang/evaluate/call.h"
+#include "flang/common/idioms.h"
+#include "flang/evaluate/characteristics.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/tools.h"
+#include "flang/semantics/symbol.h"
 
 namespace Fortran::evaluate {
 

flang/lib/evaluate/character.h

@@ -9,7 +9,7 @@
 #ifndef FORTRAN_EVALUATE_CHARACTER_H_
 #define FORTRAN_EVALUATE_CHARACTER_H_
 
-#include "type.h"
+#include "flang/evaluate/type.h"
 #include <string>
 
 // Provides implementations of intrinsic functions operating on character

flang/lib/evaluate/characteristics.cc

@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "characteristics.h"
-#include "check-expression.h"
-#include "fold.h"
-#include "intrinsics.h"
-#include "tools.h"
-#include "type.h"
-#include "../common/indirection.h"
-#include "../parser/message.h"
-#include "../semantics/scope.h"
-#include "../semantics/symbol.h"
+#include "flang/evaluate/characteristics.h"
+#include "flang/common/indirection.h"
+#include "flang/evaluate/check-expression.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/intrinsics.h"
+#include "flang/evaluate/tools.h"
+#include "flang/evaluate/type.h"
+#include "flang/parser/message.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/symbol.h"
 #include <initializer_list>
 #include <ostream>
 

flang/lib/evaluate/check-expression.cc

@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "check-expression.h"
-#include "traverse.h"
-#include "type.h"
-#include "../semantics/symbol.h"
-#include "../semantics/tools.h"
+#include "flang/evaluate/check-expression.h"
+#include "flang/evaluate/traverse.h"
+#include "flang/evaluate/type.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/tools.h"
 
 namespace Fortran::evaluate {
 

flang/lib/evaluate/common.cc

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "common.h"
-#include "../common/idioms.h"
+#include "flang/evaluate/common.h"
+#include "flang/common/idioms.h"
 
 using namespace Fortran::parser::literals;
 

flang/lib/evaluate/complex.cc

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "complex.h"
+#include "flang/evaluate/complex.h"
 
 namespace Fortran::evaluate::value {
 

flang/lib/evaluate/constant.cc

@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "constant.h"
-#include "expression.h"
-#include "shape.h"
-#include "type.h"
+#include "flang/evaluate/constant.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/shape.h"
+#include "flang/evaluate/type.h"
 #include <string>
 
 namespace Fortran::evaluate {

flang/lib/evaluate/expression.cc

@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "expression.h"
-#include "common.h"
+#include "flang/evaluate/expression.h"
 #include "int-power.h"
-#include "tools.h"
-#include "variable.h"
-#include "../common/idioms.h"
-#include "../parser/message.h"
+#include "flang/common/idioms.h"
+#include "flang/evaluate/common.h"
+#include "flang/evaluate/tools.h"
+#include "flang/evaluate/variable.h"
+#include "flang/parser/message.h"
 #include <string>
 #include <type_traits>
 

flang/lib/evaluate/fold-implementation.h

@@ -10,26 +10,26 @@
 #define FORTRAN_EVALUATE_FOLD_IMPLEMENTATION_H_
 
 #include "character.h"
-#include "characteristics.h"
-#include "common.h"
-#include "constant.h"
-#include "expression.h"
-#include "fold.h"
-#include "formatting.h"
 #include "host.h"
 #include "int-power.h"
 #include "intrinsics-library-templates.h"
-#include "shape.h"
-#include "tools.h"
-#include "traverse.h"
-#include "type.h"
-#include "../common/indirection.h"
-#include "../common/template.h"
-#include "../common/unwrap.h"
-#include "../parser/message.h"
-#include "../semantics/scope.h"
-#include "../semantics/symbol.h"
-#include "../semantics/tools.h"
+#include "flang/common/indirection.h"
+#include "flang/common/template.h"
+#include "flang/common/unwrap.h"
+#include "flang/evaluate/characteristics.h"
+#include "flang/evaluate/common.h"
+#include "flang/evaluate/constant.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/formatting.h"
+#include "flang/evaluate/shape.h"
+#include "flang/evaluate/tools.h"
+#include "flang/evaluate/traverse.h"
+#include "flang/evaluate/type.h"
+#include "flang/parser/message.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/tools.h"
 #include <algorithm>
 #include <cmath>
 #include <complex>

flang/lib/evaluate/fold-logical.cc

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "check-expression.h"
 #include "fold-implementation.h"
+#include "flang/evaluate/check-expression.h"
 
 namespace Fortran::evaluate {
 

flang/lib/evaluate/fold.cc

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "fold.h"
+#include "flang/evaluate/fold.h"
 #include "fold-implementation.h"
 
 namespace Fortran::evaluate {

flang/lib/evaluate/formatting.cc

@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "formatting.h"
-#include "call.h"
-#include "constant.h"
-#include "expression.h"
-#include "fold.h"
-#include "tools.h"
-#include "../parser/characters.h"
-#include "../semantics/symbol.h"
+#include "flang/evaluate/formatting.h"
+#include "flang/evaluate/call.h"
+#include "flang/evaluate/constant.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/tools.h"
+#include "flang/parser/characters.h"
+#include "flang/semantics/symbol.h"
 #include <sstream>
 
 namespace Fortran::evaluate {

flang/lib/evaluate/host.cc

@@ -8,7 +8,7 @@
 
 #include "host.h"
 
-#include "../common/idioms.h"
+#include "flang/common/idioms.h"
 #include <cerrno>
 #include <cfenv>
 

flang/lib/evaluate/host.h

@@ -17,7 +17,7 @@
 // hardware type maps to Fortran intrinsic type T. Then HostType<T> can be used
 // to safely refer to this hardware type.
 
-#include "type.h"
+#include "flang/evaluate/type.h"
 #include <cfenv>
 #include <complex>
 #include <cstdint>

flang/lib/evaluate/int-power.h

@@ -11,7 +11,7 @@
 
 // Computes an integer power of a real or complex value.
 
-#include "common.h"
+#include "flang/evaluate/common.h"
 
 namespace Fortran::evaluate {
 

flang/lib/evaluate/integer.cc

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "integer.h"
+#include "flang/evaluate/integer.h"
 
 namespace Fortran::evaluate::value {
 

flang/lib/evaluate/intrinsics-library-templates.h

@@ -17,9 +17,9 @@
 // which version should be instantiated in a generic way.
 
 #include "host.h"
-#include "intrinsics-library.h"
-#include "type.h"
-#include "../common/template.h"
+#include "flang/common/template.h"
+#include "flang/evaluate/intrinsics-library.h"
+#include "flang/evaluate/type.h"
 
 #include <tuple>
 #include <type_traits>

flang/lib/evaluate/intrinsics.cc

@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "intrinsics.h"
-#include "common.h"
-#include "expression.h"
-#include "fold.h"
-#include "shape.h"
-#include "tools.h"
-#include "type.h"
-#include "../common/Fortran.h"
-#include "../common/enum-set.h"
-#include "../common/idioms.h"
+#include "flang/evaluate/intrinsics.h"
+#include "flang/common/Fortran.h"
+#include "flang/common/enum-set.h"
+#include "flang/common/idioms.h"
+#include "flang/evaluate/common.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/shape.h"
+#include "flang/evaluate/tools.h"
+#include "flang/evaluate/type.h"
 #include <algorithm>
 #include <map>
 #include <ostream>

flang/lib/evaluate/logical.cc

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "logical.h"
+#include "flang/evaluate/logical.h"
 
 namespace Fortran::evaluate::value {
 

flang/lib/evaluate/real.cc

@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "real.h"
+#include "flang/evaluate/real.h"
 #include "int-power.h"
-#include "../common/idioms.h"
-#include "../decimal/decimal.h"
-#include "../parser/characters.h"
+#include "flang/common/idioms.h"
+#include "flang/decimal/decimal.h"
+#include "flang/parser/characters.h"
 #include <limits>
 
 namespace Fortran::evaluate::value {

flang/lib/evaluate/shape.cc

@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "shape.h"
-#include "characteristics.h"
-#include "fold.h"
-#include "intrinsics.h"
-#include "tools.h"
-#include "type.h"
-#include "../common/idioms.h"
-#include "../common/template.h"
-#include "../parser/message.h"
-#include "../semantics/symbol.h"
+#include "flang/evaluate/shape.h"
+#include "flang/common/idioms.h"
+#include "flang/common/template.h"
+#include "flang/evaluate/characteristics.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/intrinsics.h"
+#include "flang/evaluate/tools.h"
+#include "flang/evaluate/type.h"
+#include "flang/parser/message.h"
+#include "flang/semantics/symbol.h"
 #include <functional>
 
 using namespace std::placeholders;  // _1, _2, &c. for std::bind()

flang/lib/evaluate/static-data.cc

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "static-data.h"
-#include "../parser/characters.h"
+#include "flang/evaluate/static-data.h"
+#include "flang/parser/characters.h"
 
 namespace Fortran::evaluate {
 

flang/lib/evaluate/tools.cc

@@ -6,11 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "tools.h"
-#include "characteristics.h"
-#include "traverse.h"
-#include "../common/idioms.h"
-#include "../parser/message.h"
+#include "flang/evaluate/tools.h"
+#include "flang/common/idioms.h"
+#include "flang/evaluate/characteristics.h"
+#include "flang/evaluate/traverse.h"
+#include "flang/parser/message.h"
 #include <algorithm>
 #include <variant>
 

flang/lib/evaluate/type.cc

@@ -6,16 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "type.h"
-#include "expression.h"
-#include "fold.h"
-#include "../common/idioms.h"
-#include "../common/template.h"
-#include "../parser/characters.h"
-#include "../semantics/scope.h"
-#include "../semantics/symbol.h"
-#include "../semantics/tools.h"
-#include "../semantics/type.h"
+#include "flang/evaluate/type.h"
+#include "flang/common/idioms.h"
+#include "flang/common/template.h"
+#include "flang/evaluate/expression.h"
+#include "flang/evaluate/fold.h"
+#include "flang/parser/characters.h"
+#include "flang/semantics/scope.h"
+#include "flang/semantics/symbol.h"
+#include "flang/semantics/tools.h"
+#include "flang/semantics/type.h"
 #include <algorithm>
 #include <optional>
 #include <sstream>

flang/lib/evaluate/variable.cc

@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "variable.h"
-#include "fold.h"
-#include "tools.h"
-#include "../common/idioms.h"
-#include "../parser/char-block.h"
-#include "../parser/characters.h"
-#include "../parser/message.h"
-#include "../semantics/symbol.h"
+#include "flang/evaluate/variable.h"
+#include "flang/common/idioms.h"
+#include "flang/evaluate/fold.h"
+#include "flang/evaluate/tools.h"
+#include "flang/parser/char-block.h"
+#include "flang/parser/characters.h"
+#include "flang/parser/message.h"
+#include "flang/semantics/symbol.h"
 #include <ostream>
 #include <type_traits>
 

flang/lib/parser/Fortran-parsers.cc

@@ -33,11 +33,11 @@
 #include "basic-parsers.h"
 #include "expr-parsers.h"
 #include "misc-parsers.h"
-#include "parse-tree.h"
 #include "stmt-parser.h"
 #include "token-parsers.h"
 #include "type-parser-implementation.h"
-#include "user-state.h"
+#include "flang/parser/parse-tree.h"
+#include "flang/parser/user-state.h"
 
 namespace Fortran::parser {