4 files changed, 8 insertions, 13 deletions
diff --git a/src/asmjs/shared-constants.cpp b/src/asmjs/shared-constants.cpp
index 58742fb1d..bc5b9d08f 100644
--- a/src/asmjs/shared-constants.cpp
+++ b/src/asmjs/shared-constants.cpp
@@ -101,13 +101,6 @@ cashew::IString WASM_I64_UDIV("__wasm_i64_udiv");
 cashew::IString WASM_I64_SREM("__wasm_i64_srem");
 cashew::IString WASM_I64_UREM("__wasm_i64_urem");
 
-cashew::IString ASM_FUNC("asmFunc");
-cashew::IString ABORT_FUNC("abort");
-cashew::IString FUNCTION_TABLE("FUNCTION_TABLE");
-cashew::IString NO_RESULT("wasm2js$noresult"); // no result at all
-// result in an expression, no temp var
-cashew::IString EXPRESSION_RESULT("wasm2js$expresult");
-
 namespace ABI {
 namespace wasm2js {
 
diff --git a/src/asmjs/shared-constants.h b/src/asmjs/shared-constants.h
index 503e975dd..b6ba37c97 100644
--- a/src/asmjs/shared-constants.h
+++ b/src/asmjs/shared-constants.h
@@ -103,12 +103,6 @@ extern cashew::IString WASM_I64_SDIV;
 extern cashew::IString WASM_I64_UDIV;
 extern cashew::IString WASM_I64_SREM;
 extern cashew::IString WASM_I64_UREM;
-// wasm2js constants
-extern cashew::IString ASM_FUNC;
-extern cashew::IString ABORT_FUNC;
-extern cashew::IString FUNCTION_TABLE;
-extern cashew::IString NO_RESULT;
-extern cashew::IString EXPRESSION_RESULT;
 } // namespace wasm
 
 #endif // wasm_asmjs_shared_constants_h
diff --git a/src/tools/wasm2js.cpp b/src/tools/wasm2js.cpp
index 34ceaf357..7f3433bb7 100644
--- a/src/tools/wasm2js.cpp
+++ b/src/tools/wasm2js.cpp
@@ -18,6 +18,7 @@
 // wasm2js console tool
 //
 
+#include "wasm2js.h"
 #include "optimization-options.h"
 #include "pass.h"
 #include "support/colors.h"
diff --git a/src/wasm2js.h b/src/wasm2js.h
index 9d3fdd0ec..e5f473e21 100644
--- a/src/wasm2js.h
+++ b/src/wasm2js.h
@@ -52,6 +52,13 @@ namespace wasm {
 
 using namespace cashew;
 
+IString ASM_FUNC("asmFunc");
+IString ABORT_FUNC("abort");
+IString FUNCTION_TABLE("FUNCTION_TABLE");
+IString NO_RESULT("wasm2js$noresult"); // no result at all
+// result in an expression, no temp var
+IString EXPRESSION_RESULT("wasm2js$expresult");
+
 // Appends extra to block, flattening out if extra is a block as well
 void flattenAppend(Ref ast, Ref extra) {
   int index;