Move headers to include/wabt/ (#1998)

This makes things easier for users and packagers of libwabt.

13 files changed, 130 insertions, 130 deletions

diff --git a/src/tools/spectest-interp.cc b/src/tools/spectest-interp.cc
index 2e842dfd..af50bfb2 100644
--- a/src/tools/spectest-interp.cc
+++ b/src/tools/spectest-interp.cc
@@ -24,21 +24,21 @@
 #include <string>
 #include <vector>
 
-#include "src/binary-reader.h"
-#include "src/cast.h"
-#include "src/common.h"
-#include "src/error-formatter.h"
-#include "src/feature.h"
-#include "src/interp/binary-reader-interp.h"
-#include "src/interp/interp-util.h"
-#include "src/interp/interp.h"
-#include "src/literal.h"
-#include "src/option-parser.h"
-#include "src/stream.h"
-#include "src/string-util.h"
-#include "src/validator.h"
-#include "src/wast-lexer.h"
-#include "src/wast-parser.h"
+#include "wabt/binary-reader.h"
+#include "wabt/cast.h"
+#include "wabt/common.h"
+#include "wabt/error-formatter.h"
+#include "wabt/feature.h"
+#include "wabt/interp/binary-reader-interp.h"
+#include "wabt/interp/interp-util.h"
+#include "wabt/interp/interp.h"
+#include "wabt/literal.h"
+#include "wabt/option-parser.h"
+#include "wabt/stream.h"
+#include "wabt/string-util.h"
+#include "wabt/validator.h"
+#include "wabt/wast-lexer.h"
+#include "wabt/wast-parser.h"
 
 using namespace wabt;
 using namespace wabt::interp;
diff --git a/src/tools/wasm-decompile.cc b/src/tools/wasm-decompile.cc
index df2bd2b5..5c8c1252 100644
--- a/src/tools/wasm-decompile.cc
+++ b/src/tools/wasm-decompile.cc
@@ -19,18 +19,18 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "src/apply-names.h"
-#include "src/binary-reader-ir.h"
-#include "src/binary-reader.h"
-#include "src/decompiler.h"
-#include "src/error-formatter.h"
-#include "src/feature.h"
-#include "src/generate-names.h"
-#include "src/ir.h"
-#include "src/option-parser.h"
-#include "src/stream.h"
-#include "src/validator.h"
-#include "src/wast-lexer.h"
+#include "wabt/apply-names.h"
+#include "wabt/binary-reader-ir.h"
+#include "wabt/binary-reader.h"
+#include "wabt/decompiler.h"
+#include "wabt/error-formatter.h"
+#include "wabt/feature.h"
+#include "wabt/generate-names.h"
+#include "wabt/ir.h"
+#include "wabt/option-parser.h"
+#include "wabt/stream.h"
+#include "wabt/validator.h"
+#include "wabt/wast-lexer.h"
 
 using namespace wabt;
 
diff --git a/src/tools/wasm-interp.cc b/src/tools/wasm-interp.cc
index 465ad611..addde767 100644
--- a/src/tools/wasm-interp.cc
+++ b/src/tools/wasm-interp.cc
@@ -22,15 +22,15 @@
 #include <string>
 #include <vector>
 
-#include "src/binary-reader.h"
-#include "src/error-formatter.h"
-#include "src/feature.h"
-#include "src/interp/binary-reader-interp.h"
-#include "src/interp/interp-util.h"
-#include "src/interp/interp-wasi.h"
-#include "src/interp/interp.h"
-#include "src/option-parser.h"
-#include "src/stream.h"
+#include "wabt/binary-reader.h"
+#include "wabt/error-formatter.h"
+#include "wabt/feature.h"
+#include "wabt/interp/binary-reader-interp.h"
+#include "wabt/interp/interp-util.h"
+#include "wabt/interp/interp-wasi.h"
+#include "wabt/interp/interp.h"
+#include "wabt/option-parser.h"
+#include "wabt/stream.h"
 
 #ifdef WITH_WASI
 #include "uvwasi.h"
diff --git a/src/tools/wasm-objdump.cc b/src/tools/wasm-objdump.cc
index 59060432..d553c742 100644
--- a/src/tools/wasm-objdump.cc
+++ b/src/tools/wasm-objdump.cc
@@ -18,11 +18,11 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "src/binary-reader-objdump.h"
-#include "src/binary-reader.h"
-#include "src/common.h"
-#include "src/option-parser.h"
-#include "src/stream.h"
+#include "wabt/binary-reader-objdump.h"
+#include "wabt/binary-reader.h"
+#include "wabt/common.h"
+#include "wabt/option-parser.h"
+#include "wabt/stream.h"
 
 using namespace wabt;
 
diff --git a/src/tools/wasm-opcodecnt.cc b/src/tools/wasm-opcodecnt.cc
index f3abb868..63153d39 100644
--- a/src/tools/wasm-opcodecnt.cc
+++ b/src/tools/wasm-opcodecnt.cc
@@ -24,10 +24,10 @@
 #include <map>
 #include <vector>
 
-#include "src/binary-reader-opcnt.h"
-#include "src/binary-reader.h"
-#include "src/option-parser.h"
-#include "src/stream.h"
+#include "wabt/binary-reader-opcnt.h"
+#include "wabt/binary-reader.h"
+#include "wabt/option-parser.h"
+#include "wabt/stream.h"
 
 #define ERROR(fmt, ...) \
   fprintf(stderr, "%s:%d: " fmt, __FILE__, __LINE__, __VA_ARGS__)
diff --git a/src/tools/wasm-strip.cc b/src/tools/wasm-strip.cc
index f7abd5ff..8d8b33a0 100644
--- a/src/tools/wasm-strip.cc
+++ b/src/tools/wasm-strip.cc
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include "src/binary-reader-nop.h"
-#include "src/binary-reader.h"
-#include "src/binary.h"
-#include "src/error-formatter.h"
-#include "src/leb128.h"
-#include "src/option-parser.h"
-#include "src/stream.h"
+#include "wabt/binary-reader-nop.h"
+#include "wabt/binary-reader.h"
+#include "wabt/binary.h"
+#include "wabt/error-formatter.h"
+#include "wabt/leb128.h"
+#include "wabt/option-parser.h"
+#include "wabt/stream.h"
 
 using namespace wabt;
 
diff --git a/src/tools/wasm-validate.cc b/src/tools/wasm-validate.cc
index dd48e121..d093f1be 100644
--- a/src/tools/wasm-validate.cc
+++ b/src/tools/wasm-validate.cc
@@ -19,14 +19,14 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "src/binary-reader-ir.h"
-#include "src/binary-reader.h"
-#include "src/error-formatter.h"
-#include "src/ir.h"
-#include "src/option-parser.h"
-#include "src/stream.h"
-#include "src/validator.h"
-#include "src/wast-lexer.h"
+#include "wabt/binary-reader-ir.h"
+#include "wabt/binary-reader.h"
+#include "wabt/error-formatter.h"
+#include "wabt/ir.h"
+#include "wabt/option-parser.h"
+#include "wabt/stream.h"
+#include "wabt/validator.h"
+#include "wabt/wast-lexer.h"
 
 using namespace wabt;
 
diff --git a/src/tools/wasm2c.cc b/src/tools/wasm2c.cc
index 3dd14483..b00bce58 100644
--- a/src/tools/wasm2c.cc
+++ b/src/tools/wasm2c.cc
@@ -19,20 +19,20 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "src/apply-names.h"
-#include "src/binary-reader-ir.h"
-#include "src/binary-reader.h"
-#include "src/error-formatter.h"
-#include "src/feature.h"
-#include "src/filenames.h"
-#include "src/generate-names.h"
-#include "src/ir.h"
-#include "src/option-parser.h"
-#include "src/stream.h"
-#include "src/validator.h"
-#include "src/wast-lexer.h"
-
-#include "src/c-writer.h"
+#include "wabt/apply-names.h"
+#include "wabt/binary-reader-ir.h"
+#include "wabt/binary-reader.h"
+#include "wabt/error-formatter.h"
+#include "wabt/feature.h"
+#include "wabt/filenames.h"
+#include "wabt/generate-names.h"
+#include "wabt/ir.h"
+#include "wabt/option-parser.h"
+#include "wabt/stream.h"
+#include "wabt/validator.h"
+#include "wabt/wast-lexer.h"
+
+#include "wabt/c-writer.h"
 
 using namespace wabt;
 
@@ -101,7 +101,7 @@ static void ParseOptions(int argc, char** argv) {
   any_non_supported_feature |=                         \
       (s_features.variable##_enabled() != default_) && \
       !IsFeatureSupported(flag);
-#include "src/feature.def"
+#include "wabt/feature.def"
 #undef WABT_FEATURE
 
   if (any_non_supported_feature) {
diff --git a/src/tools/wasm2wat-fuzz.cc b/src/tools/wasm2wat-fuzz.cc
index 1318ef62..52474248 100644
--- a/src/tools/wasm2wat-fuzz.cc
+++ b/src/tools/wasm2wat-fuzz.cc
@@ -16,10 +16,10 @@
 //
 // https://github.com/google/oss-fuzz/blob/master/projects/wabt/wasm2wat_fuzzer.cc
 
-#include "src/binary-reader-ir.h"
-#include "src/binary-reader.h"
-#include "src/common.h"
-#include "src/ir.h"
+#include "wabt/binary-reader-ir.h"
+#include "wabt/binary-reader.h"
+#include "wabt/common.h"
+#include "wabt/ir.h"
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   wabt::ReadBinaryOptions options;
diff --git a/src/tools/wasm2wat.cc b/src/tools/wasm2wat.cc
index 2c50fea7..7846f710 100644
--- a/src/tools/wasm2wat.cc
+++ b/src/tools/wasm2wat.cc
@@ -19,18 +19,18 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "src/apply-names.h"
-#include "src/binary-reader-ir.h"
-#include "src/binary-reader.h"
-#include "src/error-formatter.h"
-#include "src/feature.h"
-#include "src/generate-names.h"
-#include "src/ir.h"
-#include "src/option-parser.h"
-#include "src/stream.h"
-#include "src/validator.h"
-#include "src/wast-lexer.h"
-#include "src/wat-writer.h"
+#include "wabt/apply-names.h"
+#include "wabt/binary-reader-ir.h"
+#include "wabt/binary-reader.h"
+#include "wabt/error-formatter.h"
+#include "wabt/feature.h"
+#include "wabt/generate-names.h"
+#include "wabt/ir.h"
+#include "wabt/option-parser.h"
+#include "wabt/stream.h"
+#include "wabt/validator.h"
+#include "wabt/wast-lexer.h"
+#include "wabt/wat-writer.h"
 
 using namespace wabt;
 
diff --git a/src/tools/wast2json.cc b/src/tools/wast2json.cc
index e3afed4d..bdc4a674 100644
--- a/src/tools/wast2json.cc
+++ b/src/tools/wast2json.cc
@@ -21,20 +21,20 @@
 #include <cstdlib>
 #include <string>
 
-#include "config.h"
-
-#include "src/binary-writer-spec.h"
-#include "src/binary-writer.h"
-#include "src/common.h"
-#include "src/error-formatter.h"
-#include "src/feature.h"
-#include "src/filenames.h"
-#include "src/ir.h"
-#include "src/option-parser.h"
-#include "src/resolve-names.h"
-#include "src/stream.h"
-#include "src/validator.h"
-#include "src/wast-parser.h"
+#include "wabt/config.h"
+
+#include "wabt/binary-writer-spec.h"
+#include "wabt/binary-writer.h"
+#include "wabt/common.h"
+#include "wabt/error-formatter.h"
+#include "wabt/feature.h"
+#include "wabt/filenames.h"
+#include "wabt/ir.h"
+#include "wabt/option-parser.h"
+#include "wabt/resolve-names.h"
+#include "wabt/stream.h"
+#include "wabt/validator.h"
+#include "wabt/wast-parser.h"
 
 using namespace wabt;
 
diff --git a/src/tools/wat-desugar.cc b/src/tools/wat-desugar.cc
index 85c2d8a5..69a5dd54 100644
--- a/src/tools/wat-desugar.cc
+++ b/src/tools/wat-desugar.cc
@@ -20,18 +20,18 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "config.h"
-
-#include "src/apply-names.h"
-#include "src/common.h"
-#include "src/error-formatter.h"
-#include "src/feature.h"
-#include "src/generate-names.h"
-#include "src/ir.h"
-#include "src/option-parser.h"
-#include "src/stream.h"
-#include "src/wast-parser.h"
-#include "src/wat-writer.h"
+#include "wabt/config.h"
+
+#include "wabt/apply-names.h"
+#include "wabt/common.h"
+#include "wabt/error-formatter.h"
+#include "wabt/feature.h"
+#include "wabt/generate-names.h"
+#include "wabt/ir.h"
+#include "wabt/option-parser.h"
+#include "wabt/stream.h"
+#include "wabt/wast-parser.h"
+#include "wabt/wat-writer.h"
 
 using namespace wabt;
 
diff --git a/src/tools/wat2wasm.cc b/src/tools/wat2wasm.cc
index 39eeed01..eab17ebf 100644
--- a/src/tools/wat2wasm.cc
+++ b/src/tools/wat2wasm.cc
@@ -21,19 +21,19 @@
 #include <cstdlib>
 #include <string>
 
-#include "config.h"
-
-#include "src/binary-writer.h"
-#include "src/common.h"
-#include "src/error-formatter.h"
-#include "src/feature.h"
-#include "src/filenames.h"
-#include "src/ir.h"
-#include "src/option-parser.h"
-#include "src/resolve-names.h"
-#include "src/stream.h"
-#include "src/validator.h"
-#include "src/wast-parser.h"
+#include "wabt/config.h"
+
+#include "wabt/binary-writer.h"
+#include "wabt/common.h"
+#include "wabt/error-formatter.h"
+#include "wabt/feature.h"
+#include "wabt/filenames.h"
+#include "wabt/ir.h"
+#include "wabt/option-parser.h"
+#include "wabt/resolve-names.h"
+#include "wabt/stream.h"
+#include "wabt/validator.h"
+#include "wabt/wast-parser.h"
 
 using namespace wabt;