From 4527b1f2eaf7fd00cc31f7385d779f5fb546e0c9 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Thu, 16 Mar 2023 12:55:08 -0700
Subject: [PATCH] Start using auto-generated sigs from library_sigs.js. NFC

The sigs here were removed by running `tools/gen_sig_info.py --remove`

Currently the auto-generated signature cover 906 of the 1279 total
signatures we have in the JS library.  Hopefully we can figure out
a way to remove the rest too, but that work can happen in followups.
---
 src/library.js             |  59 ---------------
 src/library_async.js       |   5 --
 src/library_browser.js     |  23 ------
 src/library_dylink.js      |   4 -
 src/library_eventloop.js   |   8 --
 src/library_glew.js        |   1 -
 src/library_glut.js        |  25 -------
 src/library_html5.js       |  66 ----------------
 src/library_html5_webgl.js |  35 +--------
 src/library_idbstore.js    |   4 -
 src/library_math.js        |   1 -
 src/library_openal.js      |  91 ----------------------
 src/library_promise.js     |   5 --
 src/library_sdl.js         | 108 ---------------------------
 src/library_sigs.js        |   5 +-
 src/library_syscall.js     |  34 ---------
 src/library_wasi.js        |  15 ----
 src/library_webaudio.js    |   9 ---
 src/library_webgl.js       | 149 +------------------------------------
 src/library_websocket.js   |  19 -----
 src/library_wget.js        |   5 --
 src/modules.js             |  14 +---
 src/utility.js             |  12 +++
 test/test_other.py         |   2 +-
 tools/gen_sig_info.py      |  12 ++-
 25 files changed, 32 insertions(+), 679 deletions(-)

diff --git a/src/library.js b/src/library.js
index e66d2df490085..983d3f7a966a6 100644
--- a/src/library.js
+++ b/src/library.js
@@ -112,7 +112,6 @@ mergeInto(LibraryManager.library, {
   },
 #endif
 
-  exit__sig: 'vi',
 #if MINIMAL_RUNTIME
   // minimal runtime doesn't do any exit cleanup handling so just
   // map exit directly to the lower-level proc_exit syscall.
@@ -124,7 +123,6 @@ mergeInto(LibraryManager.library, {
   // Returns a pointer ('p'), which means an i32 on wasm32 and an i64 wasm64
   // We have a separate JS version `getHeapMax()` which can be called directly
   // avoiding any wrapper added for wasm64.
-  emscripten_get_heap_max__sig: 'p',
   emscripten_get_heap_max__deps: ['$getHeapMax'],
   emscripten_get_heap_max: function() {
     return getHeapMax();
@@ -189,7 +187,6 @@ mergeInto(LibraryManager.library, {
   },
 #endif // ~TEST_MEMORY_GROWTH_FAILS
 
-  emscripten_resize_heap__sig: 'ip',
   emscripten_resize_heap__deps: [
     '$getHeapMax',
 #if ASSERTIONS == 2
@@ -322,7 +319,6 @@ mergeInto(LibraryManager.library, {
   },
 
   system__deps: ['$setErrNo'],
-  system__sig: 'ip',
   system: function(command) {
 #if ENVIRONMENT_MAY_BE_NODE
     if (ENVIRONMENT_IS_NODE) {
@@ -374,7 +370,6 @@ mergeInto(LibraryManager.library, {
   // module scope: the built-in runtime function abort(), and this library
   // function _abort(). Remove one of these, importing two functions for the
   // same purpose is wasteful.
-  abort__sig: 'v',
   abort: function() {
 #if ASSERTIONS
     abort('native code called abort()');
@@ -387,7 +382,6 @@ mergeInto(LibraryManager.library, {
   // the initial values of the environment accessible by getenv.
   $ENV: {},
 
-  getloadavg__sig: 'ipi',
   getloadavg: function(loadavg, nelem) {
     // int getloadavg(double loadavg[], int nelem);
     // http://linux.die.net/man/3/getloadavg
@@ -407,7 +401,6 @@ mergeInto(LibraryManager.library, {
   // so we cannot override parts of it, and therefore cannot use libc_optz.
 #if (SHRINK_LEVEL < 2 || LINKABLE || process.env.EMCC_FORCE_STDLIBS) && !STANDALONE_WASM
 
-  emscripten_memcpy_big__sig: 'vppp',
 #if MIN_CHROME_VERSION < 45 || MIN_EDGE_VERSION < 14 || MIN_FIREFOX_VERSION < 34 || MIN_IE_VERSION != TARGET_NOT_SUPPORTED || MIN_SAFARI_VERSION < 100101
   // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray/copyWithin lists browsers that support TypedArray.prototype.copyWithin, but it
   // has outdated information for Safari, saying it would not support it.
@@ -436,7 +429,6 @@ mergeInto(LibraryManager.library, {
   // assert.h
   // ==========================================================================
 
-  __assert_fail__sig: 'vppip',
   __assert_fail: function(condition, filename, line, func) {
     abort('Assertion failed: ' + UTF8ToString(condition) + ', at: ' + [filename ? UTF8ToString(filename) : 'unknown filename', line, func ? UTF8ToString(func) : 'unknown function']);
   },
@@ -446,7 +438,6 @@ mergeInto(LibraryManager.library, {
   // ==========================================================================
 
   _mktime_js__deps: ['$ydayFromDate'],
-  _mktime_js__sig: 'ip',
   _mktime_js: function(tmPtr) {
     var date = new Date({{{ makeGetValue('tmPtr', C_STRUCTS.tm.tm_year, 'i32') }}} + 1900,
                         {{{ makeGetValue('tmPtr', C_STRUCTS.tm.tm_mon, 'i32') }}},
@@ -490,7 +481,6 @@ mergeInto(LibraryManager.library, {
   },
 
   _gmtime_js__deps: ['$readI53FromI64'],
-  _gmtime_js__sig: 'vpp',
   _gmtime_js: function(time, tmPtr) {
     var date = new Date({{{ makeGetValue('time', 0, 'i53') }}}*1000);
     {{{ makeSetValue('tmPtr', C_STRUCTS.tm.tm_sec, 'date.getUTCSeconds()', 'i32') }}};
@@ -505,7 +495,6 @@ mergeInto(LibraryManager.library, {
     {{{ makeSetValue('tmPtr', C_STRUCTS.tm.tm_yday, 'yday', 'i32') }}};
   },
 
-  _timegm_js__sig: 'ip',
   _timegm_js: function(tmPtr) {
     var time = Date.UTC({{{ makeGetValue('tmPtr', C_STRUCTS.tm.tm_year, 'i32') }}} + 1900,
                         {{{ makeGetValue('tmPtr', C_STRUCTS.tm.tm_mon, 'i32') }}},
@@ -525,7 +514,6 @@ mergeInto(LibraryManager.library, {
   },
 
   _localtime_js__deps: ['$readI53FromI64', '$ydayFromDate'],
-  _localtime_js__sig: 'vpp',
   _localtime_js: function(time, tmPtr) {
     var date = new Date({{{ makeGetValue('time', 0, 'i53') }}}*1000);
     {{{ makeSetValue('tmPtr', C_STRUCTS.tm.tm_sec, 'date.getSeconds()', 'i32') }}};
@@ -549,7 +537,6 @@ mergeInto(LibraryManager.library, {
   },
 
   // musl-internal function used to implement both `asctime` and `asctime_r`
-  __asctime_r__sig: 'ppp',
   __asctime_r: function(tmPtr, buf) {
     var date = {
       tm_sec: {{{ makeGetValue('tmPtr', C_STRUCTS.tm.tm_sec, 'i32') }}},
@@ -590,7 +577,6 @@ mergeInto(LibraryManager.library, {
   // Note: glibc has one fewer underscore for all of these. Also used in other related functions (timegm)
   _tzset_js__deps: ['$allocateUTF8'],
   _tzset_js__internal: true,
-  _tzset_js__sig: 'vppp',
   _tzset_js: function(timezone, daylight, tzname) {
     // TODO: Use (malleable) environment variables instead of system settings.
     var currentYear = new Date().getFullYear();
@@ -690,7 +676,6 @@ mergeInto(LibraryManager.library, {
   strftime__deps: ['$isLeapYear', '$arraySum', '$addDays', '$MONTH_DAYS_REGULAR', '$MONTH_DAYS_LEAP',
                    '$intArrayFromString', '$writeArrayToMemory'
   ],
-  strftime__sig: 'ppppp',
   strftime: function(s, maxsize, format, tm) {
     // size_t strftime(char *restrict s, size_t maxsize, const char *restrict format, const struct tm *restrict timeptr);
     // http://pubs.opengroup.org/onlinepubs/009695399/functions/strftime.html
@@ -977,14 +962,12 @@ mergeInto(LibraryManager.library, {
     return bytes.length-1;
   },
   strftime_l__deps: ['strftime'],
-  strftime_l__sig: 'pppppp',
   strftime_l: function(s, maxsize, format, tm, loc) {
     return _strftime(s, maxsize, format, tm); // no locale support yet
   },
 
   strptime__deps: ['$isLeapYear', '$arraySum', '$addDays', '$MONTH_DAYS_REGULAR', '$MONTH_DAYS_LEAP',
                    '$jstoi_q', '$intArrayFromString' ],
-  strptime__sig: 'pppp',
   strptime: function(buf, format, tm) {
     // char *strptime(const char *restrict buf, const char *restrict format, struct tm *restrict tm);
     // http://pubs.opengroup.org/onlinepubs/009695399/functions/strptime.html
@@ -1225,7 +1208,6 @@ mergeInto(LibraryManager.library, {
 
     return 0;
   },
-  strptime_l__sig: 'ppppp',
   strptime_l__deps: ['strptime'],
   strptime_l: function(buf, format, tm, locale) {
     return _strptime(buf, format, tm); // no locale support yet
@@ -1236,7 +1218,6 @@ mergeInto(LibraryManager.library, {
   // ==========================================================================
 
 #if SUPPORT_LONGJMP == 'emscripten'
-  _emscripten_throw_longjmp__sig: 'v',
   _emscripten_throw_longjmp: function() {
 #if EXCEPTION_STACK_TRACES
     throw new EmscriptenSjLj;
@@ -1831,7 +1812,6 @@ mergeInto(LibraryManager.library, {
   // note: lots of leaking here!
   gethostbyaddr__deps: ['$DNS', '$getHostByName', '$inetNtop4', '$setErrNo'],
   gethostbyaddr__proxy: 'sync',
-  gethostbyaddr__sig: 'ppii',
   gethostbyaddr: function (addr, addrlen, type) {
     if (type !== {{{ cDefs.AF_INET }}}) {
       setErrNo({{{ cDefs.EAFNOSUPPORT }}});
@@ -1849,7 +1829,6 @@ mergeInto(LibraryManager.library, {
 
   gethostbyname__deps: ['$getHostByName'],
   gethostbyname__proxy: 'sync',
-  gethostbyname__sig: 'pp',
   gethostbyname: function(name) {
     return getHostByName(UTF8ToString(name));
   },
@@ -1877,7 +1856,6 @@ mergeInto(LibraryManager.library, {
 
   gethostbyname_r__deps: ['gethostbyname', 'memcpy', 'free'],
   gethostbyname_r__proxy: 'sync',
-  gethostbyname_r__sig: 'ipppppp',
   gethostbyname_r: function(name, ret, buf, buflen, out, err) {
     var data = _gethostbyname(name);
     _memcpy(ret, data, {{{ C_STRUCTS.hostent.__size__ }}});
@@ -1889,7 +1867,6 @@ mergeInto(LibraryManager.library, {
 
   getaddrinfo__deps: ['$Sockets', '$DNS', '$inetPton4', '$inetNtop4', '$inetPton6', '$inetNtop6', '$writeSockaddr'],
   getaddrinfo__proxy: 'sync',
-  getaddrinfo__sig: 'ipppp',
   getaddrinfo: function(node, service, hint, out) {
     // Note getaddrinfo currently only returns a single addrinfo with ai_next defaulting to NULL. When NULL
     // hints are specified or ai_family set to AF_UNSPEC or ai_socktype or ai_protocol set to 0 then we
@@ -2060,7 +2037,6 @@ mergeInto(LibraryManager.library, {
   },
 
   getnameinfo__deps: ['$Sockets', '$DNS', '$readSockaddr'],
-  getnameinfo__sig: 'ipipipii',
   getnameinfo: function (sa, salen, node, nodelen, serv, servlen, flags) {
     var info = readSockaddr(sa, salen);
     if (info.errno) {
@@ -2275,7 +2251,6 @@ mergeInto(LibraryManager.library, {
   },
 
   getentropy__deps: ['$randomFill'],
-  getentropy__sig: 'ipp',
   getentropy: function(buffer, size) {
     randomFill(HEAPU8.subarray(buffer, buffer + size));
     return 0;
@@ -2286,7 +2261,6 @@ mergeInto(LibraryManager.library, {
   // Helper function for setitimer that registers timers with the eventloop.
   // Timers always fire on the main thread, either directly from JS (here) or
   // or when the main thread is busy waiting calling _emscripten_yield.
-  _setitimer_js__sig: 'iid',
   _setitimer_js__proxy: 'sync',
   _setitimer_js__deps: ['$timers', '$callUserCallback',
                         '_emscripten_timeout', 'emscripten_get_now'],
@@ -2320,7 +2294,6 @@ mergeInto(LibraryManager.library, {
 
   // Helper for raise() to avoid signature mismatch failures:
   // https://github.com/emscripten-core/posixtestsuite/issues/6
-  __call_sighandler__sig: 'vpi',
   __call_sighandler: function(fp, sig) {
     {{{ makeDynCall('vi', 'fp') }}}(sig);
   },
@@ -2329,12 +2302,10 @@ mergeInto(LibraryManager.library, {
   // emscripten.h
   // ==========================================================================
 
-  emscripten_run_script__sig: 'vp',
   emscripten_run_script: function(ptr) {
     {{{ makeEval('eval(UTF8ToString(ptr));') }}}
   },
 
-  emscripten_run_script_int__sig: 'ip',
   emscripten_run_script_int__docs: '/** @suppress{checkTypes} */',
   emscripten_run_script_int: function(ptr) {
     {{{ makeEval('return eval(UTF8ToString(ptr))|0;') }}}
@@ -2343,7 +2314,6 @@ mergeInto(LibraryManager.library, {
   // Mark as `noleakcheck` otherwise lsan will report the last returned string
   // as a leak.
   emscripten_run_script_string__noleakcheck: true,
-  emscripten_run_script_string__sig: 'pp',
   emscripten_run_script_string: function(ptr) {
     {{{ makeEval("var s = eval(UTF8ToString(ptr));") }}}
     if (s == null) {
@@ -2365,7 +2335,6 @@ mergeInto(LibraryManager.library, {
     return Math.random();
   },
 
-  emscripten_get_now__sig: 'd',
   emscripten_get_now: ';' +
 #if ENVIRONMENT_MAY_BE_NODE
                                "if (ENVIRONMENT_IS_NODE) {\n" +
@@ -2445,7 +2414,6 @@ mergeInto(LibraryManager.library, {
   $nowIsMonotonic: 'true;',
 #endif
 
-  _emscripten_get_now_is_monotonic__sig: 'i',
   _emscripten_get_now_is_monotonic__internal: true,
   _emscripten_get_now_is_monotonic__deps: ['$nowIsMonotonic'],
   _emscripten_get_now_is_monotonic: function() {
@@ -2650,7 +2618,6 @@ mergeInto(LibraryManager.library, {
     }
   },
 
-  emscripten_log__sig: 'vipp',
   emscripten_log__deps: ['$formatString', '$emscriptenLog'],
   emscripten_log: function(flags, format, varargs) {
     var result = formatString(format, varargs);
@@ -2661,7 +2628,6 @@ mergeInto(LibraryManager.library, {
   // We never free the return values of this function so we need to allocate
   // using builtin_malloc to avoid LSan reporting these as leaks.
   emscripten_get_compiler_setting__noleakcheck: true,
-  emscripten_get_compiler_setting__sig: 'pp',
   emscripten_get_compiler_setting: function(name) {
 #if RETAIN_COMPILER_SETTINGS
     name = UTF8ToString(name);
@@ -2689,7 +2655,6 @@ mergeInto(LibraryManager.library, {
     debugger;
   },
 
-  emscripten_print_double__sig: 'idpi',
   emscripten_print_double: function(x, to, max) {
     var str = x + '';
     if (to) return stringToUTF8(str, to, max);
@@ -2732,7 +2697,6 @@ mergeInto(LibraryManager.library, {
   // Returns a representation of a call site of the caller of this function, in a manner
   // similar to __builtin_return_address. If level is 0, we return the call site of the
   // caller of this function.
-  emscripten_return_address__sig: 'pi',
   emscripten_return_address__deps: ['$convertFrameToPC', '$jsStackTrace'],
   emscripten_return_address: function(level) {
     var callstack = jsStackTrace().split('\n');
@@ -2790,7 +2754,6 @@ mergeInto(LibraryManager.library, {
   // must be able to unwind from a PC value that may no longer be on the
   // execution stack, and so we are forced to cache the entire call stack.
   emscripten_stack_snapshot__deps: ['$convertFrameToPC', '$UNWIND_CACHE', '$saveInUnwindCache', '$jsStackTrace'],
-  emscripten_stack_snapshot__sig: 'p',
   emscripten_stack_snapshot: function () {
     var callstack = jsStackTrace().split('\n');
     if (callstack[0] == 'Error') {
@@ -2821,7 +2784,6 @@ mergeInto(LibraryManager.library, {
   // emscripten_stack_snapshot, or this function will instead use the current
   // call stack.
   emscripten_stack_unwind_buffer__deps: ['$UNWIND_CACHE', '$saveInUnwindCache', '$convertFrameToPC', '$jsStackTrace'],
-  emscripten_stack_unwind_buffer__sig: 'ippi',
   emscripten_stack_unwind_buffer: function (addr, buffer, count) {
     var stack;
     if (UNWIND_CACHE.last_addr == addr) {
@@ -2850,7 +2812,6 @@ mergeInto(LibraryManager.library, {
   emscripten_pc_get_function__deps: ['$UNWIND_CACHE', 'free', '$allocateUTF8'],
   // Don't treat allocation of _emscripten_pc_get_function.ret as a leak
   emscripten_pc_get_function__noleakcheck: true,
-  emscripten_pc_get_function__sig: 'pp',
 #endif
   emscripten_pc_get_function: function (pc) {
 #if !USE_OFFSET_CONVERTER
@@ -2911,7 +2872,6 @@ mergeInto(LibraryManager.library, {
   emscripten_pc_get_file__deps: ['$convertPCtoSourceLocation', 'free', '$allocateUTF8'],
   // Don't treat allocation of _emscripten_pc_get_file.ret as a leak
   emscripten_pc_get_file__noleakcheck: true,
-  emscripten_pc_get_file__sig: 'pp',
   emscripten_pc_get_file: function (pc) {
     var result = convertPCtoSourceLocation(pc);
     if (!result) return 0;
@@ -2923,7 +2883,6 @@ mergeInto(LibraryManager.library, {
 
   // Look up the line number from our stack frame cache with our PC representation.
   emscripten_pc_get_line__deps: ['$convertPCtoSourceLocation'],
-  emscripten_pc_get_line__sig: 'ip',
   emscripten_pc_get_line: function (pc) {
     var result = convertPCtoSourceLocation(pc);
     return result ? result.line : 0;
@@ -2931,13 +2890,11 @@ mergeInto(LibraryManager.library, {
 
   // Look up the column number from our stack frame cache with our PC representation.
   emscripten_pc_get_column__deps: ['$convertPCtoSourceLocation'],
-  emscripten_pc_get_column__sig: 'ip',
   emscripten_pc_get_column: function (pc) {
     var result = convertPCtoSourceLocation(pc);
     return result ? result.column || 0 : 0;
   },
 
-  emscripten_get_module_name__sig: 'ppp',
   emscripten_get_module_name: function(buf, length) {
 #if MINIMAL_RUNTIME
     return stringToUTF8('{{{ TARGET_BASENAME }}}.wasm', buf, length);
@@ -3035,18 +2992,15 @@ mergeInto(LibraryManager.library, {
     return ASM_CONSTS[code].apply(null, args);
   },
 
-  emscripten_asm_const_int__sig: 'ippp',
   emscripten_asm_const_int__deps: ['$runEmAsmFunction'],
   emscripten_asm_const_int: function(code, sigPtr, argbuf) {
     return runEmAsmFunction(code, sigPtr, argbuf);
   },
-  emscripten_asm_const_double__sig: 'dppp',
   emscripten_asm_const_double__deps: ['$runEmAsmFunction'],
   emscripten_asm_const_double: function(code, sigPtr, argbuf) {
     return runEmAsmFunction(code, sigPtr, argbuf);
   },
 
-  emscripten_asm_const_ptr__sig: 'pppp',
   emscripten_asm_const_ptr__deps: ['$runEmAsmFunction'],
   emscripten_asm_const_ptr: function(code, sigPtr, argbuf) {
     return runEmAsmFunction(code, sigPtr, argbuf);
@@ -3077,13 +3031,11 @@ mergeInto(LibraryManager.library, {
     return ASM_CONSTS[code].apply(null, args);
   },
   emscripten_asm_const_int_sync_on_main_thread__deps: ['$runMainThreadEmAsm'],
-  emscripten_asm_const_int_sync_on_main_thread__sig: 'ippp',
   emscripten_asm_const_int_sync_on_main_thread: function(code, sigPtr, argbuf) {
     return runMainThreadEmAsm(code, sigPtr, argbuf, 1);
   },
   emscripten_asm_const_double_sync_on_main_thread: 'emscripten_asm_const_int_sync_on_main_thread',
   emscripten_asm_const_async_on_main_thread__deps: ['$runMainThreadEmAsm'],
-  emscripten_asm_const_async_on_main_thread__sig: 'vppp',
   emscripten_asm_const_async_on_main_thread: function(code, sigPtr, argbuf) {
     return runMainThreadEmAsm(code, sigPtr, argbuf, 0);
   },
@@ -3166,7 +3118,6 @@ mergeInto(LibraryManager.library, {
 
 #if STACK_OVERFLOW_CHECK
   // Used by wasm-emscripten-finalize to implement STACK_OVERFLOW_CHECK
-  __handle_stack_overflow__sig: 'vp',
   __handle_stack_overflow__deps: ['emscripten_stack_get_base', 'emscripten_stack_get_end', '$ptrToString'],
   __handle_stack_overflow: function(requested) {
     requested = requested >>> 0;
@@ -3379,7 +3330,6 @@ mergeInto(LibraryManager.library, {
 #endif // SHRINK_LEVEL == 0
 
   // Callable in pthread without __proxy needed.
-  emscripten_exit_with_live_runtime__sig: 'v',
   emscripten_exit_with_live_runtime: function() {
     {{{ runtimeKeepalivePush() }}}
     throw 'unwind';
@@ -3391,7 +3341,6 @@ mergeInto(LibraryManager.library, {
 #endif
   ],
   emscripten_force_exit__proxy: 'sync',
-  emscripten_force_exit__sig: 'vi',
   emscripten_force_exit: function(status) {
 #if RUNTIME_DEBUG
     dbg('emscripten_force_exit');
@@ -3406,18 +3355,15 @@ mergeInto(LibraryManager.library, {
     _exit(status);
   },
 
-  _emscripten_out__sig: 'vp',
   _emscripten_out: function(str) {
     out(UTF8ToString(str));
   },
 
-  _emscripten_err__sig: 'vp',
   _emscripten_err: function(str) {
     err(UTF8ToString(str));
   },
 
 #if ASSERTIONS || RUNTIME_DEBUG
-  _emscripten_dbg__sig: 'vp',
   _emscripten_dbg: function(str) {
     dbg(UTF8ToString(str));
   },
@@ -3425,7 +3371,6 @@ mergeInto(LibraryManager.library, {
 
   // Use program_invocation_short_name and program_invocation_name in compiled
   // programs. This function is for implementing them.
-  _emscripten_get_progname__sig: 'vpi',
   _emscripten_get_progname: function(str, len) {
 #if !MINIMAL_RUNTIME
 #if ASSERTIONS
@@ -3436,7 +3381,6 @@ mergeInto(LibraryManager.library, {
 #endif
   },
 
-  emscripten_console_log__sig: 'vp',
   emscripten_console_log: function(str) {
 #if ASSERTIONS
     assert(typeof str == 'number');
@@ -3444,7 +3388,6 @@ mergeInto(LibraryManager.library, {
     console.log(UTF8ToString(str));
   },
 
-  emscripten_console_warn__sig: 'vp',
   emscripten_console_warn: function(str) {
 #if ASSERTIONS
     assert(typeof str == 'number');
@@ -3452,7 +3395,6 @@ mergeInto(LibraryManager.library, {
     console.warn(UTF8ToString(str));
   },
 
-  emscripten_console_error__sig: 'vp',
   emscripten_console_error: function(str) {
 #if ASSERTIONS
     assert(typeof str == 'number');
@@ -3686,7 +3628,6 @@ mergeInto(LibraryManager.library, {
 #endif
 
   _emscripten_fs_load_embedded_files__deps: ['$FS', '$PATH'],
-  _emscripten_fs_load_embedded_files__sig: 'vp',
   _emscripten_fs_load_embedded_files: function(ptr) {
 #if RUNTIME_DEBUG
     dbg('preloading data files');
diff --git a/src/library_async.js b/src/library_async.js
index 82c57b741f8a8..2d2843970986f 100644
--- a/src/library_async.js
+++ b/src/library_async.js
@@ -450,7 +450,6 @@ mergeInto(LibraryManager.library, {
 #endif
   },
 
-  emscripten_sleep__sig: 'vi',
   emscripten_sleep__deps: ['$safeSetTimeout'],
   emscripten_sleep: function(ms) {
     // emscripten_sleep() does not return a value, but we still need a |return|
@@ -460,7 +459,6 @@ mergeInto(LibraryManager.library, {
     return Asyncify.handleSleep((wakeUp) => safeSetTimeout(wakeUp, ms));
   },
 
-  emscripten_wget__sig: 'vpp',
   emscripten_wget__deps: ['$Browser', '$PATH_FS', '$FS'],
   emscripten_wget: function(url, file) {
     return Asyncify.handleSleep((wakeUp) => {
@@ -488,7 +486,6 @@ mergeInto(LibraryManager.library, {
     });
   },
 
-  emscripten_wget_data__sig: 'vpppp',
   emscripten_wget_data__deps: ['$asyncLoad', 'malloc'],
   emscripten_wget_data: function(url, pbuffer, pnum, perror) {
     return Asyncify.handleSleep((wakeUp) => {
@@ -507,7 +504,6 @@ mergeInto(LibraryManager.library, {
     });
   },
 
-  emscripten_scan_registers__sig: 'vp',
   emscripten_scan_registers__deps: ['$safeSetTimeout'],
   emscripten_scan_registers: function(func) {
     return Asyncify.handleSleep((wakeUp) => {
@@ -608,7 +604,6 @@ mergeInto(LibraryManager.library, {
     },
   },
 
-  emscripten_fiber_swap__sig: 'vpp',
   emscripten_fiber_swap__deps: ["$Asyncify", "$Fibers"],
   emscripten_fiber_swap: function(oldFiber, newFiber) {
     if (ABORT) return;
diff --git a/src/library_browser.js b/src/library_browser.js
index 7062da465f461..ff9de924298f7 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -779,7 +779,6 @@ var LibraryBrowser = {
 
   emscripten_run_preload_plugins__deps: ['$PATH'],
   emscripten_run_preload_plugins__proxy: 'sync',
-  emscripten_run_preload_plugins__sig: 'ippp',
   emscripten_run_preload_plugins: function(file, onload, onerror) {
     {{{ runtimeKeepalivePush() }}}
 
@@ -805,7 +804,6 @@ var LibraryBrowser = {
 
   emscripten_run_preload_plugins_data__proxy: 'sync',
   emscripten_run_preload_plugins_data__deps: ['malloc'],
-  emscripten_run_preload_plugins_data__sig: 'vpipppp',
   emscripten_run_preload_plugins_data: function(data, size, suffix, arg, onload, onerror) {
     {{{ runtimeKeepalivePush() }}}
 
@@ -875,14 +873,12 @@ var LibraryBrowser = {
   },
 
   // Runs natively in pthread, no __proxy needed.
-  emscripten_get_main_loop_timing__sig: 'vpp',
   emscripten_get_main_loop_timing: function(mode, value) {
     if (mode) {{{ makeSetValue('mode', 0, 'Browser.mainLoop.timingMode', 'i32') }}};
     if (value) {{{ makeSetValue('value', 0, 'Browser.mainLoop.timingValue', 'i32') }}};
   },
 
   // Runs natively in pthread, no __proxy needed.
-  emscripten_set_main_loop_timing__sig: 'iii',
   emscripten_set_main_loop_timing: function(mode, value) {
     Browser.mainLoop.timingMode = mode;
     Browser.mainLoop.timingValue = value;
@@ -942,7 +938,6 @@ var LibraryBrowser = {
   },
 
   emscripten_set_main_loop__deps: ['$setMainLoop'],
-  emscripten_set_main_loop__sig: 'vpii',
   emscripten_set_main_loop: function(func, fps, simulateInfiniteLoop) {
     var browserIterationFunc = {{{ makeDynCall('v', 'func') }}};
     setMainLoop(browserIterationFunc, fps, simulateInfiniteLoop);
@@ -1104,27 +1099,23 @@ var LibraryBrowser = {
 
   // Runs natively in pthread, no __proxy needed.
   emscripten_set_main_loop_arg__deps: ['$setMainLoop'],
-  emscripten_set_main_loop_arg__sig: 'vppii',
   emscripten_set_main_loop_arg: function(func, arg, fps, simulateInfiniteLoop) {
     var browserIterationFunc = () => {{{ makeDynCall('vi', 'func') }}}(arg);
     setMainLoop(browserIterationFunc, fps, simulateInfiniteLoop, arg);
   },
 
   // Runs natively in pthread, no __proxy needed.
-  emscripten_cancel_main_loop__sig: 'v',
   emscripten_cancel_main_loop: function() {
     Browser.mainLoop.pause();
     Browser.mainLoop.func = null;
   },
 
   // Runs natively in pthread, no __proxy needed.
-  emscripten_pause_main_loop__sig: 'v',
   emscripten_pause_main_loop: function() {
     Browser.mainLoop.pause();
   },
 
   // Runs natively in pthread, no __proxy needed.
-  emscripten_resume_main_loop__sig: 'v',
   emscripten_resume_main_loop: function() {
     Browser.mainLoop.resume();
   },
@@ -1146,7 +1137,6 @@ var LibraryBrowser = {
   },
 
   // Runs natively in pthread, no __proxy needed.
-  emscripten_set_main_loop_expected_blockers__sig: 'vi',
   emscripten_set_main_loop_expected_blockers: function(num) {
     Browser.mainLoop.expectedBlockers = num;
     Browser.mainLoop.remainingBlockers = num;
@@ -1154,7 +1144,6 @@ var LibraryBrowser = {
   },
 
   // Runs natively in pthread, no __proxy needed.
-  emscripten_async_call__sig: 'vppi',
   emscripten_async_call__deps: ['$safeSetTimeout'],
   emscripten_async_call: function(func, arg, millis) {
     function wrapper() {
@@ -1174,7 +1163,6 @@ var LibraryBrowser = {
   },
 
   emscripten_get_window_title__proxy: 'sync',
-  emscripten_get_window_title__sig: 'p',
   emscripten_get_window_title: function() {
     var buflen = 256;
 
@@ -1188,20 +1176,17 @@ var LibraryBrowser = {
   },
 
   emscripten_set_window_title__proxy: 'sync',
-  emscripten_set_window_title__sig: 'vp',
   emscripten_set_window_title: function(title) {
     setWindowTitle(UTF8ToString(title));
   },
 
   emscripten_get_screen_size__proxy: 'sync',
-  emscripten_get_screen_size__sig: 'vpp',
   emscripten_get_screen_size: function(width, height) {
     {{{ makeSetValue('width', '0', 'screen.width', 'i32') }}};
     {{{ makeSetValue('height', '0', 'screen.height', 'i32') }}};
   },
 
   emscripten_hide_mouse__proxy: 'sync',
-  emscripten_hide_mouse__sig: 'v',
   emscripten_hide_mouse: function() {
     var styleSheet = document.styleSheets[0];
     var rules = styleSheet.cssRules;
@@ -1215,13 +1200,11 @@ var LibraryBrowser = {
   },
 
   emscripten_set_canvas_size__proxy: 'sync',
-  emscripten_set_canvas_size__sig: 'vii',
   emscripten_set_canvas_size: function(width, height) {
     Browser.setCanvasSize(width, height);
   },
 
   emscripten_get_canvas_size__proxy: 'sync',
-  emscripten_get_canvas_size__sig: 'vppp',
   emscripten_get_canvas_size: function(width, height, isFullscreen) {
     var canvas = Module['canvas'];
     {{{ makeSetValue('width', '0', 'canvas.width', 'i32') }}};
@@ -1231,7 +1214,6 @@ var LibraryBrowser = {
 
   // To avoid creating worker parent->child chains, always proxies to execute on the main thread.
   emscripten_create_worker__proxy: 'sync',
-  emscripten_create_worker__sig: 'ip',
   emscripten_create_worker: function(url) {
     url = UTF8ToString(url);
     var id = Browser.workers.length;
@@ -1274,7 +1256,6 @@ var LibraryBrowser = {
   },
 
   emscripten_destroy_worker__proxy: 'sync',
-  emscripten_destroy_worker__sig: 'vi',
   emscripten_destroy_worker: function(id) {
     var info = Browser.workers[id];
     info.worker.terminate();
@@ -1283,7 +1264,6 @@ var LibraryBrowser = {
   },
 
   emscripten_call_worker__proxy: 'sync',
-  emscripten_call_worker__sig: 'vippipp',
   emscripten_call_worker: function(id, funcName, data, size, callback, arg) {
     funcName = UTF8ToString(funcName);
     var info = Browser.workers[id];
@@ -1349,7 +1329,6 @@ var LibraryBrowser = {
 #endif
 
   emscripten_get_worker_queue_size__proxy: 'sync',
-  emscripten_get_worker_queue_size__sig: 'ii',
   emscripten_get_worker_queue_size: function(id) {
     var info = Browser.workers[id];
     if (!info) return -1;
@@ -1358,7 +1337,6 @@ var LibraryBrowser = {
 
   emscripten_get_preloaded_image_data__deps: ['$PATH_FS', 'malloc'],
   emscripten_get_preloaded_image_data__proxy: 'sync',
-  emscripten_get_preloaded_image_data__sig: 'pppp',
   emscripten_get_preloaded_image_data: function(path, w, h) {
     if ((path | 0) === path) path = UTF8ToString(path);
 
@@ -1382,7 +1360,6 @@ var LibraryBrowser = {
 
   emscripten_get_preloaded_image_data_from_FILE__deps: ['emscripten_get_preloaded_image_data', 'fileno'],
   emscripten_get_preloaded_image_data_from_FILE__proxy: 'sync',
-  emscripten_get_preloaded_image_data_from_FILE__sig: 'pppp',
   emscripten_get_preloaded_image_data_from_FILE: function(file, w, h) {
     var fd = _fileno(file);
     var stream = FS.getStream(fd);
diff --git a/src/library_dylink.js b/src/library_dylink.js
index 4053ac83c0751..39c3cf2bc1519 100644
--- a/src/library_dylink.js
+++ b/src/library_dylink.js
@@ -1087,7 +1087,6 @@ var LibraryDylink = {
   },
 
   _dlopen_js__deps: ['$dlopenInternal'],
-  _dlopen_js__sig: 'pp',
   _dlopen_js: function(handle) {
 #if ASYNCIFY
     return Asyncify.handleSleep(function(wakeUp) {
@@ -1109,7 +1108,6 @@ var LibraryDylink = {
 
   // Async version of dlopen.
   _emscripten_dlopen_js__deps: ['$dlopenInternal', '$callUserCallback', '$dlSetError'],
-  _emscripten_dlopen_js__sig: 'vpppp',
   _emscripten_dlopen_js: function(handle, onsuccess, onerror, user_data) {
     /** @param {Object=} e */
     function errorCallback(e) {
@@ -1132,7 +1130,6 @@ var LibraryDylink = {
     }
   },
 
-  _dlsym_catchup_js__sig: 'ppi',
   _dlsym_catchup_js: function(handle, symbolIndex) {
 #if DYLINK_DEBUG
     dbg("_dlsym_catchup: handle=" + ptrToString(handle) + " symbolIndex=" + symbolIndex);
@@ -1150,7 +1147,6 @@ var LibraryDylink = {
 
   // void* dlsym(void* handle, const char* symbol);
   _dlsym_js__deps: ['$dlSetError', '$getFunctionAddress', '$addFunction'],
-  _dlsym_js__sig: 'pppp',
   _dlsym_js: function(handle, symbol, symbolIndex) {
     // void *dlsym(void *restrict handle, const char *restrict name);
     // http://pubs.opengroup.org/onlinepubs/009695399/functions/dlsym.html
diff --git a/src/library_eventloop.js b/src/library_eventloop.js
index 394507fd93a3a..ca6dba8c0277c 100644
--- a/src/library_eventloop.js
+++ b/src/library_eventloop.js
@@ -70,7 +70,6 @@ LibraryJSEventLoop = {
     // emscripten_set_immediate_loop() if application links to both of them.
   },
 
-  emscripten_set_immediate__sig: 'ipp',
   emscripten_set_immediate__deps: ['$polyfillSetImmediate', '$callUserCallback'],
   emscripten_set_immediate: function(cb, userData) {
     polyfillSetImmediate();
@@ -83,14 +82,12 @@ LibraryJSEventLoop = {
     });
   },
 
-  emscripten_clear_immediate__sig: 'vi',
   emscripten_clear_immediate__deps: ['$polyfillSetImmediate'],
   emscripten_clear_immediate: function(id) {
     {{{ runtimeKeepalivePop(); }}}
     emClearImmediate(id);
   },
 
-  emscripten_set_immediate_loop__sig: 'vpp',
   emscripten_set_immediate_loop__deps: ['$polyfillSetImmediate', '$callUserCallback'],
   emscripten_set_immediate_loop: function(cb, userData) {
     polyfillSetImmediate();
@@ -107,18 +104,15 @@ LibraryJSEventLoop = {
     emSetImmediate(tick);
   },
 
-  emscripten_set_timeout__sig: 'ipdp',
   emscripten_set_timeout__deps: ['$safeSetTimeout'],
   emscripten_set_timeout: function(cb, msecs, userData) {
     return safeSetTimeout(() => {{{ makeDynCall('vp', 'cb') }}}(userData), msecs);
   },
 
-  emscripten_clear_timeout__sig: 'vi',
   emscripten_clear_timeout: function(id) {
     clearTimeout(id);
   },
 
-  emscripten_set_timeout_loop__sig: 'vpdp',
   emscripten_set_timeout_loop__deps: ['$callUserCallback'],
   emscripten_set_timeout_loop: function(cb, msecs, userData) {
     function tick() {
@@ -139,7 +133,6 @@ LibraryJSEventLoop = {
     return setTimeout(tick, 0);
   },
 
-  emscripten_set_interval__sig: 'ipdp',
   emscripten_set_interval__deps: ['$callUserCallback'],
   emscripten_set_interval: function(cb, msecs, userData) {
     {{{ runtimeKeepalivePush() }}}
@@ -150,7 +143,6 @@ LibraryJSEventLoop = {
     }, msecs);
   },
 
-  emscripten_clear_interval__sig: 'vi',
   emscripten_clear_interval: function(id) {
     {{{ runtimeKeepalivePop() }}}
     clearInterval(id);
diff --git a/src/library_glew.js b/src/library_glew.js
index 5e270c54623f4..8bb1100e3be23 100644
--- a/src/library_glew.js
+++ b/src/library_glew.js
@@ -127,7 +127,6 @@ var LibraryGLEW = {
     return GLEW.extensionIsSupported(UTF8ToString(name));
   },
 
-  glewGetErrorString__sig: 'pi',
   glewGetErrorString: function(error) {
     return GLEW.errorString(error);
   },
diff --git a/src/library_glut.js b/src/library_glut.js
index 5d37dd69f412e..37da07279d548 100644
--- a/src/library_glut.js
+++ b/src/library_glut.js
@@ -302,12 +302,10 @@ var LibraryGLUT = {
   },
 
   glutGetModifiers__proxy: 'sync',
-  glutGetModifiers__sig: 'i',
   glutGetModifiers: function() { return GLUT.modifiers; },
 
   glutInit__deps: ['$Browser'],
   glutInit__proxy: 'sync',
-  glutInit__sig: 'vpp',
   glutInit: function(argcp, argv) {
     // Ignore arguments
     GLUT.initTime = Date.now();
@@ -366,14 +364,12 @@ var LibraryGLUT = {
   },
 
   glutInitWindowSize__proxy: 'sync',
-  glutInitWindowSize__sig: 'vii',
   glutInitWindowSize: function(width, height) {
     Browser.setCanvasSize( GLUT.initWindowWidth = width,
                            GLUT.initWindowHeight = height );
   },
 
   glutInitWindowPosition__proxy: 'sync',
-  glutInitWindowPosition__sig: 'vii',
   glutInitWindowPosition: function(x, y) {
     // Ignore for now
   },
@@ -419,7 +415,6 @@ var LibraryGLUT = {
 
   glutIdleFunc__proxy: 'sync',
   glutIdleFunc__deps: ['$safeSetTimeout'],
-  glutIdleFunc__sig: 'vp',
   glutIdleFunc: function(func) {
     function callback() {
       if (GLUT.idleFunc) {
@@ -435,67 +430,56 @@ var LibraryGLUT = {
 
   glutTimerFunc__proxy: 'sync',
   glutTimerFunc__deps: ['$safeSetTimeout'],
-  glutTimerFunc__sig: 'vipi',
   glutTimerFunc: function(msec, func, value) {
     safeSetTimeout(function() { {{{ makeDynCall('vi', 'func') }}}(value); }, msec);
   },
 
   glutDisplayFunc__proxy: 'sync',
-  glutDisplayFunc__sig: 'vp',
   glutDisplayFunc: function(func) {
     GLUT.displayFunc = func;
   },
 
   glutKeyboardFunc__proxy: 'sync',
-  glutKeyboardFunc__sig: 'vp',
   glutKeyboardFunc: function(func) {
     GLUT.keyboardFunc = func;
   },
 
   glutKeyboardUpFunc__proxy: 'sync',
-  glutKeyboardUpFunc__sig: 'vp',
   glutKeyboardUpFunc: function(func) {
     GLUT.keyboardUpFunc = func;
   },
 
   glutSpecialFunc__proxy: 'sync',
-  glutSpecialFunc__sig: 'vp',
   glutSpecialFunc: function(func) {
     GLUT.specialFunc = func;
   },
 
   glutSpecialUpFunc__proxy: 'sync',
-  glutSpecialUpFunc__sig: 'vp',
   glutSpecialUpFunc: function(func) {
     GLUT.specialUpFunc = func;
   },
 
   glutReshapeFunc__proxy: 'sync',
-  glutReshapeFunc__sig: 'vp',
   glutReshapeFunc: function(func) {
     GLUT.reshapeFunc = func;
   },
 
   glutMotionFunc__proxy: 'sync',
-  glutMotionFunc__sig: 'vp',
   glutMotionFunc: function(func) {
     GLUT.motionFunc = func;
   },
 
   glutPassiveMotionFunc__proxy: 'sync',
-  glutPassiveMotionFunc__sig: 'vp',
   glutPassiveMotionFunc: function(func) {
     GLUT.passiveMotionFunc = func;
   },
 
   glutMouseFunc__proxy: 'sync',
-  glutMouseFunc__sig: 'vp',
   glutMouseFunc: function(func) {
     GLUT.mouseFunc = func;
   },
 
   glutSetCursor__proxy: 'sync',
-  glutSetCursor__sig: 'vi',
   glutSetCursor: function(cursor) {
     var cursorStyle = 'auto';
     switch (cursor) {
@@ -573,7 +557,6 @@ var LibraryGLUT = {
 
   glutCreateWindow__proxy: 'sync',
   glutCreateWindow__deps: ['$Browser'],
-  glutCreateWindow__sig: 'ip',
   glutCreateWindow: function(name) {
     var contextAttributes = {
       antialias: ((GLUT.initDisplayMode & 0x0080 /*GLUT_MULTISAMPLE*/) != 0),
@@ -591,7 +574,6 @@ var LibraryGLUT = {
 
   glutDestroyWindow__proxy: 'sync',
   glutDestroyWindow__deps: ['$Browser'],
-  glutDestroyWindow__sig: 'vi',
   glutDestroyWindow: function(name) {
     Module.ctx = Browser.destroyContext(Module['canvas'], true, true);
     return 1;
@@ -599,7 +581,6 @@ var LibraryGLUT = {
 
   glutReshapeWindow__proxy: 'sync',
   glutReshapeWindow__deps: ['$GLUT', 'glutPostRedisplay'],
-  glutReshapeWindow__sig: 'vii',
   glutReshapeWindow: function(width, height) {
     Browser.exitFullscreen();
     Browser.setCanvasSize(width, height, true); // N.B. GLUT.reshapeFunc is also registered as a canvas resize callback.
@@ -612,7 +593,6 @@ var LibraryGLUT = {
 
   glutPositionWindow__proxy: 'sync',
   glutPositionWindow__deps: ['$GLUT', 'glutPostRedisplay'],
-  glutPositionWindow__sig: 'vii',
   glutPositionWindow: function(x, y) {
     Browser.exitFullscreen();
     /* TODO */
@@ -621,7 +601,6 @@ var LibraryGLUT = {
 
   glutFullScreen__proxy: 'sync',
   glutFullScreen__deps: ['$GLUT', 'glutPostRedisplay'],
-  glutFullScreen__sig: 'v',
   glutFullScreen: function() {
     GLUT.windowX = 0; // TODO
     GLUT.windowY = 0; // TODO
@@ -634,17 +613,14 @@ var LibraryGLUT = {
   },
 
   glutInitDisplayMode__proxy: 'sync',
-  glutInitDisplayMode__sig: 'vi',
   glutInitDisplayMode: function(mode) {
     GLUT.initDisplayMode = mode;
   },
 
   glutSwapBuffers__proxy: 'sync',
-  glutSwapBuffers__sig: 'v',
   glutSwapBuffers: function() {},
 
   glutPostRedisplay__proxy: 'sync',
-  glutPostRedisplay__sig: 'v',
   glutPostRedisplay: function() {
     if (GLUT.displayFunc && !GLUT.requestedAnimationFrame) {
       GLUT.requestedAnimationFrame = true;
@@ -659,7 +635,6 @@ var LibraryGLUT = {
 
   glutMainLoop__proxy: 'sync',
   glutMainLoop__deps: ['$GLUT', 'glutReshapeWindow', 'glutPostRedisplay'],
-  glutMainLoop__sig: 'v',
   glutMainLoop: function() {
     _glutReshapeWindow(Module['canvas'].width, Module['canvas'].height);
     _glutPostRedisplay();
diff --git a/src/library_html5.js b/src/library_html5.js
index 3f75f317f25bc..692f8bdcd82c4 100644
--- a/src/library_html5.js
+++ b/src/library_html5.js
@@ -399,7 +399,6 @@ var LibraryHTML5 = {
 #endif
 
   emscripten_set_keypress_callback_on_thread__proxy: 'sync',
-  emscripten_set_keypress_callback_on_thread__sig: 'ippipp',
   emscripten_set_keypress_callback_on_thread__deps: ['$registerKeyEventCallback'],
   emscripten_set_keypress_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerKeyEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_KEYPRESS }}}, "keypress", targetThread);
@@ -407,7 +406,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_keydown_callback_on_thread__proxy: 'sync',
-  emscripten_set_keydown_callback_on_thread__sig: 'ippipp',
   emscripten_set_keydown_callback_on_thread__deps: ['$registerKeyEventCallback'],
   emscripten_set_keydown_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerKeyEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_KEYDOWN }}}, "keydown", targetThread);
@@ -415,7 +413,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_keyup_callback_on_thread__proxy: 'sync',
-  emscripten_set_keyup_callback_on_thread__sig: 'ippipp',
   emscripten_set_keyup_callback_on_thread__deps: ['$registerKeyEventCallback'],
   emscripten_set_keyup_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerKeyEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_KEYUP }}}, "keyup", targetThread);
@@ -546,7 +543,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_click_callback_on_thread__proxy: 'sync',
-  emscripten_set_click_callback_on_thread__sig: 'ippipp',
   emscripten_set_click_callback_on_thread__deps: ['$registerMouseEventCallback'],
   emscripten_set_click_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerMouseEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_CLICK }}}, "click", targetThread);
@@ -554,7 +550,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_mousedown_callback_on_thread__proxy: 'sync',
-  emscripten_set_mousedown_callback_on_thread__sig: 'ippipp',
   emscripten_set_mousedown_callback_on_thread__deps: ['$registerMouseEventCallback'],
   emscripten_set_mousedown_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerMouseEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_MOUSEDOWN }}}, "mousedown", targetThread);
@@ -562,7 +557,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_mouseup_callback_on_thread__proxy: 'sync',
-  emscripten_set_mouseup_callback_on_thread__sig: 'ippipp',
   emscripten_set_mouseup_callback_on_thread__deps: ['$registerMouseEventCallback'],
   emscripten_set_mouseup_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerMouseEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_MOUSEUP }}}, "mouseup", targetThread);
@@ -570,7 +564,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_dblclick_callback_on_thread__proxy: 'sync',
-  emscripten_set_dblclick_callback_on_thread__sig: 'ippipp',
   emscripten_set_dblclick_callback_on_thread__deps: ['$registerMouseEventCallback'],
   emscripten_set_dblclick_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerMouseEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_DBLCLICK }}}, "dblclick", targetThread);
@@ -578,7 +571,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_mousemove_callback_on_thread__proxy: 'sync',
-  emscripten_set_mousemove_callback_on_thread__sig: 'ippipp',
   emscripten_set_mousemove_callback_on_thread__deps: ['$registerMouseEventCallback'],
   emscripten_set_mousemove_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerMouseEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_MOUSEMOVE }}}, "mousemove", targetThread);
@@ -586,7 +578,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_mouseenter_callback_on_thread__proxy: 'sync',
-  emscripten_set_mouseenter_callback_on_thread__sig: 'ippipp',
   emscripten_set_mouseenter_callback_on_thread__deps: ['$registerMouseEventCallback'],
   emscripten_set_mouseenter_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerMouseEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_MOUSEENTER }}}, "mouseenter", targetThread);
@@ -594,7 +585,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_mouseleave_callback_on_thread__proxy: 'sync',
-  emscripten_set_mouseleave_callback_on_thread__sig: 'ippipp',
   emscripten_set_mouseleave_callback_on_thread__deps: ['$registerMouseEventCallback'],
   emscripten_set_mouseleave_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerMouseEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_MOUSELEAVE }}}, "mouseleave", targetThread);
@@ -602,7 +592,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_mouseover_callback_on_thread__proxy: 'sync',
-  emscripten_set_mouseover_callback_on_thread__sig: 'ippipp',
   emscripten_set_mouseover_callback_on_thread__deps: ['$registerMouseEventCallback'],
   emscripten_set_mouseover_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerMouseEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_MOUSEOVER }}}, "mouseover", targetThread);
@@ -610,7 +599,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_mouseout_callback_on_thread__proxy: 'sync',
-  emscripten_set_mouseout_callback_on_thread__sig: 'ippipp',
   emscripten_set_mouseout_callback_on_thread__deps: ['$registerMouseEventCallback'],
   emscripten_set_mouseout_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerMouseEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_MOUSEOUT }}}, "mouseout", targetThread);
@@ -618,7 +606,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_get_mouse_status__proxy: 'sync',
-  emscripten_get_mouse_status__sig: 'ip',
   emscripten_get_mouse_status__deps: ['$JSEvents'],
   emscripten_get_mouse_status: function(mouseState) {
     if (!JSEvents.mouseEvent) return {{{ cDefs.EMSCRIPTEN_RESULT_NO_DATA }}};
@@ -689,7 +676,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_wheel_callback_on_thread__proxy: 'sync',
-  emscripten_set_wheel_callback_on_thread__sig: 'ippipp',
   emscripten_set_wheel_callback_on_thread__deps: ['$JSEvents', '$registerWheelEventCallback', '$findEventTarget'],
   emscripten_set_wheel_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     target = findEventTarget(target);
@@ -769,7 +755,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_resize_callback_on_thread__proxy: 'sync',
-  emscripten_set_resize_callback_on_thread__sig: 'ippipp',
   emscripten_set_resize_callback_on_thread__deps: ['$registerUiEventCallback'],
   emscripten_set_resize_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerUiEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_RESIZE }}}, "resize", targetThread);
@@ -777,7 +762,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_scroll_callback_on_thread__proxy: 'sync',
-  emscripten_set_scroll_callback_on_thread__sig: 'ippipp',
   emscripten_set_scroll_callback_on_thread__deps: ['$registerUiEventCallback'],
   emscripten_set_scroll_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerUiEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_SCROLL }}}, "scroll", targetThread);
@@ -821,7 +805,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_blur_callback_on_thread__proxy: 'sync',
-  emscripten_set_blur_callback_on_thread__sig: 'ippipp',
   emscripten_set_blur_callback_on_thread__deps: ['$registerFocusEventCallback'],
   emscripten_set_blur_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerFocusEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_BLUR }}}, "blur", targetThread);
@@ -829,7 +812,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_focus_callback_on_thread__proxy: 'sync',
-  emscripten_set_focus_callback_on_thread__sig: 'ippipp',
   emscripten_set_focus_callback_on_thread__deps: ['$registerFocusEventCallback'],
   emscripten_set_focus_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerFocusEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_FOCUS }}}, "focus", targetThread);
@@ -837,7 +819,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_focusin_callback_on_thread__proxy: 'sync',
-  emscripten_set_focusin_callback_on_thread__sig: 'ippipp',
   emscripten_set_focusin_callback_on_thread__deps: ['$registerFocusEventCallback'],
   emscripten_set_focusin_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerFocusEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_FOCUSIN }}}, "focusin", targetThread);
@@ -845,7 +826,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_focusout_callback_on_thread__proxy: 'sync',
-  emscripten_set_focusout_callback_on_thread__sig: 'ippipp',
   emscripten_set_focusout_callback_on_thread__deps: ['$registerFocusEventCallback'],
   emscripten_set_focusout_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerFocusEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_FOCUSOUT }}}, "focusout", targetThread);
@@ -891,7 +871,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_deviceorientation_callback_on_thread__proxy: 'sync',
-  emscripten_set_deviceorientation_callback_on_thread__sig: 'ipipp',
   emscripten_set_deviceorientation_callback_on_thread__deps: ['$registerDeviceOrientationEventCallback'],
   emscripten_set_deviceorientation_callback_on_thread: function(userData, useCapture, callbackfunc, targetThread) {
     registerDeviceOrientationEventCallback({{{ cDefs.EMSCRIPTEN_EVENT_TARGET_WINDOW }}}, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_DEVICEORIENTATION }}}, "deviceorientation", targetThread);
@@ -899,7 +878,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_get_deviceorientation_status__proxy: 'sync',
-  emscripten_get_deviceorientation_status__sig: 'ip',
   emscripten_get_deviceorientation_status__deps: ['$JSEvents', '$registerDeviceOrientationEventCallback'],
   emscripten_get_deviceorientation_status: function(orientationState) {
     if (!JSEvents.deviceOrientationEvent) return {{{ cDefs.EMSCRIPTEN_RESULT_NO_DATA }}};
@@ -964,7 +942,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_devicemotion_callback_on_thread__proxy: 'sync',
-  emscripten_set_devicemotion_callback_on_thread__sig: 'ipipp',
   emscripten_set_devicemotion_callback_on_thread__deps: ['$registerDeviceMotionEventCallback'],
   emscripten_set_devicemotion_callback_on_thread: function(userData, useCapture, callbackfunc, targetThread) {
     registerDeviceMotionEventCallback({{{ cDefs.EMSCRIPTEN_EVENT_TARGET_WINDOW }}}, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_DEVICEMOTION }}}, "devicemotion", targetThread);
@@ -972,7 +949,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_get_devicemotion_status__proxy: 'sync',
-  emscripten_get_devicemotion_status__sig: 'ip',
   emscripten_get_devicemotion_status__deps: ['$JSEvents'],
   emscripten_get_devicemotion_status: function(motionState) {
     if (!JSEvents.deviceMotionEvent) return {{{ cDefs.EMSCRIPTEN_RESULT_NO_DATA }}};
@@ -1041,7 +1017,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_orientationchange_callback_on_thread__proxy: 'sync',
-  emscripten_set_orientationchange_callback_on_thread__sig: 'ipipp',
   emscripten_set_orientationchange_callback_on_thread__deps: ['$registerOrientationChangeEventCallback'],
   emscripten_set_orientationchange_callback_on_thread: function(userData, useCapture, callbackfunc, targetThread) {
     if (!screen || !screen['addEventListener']) return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
@@ -1050,7 +1025,6 @@ var LibraryHTML5 = {
   },
   
   emscripten_get_orientation_status__proxy: 'sync',
-  emscripten_get_orientation_status__sig: 'ip',
   emscripten_get_orientation_status__deps: ['$fillOrientationChangeEventData', '$screenOrientation'],
   emscripten_get_orientation_status: function(orientationChangeEvent) {
     if (!screenOrientation() && typeof orientation == 'undefined') return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
@@ -1059,7 +1033,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_lock_orientation__proxy: 'sync',
-  emscripten_lock_orientation__sig: 'ii',
   emscripten_lock_orientation: function(allowedOrientations) {
     var orientations = [];
     if (allowedOrientations & 1) orientations.push("portrait-primary");
@@ -1085,7 +1058,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_unlock_orientation__proxy: 'sync',
-  emscripten_unlock_orientation__sig: 'i',
   emscripten_unlock_orientation: function() {
     if (screen.unlockOrientation) {
       screen.unlockOrientation();
@@ -1161,7 +1133,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_fullscreenchange_callback_on_thread__proxy: 'sync',
-  emscripten_set_fullscreenchange_callback_on_thread__sig: 'ippipp',
   emscripten_set_fullscreenchange_callback_on_thread__deps: ['$JSEvents', '$registerFullscreenChangeEventCallback', '$findEventTarget', '$specialHTMLTargets'],
   emscripten_set_fullscreenchange_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     if (!JSEvents.fullscreenEnabled()) return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
@@ -1190,7 +1161,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_get_fullscreen_status__proxy: 'sync',
-  emscripten_get_fullscreen_status__sig: 'ip',
   emscripten_get_fullscreen_status__deps: ['$JSEvents', '$fillFullscreenChangeEventData'],
   emscripten_get_fullscreen_status: function(fullscreenStatus) {
     if (!JSEvents.fullscreenEnabled()) return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
@@ -1559,7 +1529,6 @@ var LibraryHTML5 = {
 
   emscripten_request_fullscreen__deps: ['$doRequestFullscreen'],
   emscripten_request_fullscreen__proxy: 'sync',
-  emscripten_request_fullscreen__sig: 'ipi',
   emscripten_request_fullscreen: function(target, deferUntilInEventHandler) {
     var strategy = {
       // These options perform no added logic, but just bare request fullscreen.
@@ -1576,7 +1545,6 @@ var LibraryHTML5 = {
 
   emscripten_request_fullscreen_strategy__deps: ['$doRequestFullscreen', '$currentFullscreenStrategy', '$registerRestoreOldStyle'],
   emscripten_request_fullscreen_strategy__proxy: 'sync',
-  emscripten_request_fullscreen_strategy__sig: 'ipip',
   emscripten_request_fullscreen_strategy: function(target, deferUntilInEventHandler, fullscreenStrategy) {
     var strategy = {
       scaleMode: {{{ makeGetValue('fullscreenStrategy', C_STRUCTS.EmscriptenFullscreenStrategy.scaleMode, 'i32') }}},
@@ -1597,7 +1565,6 @@ var LibraryHTML5 = {
 
   emscripten_enter_soft_fullscreen__deps: ['$JSEvents', '$setLetterbox', '$hideEverythingExceptGivenElement', '$restoreOldWindowedStyle', '$registerRestoreOldStyle', '$restoreHiddenElements', '$currentFullscreenStrategy', '$softFullscreenResizeWebGLRenderTarget', '$getCanvasElementSize', '$setCanvasElementSize', '$JSEvents_resizeCanvasForFullscreen', '$findEventTarget'],
   emscripten_enter_soft_fullscreen__proxy: 'sync',
-  emscripten_enter_soft_fullscreen__sig: 'ipp',
   emscripten_enter_soft_fullscreen: function(target, fullscreenStrategy) {
 #if !DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR
     if (!target) target = '#canvas';
@@ -1657,7 +1624,6 @@ var LibraryHTML5 = {
 
   emscripten_exit_soft_fullscreen__deps: ['$restoreOldWindowedStyle'],
   emscripten_exit_soft_fullscreen__proxy: 'sync',
-  emscripten_exit_soft_fullscreen__sig: 'i',
   emscripten_exit_soft_fullscreen: function() {
     if (restoreOldWindowedStyle) restoreOldWindowedStyle();
     restoreOldWindowedStyle = null;
@@ -1667,7 +1633,6 @@ var LibraryHTML5 = {
 
   emscripten_exit_fullscreen__deps: ['$JSEvents', '$currentFullscreenStrategy', '$JSEvents_requestFullscreen', '$specialHTMLTargets'],
   emscripten_exit_fullscreen__proxy: 'sync',
-  emscripten_exit_fullscreen__sig: 'i',
   emscripten_exit_fullscreen: function() {
     if (!JSEvents.fullscreenEnabled()) return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
 #if HTML5_SUPPORT_DEFERRING_USER_SENSITIVE_REQUESTS
@@ -1745,7 +1710,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_pointerlockchange_callback_on_thread__proxy: 'sync',
-  emscripten_set_pointerlockchange_callback_on_thread__sig: 'ippipp',
   emscripten_set_pointerlockchange_callback_on_thread__deps: ['$JSEvents', '$registerPointerlockChangeEventCallback', '$findEventTarget', '$specialHTMLTargets'],
   emscripten_set_pointerlockchange_callback_on_thread__docs: '/** @suppress {missingProperties} */', // Closure does not see document.body.mozRequestPointerLock etc.
   emscripten_set_pointerlockchange_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
@@ -1792,7 +1756,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_pointerlockerror_callback_on_thread__proxy: 'sync',
-  emscripten_set_pointerlockerror_callback_on_thread__sig: 'ippipp',
   emscripten_set_pointerlockerror_callback_on_thread__deps: ['$JSEvents', '$registerPointerlockErrorEventCallback', '$findEventTarget', '$specialHTMLTargets'],
   emscripten_set_pointerlockerror_callback_on_thread__docs: '/** @suppress {missingProperties} */', // Closure does not see document.body.mozRequestPointerLock etc.
   emscripten_set_pointerlockerror_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
@@ -1816,7 +1779,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_get_pointerlock_status__proxy: 'sync',
-  emscripten_get_pointerlock_status__sig: 'ip',
   emscripten_get_pointerlock_status__deps: ['$fillPointerlockChangeEventData'],
   emscripten_get_pointerlock_status__docs: '/** @suppress {missingProperties} */', // Closure does not see document.body.mozRequestPointerLock etc.
   emscripten_get_pointerlock_status: function(pointerlockStatus) {
@@ -1864,7 +1826,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_request_pointerlock__proxy: 'sync',
-  emscripten_request_pointerlock__sig: 'ipi',
   emscripten_request_pointerlock__deps: ['$JSEvents', '$requestPointerLock', '$findEventTarget'],
   emscripten_request_pointerlock: function(target, deferUntilInEventHandler) {
 #if !DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR
@@ -1903,7 +1864,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_exit_pointerlock__proxy: 'sync',
-  emscripten_exit_pointerlock__sig: 'i',
   emscripten_exit_pointerlock__deps: ['$JSEvents', '$requestPointerLock'],
   emscripten_exit_pointerlock: function() {
 #if HTML5_SUPPORT_DEFERRING_USER_SENSITIVE_REQUESTS
@@ -1932,7 +1892,6 @@ var LibraryHTML5 = {
   },
   
   emscripten_vibrate__proxy: 'sync',
-  emscripten_vibrate__sig: 'ii',
   emscripten_vibrate: function(msecs) {
     if (!navigator.vibrate) return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};    
     navigator.vibrate(msecs);
@@ -1940,7 +1899,6 @@ var LibraryHTML5 = {
   },
   
   emscripten_vibrate_pattern__proxy: 'sync',
-  emscripten_vibrate_pattern__sig: 'ipi',
   emscripten_vibrate_pattern: function(msecsArray, numEntries) {
     if (!navigator.vibrate) return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
 
@@ -1999,7 +1957,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_visibilitychange_callback_on_thread__proxy: 'sync',
-  emscripten_set_visibilitychange_callback_on_thread__sig: 'ipipp',
   emscripten_set_visibilitychange_callback_on_thread__deps: ['$registerVisibilityChangeEventCallback', '$specialHTMLTargets'],
   emscripten_set_visibilitychange_callback_on_thread: function(userData, useCapture, callbackfunc, targetThread) {
 #if ENVIRONMENT_MAY_BE_WORKER || ENVIRONMENT_MAY_BE_NODE || ENVIRONMENT_MAY_BE_SHELL
@@ -2012,7 +1969,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_get_visibility_status__proxy: 'sync',
-  emscripten_get_visibility_status__sig: 'ip',
   emscripten_get_visibility_status__deps: ['$fillVisibilityChangeEventData'],
   emscripten_get_visibility_status: function(visibilityStatus) {
     if (typeof document.visibilityState == 'undefined' && typeof document.hidden == 'undefined') {
@@ -2122,7 +2078,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_touchstart_callback_on_thread__proxy: 'sync',
-  emscripten_set_touchstart_callback_on_thread__sig: 'ippipp',
   emscripten_set_touchstart_callback_on_thread__deps: ['$registerTouchEventCallback'],
   emscripten_set_touchstart_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerTouchEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_TOUCHSTART }}}, "touchstart", targetThread);
@@ -2130,7 +2085,6 @@ var LibraryHTML5 = {
   },
   
   emscripten_set_touchend_callback_on_thread__proxy: 'sync',
-  emscripten_set_touchend_callback_on_thread__sig: 'ippipp',
   emscripten_set_touchend_callback_on_thread__deps: ['$registerTouchEventCallback'],
   emscripten_set_touchend_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerTouchEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_TOUCHEND }}}, "touchend", targetThread);
@@ -2138,7 +2092,6 @@ var LibraryHTML5 = {
   },
   
   emscripten_set_touchmove_callback_on_thread__proxy: 'sync',
-  emscripten_set_touchmove_callback_on_thread__sig: 'ippipp',
   emscripten_set_touchmove_callback_on_thread__deps: ['$registerTouchEventCallback'],
   emscripten_set_touchmove_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerTouchEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_TOUCHMOVE }}}, "touchmove", targetThread);
@@ -2146,7 +2099,6 @@ var LibraryHTML5 = {
   },
   
   emscripten_set_touchcancel_callback_on_thread__proxy: 'sync',
-  emscripten_set_touchcancel_callback_on_thread__sig: 'ippipp',
   emscripten_set_touchcancel_callback_on_thread__deps: ['$registerTouchEventCallback'],
   emscripten_set_touchcancel_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerTouchEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_TOUCHCANCEL }}}, "touchcancel", targetThread);
@@ -2220,7 +2172,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_gamepadconnected_callback_on_thread__proxy: 'sync',
-  emscripten_set_gamepadconnected_callback_on_thread__sig: 'ipipp',
   emscripten_set_gamepadconnected_callback_on_thread__deps: ['$registerGamepadEventCallback'],
   emscripten_set_gamepadconnected_callback_on_thread: function(userData, useCapture, callbackfunc, targetThread) {
     if (!navigator.getGamepads && !navigator.webkitGetGamepads) return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
@@ -2229,7 +2180,6 @@ var LibraryHTML5 = {
   },
   
   emscripten_set_gamepaddisconnected_callback_on_thread__proxy: 'sync',
-  emscripten_set_gamepaddisconnected_callback_on_thread__sig: 'ipipp',
   emscripten_set_gamepaddisconnected_callback_on_thread__deps: ['$registerGamepadEventCallback'],
   emscripten_set_gamepaddisconnected_callback_on_thread: function(userData, useCapture, callbackfunc, targetThread) {
     if (!navigator.getGamepads && !navigator.webkitGetGamepads) return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
@@ -2238,7 +2188,6 @@ var LibraryHTML5 = {
   },
   
   emscripten_sample_gamepad_data__proxy: 'sync',
-  emscripten_sample_gamepad_data__sig: 'i',
   emscripten_sample_gamepad_data__deps: ['$JSEvents'],
   emscripten_sample_gamepad_data: function() {
     return (JSEvents.lastGamepadState = (navigator.getGamepads ? navigator.getGamepads() : (navigator.webkitGetGamepads ? navigator.webkitGetGamepads() : null)))
@@ -2246,7 +2195,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_get_num_gamepads__proxy: 'sync',
-  emscripten_get_num_gamepads__sig: 'i',
   emscripten_get_num_gamepads__deps: ['$JSEvents'],
   emscripten_get_num_gamepads: function() {
 #if ASSERTIONS
@@ -2258,7 +2206,6 @@ var LibraryHTML5 = {
   },
   
   emscripten_get_gamepad_status__proxy: 'sync',
-  emscripten_get_gamepad_status__sig: 'iip',
   emscripten_get_gamepad_status__deps: ['$JSEvents', '$fillGamepadEventData'],
   emscripten_get_gamepad_status: function(index, gamepadState) {
 #if ASSERTIONS
@@ -2305,7 +2252,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_beforeunload_callback_on_thread__proxy: 'sync',
-  emscripten_set_beforeunload_callback_on_thread__sig: 'ippp',
   emscripten_set_beforeunload_callback_on_thread__deps: ['$registerBeforeUnloadEventCallback'],
   emscripten_set_beforeunload_callback_on_thread: function(userData, callbackfunc, targetThread) {
     if (typeof onbeforeunload == 'undefined') return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
@@ -2358,7 +2304,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_batterychargingchange_callback_on_thread__proxy: 'sync',
-  emscripten_set_batterychargingchange_callback_on_thread__sig: 'ippp',
   emscripten_set_batterychargingchange_callback_on_thread__deps: ['$registerBatteryEventCallback', '$battery', 'malloc'],
   emscripten_set_batterychargingchange_callback_on_thread: function(userData, callbackfunc, targetThread) {
     if (!battery()) return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}}; 
@@ -2367,7 +2312,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_batterylevelchange_callback_on_thread__proxy: 'sync',
-  emscripten_set_batterylevelchange_callback_on_thread__sig: 'ippp',
   emscripten_set_batterylevelchange_callback_on_thread__deps: ['$registerBatteryEventCallback', '$battery', 'malloc'],
   emscripten_set_batterylevelchange_callback_on_thread: function(userData, callbackfunc, targetThread) {
     if (!battery()) return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}}; 
@@ -2376,7 +2320,6 @@ var LibraryHTML5 = {
   },
   
   emscripten_get_battery_status__proxy: 'sync',
-  emscripten_get_battery_status__sig: 'ip',
   emscripten_get_battery_status__deps: ['$fillBatteryEventData', '$battery'],
   emscripten_get_battery_status: function(batteryState) {
     if (!battery()) return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}}; 
@@ -2489,7 +2432,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_canvas_element_size__deps: ['$JSEvents', '$setCanvasElementSizeCallingThread', '$setCanvasElementSizeMainThread', '$findCanvasEventTarget'],
-  emscripten_set_canvas_element_size__sig: 'ipii',
   emscripten_set_canvas_element_size: function(target, width, height) {
 #if GL_DEBUG
     dbg('emscripten_set_canvas_element_size(target='+target+',width='+width+',height='+height);
@@ -2502,7 +2444,6 @@ var LibraryHTML5 = {
   },
 #else
   emscripten_set_canvas_element_size__deps: ['$JSEvents', '$findCanvasEventTarget'],
-  emscripten_set_canvas_element_size__sig: 'ipii',
   emscripten_set_canvas_element_size: function(target, width, height) {
 #if GL_DEBUG
     dbg('emscripten_set_canvas_element_size(target='+target+',width='+width+',height='+height);
@@ -2574,7 +2515,6 @@ var LibraryHTML5 = {
   emscripten_get_canvas_element_size_main_thread__deps: ['emscripten_get_canvas_element_size_calling_thread'],
   emscripten_get_canvas_element_size_main_thread: function(target, width, height) { return _emscripten_get_canvas_element_size_calling_thread(target, width, height); },
 
-  emscripten_get_canvas_element_size__sig: 'ippp',
   emscripten_get_canvas_element_size__deps: ['$JSEvents', 'emscripten_get_canvas_element_size_calling_thread', 'emscripten_get_canvas_element_size_main_thread', '$findCanvasEventTarget'],
   emscripten_get_canvas_element_size: function(target, width, height) {
     var canvas = findCanvasEventTarget(target);
@@ -2585,7 +2525,6 @@ var LibraryHTML5 = {
   },
 #else
   emscripten_get_canvas_element_size__deps: ['$JSEvents', '$findCanvasEventTarget'],
-  emscripten_get_canvas_element_size__sig: 'ippp',
   emscripten_get_canvas_element_size: function(target, width, height) {
     var canvas = findCanvasEventTarget(target);
     if (!canvas) return {{{ cDefs.EMSCRIPTEN_RESULT_UNKNOWN_TARGET }}};
@@ -2610,7 +2549,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_set_element_css_size__proxy: 'sync',
-  emscripten_set_element_css_size__sig: 'ipdd',
   emscripten_set_element_css_size__deps: ['$JSEvents', '$findEventTarget'],
   emscripten_set_element_css_size: function(target, width, height) {
 #if DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR
@@ -2627,7 +2565,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_get_element_css_size__proxy: 'sync',
-  emscripten_get_element_css_size__sig: 'ippp',
   emscripten_get_element_css_size__deps: ['$JSEvents', '$findEventTarget', '$getBoundingClientRect'],
   emscripten_get_element_css_size: function(target, width, height) {
 #if DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR
@@ -2651,7 +2588,6 @@ var LibraryHTML5 = {
     return {{{ cDefs.EMSCRIPTEN_RESULT_SUCCESS }}};
   },
 
-  emscripten_html5_remove_all_event_listeners__sig: 'v',
   emscripten_html5_remove_all_event_listeners__deps: ['$JSEvents'],
   emscripten_html5_remove_all_event_listeners: function() {
     JSEvents.removeAllEventListeners();
@@ -2676,7 +2612,6 @@ var LibraryHTML5 = {
     return requestAnimationFrame(tick);
   },
 
-  emscripten_date_now__sig: 'd',
   emscripten_date_now: function() {
     return Date.now();
   },
@@ -2686,7 +2621,6 @@ var LibraryHTML5 = {
   },
 
   emscripten_get_device_pixel_ratio__proxy: 'sync',
-  emscripten_get_device_pixel_ratio__sig: 'd',
   emscripten_get_device_pixel_ratio: function() {
 #if ENVIRONMENT_MAY_BE_NODE || ENVIRONMENT_MAY_BE_SHELL
     return (typeof devicePixelRatio == 'number' && devicePixelRatio) || 1.0;
diff --git a/src/library_html5_webgl.js b/src/library_html5_webgl.js
index 5edd57452040c..8c36727abfc34 100644
--- a/src/library_html5_webgl.js
+++ b/src/library_html5_webgl.js
@@ -61,13 +61,10 @@ var LibraryHtml5WebGL = {
 #else
   // When not in offscreen framebuffer mode, these functions are implemented
   // in JS and forwarded without any proxying.
-  emscripten_webgl_create_context__sig: 'ipp',
   emscripten_webgl_create_context: 'emscripten_webgl_do_create_context',
 
-  emscripten_webgl_get_current_context__sig: 'i',
   emscripten_webgl_get_current_context: 'emscripten_webgl_do_get_current_context',
 
-  emscripten_webgl_commit_frame__sig: 'i',
   emscripten_webgl_commit_frame: 'emscripten_webgl_do_commit_frame',
 #endif
 
@@ -84,7 +81,6 @@ var LibraryHtml5WebGL = {
 #endif
   '$JSEvents', '$emscripten_webgl_power_preferences', '$findEventTarget', '$findCanvasEventTarget'],
   // This function performs proxying manually, depending on the style of context that is to be created.
-  emscripten_webgl_do_create_context__sig: 'ipp',
   emscripten_webgl_do_create_context: function(target, attributes) {
 #if ASSERTIONS
     assert(attributes);
@@ -231,7 +227,6 @@ var LibraryHtml5WebGL = {
     GL.currentContextIsProxied = true;
   },
 #else
-  emscripten_webgl_make_context_current__sig: 'ii',
   emscripten_webgl_make_context_current: function(contextHandle) {
     var success = GL.makeContextCurrent(contextHandle);
     return success ? {{{ cDefs.EMSCRIPTEN_RESULT_SUCCESS }}} : {{{ cDefs.EMSCRIPTEN_RESULT_INVALID_PARAM }}};
@@ -243,7 +238,6 @@ var LibraryHtml5WebGL = {
   },
 
   emscripten_webgl_get_drawing_buffer_size__proxy: 'sync_on_webgl_context_handle_thread',
-  emscripten_webgl_get_drawing_buffer_size__sig: 'iipp',
   emscripten_webgl_get_drawing_buffer_size: function(contextHandle, width, height) {
     var GLContext = GL.getContext(contextHandle);
 
@@ -255,7 +249,6 @@ var LibraryHtml5WebGL = {
     return {{{ cDefs.EMSCRIPTEN_RESULT_SUCCESS }}};
   },
 
-  emscripten_webgl_do_commit_frame__sig: 'i',
   emscripten_webgl_do_commit_frame: function() {
 #if TRACE_WEBGL_CALLS
     var threadId = (typeof _pthread_self != 'undefined') ? _pthread_self : function() { return 1; };
@@ -290,7 +283,6 @@ var LibraryHtml5WebGL = {
   },
 
   emscripten_webgl_get_context_attributes__proxy: 'sync_on_webgl_context_handle_thread',
-  emscripten_webgl_get_context_attributes__sig: 'iip',
   emscripten_webgl_get_context_attributes__deps: ['$emscripten_webgl_power_preferences'],
   emscripten_webgl_get_context_attributes: function(c, a) {
     if (!a) return {{{ cDefs.EMSCRIPTEN_RESULT_INVALID_PARAM }}};
@@ -321,7 +313,6 @@ var LibraryHtml5WebGL = {
   },
 
   emscripten_webgl_destroy_context__proxy: 'sync_on_webgl_context_handle_thread',
-  emscripten_webgl_destroy_context__sig: 'ii',
   emscripten_webgl_destroy_context: function(contextHandle) {
     if (GL.currentContext == contextHandle) GL.currentContext = 0;
     GL.deleteContext(contextHandle);
@@ -351,7 +342,6 @@ var LibraryHtml5WebGL = {
 #endif
   ],
   emscripten_webgl_enable_extension__proxy: 'sync_on_webgl_context_handle_thread',
-  emscripten_webgl_enable_extension__sig: 'iip',
   emscripten_webgl_enable_extension: function(contextHandle, extension) {
     var context = GL.getContext(contextHandle);
     var extString = UTF8ToString(extension);
@@ -436,7 +426,6 @@ var LibraryHtml5WebGL = {
   },
 
   emscripten_set_webglcontextlost_callback_on_thread__proxy: 'sync',
-  emscripten_set_webglcontextlost_callback_on_thread__sig: 'ippipp',
   emscripten_set_webglcontextlost_callback_on_thread__deps: ['$registerWebGlEventCallback'],
   emscripten_set_webglcontextlost_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerWebGlEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_WEBGLCONTEXTLOST }}}, "webglcontextlost", targetThread);
@@ -444,7 +433,6 @@ var LibraryHtml5WebGL = {
   },
 
   emscripten_set_webglcontextrestored_callback_on_thread__proxy: 'sync',
-  emscripten_set_webglcontextrestored_callback_on_thread__sig: 'ippipp',
   emscripten_set_webglcontextrestored_callback_on_thread__deps: ['$registerWebGlEventCallback'],
   emscripten_set_webglcontextrestored_callback_on_thread: function(target, userData, useCapture, callbackfunc, targetThread) {
     registerWebGlEventCallback(target, userData, useCapture, callbackfunc, {{{ cDefs.EMSCRIPTEN_EVENT_WEBGLCONTEXTRESTORED }}}, "webglcontextrestored", targetThread);
@@ -452,113 +440,96 @@ var LibraryHtml5WebGL = {
   },
 
   emscripten_is_webgl_context_lost__proxy: 'sync_on_webgl_context_handle_thread',
-  emscripten_is_webgl_context_lost__sig: 'ii',
   emscripten_is_webgl_context_lost: function(contextHandle) {
     return !GL.contexts[contextHandle] || GL.contexts[contextHandle].GLctx.isContextLost(); // No context ~> lost context.
   },
 
-  emscripten_webgl_get_supported_extensions__sig: 'p',
   emscripten_webgl_get_supported_extensions__proxy: 'sync_on_current_webgl_context_thread',
   emscripten_webgl_get_supported_extensions__deps: ['$stringToNewUTF8'],
   emscripten_webgl_get_supported_extensions: function() {
     return stringToNewUTF8(GLctx.getSupportedExtensions().join(' '));
   },
 
-  emscripten_webgl_get_program_parameter_d__sig: 'dii',
   emscripten_webgl_get_program_parameter_d__proxy: 'sync_on_current_webgl_context_thread',
   emscripten_webgl_get_program_parameter_d: function(program, param) {
     return GLctx.getProgramParameter(GL.programs[program], param);
   },
 
-  emscripten_webgl_get_program_info_log_utf8__sig: 'pi',
   emscripten_webgl_get_program_info_log_utf8__proxy: 'sync_on_current_webgl_context_thread',
   emscripten_webgl_get_program_info_log_utf8__deps: ['$stringToNewUTF8'],
   emscripten_webgl_get_program_info_log_utf8: function(program) {
     return stringToNewUTF8(GLctx.getProgramInfoLog(GL.programs[program]));
   },
 
-  emscripten_webgl_get_shader_parameter_d__sig: 'dii',
   emscripten_webgl_get_shader_parameter_d__proxy: 'sync_on_current_webgl_context_thread',
   emscripten_webgl_get_shader_parameter_d: function(shader, param) {
     return GLctx.getShaderParameter(GL.shaders[shader], param);
   },
 
-  emscripten_webgl_get_shader_info_log_utf8__sig: 'pi',
   emscripten_webgl_get_shader_info_log_utf8__proxy: 'sync_on_current_webgl_context_thread',
   emscripten_webgl_get_shader_info_log_utf8__deps: ['$stringToNewUTF8'],
   emscripten_webgl_get_shader_info_log_utf8: function(shader) {
     return stringToNewUTF8(GLctx.getShaderInfoLog(GL.shaders[shader]));
   },
 
-  emscripten_webgl_get_shader_source_utf8__sig: 'pi',
   emscripten_webgl_get_shader_source_utf8__proxy: 'sync_on_current_webgl_context_thread',
   emscripten_webgl_get_shader_source_utf8__deps: ['$stringToNewUTF8'],
   emscripten_webgl_get_shader_source_utf8: function(shader) {
     return stringToNewUTF8(GLctx.getShaderSource(GL.shaders[shader]));
   },
 
-  emscripten_webgl_get_vertex_attrib_d__sig: 'dii',
   emscripten_webgl_get_vertex_attrib_d__proxy: 'sync_on_current_webgl_context_thread',
   emscripten_webgl_get_vertex_attrib_d: function(index, param) {
     return GLctx.getVertexAttrib(index, param);
   },
 
-  emscripten_webgl_get_vertex_attrib_o__sig: 'iii',
   emscripten_webgl_get_vertex_attrib_o__proxy: 'sync_on_current_webgl_context_thread',
   emscripten_webgl_get_vertex_attrib_o: function(index, param) {
     var obj = GLctx.getVertexAttrib(index, param);
     return obj && obj.name;
   },
 
-  emscripten_webgl_get_vertex_attrib_v__sig: 'iiipii',
   emscripten_webgl_get_vertex_attrib_v__proxy: 'sync_on_current_webgl_context_thread',
   emscripten_webgl_get_vertex_attrib_v__deps: ['$writeGLArray'],
   emscripten_webgl_get_vertex_attrib_v: function(index, param, dst, dstLength, dstType) {
     return writeGLArray(GLctx.getVertexAttrib(index, param), dst, dstLength, dstType);
   },
 
-  emscripten_webgl_get_uniform_d__sig: 'dii',
   emscripten_webgl_get_uniform_d__proxy: 'sync_on_current_webgl_context_thread',
   emscripten_webgl_get_uniform_d__deps: ['$webglGetUniformLocation'],
   emscripten_webgl_get_uniform_d: function(program, location) {
     return GLctx.getUniform(GL.programs[program], webglGetUniformLocation(location));
   },
 
-  emscripten_webgl_get_uniform_v__sig: 'iiipii',
   emscripten_webgl_get_uniform_v__proxy: 'sync_on_current_webgl_context_thread',
   emscripten_webgl_get_uniform_v__deps: ['$writeGLArray', '$webglGetUniformLocation'],
   emscripten_webgl_get_uniform_v: function(program, location, dst, dstLength, dstType) {
     return writeGLArray(GLctx.getUniform(GL.programs[program], webglGetUniformLocation(location)), dst, dstLength, dstType);
   },
 
-  emscripten_webgl_get_parameter_v__sig: 'iipii',
   emscripten_webgl_get_parameter_v__proxy: 'sync_on_current_webgl_context_thread',
   emscripten_webgl_get_parameter_v__deps: ['$writeGLArray'],
   emscripten_webgl_get_parameter_v: function(param, dst, dstLength, dstType) {
     return writeGLArray(GLctx.getParameter(param), dst, dstLength, dstType);
   },
 
-  emscripten_webgl_get_parameter_d__sig: 'di',
   emscripten_webgl_get_parameter_d__proxy: 'sync_on_current_webgl_context_thread',
   emscripten_webgl_get_parameter_d: function(param) {
     return GLctx.getParameter(param);
   },
 
-  emscripten_webgl_get_parameter_o__sig: 'ii',
   emscripten_webgl_get_parameter_o__proxy: 'sync_on_current_webgl_context_thread',
   emscripten_webgl_get_parameter_o: function(param) {
     var obj = GLctx.getParameter(param);
     return obj && obj.name;
   },
 
-  emscripten_webgl_get_parameter_utf8__sig: 'pi',
   emscripten_webgl_get_parameter_utf8__deps: ['$stringToNewUTF8'],
   emscripten_webgl_get_parameter_utf8__proxy: 'sync_on_current_webgl_context_thread',
   emscripten_webgl_get_parameter_utf8: function(param) {
     return stringToNewUTF8(GLctx.getParameter(param));
   },
 
-  emscripten_webgl_get_parameter_i64v__sig: 'vip',
   emscripten_webgl_get_parameter_i64v__proxy: 'sync_on_current_webgl_context_thread',
   emscripten_webgl_get_parameter_i64v__deps: ['$writeI53ToI64'],
   emscripten_webgl_get_parameter_i64v: function(param, dst) {
@@ -605,17 +576,19 @@ function handleWebGLProxying(funcs) {
       // Dynamically check at runtime whether the current thread owns the GL context handle/current GL context
       // object. If not, proxy the call to main thread.
       // TODO: this handles the calling pthread and main thread cases, but not yet the case from pthread->pthread.
+      const sig = funcs[i + '__sig'] || LibraryManager.library[i + '__sig']
+      assert(sig);
       funcs[i + '_calling_thread'] = funcs[i];
       funcs[i + '_main_thread'] = i + '_calling_thread';
       funcs[i + '_main_thread__proxy'] = 'sync';
-      funcs[i + '_main_thread__sig'] = funcs[i + '__sig'];
+      funcs[i + '_main_thread__sig'] = sig;
       if (!funcs[i + '__deps']) funcs[i + '__deps'] = [];
       funcs[i + '__deps'].push(i + '_calling_thread');
       funcs[i + '__deps'].push(i + '_main_thread');
       delete funcs[i + '__proxy'];
       var funcArgs = listOfNFunctionArgs(funcs[i]);
       var funcArgsString = funcArgs.join(',');
-      var retStatement = funcs[i + '__sig'][0] != 'v' ? 'return' : '';
+      var retStatement = sig[0] != 'v' ? 'return' : '';
       var contextCheck = proxyContextHandle ? 'GL.contexts[p0]' : 'GLctx';
       var funcBody = `${retStatement} ${contextCheck} ? _${i}_calling_thread(${funcArgsString}) : _${i}_main_thread(${funcArgsString});`;
       if (funcs[i + '_before_on_calling_thread']) {
diff --git a/src/library_idbstore.js b/src/library_idbstore.js
index c28da22e7f7a1..e6fe74f67ca02 100644
--- a/src/library_idbstore.js
+++ b/src/library_idbstore.js
@@ -13,7 +13,6 @@ var LibraryIDBStore = {
   $IDBStore:
 #include IDBStore.js
   ,
-  emscripten_idb_async_load__sig: 'vppppp',
   emscripten_idb_async_load: function(db, id, arg, onload, onerror) {
     IDBStore.getFile(UTF8ToString(db), UTF8ToString(id), function(error, byteArray) {
       if (error) {
@@ -26,7 +25,6 @@ var LibraryIDBStore = {
       _free(buffer);
     });
   },
-  emscripten_idb_async_store__sig: 'vpppippp',
   emscripten_idb_async_store: function(db, id, ptr, num, arg, onstore, onerror) {
     // note that we copy the data here, as these are async operatins - changes to HEAPU8 meanwhile should not affect us!
     IDBStore.setFile(UTF8ToString(db), UTF8ToString(id), new Uint8Array(HEAPU8.subarray(ptr, ptr+num)), function(error) {
@@ -37,7 +35,6 @@ var LibraryIDBStore = {
       if (onstore) {{{ makeDynCall('vi', 'onstore') }}}(arg);
     });
   },
-  emscripten_idb_async_delete__sig: 'vppppp',
   emscripten_idb_async_delete: function(db, id, arg, ondelete, onerror) {
     IDBStore.deleteFile(UTF8ToString(db), UTF8ToString(id), function(error) {
       if (error) {
@@ -47,7 +44,6 @@ var LibraryIDBStore = {
       if (ondelete) {{{ makeDynCall('vi', 'ondelete') }}}(arg);
     });
   },
-  emscripten_idb_async_exists__sig: 'vppppp',
   emscripten_idb_async_exists: function(db, id, arg, oncheck, onerror) {
     IDBStore.existsFile(UTF8ToString(db), UTF8ToString(id), function(error, exists) {
       if (error) {
diff --git a/src/library_math.js b/src/library_math.js
index 757314763d90d..f2fcbcb4a12dc 100644
--- a/src/library_math.js
+++ b/src/library_math.js
@@ -65,7 +65,6 @@ mergeInto(LibraryManager.library, {
   emscripten_math_cosh: function(x) {
     return Math.cosh(x);
   },
-  emscripten_math_hypot__sig: 'dip',
   emscripten_math_hypot: function(count, varargs) {
     var args = [];
     for (var i = 0; i < count; ++i) args.push(HEAPF64[(varargs>>3) + i]);
diff --git a/src/library_openal.js b/src/library_openal.js
index e89642506a1dc..f09a6b427b04c 100644
--- a/src/library_openal.js
+++ b/src/library_openal.js
@@ -1613,7 +1613,6 @@ var LibraryOpenAL = {
   // bufferFrameCapacity here for clarity.
   alcCaptureOpenDevice__deps: ['$autoResumeAudioContext'],
   alcCaptureOpenDevice__proxy: 'sync',
-  alcCaptureOpenDevice__sig: 'ppiii',
   alcCaptureOpenDevice: function(pDeviceName, requestedSampleRate, format, bufferFrameCapacity) {
 
     var resolvedDeviceName = AL.CAPTURE_DEVICE_NAME;
@@ -1905,7 +1904,6 @@ var LibraryOpenAL = {
   },
 
   alcCaptureCloseDevice__proxy: 'sync',
-  alcCaptureCloseDevice__sig: 'ip',
   alcCaptureCloseDevice: function(deviceId) {
     var c = AL.requireValidCaptureDevice(deviceId, 'alcCaptureCloseDevice');
     if (!c) return false;
@@ -1938,7 +1936,6 @@ var LibraryOpenAL = {
   },
 
   alcCaptureStart__proxy: 'sync',
-  alcCaptureStart__sig: 'vp',
   alcCaptureStart: function(deviceId) {
     var c = AL.requireValidCaptureDevice(deviceId, 'alcCaptureStart');
     if (!c) return;
@@ -1959,7 +1956,6 @@ var LibraryOpenAL = {
   },
 
   alcCaptureStop__proxy: 'sync',
-  alcCaptureStop__sig: 'vp',
   alcCaptureStop: function(deviceId) {
     var c = AL.requireValidCaptureDevice(deviceId, 'alcCaptureStop');
     if (!c) return;
@@ -1978,7 +1974,6 @@ var LibraryOpenAL = {
   // The last parameter is actually 'number of sample frames', so was
   // renamed accordingly here
   alcCaptureSamples__proxy: 'sync',
-  alcCaptureSamples__sig: 'vppi',
   alcCaptureSamples: function(deviceId, pFrames, requestedFrameCount) {
     var c = AL.requireValidCaptureDevice(deviceId, 'alcCaptureSamples');
     if (!c) return;
@@ -2066,7 +2061,6 @@ var LibraryOpenAL = {
   // -------------------------------------------------------
 
   alcOpenDevice__proxy: 'sync',
-  alcOpenDevice__sig: 'pp',
   alcOpenDevice: function(pDeviceName) {
     if (pDeviceName) {
       var name = UTF8ToString(pDeviceName);
@@ -2084,7 +2078,6 @@ var LibraryOpenAL = {
   },
 
   alcCloseDevice__proxy: 'sync',
-  alcCloseDevice__sig: 'ip',
   alcCloseDevice: function(deviceId) {
     if (!(deviceId in AL.deviceRefCounts) || AL.deviceRefCounts[deviceId] > 0) {
       return {{{ cDefs.ALC_FALSE }}};
@@ -2097,7 +2090,6 @@ var LibraryOpenAL = {
 
   alcCreateContext__deps: ['$autoResumeAudioContext'],
   alcCreateContext__proxy: 'sync',
-  alcCreateContext__sig: 'ppp',
   alcCreateContext: function(deviceId, pAttrList) {
     if (!(deviceId in AL.deviceRefCounts)) {
 #if OPENAL_DEBUG
@@ -2252,7 +2244,6 @@ var LibraryOpenAL = {
   },
 
   alcDestroyContext__proxy: 'sync',
-  alcDestroyContext__sig: 'vp',
   alcDestroyContext: function(contextId) {
     var ctx = AL.contexts[contextId];
     if (AL.currentCtx === ctx) {
@@ -2277,7 +2268,6 @@ var LibraryOpenAL = {
   // -------------------------------------------------------
 
   alcGetError__proxy: 'sync',
-  alcGetError__sig: 'ip',
   alcGetError: function(deviceId) {
     var err = AL.alcErr;
     AL.alcErr = {{{ cDefs.ALC_NO_ERROR }}};
@@ -2285,7 +2275,6 @@ var LibraryOpenAL = {
   },
 
   alcGetCurrentContext__proxy: 'sync',
-  alcGetCurrentContext__sig: 'p',
   alcGetCurrentContext: function() {
     if (AL.currentCtx !== null) {
       return AL.currentCtx.id;
@@ -2294,7 +2283,6 @@ var LibraryOpenAL = {
   },
 
   alcMakeContextCurrent__proxy: 'sync',
-  alcMakeContextCurrent__sig: 'ip',
   alcMakeContextCurrent: function(contextId) {
     if (contextId === 0) {
       AL.currentCtx = null;
@@ -2305,7 +2293,6 @@ var LibraryOpenAL = {
   },
 
   alcGetContextsDevice__proxy: 'sync',
-  alcGetContextsDevice__sig: 'pp',
   alcGetContextsDevice: function(contextId) {
     if (contextId in AL.contexts) {
       return AL.contexts[contextId].deviceId;
@@ -2314,13 +2301,10 @@ var LibraryOpenAL = {
   },
 
   // The spec is vague about what these are actually supposed to do, and NOP is a reasonable implementation
-  alcProcessContext__sig: 'vp',
   alcProcessContext: function(contextId) {},
-  alcSuspendContext__sig: 'vp',
   alcSuspendContext: function(contextId) {},
 
   alcIsExtensionPresent__proxy: 'sync',
-  alcIsExtensionPresent__sig: 'ipp',
   alcIsExtensionPresent: function(deviceId, pExtName) {
     var name = UTF8ToString(pExtName);
 
@@ -2328,7 +2312,6 @@ var LibraryOpenAL = {
   },
 
   alcGetEnumValue__proxy: 'sync',
-  alcGetEnumValue__sig: 'ipp',
   alcGetEnumValue: function(deviceId, pEnumName) {
     // Spec says :
     // Using a NULL handle is legal, but only the
@@ -2393,7 +2376,6 @@ var LibraryOpenAL = {
   },
 
   alcGetString__proxy: 'sync',
-  alcGetString__sig: 'ppi',
   alcGetString__deps: ['$allocateUTF8'],
   alcGetString: function(deviceId, param) {
     if (AL.alcStringCache[param]) {
@@ -2474,7 +2456,6 @@ var LibraryOpenAL = {
   },
 
   alcGetIntegerv__proxy: 'sync',
-  alcGetIntegerv__sig: 'vpiip',
   alcGetIntegerv: function(deviceId, param, size, pValues) {
     if (size === 0 || !pValues) {
       // Ignore the query, per the spec
@@ -2751,7 +2732,6 @@ var LibraryOpenAL = {
   // -------------------------------------------------------
 
   alGenBuffers__proxy: 'sync',
-  alGenBuffers__sig: 'vip',
   alGenBuffers: function(count, pBufferIds) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -2778,7 +2758,6 @@ var LibraryOpenAL = {
   },
 
   alDeleteBuffers__proxy: 'sync',
-  alDeleteBuffers__sig: 'vip',
   alDeleteBuffers: function(count, pBufferIds) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -2826,7 +2805,6 @@ var LibraryOpenAL = {
   },
 
   alGenSources__proxy: 'sync',
-  alGenSources__sig: 'vip',
   alGenSources: function(count, pSourceIds) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -2878,7 +2856,6 @@ var LibraryOpenAL = {
 
   alDeleteSources__deps: ['alSourcei'],
   alDeleteSources__proxy: 'sync',
-  alDeleteSources__sig: 'vip',
   alDeleteSources: function(count, pSourceIds) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -2912,7 +2889,6 @@ var LibraryOpenAL = {
   // -------------------------------------------------------
 
   alGetError__proxy: 'sync',
-  alGetError__sig: 'i',
   alGetError: function() {
     if (!AL.currentCtx) {
       return {{{ cDefs.AL_INVALID_OPERATION }}};
@@ -2924,7 +2900,6 @@ var LibraryOpenAL = {
   },
 
   alIsExtensionPresent__proxy: 'sync',
-  alIsExtensionPresent__sig: 'ip',
   alIsExtensionPresent: function(pExtName) {
     var name = UTF8ToString(pExtName);
 
@@ -2932,7 +2907,6 @@ var LibraryOpenAL = {
   },
 
   alGetEnumValue__proxy: 'sync',
-  alGetEnumValue__sig: 'ip',
   alGetEnumValue: function(pEnumName) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -3044,7 +3018,6 @@ var LibraryOpenAL = {
   },
 
   alGetString__proxy: 'sync',
-  alGetString__sig: 'pi',
   alGetString__deps: ['$allocateUTF8'],
   alGetString: function(param) {
     if (AL.stringCache[param]) {
@@ -3105,7 +3078,6 @@ var LibraryOpenAL = {
   },
 
   alEnable__proxy: 'sync',
-  alEnable__sig: 'vi',
   alEnable: function(param) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -3128,7 +3100,6 @@ var LibraryOpenAL = {
   },
 
   alDisable__proxy: 'sync',
-  alDisable__sig: 'vi',
   alDisable: function(param) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -3151,7 +3122,6 @@ var LibraryOpenAL = {
   },
 
   alIsEnabled__proxy: 'sync',
-  alIsEnabled__sig: 'ii',
   alIsEnabled: function(param) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -3172,7 +3142,6 @@ var LibraryOpenAL = {
   },
 
   alGetDouble__proxy: 'sync',
-  alGetDouble__sig: 'di',
   alGetDouble: function(param) {
     var val = AL.getGlobalParam('alGetDouble', param);
     if (val === null) {
@@ -3194,7 +3163,6 @@ var LibraryOpenAL = {
   },
 
   alGetDoublev__proxy: 'sync',
-  alGetDoublev__sig: 'vip',
   alGetDoublev: function(param, pValues) {
     var val = AL.getGlobalParam('alGetDoublev', param);
     // Silently ignore null destinations, as per the spec for global state functions
@@ -3218,7 +3186,6 @@ var LibraryOpenAL = {
   },
 
   alGetFloat__proxy: 'sync',
-  alGetFloat__sig: 'fi',
   alGetFloat: function(param) {
     var val = AL.getGlobalParam('alGetFloat', param);
     if (val === null) {
@@ -3239,7 +3206,6 @@ var LibraryOpenAL = {
   },
 
   alGetFloatv__proxy: 'sync',
-  alGetFloatv__sig: 'vip',
   alGetFloatv: function(param, pValues) {
     var val = AL.getGlobalParam('alGetFloatv', param);
     // Silently ignore null destinations, as per the spec for global state functions
@@ -3263,7 +3229,6 @@ var LibraryOpenAL = {
   },
 
   alGetInteger__proxy: 'sync',
-  alGetInteger__sig: 'ii',
   alGetInteger: function(param) {
     var val = AL.getGlobalParam('alGetInteger', param);
     if (val === null) {
@@ -3285,7 +3250,6 @@ var LibraryOpenAL = {
   },
 
   alGetIntegerv__proxy: 'sync',
-  alGetIntegerv__sig: 'vip',
   alGetIntegerv: function(param, pValues) {
     var val = AL.getGlobalParam('alGetIntegerv', param);
     // Silently ignore null destinations, as per the spec for global state functions
@@ -3309,7 +3273,6 @@ var LibraryOpenAL = {
   },
 
   alGetBoolean__proxy: 'sync',
-  alGetBoolean__sig: 'ii',
   alGetBoolean: function(param) {
     var val = AL.getGlobalParam('alGetBoolean', param);
     if (val === null) {
@@ -3331,7 +3294,6 @@ var LibraryOpenAL = {
   },
 
   alGetBooleanv__proxy: 'sync',
-  alGetBooleanv__sig: 'vip',
   alGetBooleanv: function(param, pValues) {
     var val = AL.getGlobalParam('alGetBooleanv', param);
     // Silently ignore null destinations, as per the spec for global state functions
@@ -3355,19 +3317,16 @@ var LibraryOpenAL = {
   },
 
   alDistanceModel__proxy: 'sync',
-  alDistanceModel__sig: 'vi',
   alDistanceModel: function(model) {
     AL.setGlobalParam('alDistanceModel', {{{ cDefs.AL_DISTANCE_MODEL }}}, model);
   },
 
   alSpeedOfSound__proxy: 'sync',
-  alSpeedOfSound__sig: 'vf',
   alSpeedOfSound: function(value) {
     AL.setGlobalParam('alSpeedOfSound', {{{ cDefs.AL_SPEED_OF_SOUND }}}, value);
   },
 
   alDopplerFactor__proxy: 'sync',
-  alDopplerFactor__sig: 'vf',
   alDopplerFactor: function(value) {
     AL.setGlobalParam('alDopplerFactor', {{{ cDefs.AL_DOPPLER_FACTOR }}}, value);
   },
@@ -3377,7 +3336,6 @@ var LibraryOpenAL = {
   // It's deprecated since it's equivalent to directly calling
   // alSpeedOfSound() with an appropriately premultiplied value.
   alDopplerVelocity__proxy: 'sync',
-  alDopplerVelocity__sig: 'vf',
   alDopplerVelocity: function(value) {
     warnOnce('alDopplerVelocity() is deprecated, and only kept for compatibility with OpenAL 1.0. Use alSpeedOfSound() instead.');
     if (!AL.currentCtx) {
@@ -3397,7 +3355,6 @@ var LibraryOpenAL = {
   // -------------------------------------------------------
 
   alGetListenerf__proxy: 'sync',
-  alGetListenerf__sig: 'vip',
   alGetListenerf: function(param, pValue) {
     var val = AL.getListenerParam('alGetListenerf', param);
     if (val === null) {
@@ -3425,7 +3382,6 @@ var LibraryOpenAL = {
   },
 
   alGetListener3f__proxy: 'sync',
-  alGetListener3f__sig: 'vippp',
   alGetListener3f: function(param, pValue0, pValue1, pValue2) {
     var val = AL.getListenerParam('alGetListener3f', param);
     if (val === null) {
@@ -3456,7 +3412,6 @@ var LibraryOpenAL = {
   },
 
   alGetListenerfv__proxy: 'sync',
-  alGetListenerfv__sig: 'vip',
   alGetListenerfv: function(param, pValues) {
     var val = AL.getListenerParam('alGetListenerfv', param);
     if (val === null) {
@@ -3495,7 +3450,6 @@ var LibraryOpenAL = {
   },
 
   alGetListeneri__proxy: 'sync',
-  alGetListeneri__sig: 'vip',
   alGetListeneri: function(param, pValue) {
     var val = AL.getListenerParam('alGetListeneri', param);
     if (val === null) {
@@ -3516,7 +3470,6 @@ var LibraryOpenAL = {
   },
 
   alGetListener3i__proxy: 'sync',
-  alGetListener3i__sig: 'vippp',
   alGetListener3i: function(param, pValue0, pValue1, pValue2) {
     var val = AL.getListenerParam('alGetListener3i', param);
     if (val === null) {
@@ -3547,7 +3500,6 @@ var LibraryOpenAL = {
   },
 
   alGetListeneriv__proxy: 'sync',
-  alGetListeneriv__sig: 'vip',
   alGetListeneriv: function(param, pValues) {
     var val = AL.getListenerParam('alGetListeneriv', param);
     if (val === null) {
@@ -3586,7 +3538,6 @@ var LibraryOpenAL = {
   },
 
   alListenerf__proxy: 'sync',
-  alListenerf__sig: 'vif',
   alListenerf: function(param, value) {
     switch (param) {
     case {{{ cDefs.AL_GAIN }}}:
@@ -3599,7 +3550,6 @@ var LibraryOpenAL = {
   },
 
   alListener3f__proxy: 'sync',
-  alListener3f__sig: 'vifff',
   alListener3f: function(param, value0, value1, value2) {
     switch (param) {
     case {{{ cDefs.AL_POSITION }}}:
@@ -3616,7 +3566,6 @@ var LibraryOpenAL = {
   },
 
   alListenerfv__proxy: 'sync',
-  alListenerfv__sig: 'vip',
   alListenerfv: function(param, pValues) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -3656,13 +3605,11 @@ var LibraryOpenAL = {
   },
 
   alListeneri__proxy: 'sync',
-  alListeneri__sig: 'vii',
   alListeneri: function(param, value) {
     AL.setListenerParam('alListeneri', param, null);
   },
 
   alListener3i__proxy: 'sync',
-  alListener3i__sig: 'viiii',
   alListener3i: function(param, value0, value1, value2) {
     switch (param) {
     case {{{ cDefs.AL_POSITION }}}:
@@ -3679,7 +3626,6 @@ var LibraryOpenAL = {
   },
 
   alListeneriv__proxy: 'sync',
-  alListeneriv__sig: 'vip',
   alListeneriv: function(param, pValues) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -3723,7 +3669,6 @@ var LibraryOpenAL = {
   // -------------------------------------------------------
 
   alIsBuffer__proxy: 'sync',
-  alIsBuffer__sig: 'ii',
   alIsBuffer: function(bufferId) {
     if (!AL.currentCtx) {
       return false;
@@ -3739,7 +3684,6 @@ var LibraryOpenAL = {
   },
 
   alBufferData__proxy: 'sync',
-  alBufferData__sig: 'viipii',
   alBufferData: function(bufferId, format, pData, size, freq) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -3867,7 +3811,6 @@ var LibraryOpenAL = {
   },
 
   alGetBufferf__proxy: 'sync',
-  alGetBufferf__sig: 'viip',
   alGetBufferf: function(bufferId, param, pValue) {
     var val = AL.getBufferParam('alGetBufferf', bufferId, param);
     if (val === null) {
@@ -3888,7 +3831,6 @@ var LibraryOpenAL = {
   },
 
   alGetBuffer3f__proxy: 'sync',
-  alGetBuffer3f__sig: 'viippp',
   alGetBuffer3f: function(bufferId, param, pValue0, pValue1, pValue2) {
     var val = AL.getBufferParam('alGetBuffer3f', bufferId, param);
     if (val === null) {
@@ -3909,7 +3851,6 @@ var LibraryOpenAL = {
   },
 
   alGetBufferfv__proxy: 'sync',
-  alGetBufferfv__sig: 'viip',
   alGetBufferfv: function(bufferId, param, pValues) {
     var val = AL.getBufferParam('alGetBufferfv', bufferId, param);
     if (val === null) {
@@ -3930,7 +3871,6 @@ var LibraryOpenAL = {
   },
 
   alGetBufferi__proxy: 'sync',
-  alGetBufferi__sig: 'viip',
   alGetBufferi: function(bufferId, param, pValue) {
     var val = AL.getBufferParam('alGetBufferi', bufferId, param);
     if (val === null) {
@@ -3961,7 +3901,6 @@ var LibraryOpenAL = {
   },
 
   alGetBuffer3i__proxy: 'sync',
-  alGetBuffer3i__sig: 'viippp',
   alGetBuffer3i: function(bufferId, param, pValue0, pValue1, pValue2) {
     var val = AL.getBufferParam('alGetBuffer3i', bufferId, param);
     if (val === null) {
@@ -3982,7 +3921,6 @@ var LibraryOpenAL = {
   },
 
   alGetBufferiv__proxy: 'sync',
-  alGetBufferiv__sig: 'viip',
   alGetBufferiv: function(bufferId, param, pValues) {
     var val = AL.getBufferParam('alGetBufferiv', bufferId, param);
     if (val === null) {
@@ -4021,19 +3959,16 @@ var LibraryOpenAL = {
   // property for these.
 
   alBufferf__proxy: 'sync',
-  alBufferf__sig: 'viif',
   alBufferf: function(bufferId, param, value) {
     AL.setBufferParam('alBufferf', bufferId, param, null);
   },
 
   alBuffer3f__proxy: 'sync',
-  alBuffer3f__sig: 'viifff',
   alBuffer3f: function(bufferId, param, value0, value1, value2) {
     AL.setBufferParam('alBuffer3f', bufferId, param, null);
   },
 
   alBufferfv__proxy: 'sync',
-  alBufferfv__sig: 'viip',
   alBufferfv: function(bufferId, param, pValues) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -4053,19 +3988,16 @@ var LibraryOpenAL = {
   },
 
   alBufferi__proxy: 'sync',
-  alBufferi__sig: 'viii',
   alBufferi: function(bufferId, param, value) {
     AL.setBufferParam('alBufferi', bufferId, param, null);
   },
 
   alBuffer3i__proxy: 'sync',
-  alBuffer3i__sig: 'viiiii',
   alBuffer3i: function(bufferId, param, value0, value1, value2) {
     AL.setBufferParam('alBuffer3i', bufferId, param, null);
   },
 
   alBufferiv__proxy: 'sync',
-  alBufferiv__sig: 'viip',
   alBufferiv: function(bufferId, param, pValues) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -4098,7 +4030,6 @@ var LibraryOpenAL = {
   // -------------------------------------------------------
 
   alIsSource__proxy: 'sync',
-  alIsSource__sig: 'ii',
   alIsSource: function(sourceId) {
     if (!AL.currentCtx) {
       return false;
@@ -4111,7 +4042,6 @@ var LibraryOpenAL = {
   },
 
   alSourceQueueBuffers__proxy: 'sync',
-  alSourceQueueBuffers__sig: 'viip',
   alSourceQueueBuffers: function(sourceId, count, pBufferIds) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -4195,7 +4125,6 @@ var LibraryOpenAL = {
   },
 
   alSourceUnqueueBuffers__proxy: 'sync',
-  alSourceUnqueueBuffers__sig: 'viip',
   alSourceUnqueueBuffers: function(sourceId, count, pBufferIds) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -4238,7 +4167,6 @@ var LibraryOpenAL = {
   },
 
   alSourcePlay__proxy: 'sync',
-  alSourcePlay__sig: 'vi',
   alSourcePlay: function(sourceId) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -4258,7 +4186,6 @@ var LibraryOpenAL = {
   },
 
   alSourcePlayv__proxy: 'sync',
-  alSourcePlayv__sig: 'vip',
   alSourcePlayv: function(count, pSourceIds) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -4289,7 +4216,6 @@ var LibraryOpenAL = {
   },
 
   alSourceStop__proxy: 'sync',
-  alSourceStop__sig: 'vi',
   alSourceStop: function(sourceId) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -4309,7 +4235,6 @@ var LibraryOpenAL = {
   },
 
   alSourceStopv__proxy: 'sync',
-  alSourceStopv__sig: 'vip',
   alSourceStopv: function(count, pSourceIds) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -4340,7 +4265,6 @@ var LibraryOpenAL = {
   },
 
   alSourceRewind__proxy: 'sync',
-  alSourceRewind__sig: 'vi',
   alSourceRewind: function(sourceId) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -4363,7 +4287,6 @@ var LibraryOpenAL = {
   },
 
   alSourceRewindv__proxy: 'sync',
-  alSourceRewindv__sig: 'vip',
   alSourceRewindv: function(count, pSourceIds) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -4394,7 +4317,6 @@ var LibraryOpenAL = {
   },
 
   alSourcePause__proxy: 'sync',
-  alSourcePause__sig: 'vi',
   alSourcePause: function(sourceId) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -4414,7 +4336,6 @@ var LibraryOpenAL = {
   },
 
   alSourcePausev__proxy: 'sync',
-  alSourcePausev__sig: 'vip',
   alSourcePausev: function(count, pSourceIds) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -4445,7 +4366,6 @@ var LibraryOpenAL = {
   },
 
   alGetSourcef__proxy: 'sync',
-  alGetSourcef__sig: 'viip',
   alGetSourcef: function(sourceId, param, pValue) {
     var val = AL.getSourceParam('alGetSourcef', sourceId, param);
     if (val === null) {
@@ -4486,7 +4406,6 @@ var LibraryOpenAL = {
   },
 
   alGetSource3f__proxy: 'sync',
-  alGetSource3f__sig: 'viippp',
   alGetSource3f: function(sourceId, param, pValue0, pValue1, pValue2) {
     var val = AL.getSourceParam('alGetSource3f', sourceId, param);
     if (val === null) {
@@ -4518,7 +4437,6 @@ var LibraryOpenAL = {
   },
 
   alGetSourcefv__proxy: 'sync',
-  alGetSourcefv__sig: 'viip',
   alGetSourcefv: function(sourceId, param, pValues) {
     var val = AL.getSourceParam('alGetSourcefv', sourceId, param);
     if (val === null) {
@@ -4566,7 +4484,6 @@ var LibraryOpenAL = {
   },
 
   alGetSourcei__proxy: 'sync',
-  alGetSourcei__sig: 'viip',
   alGetSourcei: function(sourceId, param, pValue) {
     var val = AL.getSourceParam('alGetSourcei', sourceId, param);
     if (val === null) {
@@ -4612,7 +4529,6 @@ var LibraryOpenAL = {
   },
 
   alGetSource3i__proxy: 'sync',
-  alGetSource3i__sig: 'viippp',
   alGetSource3i: function(sourceId, param, pValue0, pValue1, pValue2) {
     var val = AL.getSourceParam('alGetSource3i', sourceId, param);
     if (val === null) {
@@ -4644,7 +4560,6 @@ var LibraryOpenAL = {
   },
 
   alGetSourceiv__proxy: 'sync',
-  alGetSourceiv__sig: 'viip',
   alGetSourceiv: function(sourceId, param, pValues) {
     var val = AL.getSourceParam('alGetSourceiv', sourceId, param);
     if (val === null) {
@@ -4697,7 +4612,6 @@ var LibraryOpenAL = {
   },
 
   alSourcef__proxy: 'sync',
-  alSourcef__sig: 'viif',
   alSourcef: function(sourceId, param, value) {
     switch (param) {
     case 0x1001 /* AL_CONE_INNER_ANGLE */:
@@ -4723,7 +4637,6 @@ var LibraryOpenAL = {
   },
 
   alSource3f__proxy: 'sync',
-  alSource3f__sig: 'viifff',
   alSource3f: function(sourceId, param, value0, value1, value2) {
     switch (param) {
     case {{{ cDefs.AL_POSITION }}}:
@@ -4741,7 +4654,6 @@ var LibraryOpenAL = {
   },
 
   alSourcefv__proxy: 'sync',
-  alSourcefv__sig: 'viip',
   alSourcefv: function(sourceId, param, pValues) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
@@ -4790,7 +4702,6 @@ var LibraryOpenAL = {
   },
 
   alSourcei__proxy: 'sync',
-  alSourcei__sig: 'viii',
   alSourcei: function(sourceId, param, value) {
     switch (param) {
     case 0x202 /* AL_SOURCE_RELATIVE */:
@@ -4817,7 +4728,6 @@ var LibraryOpenAL = {
   },
 
   alSource3i__proxy: 'sync',
-  alSource3i__sig: 'viiiii',
   alSource3i: function(sourceId, param, value0, value1, value2) {
     switch (param) {
     case {{{ cDefs.AL_POSITION }}}:
@@ -4835,7 +4745,6 @@ var LibraryOpenAL = {
   },
 
   alSourceiv__proxy: 'sync',
-  alSourceiv__sig: 'viip',
   alSourceiv: function(sourceId, param, pValues) {
     if (!AL.currentCtx) {
 #if OPENAL_DEBUG
diff --git a/src/library_promise.js b/src/library_promise.js
index 4ef9fed97d216..1ee467c88efb2 100644
--- a/src/library_promise.js
+++ b/src/library_promise.js
@@ -28,13 +28,11 @@ mergeInto(LibraryManager.library, {
   },
 
   emscripten_promise_create__deps: ['$makePromise'],
-  emscripten_promise_create__sig: 'p',
   emscripten_promise_create: function() {
     return makePromise().id;
   },
 
   emscripten_promise_destroy__deps: ['$promiseMap'],
-  emscripten_promise_destroy__sig: 'vp',
   emscripten_promise_destroy: function(id) {
 #if RUNTIME_DEBUG
     dbg('emscripten_promise_destroy: ' + id);
@@ -45,7 +43,6 @@ mergeInto(LibraryManager.library, {
   emscripten_promise_resolve__deps: ['$promiseMap',
                                      '$getPromise',
                                      'emscripten_promise_destroy'],
-  emscripten_promise_resolve__sig: 'vpip',
   emscripten_promise_resolve: function(id, result, value) {
 #if RUNTIME_DEBUG
     dbg('emscripten_promise_resolve: ' + id);
@@ -130,7 +127,6 @@ mergeInto(LibraryManager.library, {
   emscripten_promise_then__deps: ['$promiseMap',
                                   '$getPromise',
                                   '$makePromiseCallback'],
-  emscripten_promise_then__sig: 'ppppp',
   emscripten_promise_then: function(id,
                                     onFulfilled,
                                     onRejected,
@@ -151,7 +147,6 @@ mergeInto(LibraryManager.library, {
   },
 
   emscripten_promise_all__deps: ['$promiseMap', '$getPromise'],
-  emscripten_promise_all__sig: 'pppp',
   emscripten_promise_all: function(idBuf, resultBuf, size) {
     var promises = [];
     for (var i = 0; i < size; i++) {
diff --git a/src/library_sdl.js b/src/library_sdl.js
index 59271962490e5..6a0b1a0c6887c 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -1337,7 +1337,6 @@ var LibrarySDL = {
   },
 
   SDL_Linked_Version__proxy: 'sync',
-  SDL_Linked_Version__sig: 'p',
   SDL_Linked_Version: function() {
     if (SDL.version === null) {
       SDL.version = _malloc({{{ C_STRUCTS.SDL_version.__size__ }}});
@@ -1350,7 +1349,6 @@ var LibrarySDL = {
 
   SDL_Init__deps: ['$zeroMemory', 'malloc', 'free', 'memcpy'],
   SDL_Init__proxy: 'sync',
-  SDL_Init__sig: 'ii',
   SDL_Init__docs: '/** @param{number} initFlags */',
   SDL_Init: function(initFlags) {
     SDL.startTime = Date.now();
@@ -1398,7 +1396,6 @@ var LibrarySDL = {
 
   SDL_WasInit__deps: ['SDL_Init'],
   SDL_WasInit__proxy: 'sync',
-  SDL_WasInit__sig: 'ii',
   SDL_WasInit: function(flags) {
     if (SDL.startTime === null) {
       _SDL_Init(0);
@@ -1408,7 +1405,6 @@ var LibrarySDL = {
 
   SDL_GetVideoInfo__deps: ['$zeroMemory'],
   SDL_GetVideoInfo__proxy: 'sync',
-  SDL_GetVideoInfo__sig: 'p',
   SDL_GetVideoInfo: function() {
     var ret = _malloc({{{ C_STRUCTS.SDL_VideoInfo.__size__ }}});
     zeroMemory(ret, {{{ C_STRUCTS.SDL_version.__size__ }}});
@@ -1433,7 +1429,6 @@ var LibrarySDL = {
   },
 
   SDL_VideoDriverName__proxy: 'sync',
-  SDL_VideoDriverName__sig: 'ppi',
   SDL_VideoDriverName: function(buf, max_size) {
     if (SDL.startTime === null) {
       return 0; //return NULL
@@ -1461,7 +1456,6 @@ var LibrarySDL = {
 
   SDL_SetVideoMode__deps: ['$GL'],
   SDL_SetVideoMode__proxy: 'sync',
-  SDL_SetVideoMode__sig: 'piiii',
   SDL_SetVideoMode: function(width, height, depth, flags) {
     ['touchstart', 'touchend', 'touchmove', 'mousedown', 'mouseup', 'mousemove', 'DOMMouseScroll', 'mousewheel', 'wheel', 'mouseout'].forEach(function(event) {
       Module['canvas'].addEventListener(event, SDL.receiveEvent, true);
@@ -1506,13 +1500,11 @@ var LibrarySDL = {
   },
 
   SDL_GetVideoSurface__proxy: 'sync',
-  SDL_GetVideoSurface__sig: 'p',
   SDL_GetVideoSurface: function() {
     return SDL.screen;
   },
 
   SDL_AudioQuit__proxy: 'sync',
-  SDL_AudioQuit__sig: 'v',
   SDL_AudioQuit: function() {
     for (var i = 0; i < SDL.numChannels; ++i) {
       var chan = /** @type {{ audio: (HTMLMediaElement|undefined) }} */ (SDL.channels[i]);
@@ -1542,7 +1534,6 @@ var LibrarySDL = {
 
   // Copy data from the canvas backing to a C++-accessible storage
   SDL_LockSurface__proxy: 'sync',
-  SDL_LockSurface__sig: 'ip',
   SDL_LockSurface: function(surf) {
     var surfData = SDL.surfaces[surf];
 
@@ -1612,7 +1603,6 @@ var LibrarySDL = {
 
   // Copy data from the C++-accessible storage to the canvas backing
   SDL_UnlockSurface__proxy: 'sync',
-  SDL_UnlockSurface__sig: 'vp',
   SDL_UnlockSurface: function(surf) {
     assert(!SDL.GL); // in GL mode we do not keep around 2D canvases and contexts
 
@@ -1746,7 +1736,6 @@ var LibrarySDL = {
 #endif
 
   SDL_WM_SetCaption__proxy: 'sync',
-  SDL_WM_SetCaption__sig: 'vpp',
   SDL_WM_SetCaption: function(title, icon) {
     if (title && typeof setWindowTitle != 'undefined') {
       setWindowTitle(UTF8ToString(title));
@@ -1759,7 +1748,6 @@ var LibrarySDL = {
   },
 
   SDL_GetKeyboardState__proxy: 'sync',
-  SDL_GetKeyboardState__sig: 'pp',
   SDL_GetKeyboardState__docs: '/** @param {number} numKeys */',
   SDL_GetKeyboardState: function(numKeys) {
     if (numKeys) {
@@ -1774,7 +1762,6 @@ var LibrarySDL = {
   },
 
   SDL_GetKeyName__proxy: 'sync',
-  SDL_GetKeyName__sig: 'pi',
   SDL_GetKeyName__deps: ['$allocateUTF8'],
   SDL_GetKeyName: function(key) {
     if (!SDL.keyName) {
@@ -1784,13 +1771,11 @@ var LibrarySDL = {
   },
 
   SDL_GetModState__proxy: 'sync',
-  SDL_GetModState__sig: 'i',
   SDL_GetModState: function() {
     return SDL.modState;
   },
 
   SDL_GetMouseState__proxy: 'sync',
-  SDL_GetMouseState__sig: 'ipp',
   SDL_GetMouseState: function(x, y) {
     if (x) {{{ makeSetValue('x', '0', 'Browser.mouseX', 'i32') }}};
     if (y) {{{ makeSetValue('y', '0', 'Browser.mouseY', 'i32') }}};
@@ -1798,7 +1783,6 @@ var LibrarySDL = {
   },
 
   SDL_WarpMouse__proxy: 'sync',
-  SDL_WarpMouse__sig: 'vii',
   SDL_WarpMouse: function(x, y) {
     return; // TODO: implement this in a non-buggy way. Need to keep relative mouse movements correct after calling this
     /*
@@ -1812,7 +1796,6 @@ var LibrarySDL = {
   },
 
   SDL_ShowCursor__proxy: 'sync',
-  SDL_ShowCursor__sig: 'ii',
   SDL_ShowCursor: function(toggle) {
     switch (toggle) {
       case 0: // SDL_DISABLE
@@ -1834,7 +1817,6 @@ var LibrarySDL = {
   },
 
   SDL_GetError__proxy: 'sync',
-  SDL_GetError__sig: 'p',
   SDL_GetError__deps: ['$allocateUTF8'],
   SDL_GetError: function() {
     if (!SDL.errorMessage) {
@@ -1847,13 +1829,11 @@ var LibrarySDL = {
 
   SDL_CreateRGBSurface__deps: ['malloc', 'free'],
   SDL_CreateRGBSurface__proxy: 'sync',
-  SDL_CreateRGBSurface__sig: 'piiiiiiii',
   SDL_CreateRGBSurface: function(flags, width, height, depth, rmask, gmask, bmask, amask) {
     return SDL.makeSurface(width, height, flags, false, 'CreateRGBSurface', rmask, gmask, bmask, amask);
   },
 
   SDL_CreateRGBSurfaceFrom__proxy: 'sync',
-  SDL_CreateRGBSurfaceFrom__sig: 'ppiiiiiiii',
   SDL_CreateRGBSurfaceFrom: function(pixels, width, height, depth, pitch, rmask, gmask, bmask, amask) {
     var surf = SDL.makeSurface(width, height, 0, false, 'CreateRGBSurfaceFrom', rmask, gmask, bmask, amask);
 
@@ -1883,7 +1863,6 @@ var LibrarySDL = {
   },
 
   SDL_ConvertSurface__proxy: 'sync',
-  SDL_ConvertSurface__sig: 'pppi',
   SDL_ConvertSurface__docs: '/** @param {number} format @param {number} flags */',
   SDL_ConvertSurface: function(surf, format, flags) {
     if  (format) {
@@ -1906,19 +1885,16 @@ var LibrarySDL = {
   },
 
   SDL_FreeSurface__proxy: 'sync',
-  SDL_FreeSurface__sig: 'vp',
   SDL_FreeSurface: function(surf) {
     if (surf) SDL.freeSurface(surf);
   },
 
   SDL_UpperBlit__proxy: 'sync',
-  SDL_UpperBlit__sig: 'ipppp',
   SDL_UpperBlit: function(src, srcrect, dst, dstrect) {
     return SDL.blitSurface(src, srcrect, dst, dstrect, false);
   },
 
   SDL_UpperBlitScaled__proxy: 'sync',
-  SDL_UpperBlitScaled__sig: 'ipppp',
   SDL_UpperBlitScaled: function(src, srcrect, dst, dstrect) {
     return SDL.blitSurface(src, srcrect, dst, dstrect, true);
   },
@@ -1927,7 +1903,6 @@ var LibrarySDL = {
   SDL_LowerBlitScaled: 'SDL_UpperBlitScaled',
 
   SDL_GetClipRect__proxy: 'sync',
-  SDL_GetClipRect__sig: 'vpp',
   SDL_GetClipRect: function(surf, rect) {
     assert(rect);
 
@@ -1937,7 +1912,6 @@ var LibrarySDL = {
   },
 
   SDL_SetClipRect__proxy: 'sync',
-  SDL_SetClipRect__sig: 'ipp',
   SDL_SetClipRect: function(surf, rect) {
     var surfData = SDL.surfaces[surf];
 
@@ -1949,7 +1923,6 @@ var LibrarySDL = {
   },
 
   SDL_FillRect__proxy: 'sync',
-  SDL_FillRect__sig: 'ippi',
   SDL_FillRect: function(surf, rect, color) {
     var surfData = SDL.surfaces[surf];
     assert(!surfData.locked); // but we could unlock and re-lock if we must..
@@ -2014,7 +1987,6 @@ var LibrarySDL = {
   },
 
   SDL_SetAlpha__proxy: 'sync',
-  SDL_SetAlpha__sig: 'ipii',
   SDL_SetAlpha: function(surf, flag, alpha) {
     var surfData = SDL.surfaces[surf];
     surfData.alpha = alpha;
@@ -2033,19 +2005,16 @@ var LibrarySDL = {
   },
 
   SDL_GetTicks__proxy: 'sync',
-  SDL_GetTicks__sig: 'i',
   SDL_GetTicks: function() {
     return (Date.now() - SDL.startTime)|0;
   },
 
   SDL_PollEvent__proxy: 'sync',
-  SDL_PollEvent__sig: 'ip',
   SDL_PollEvent: function(ptr) {
     return SDL.pollEvent(ptr);
   },
 
   SDL_PushEvent__proxy: 'sync',
-  SDL_PushEvent__sig: 'ip',
   SDL_PushEvent__deps: ['malloc'],
   SDL_PushEvent: function(ptr) {
     var copy = _malloc({{{ C_STRUCTS.SDL_KeyboardEvent.__size__ }}});
@@ -2055,7 +2024,6 @@ var LibrarySDL = {
   },
 
   SDL_PeepEvents__proxy: 'sync',
-  SDL_PeepEvents__sig: 'ipiiii',
   SDL_PeepEvents: function(events, requestedEventCount, action, from, to) {
     switch (action) {
       case 2: { // SDL_GETEVENT
@@ -2087,7 +2055,6 @@ var LibrarySDL = {
   },
 
   SDL_PumpEvents__proxy: 'sync',
-  SDL_PumpEvents__sig: 'v',
   SDL_PumpEvents: function(){
     SDL.events.forEach(function(event) {
       SDL.handleEvent(event);
@@ -2098,7 +2065,6 @@ var LibrarySDL = {
   // Allow recording a callback that will be called for each received event.
   emscripten_SDL_SetEventHandler__proxy: 'sync',
   emscripten_SDL_SetEventHandler__deps: ['malloc'],
-  emscripten_SDL_SetEventHandler__sig: 'vpp',
   emscripten_SDL_SetEventHandler: function(handler, userdata) {
     SDL.eventHandler = handler;
     SDL.eventHandlerContext = userdata;
@@ -2108,7 +2074,6 @@ var LibrarySDL = {
   },
 
   SDL_SetColors__proxy: 'sync',
-  SDL_SetColors__sig: 'ippii',
   SDL_SetColors: function(surf, colors, firstColor, nColors) {
     var surfData = SDL.surfaces[surf];
 
@@ -2139,7 +2104,6 @@ var LibrarySDL = {
   },
 
   SDL_MapRGB__proxy: 'sync',
-  SDL_MapRGB__sig: 'ipiii',
   SDL_MapRGB: function(fmt, r, g, b) {
     SDL.checkPixelFormat(fmt);
     // We assume the machine is little-endian.
@@ -2147,7 +2111,6 @@ var LibrarySDL = {
   },
 
   SDL_MapRGBA__proxy: 'sync',
-  SDL_MapRGBA__sig: 'ipiiii',
   SDL_MapRGBA: function(fmt, r, g, b, a) {
     SDL.checkPixelFormat(fmt);
     // We assume the machine is little-endian.
@@ -2155,7 +2118,6 @@ var LibrarySDL = {
   },
 
   SDL_GetRGB__proxy: 'sync',
-  SDL_GetRGB__sig: 'vipppp',
   SDL_GetRGB: function(pixel, fmt, r, g, b) {
     SDL.checkPixelFormat(fmt);
     // We assume the machine is little-endian.
@@ -2171,7 +2133,6 @@ var LibrarySDL = {
   },
 
   SDL_GetRGBA__proxy: 'sync',
-  SDL_GetRGBA__sig: 'vippppp',
   SDL_GetRGBA: function(pixel, fmt, r, g, b, a) {
     SDL.checkPixelFormat(fmt);
     // We assume the machine is little-endian.
@@ -2190,7 +2151,6 @@ var LibrarySDL = {
   },
 
   SDL_GetAppState__proxy: 'sync',
-  SDL_GetAppState__sig: 'i',
   SDL_GetAppState: function() {
     var state = 0;
 
@@ -2208,7 +2168,6 @@ var LibrarySDL = {
   SDL_WM_GrabInput: function() {},
 
   SDL_WM_ToggleFullScreen__proxy: 'sync',
-  SDL_WM_ToggleFullScreen__sig: 'ip',
   SDL_WM_ToggleFullScreen: function(surf) {
     if (Browser.exitFullscreen()) {
       return 1;
@@ -2228,7 +2187,6 @@ var LibrarySDL = {
 
   IMG_Load_RW__deps: ['SDL_LockSurface', 'SDL_FreeRW', '$PATH_FS', 'malloc'],
   IMG_Load_RW__proxy: 'sync',
-  IMG_Load_RW__sig: 'ppi',
   IMG_Load_RW: function(rwopsID, freeSrc) {
     try {
       // stb_image integration support
@@ -2380,7 +2338,6 @@ var LibrarySDL = {
 
   IMG_Load__deps: ['IMG_Load_RW', 'SDL_RWFromFile'],
   IMG_Load__proxy: 'sync',
-  IMG_Load__sig: 'pp',
   IMG_Load: function(filename){
     var rwops = _SDL_RWFromFile(filename, 0);
     var result = _IMG_Load_RW(rwops, 1);
@@ -2395,7 +2352,6 @@ var LibrarySDL = {
 
   SDL_OpenAudio__deps: ['$autoResumeAudioContext', '$safeSetTimeout', 'malloc'],
   SDL_OpenAudio__proxy: 'sync',
-  SDL_OpenAudio__sig: 'ipp',
   SDL_OpenAudio: function(desired, obtained) {
     try {
       SDL.audio = {
@@ -2618,7 +2574,6 @@ var LibrarySDL = {
 
   SDL_PauseAudio__proxy: 'sync',
   SDL_PauseAudio__deps: ['$safeSetTimeout'],
-  SDL_PauseAudio__sig: 'vi',
   SDL_PauseAudio: function(pauseOn) {
     if (!SDL.audio) {
       return;
@@ -2639,7 +2594,6 @@ var LibrarySDL = {
 
   SDL_CloseAudio__deps: ['SDL_PauseAudio'],
   SDL_CloseAudio__proxy: 'sync',
-  SDL_CloseAudio__sig: 'v',
   SDL_CloseAudio: function() {
     if (SDL.audio) {
       if (SDL.audio.callbackRemover) {
@@ -2667,12 +2621,10 @@ var LibrarySDL = {
   SDL_DestroyCond: function(cond) {},
 
   SDL_StartTextInput__proxy: 'sync',
-  SDL_StartTextInput__sig: 'v',
   SDL_StartTextInput: function() {
     SDL.textInput = true;
   },
   SDL_StopTextInput__proxy: 'sync',
-  SDL_StopTextInput__sig: 'v',
   SDL_StopTextInput: function() {
     SDL.textInput = false;
   },
@@ -2687,7 +2639,6 @@ var LibrarySDL = {
 
   Mix_OpenAudio__deps: ['$autoResumeAudioContext'],
   Mix_OpenAudio__proxy: 'sync',
-  Mix_OpenAudio__sig: 'iiiii',
   Mix_OpenAudio: function(frequency, format, channels, chunksize) {
     SDL.openAudioContext();
     autoResumeAudioContext(SDL.audioContext);
@@ -2703,20 +2654,17 @@ var LibrarySDL = {
   Mix_CloseAudio: 'SDL_CloseAudio',
 
   Mix_AllocateChannels__proxy: 'sync',
-  Mix_AllocateChannels__sig: 'ii',
   Mix_AllocateChannels: function(num) {
     SDL.allocateChannels(num);
     return num;
   },
 
   Mix_ChannelFinished__proxy: 'sync',
-  Mix_ChannelFinished__sig: 'vp',
   Mix_ChannelFinished: function(func) {
     SDL.channelFinished = func;
   },
 
   Mix_Volume__proxy: 'sync',
-  Mix_Volume__sig: 'iii',
   Mix_Volume: function(channel, volume) {
     if (channel == -1) {
       for (var i = 0; i < SDL.numChannels-1; i++) {
@@ -2729,7 +2677,6 @@ var LibrarySDL = {
 
   // Note: Mix_SetPanning requires WebAudio (file loaded from memory).
   Mix_SetPanning__proxy: 'sync',
-  Mix_SetPanning__sig: 'iiii',
   Mix_SetPanning: function(channel, left, right) {
     // SDL API uses [0-255], while PannerNode has an (x, y, z) position.
 
@@ -2745,7 +2692,6 @@ var LibrarySDL = {
 
   Mix_LoadWAV_RW__deps: ['$PATH_FS', 'fileno'],
   Mix_LoadWAV_RW__proxy: 'sync',
-  Mix_LoadWAV_RW__sig: 'ppi',
   Mix_LoadWAV_RW__docs: '/** @param {number} freesrc */',
   Mix_LoadWAV_RW: function(rwopsID, freesrc) {
     var rwops = SDL.rwops[rwopsID];
@@ -2852,7 +2798,6 @@ var LibrarySDL = {
 
   Mix_LoadWAV__deps: ['Mix_LoadWAV_RW', 'SDL_RWFromFile', 'SDL_FreeRW'],
   Mix_LoadWAV__proxy: 'sync',
-  Mix_LoadWAV__sig: 'pp',
   Mix_LoadWAV: function(filename) {
     var rwops = _SDL_RWFromFile(filename, 0);
     var result = _Mix_LoadWAV_RW(rwops, 0);
@@ -2861,7 +2806,6 @@ var LibrarySDL = {
   },
 
   Mix_QuickLoad_RAW__proxy: 'sync',
-  Mix_QuickLoad_RAW__sig: 'ppi',
   Mix_QuickLoad_RAW: function(mem, len) {
     var audio;
     var webAudio;
@@ -2895,17 +2839,14 @@ var LibrarySDL = {
   },
 
   Mix_FreeChunk__proxy: 'sync',
-  Mix_FreeChunk__sig: 'vp',
   Mix_FreeChunk: function(id) {
     SDL.audios[id] = null;
   },
   Mix_ReserveChannels__proxy: 'sync',
-  Mix_ReserveChannels__sig: 'ii',
   Mix_ReserveChannels: function(num) {
     SDL.channelMinimumNumber = num;
   },
   Mix_PlayChannelTimed__proxy: 'sync',
-  Mix_PlayChannelTimed__sig: 'iipii',
   Mix_PlayChannelTimed: function(channel, id, loops, ticks) {
     // TODO: handle fixed amount of N loops. Currently loops either 0 or infinite times.
     assert(ticks == -1);
@@ -2964,7 +2905,6 @@ var LibrarySDL = {
   },
 
   Mix_HaltChannel__proxy: 'sync',
-  Mix_HaltChannel__sig: 'ii',
   Mix_HaltChannel: function(channel) {
     function halt(channel) {
       var info = /** @type {{ audio: HTMLMediaElement }} */ (SDL.channels[channel]);
@@ -2986,7 +2926,6 @@ var LibrarySDL = {
 
   Mix_HookMusicFinished__deps: ['Mix_HaltMusic'],
   Mix_HookMusicFinished__proxy: 'sync',
-  Mix_HookMusicFinished__sig: 'vp',
   Mix_HookMusicFinished: function(func) {
     SDL.hookMusicFinished = func;
     if (SDL.music.audio) { // ensure the callback will be called, if a music is already playing
@@ -2995,7 +2934,6 @@ var LibrarySDL = {
   },
 
   Mix_VolumeMusic__proxy: 'sync',
-  Mix_VolumeMusic__sig: 'ii',
   Mix_VolumeMusic: function(volume) {
     return SDL.setGetVolume(SDL.music, volume);
   },
@@ -3005,7 +2943,6 @@ var LibrarySDL = {
 
   Mix_LoadMUS__deps: ['Mix_LoadMUS_RW', 'SDL_RWFromFile', 'SDL_FreeRW'],
   Mix_LoadMUS__proxy: 'sync',
-  Mix_LoadMUS__sig: 'pp',
   Mix_LoadMUS: function(filename) {
     var rwops = _SDL_RWFromFile(filename, 0);
     var result = _Mix_LoadMUS_RW(rwops, 0);
@@ -3017,7 +2954,6 @@ var LibrarySDL = {
 
   Mix_PlayMusic__deps: ['Mix_HaltMusic'],
   Mix_PlayMusic__proxy: 'sync',
-  Mix_PlayMusic__sig: 'ipi',
   Mix_PlayMusic: function(id, loops) {
     // Pause old music if it exists.
     if (SDL.music.audio) {
@@ -3046,21 +2982,18 @@ var LibrarySDL = {
   },
 
   Mix_PauseMusic__proxy: 'sync',
-  Mix_PauseMusic__sig: 'v',
   Mix_PauseMusic: function() {
     var audio = /** @type {HTMLMediaElement} */ (SDL.music.audio);
     if (audio) audio.pause();
   },
 
   Mix_ResumeMusic__proxy: 'sync',
-  Mix_ResumeMusic__sig: 'v',
   Mix_ResumeMusic: function() {
     var audio = SDL.music.audio;
     if (audio) audio.play();
   },
 
   Mix_HaltMusic__proxy: 'sync',
-  Mix_HaltMusic__sig: 'i',
   Mix_HaltMusic: function() {
     var audio = /** @type {HTMLMediaElement} */ (SDL.music.audio);
     if (audio) {
@@ -3080,7 +3013,6 @@ var LibrarySDL = {
   Mix_FadeOutMusic: 'Mix_HaltMusic', // XXX ignore fading out effect
 
   Mix_PlayingMusic__proxy: 'sync',
-  Mix_PlayingMusic__sig: 'i',
   Mix_PlayingMusic: function() {
     return (SDL.music.audio && !SDL.music.audio.paused) ? 1 : 0;
   },
@@ -3088,7 +3020,6 @@ var LibrarySDL = {
   // http://www.libsdl.org/projects/SDL_mixer/docs/SDL_mixer_38.html#SEC38
   // "Note: Does not check if the channel has been paused."
   Mix_Playing__proxy: 'sync',
-  Mix_Playing__sig: 'ii',
   Mix_Playing: function(channel) {
     if (channel === -1) {
       var count = 0;
@@ -3105,7 +3036,6 @@ var LibrarySDL = {
   },
 
   Mix_Pause__proxy: 'sync',
-  Mix_Pause__sig: 'vi',
   Mix_Pause: function(channel) {
     if (channel === -1) {
       for (var i = 0; i<SDL.channels.length;i++) {
@@ -3124,7 +3054,6 @@ var LibrarySDL = {
 
   // http://www.libsdl.org/projects/SDL_mixer/docs/SDL_mixer_39.html#SEC39
   Mix_Paused__proxy: 'sync',
-  Mix_Paused__sig: 'ii',
   Mix_Paused: function(channel) {
     if (channel === -1) {
       var pausedCount = 0;
@@ -3141,14 +3070,12 @@ var LibrarySDL = {
   },
 
   Mix_PausedMusic__proxy: 'sync',
-  Mix_PausedMusic__sig: 'i',
   Mix_PausedMusic: function() {
     return (SDL.music.audio && SDL.music.audio.paused) ? 1 : 0;
   },
 
   // http://www.libsdl.org/projects/SDL_mixer/docs/SDL_mixer_33.html#SEC33
   Mix_Resume__proxy: 'sync',
-  Mix_Resume__sig: 'vi',
   Mix_Resume: function(channel) {
     if (channel === -1) {
       for (var i = 0; i<SDL.channels.length;i++) {
@@ -3163,7 +3090,6 @@ var LibrarySDL = {
   // SDL TTF
 
   TTF_Init__proxy: 'sync',
-  TTF_Init__sig: 'i',
   TTF_Init: function() {
     // OffscreenCanvas 2D is faster than Canvas for text operations, so we use
     // it if it's available.
@@ -3191,7 +3117,6 @@ var LibrarySDL = {
   },
 
   TTF_OpenFont__proxy: 'sync',
-  TTF_OpenFont__sig: 'ppi',
   TTF_OpenFont: function(filename, size) {
     filename = PATH.normalize(UTF8ToString(filename));
     var id = SDL.fonts.length;
@@ -3203,13 +3128,11 @@ var LibrarySDL = {
   },
 
   TTF_CloseFont__proxy: 'sync',
-  TTF_CloseFont__sig: 'vp',
   TTF_CloseFont: function(font) {
     SDL.fonts[font] = null;
   },
 
   TTF_RenderText_Solid__proxy: 'sync',
-  TTF_RenderText_Solid__sig: 'pppp',
   TTF_RenderText_Solid: function(font, text, color) {
     // XXX the font and color are ignored
     text = UTF8ToString(text) || ' '; // if given an empty string, still return a valid surface
@@ -3237,7 +3160,6 @@ var LibrarySDL = {
   TTF_SizeUTF8: 'TTF_SizeText',
 
   TTF_SizeText__proxy: 'sync',
-  TTF_SizeText__sig: 'ipppp',
   TTF_SizeText: function(font, text, w, h) {
     var fontData = SDL.fonts[font];
     if (w) {
@@ -3250,7 +3172,6 @@ var LibrarySDL = {
   },
 
   TTF_GlyphMetrics__proxy: 'sync',
-  TTF_GlyphMetrics__sig: 'ipippppp',
   TTF_GlyphMetrics: function(font, ch, minx, maxx, miny, maxy, advance) {
     var fontData = SDL.fonts[font];
     var width = SDL.estimateTextWidth(fontData,  String.fromCharCode(ch));
@@ -3273,21 +3194,18 @@ var LibrarySDL = {
   },
 
   TTF_FontAscent__proxy: 'sync',
-  TTF_FontAscent__sig: 'ip',
   TTF_FontAscent: function(font) {
     var fontData = SDL.fonts[font];
     return (fontData.size*0.98)|0; // XXX
   },
 
   TTF_FontDescent__proxy: 'sync',
-  TTF_FontDescent__sig: 'ip',
   TTF_FontDescent: function(font) {
     var fontData = SDL.fonts[font];
     return (fontData.size*0.02)|0; // XXX
   },
 
   TTF_FontHeight__proxy: 'sync',
-  TTF_FontHeight__sig: 'ip',
   TTF_FontHeight: function(font) {
     var fontData = SDL.fonts[font];
     return fontData.size;
@@ -3420,7 +3338,6 @@ var LibrarySDL = {
   // GL
 
   SDL_GL_SetAttribute__proxy: 'sync',
-  SDL_GL_SetAttribute__sig: 'iii',
   SDL_GL_SetAttribute: function(attr, value) {
     if (!(attr in SDL.glAttributes)) {
       abort('Unknown SDL GL attribute (' + attr + '). Please check if your SDL version is supported.');
@@ -3430,7 +3347,6 @@ var LibrarySDL = {
   },
 
   SDL_GL_GetAttribute__proxy: 'sync',
-  SDL_GL_GetAttribute__sig: 'iip',
   SDL_GL_GetAttribute: function(attr, value) {
     if (!(attr in SDL.glAttributes)) {
       abort('Unknown SDL GL attribute (' + attr + '). Please check if your SDL version is supported.');
@@ -3442,7 +3358,6 @@ var LibrarySDL = {
   },
 
   SDL_GL_SwapBuffers__proxy: 'sync',
-  SDL_GL_SwapBuffers__sig: 'v',
   SDL_GL_SwapBuffers: function() {
     if (Browser.doSwapBuffers) Browser.doSwapBuffers(); // in workers, this is used to send out a buffered frame
   },
@@ -3450,7 +3365,6 @@ var LibrarySDL = {
   // SDL 2
 
   SDL_GL_ExtensionSupported__proxy: 'sync',
-  SDL_GL_ExtensionSupported__sig: 'ip',
   SDL_GL_ExtensionSupported: function(extension) {
     return Module.ctx.getExtension(extension) | 0;
   },
@@ -3460,7 +3374,6 @@ var LibrarySDL = {
   SDL_DestroyRenderer: function(renderer) {},
 
   SDL_GetWindowFlags__proxy: 'sync',
-  SDL_GetWindowFlags__sig: 'ip',
   SDL_GetWindowFlags: function(window) {
     if (Browser.isFullscreen) {
        return 1;
@@ -3476,7 +3389,6 @@ var LibrarySDL = {
   SDL_GL_DeleteContext: function(context) {},
 
   SDL_GL_GetSwapInterval__proxy: 'sync',
-  SDL_GL_GetSwapInterval__sig: 'i',
   SDL_GL_GetSwapInterval: function() {
     if (Browser.mainLoop.timingMode == 1/*EM_TIMING_RAF*/) return Browser.mainLoop.timingValue;
     else return 0;
@@ -3488,13 +3400,11 @@ var LibrarySDL = {
   },
 
   SDL_SetWindowTitle__proxy: 'sync',
-  SDL_SetWindowTitle__sig: 'vpp',
   SDL_SetWindowTitle: function(window, title) {
     if (title) document.title = UTF8ToString(title);
   },
 
   SDL_GetWindowSize__proxy: 'sync',
-  SDL_GetWindowSize__sig: 'vppp',
   SDL_GetWindowSize: function(window, width, height){
     var w = Module['canvas'].width;
     var h = Module['canvas'].height;
@@ -3505,7 +3415,6 @@ var LibrarySDL = {
   SDL_LogSetOutputFunction: function(callback, userdata) {},
 
   SDL_SetWindowFullscreen__proxy: 'sync',
-  SDL_SetWindowFullscreen__sig: 'ipi',
   SDL_SetWindowFullscreen: function(window, fullscreen) {
     if (Browser.isFullscreen) {
       Module['canvas'].exitFullscreen();
@@ -3529,7 +3438,6 @@ var LibrarySDL = {
   // Joysticks
 
   SDL_NumJoysticks__proxy: 'sync',
-  SDL_NumJoysticks__sig: 'i',
   SDL_NumJoysticks: function() {
     var count = 0;
     var gamepads = SDL.getGamepads();
@@ -3541,7 +3449,6 @@ var LibrarySDL = {
   },
 
   SDL_JoystickName__proxy: 'sync',
-  SDL_JoystickName__sig: 'pi',
   SDL_JoystickName__deps: ['$allocateUTF8'],
   SDL_JoystickName: function(deviceIndex) {
     var gamepad = SDL.getGamepad(deviceIndex);
@@ -3556,7 +3463,6 @@ var LibrarySDL = {
   },
 
   SDL_JoystickOpen__proxy: 'sync',
-  SDL_JoystickOpen__sig: 'pi',
   SDL_JoystickOpen: function(deviceIndex) {
     var gamepad = SDL.getGamepad(deviceIndex);
     if (gamepad) {
@@ -3569,7 +3475,6 @@ var LibrarySDL = {
   },
 
   SDL_JoystickOpened__proxy: 'sync',
-  SDL_JoystickOpened__sig: 'ii',
   SDL_JoystickOpened: function(deviceIndex) {
     return SDL.lastJoystickState.hasOwnProperty(deviceIndex+1) ? 1 : 0;
   },
@@ -3580,7 +3485,6 @@ var LibrarySDL = {
   },
 
   SDL_JoystickNumAxes__proxy: 'sync',
-  SDL_JoystickNumAxes__sig: 'ip',
   SDL_JoystickNumAxes: function(joystick) {
     var gamepad = SDL.getGamepad(joystick - 1);
     if (gamepad) {
@@ -3594,7 +3498,6 @@ var LibrarySDL = {
   SDL_JoystickNumHats: function(joystick) { return 0; },
 
   SDL_JoystickNumButtons__proxy: 'sync',
-  SDL_JoystickNumButtons__sig: 'ip',
   SDL_JoystickNumButtons: function(joystick) {
     var gamepad = SDL.getGamepad(joystick - 1);
     if (gamepad) {
@@ -3604,13 +3507,11 @@ var LibrarySDL = {
   },
 
   SDL_JoystickUpdate__proxy: 'sync',
-  SDL_JoystickUpdate__sig: 'v',
   SDL_JoystickUpdate: function() {
     SDL.queryJoysticks();
   },
 
   SDL_JoystickEventState__proxy: 'sync',
-  SDL_JoystickEventState__sig: 'ii',
   SDL_JoystickEventState: function(state) {
     if (state < 0) {
       // SDL_QUERY: Return current state.
@@ -3620,7 +3521,6 @@ var LibrarySDL = {
   },
 
   SDL_JoystickGetAxis__proxy: 'sync',
-  SDL_JoystickGetAxis__sig: 'ipi',
   SDL_JoystickGetAxis: function(joystick, axis) {
     var gamepad = SDL.getGamepad(joystick - 1);
     if (gamepad && gamepad.axes.length > axis) {
@@ -3634,7 +3534,6 @@ var LibrarySDL = {
   SDL_JoystickGetBall: function(joystick, ball, dxptr, dyptr) { return -1; },
 
   SDL_JoystickGetButton__proxy: 'sync',
-  SDL_JoystickGetButton__sig: 'ipi',
   SDL_JoystickGetButton: function(joystick, button) {
     var gamepad = SDL.getGamepad(joystick - 1);
     if (gamepad && gamepad.buttons.length > button) {
@@ -3644,7 +3543,6 @@ var LibrarySDL = {
   },
 
   SDL_JoystickClose__proxy: 'sync',
-  SDL_JoystickClose__sig: 'vp',
   SDL_JoystickClose: function(joystick) {
     delete SDL.lastJoystickState[joystick];
   },
@@ -3654,7 +3552,6 @@ var LibrarySDL = {
   SDL_InitSubSystem: function(flags) { return 0 },
 
   SDL_RWFromConstMem__proxy: 'sync',
-  SDL_RWFromConstMem__sig: 'ppi',
   SDL_RWFromConstMem: function(mem, size) {
     var id = SDL.rwops.length; // TODO: recycle ids when they are null
     SDL.rwops.push({ bytes: mem, count: size });
@@ -3663,7 +3560,6 @@ var LibrarySDL = {
   SDL_RWFromMem: 'SDL_RWFromConstMem',
 
   SDL_RWFromFile__proxy: 'sync',
-  SDL_RWFromFile__sig: 'ppp',
   SDL_RWFromFile__docs: '/** @param {number} mode */',
   SDL_RWFromFile: function(_name, mode) {
     var id = SDL.rwops.length; // TODO: recycle ids when they are null
@@ -3673,7 +3569,6 @@ var LibrarySDL = {
   },
 
   SDL_FreeRW__proxy: 'sync',
-  SDL_FreeRW__sig: 'vp',
   SDL_FreeRW: function(rwopsID) {
     SDL.rwops[rwopsID] = null;
     while (SDL.rwops.length > 0 && SDL.rwops[SDL.rwops.length-1] === null) {
@@ -3693,7 +3588,6 @@ var LibrarySDL = {
   SDL_GetAudioDriver: function(index) { return _SDL_GetCurrentAudioDriver() },
 
   SDL_EnableUNICODE__proxy: 'sync',
-  SDL_EnableUNICODE__sig: 'ii',
   SDL_EnableUNICODE: function(on) {
     var ret = SDL.unicode || 0;
     SDL.unicode = on;
@@ -3702,14 +3596,12 @@ var LibrarySDL = {
 
   SDL_AddTimer__proxy: 'sync',
   SDL_AddTimer__deps: ['$safeSetTimeout'],
-  SDL_AddTimer__sig: 'iipp',
   SDL_AddTimer: function(interval, callback, param) {
     return safeSetTimeout(
       () => {{{ makeDynCall('iii', 'callback') }}}(interval, param),
       interval);
   },
   SDL_RemoveTimer__proxy: 'sync',
-  SDL_RemoveTimer__sig: 'ii',
   SDL_RemoveTimer: function(id) {
     clearTimeout(id);
     return true;
diff --git a/src/library_sigs.js b/src/library_sigs.js
index dc424111eba65..a503df85dcc8c 100644
--- a/src/library_sigs.js
+++ b/src/library_sigs.js
@@ -908,4 +908,7 @@ sigs = {
   uuid_variant__sig: 'ip',
   zoomSurface__sig: 'ppddi',
 }
-mergeInto(LibraryManager.library, sigs);
+
+// We have to merge with `allowMissing` since this file contains signatures
+// for functions that might not exist in all build configurations.
+mergeInto(LibraryManager.library, sigs, {allowMissing: true});
diff --git a/src/library_syscall.js b/src/library_syscall.js
index e9b69cbd06b99..bc08ecb93aa97 100644
--- a/src/library_syscall.js
+++ b/src/library_syscall.js
@@ -124,7 +124,6 @@ var SyscallsLibrary = {
 #endif // SYSCALLS_REQUIRE_FILESYSTEM
   },
 
-  _mmap_js__sig: 'ipiiippp',
   _mmap_js__deps: ['$SYSCALLS',
 #if FILESYSTEM && SYSCALLS_REQUIRE_FILESYSTEM
     '$FS',
@@ -151,7 +150,6 @@ var SyscallsLibrary = {
     '$FS',
 #endif
   ],
-  _munmap_js__sig: 'ippiiip',
   _munmap_js: function(addr, len, prot, flags, fd, offset) {
 #if FILESYSTEM && SYSCALLS_REQUIRE_FILESYSTEM
     var stream = SYSCALLS.getStreamFromFD(fd);
@@ -163,31 +161,26 @@ var SyscallsLibrary = {
 #endif
   },
 
-  __syscall_chdir__sig: 'ip',
   __syscall_chdir: function(path) {
     path = SYSCALLS.getStr(path);
     FS.chdir(path);
     return 0;
   },
-  __syscall_chmod__sig: 'ipi',
   __syscall_chmod: function(path, mode) {
     path = SYSCALLS.getStr(path);
     FS.chmod(path, mode);
     return 0;
   },
-  __syscall_rmdir__sig: 'ip',
   __syscall_rmdir: function(path) {
     path = SYSCALLS.getStr(path);
     FS.rmdir(path);
     return 0;
   },
-  __syscall_dup__sig: 'ii',
   __syscall_dup: function(fd) {
     var old = SYSCALLS.getStreamFromFD(fd);
     return FS.createStream(old, 0).fd;
   },
   __syscall_pipe__deps: ['$PIPEFS'],
-  __syscall_pipe__sig: 'ip',
   __syscall_pipe: function(fdPtr) {
     if (fdPtr == 0) {
       throw new FS.ErrnoError({{{ cDefs.EFAULT }}});
@@ -200,7 +193,6 @@ var SyscallsLibrary = {
 
     return 0;
   },
-  __syscall_ioctl__sig: 'iiip',
   __syscall_ioctl: function(fd, op, varargs) {
 #if SYSCALLS_REQUIRE_FILESYSTEM == 0
 #if SYSCALL_DEBUG
@@ -258,7 +250,6 @@ var SyscallsLibrary = {
     }
 #endif // SYSCALLS_REQUIRE_FILESYSTEM
   },
-  __syscall_symlink__sig: 'ipp',
   __syscall_symlink: function(target, linkpath) {
     target = SYSCALLS.getStr(target);
     linkpath = SYSCALLS.getStr(linkpath);
@@ -328,7 +319,6 @@ var SyscallsLibrary = {
     return 0;
   },
   __syscall_connect__deps: ['$getSocketFromFD', '$getSocketAddress'],
-  __syscall_connect__sig: 'iippiii',
   __syscall_connect: function(fd, addr, addrlen, d1, d2, d3) {
     var sock = getSocketFromFD(fd);
     var info = getSocketAddress(addr, addrlen);
@@ -353,7 +343,6 @@ var SyscallsLibrary = {
     return newsock.stream.fd;
   },
   __syscall_bind__deps: ['$getSocketFromFD', '$getSocketAddress'],
-  __syscall_bind__sig: 'iippiii',
   __syscall_bind: function(fd, addr, addrlen, d1, d2, d3) {
     var sock = getSocketFromFD(fd);
     var info = getSocketAddress(addr, addrlen);
@@ -381,7 +370,6 @@ var SyscallsLibrary = {
     return msg.buffer.byteLength;
   },
   __syscall_sendto__deps: ['$getSocketFromFD', '$getSocketAddress'],
-  __syscall_sendto__sig: 'iippipp',
   __syscall_sendto: function(fd, message, length, flags, addr, addr_len) {
     var sock = getSocketFromFD(fd);
     var dest = getSocketAddress(addr, addr_len, true);
@@ -582,7 +570,6 @@ var SyscallsLibrary = {
 
     return total;
   },
-  _msync_js__sig: 'ippiiip',
   _msync_js: function(addr, len, prot, flags, fd, offset) {
     SYSCALLS.doMsync(addr, SYSCALLS.getStreamFromFD(fd), len, flags, 0);
     return 0;
@@ -591,7 +578,6 @@ var SyscallsLibrary = {
     var stream = SYSCALLS.getStreamFromFD(fd);
     return 0; // we can't do anything synchronously; the in-memory FS is already synced to
   },
-  __syscall_poll__sig: 'ipii',
   __syscall_poll: function(fds, nfds, timeout) {
     var nonzero = 0;
     for (var i = 0; i < nfds; i++) {
@@ -612,7 +598,6 @@ var SyscallsLibrary = {
     }
     return nonzero;
   },
-  __syscall_getcwd__sig: 'ipp',
   __syscall_getcwd: function(buf, size) {
     if (size === 0) return -{{{ cDefs.EINVAL }}};
     var cwd = FS.cwd();
@@ -621,7 +606,6 @@ var SyscallsLibrary = {
     stringToUTF8(cwd, buf, size);
     return cwdLengthInBytes;
   },
-  __syscall_truncate64__sig: 'ipj',
   __syscall_truncate64__deps: i53ConversionDeps,
   __syscall_truncate64: function(path, {{{ defineI64Param('length') }}}) {
     {{{ receiveI64ParamAsI53('length', -cDefs.EOVERFLOW) }}}
@@ -629,24 +613,20 @@ var SyscallsLibrary = {
     FS.truncate(path, length);
     return 0;
   },
-  __syscall_ftruncate64__sig: 'iij',
   __syscall_ftruncate64__deps: i53ConversionDeps,
   __syscall_ftruncate64: function(fd, {{{ defineI64Param('length') }}}) {
     {{{ receiveI64ParamAsI53('length', -cDefs.EOVERFLOW) }}}
     FS.ftruncate(fd, length);
     return 0;
   },
-  __syscall_stat64__sig: 'ipp',
   __syscall_stat64: function(path, buf) {
     path = SYSCALLS.getStr(path);
     return SYSCALLS.doStat(FS.stat, path, buf);
   },
-  __syscall_lstat64__sig: 'ipp',
   __syscall_lstat64: function(path, buf) {
     path = SYSCALLS.getStr(path);
     return SYSCALLS.doStat(FS.lstat, path, buf);
   },
-  __syscall_fstat64__sig: 'iip',
   __syscall_fstat64: function(fd, buf) {
     var stream = SYSCALLS.getStreamFromFD(fd);
     return SYSCALLS.doStat(FS.stat, stream.path, buf);
@@ -655,7 +635,6 @@ var SyscallsLibrary = {
     FS.fchown(fd, owner, group);
     return 0;
   },
-  __syscall_getdents64__sig: 'iipp',
   __syscall_getdents64: function(fd, dirp, count) {
     var stream = SYSCALLS.getStreamFromFD(fd)
     if (!stream.getdents) {
@@ -704,7 +683,6 @@ var SyscallsLibrary = {
     return pos;
   },
   __syscall_fcntl64__deps: ['$setErrNo'],
-  __syscall_fcntl64__sig: 'iiip',
   __syscall_fcntl64: function(fd, cmd, varargs) {
 #if SYSCALLS_REQUIRE_FILESYSTEM == 0
 #if SYSCALL_DEBUG
@@ -766,7 +744,6 @@ var SyscallsLibrary = {
 #endif // SYSCALLS_REQUIRE_FILESYSTEM
   },
 
-  __syscall_statfs64__sig: 'ippp',
   __syscall_statfs64: function(path, size, buf) {
     path = SYSCALLS.getStr(path);
 #if ASSERTIONS
@@ -796,14 +773,12 @@ var SyscallsLibrary = {
   __syscall_fadvise64: function(fd, offset, len, advice) {
     return 0; // your advice is important to us (but we can't use it)
   },
-  __syscall_openat__sig: 'iipip',
   __syscall_openat: function(dirfd, path, flags, varargs) {
     path = SYSCALLS.getStr(path);
     path = SYSCALLS.calculateAt(dirfd, path);
     var mode = varargs ? SYSCALLS.get() : 0;
     return FS.open(path, flags, mode).fd;
   },
-  __syscall_mkdirat__sig: 'iipi',
   __syscall_mkdirat: function(dirfd, path, mode) {
 #if SYSCALL_DEBUG
     dbg('warning: untested syscall');
@@ -817,7 +792,6 @@ var SyscallsLibrary = {
     FS.mkdir(path, mode, 0);
     return 0;
   },
-  __syscall_mknodat__sig: 'iipii',
   __syscall_mknodat: function(dirfd, path, mode, dev) {
 #if SYSCALL_DEBUG
     dbg('warning: untested syscall');
@@ -837,7 +811,6 @@ var SyscallsLibrary = {
     FS.mknod(path, mode, dev);
     return 0;
   },
-  __syscall_fchownat__sig: 'iipiii',
   __syscall_fchownat: function(dirfd, path, owner, group, flags) {
 #if SYSCALL_DEBUG
     dbg('warning: untested syscall');
@@ -852,7 +825,6 @@ var SyscallsLibrary = {
     (nofollow ? FS.lchown : FS.chown)(path, owner, group);
     return 0;
   },
-  __syscall_newfstatat__sig: 'iippi',
   __syscall_newfstatat: function(dirfd, path, buf, flags) {
     path = SYSCALLS.getStr(path);
     var nofollow = flags & {{{ cDefs.AT_SYMLINK_NOFOLLOW }}};
@@ -864,7 +836,6 @@ var SyscallsLibrary = {
     path = SYSCALLS.calculateAt(dirfd, path, allowEmpty);
     return SYSCALLS.doStat(nofollow ? FS.lstat : FS.stat, path, buf);
   },
-  __syscall_unlinkat__sig: 'iipi',
   __syscall_unlinkat: function(dirfd, path, flags) {
     path = SYSCALLS.getStr(path);
     path = SYSCALLS.calculateAt(dirfd, path);
@@ -877,7 +848,6 @@ var SyscallsLibrary = {
     }
     return 0;
   },
-  __syscall_renameat__sig: 'iipip',
   __syscall_renameat: function(olddirfd, oldpath, newdirfd, newpath) {
     oldpath = SYSCALLS.getStr(oldpath);
     newpath = SYSCALLS.getStr(newpath);
@@ -899,7 +869,6 @@ var SyscallsLibrary = {
     FS.symlink(target, linkpath);
     return 0;
   },
-  __syscall_readlinkat__sig: 'iippp',
   __syscall_readlinkat: function(dirfd, path, buf, bufsize) {
     path = SYSCALLS.getStr(path);
     path = SYSCALLS.calculateAt(dirfd, path);
@@ -914,7 +883,6 @@ var SyscallsLibrary = {
     HEAP8[buf+len] = endChar;
     return len;
   },
-  __syscall_fchmodat__sig: 'iipip',
   __syscall_fchmodat: function(dirfd, path, mode, varargs) {
 #if SYSCALL_DEBUG
     dbg('warning: untested syscall');
@@ -924,7 +892,6 @@ var SyscallsLibrary = {
     FS.chmod(path, mode);
     return 0;
   },
-  __syscall_faccessat__sig: 'iipii',
   __syscall_faccessat: function(dirfd, path, amode, flags) {
 #if SYSCALL_DEBUG
     dbg('warning: untested syscall');
@@ -952,7 +919,6 @@ var SyscallsLibrary = {
     }
     return 0;
   },
-  __syscall_utimensat__sig: 'iippi',
   __syscall_utimensat__deps: ['$readI53FromI64'],
   __syscall_utimensat: function(dirfd, path, times, flags) {
     path = SYSCALLS.getStr(path);
diff --git a/src/library_wasi.js b/src/library_wasi.js
index a57b9326bc43b..905613d3bbd11 100644
--- a/src/library_wasi.js
+++ b/src/library_wasi.js
@@ -16,7 +16,6 @@ var WasiLibrary = {
 #endif
 
   proc_exit__nothrow: true,
-  proc_exit__sig: 'vi',
   proc_exit: function(code) {
 #if MINIMAL_RUNTIME
     throw 'exit(' + code + ')';
@@ -77,7 +76,6 @@ var WasiLibrary = {
 
   environ_sizes_get__deps: ['$getEnvStrings'],
   environ_sizes_get__nothrow: true,
-  environ_sizes_get__sig: 'ipp',
   environ_sizes_get: function(penviron_count, penviron_buf_size) {
     var strings = getEnvStrings();
     {{{ makeSetValue('penviron_count', 0, 'strings.length', SIZE_TYPE) }}};
@@ -91,7 +89,6 @@ var WasiLibrary = {
 
   environ_get__deps: ['$getEnvStrings', '$writeAsciiToMemory'],
   environ_get__nothrow: true,
-  environ_get__sig: 'ipp',
   environ_get: function(__environ, environ_buf) {
     var bufSize = 0;
     getEnvStrings().forEach(function(string, i) {
@@ -107,7 +104,6 @@ var WasiLibrary = {
   // to main, and the `mainArgs` global does not exist.
 #if STANDALONE_WASM
   args_sizes_get__nothrow: true,
-  args_sizes_get__sig: 'ipp',
   args_sizes_get: function(pargc, pargv_buf_size) {
 #if MAIN_READS_PARAMS
     {{{ makeSetValue('pargc', 0, 'mainArgs.length', SIZE_TYPE) }}};
@@ -123,7 +119,6 @@ var WasiLibrary = {
   },
 
   args_get__nothrow: true,
-  args_get__sig: 'ipp',
   args_get__deps: ['$writeAsciiToMemory'],
   args_get: function(argv, argv_buf) {
 #if MAIN_READS_PARAMS
@@ -151,7 +146,6 @@ var WasiLibrary = {
   // this is needed. To get this code to be usable as a JS shim we need to
   // either wait for BigInt support or to legalize on the client.
   clock_time_get__nothrow: true,
-  clock_time_get__sig: 'iijp',
   clock_time_get__deps: ['emscripten_get_now', '$nowIsMonotonic', '$checkWasiClock'],
   clock_time_get: function(clk_id, {{{ defineI64Param('ignored_precision') }}}, ptime) {
     if (!checkWasiClock(clk_id)) {
@@ -174,7 +168,6 @@ var WasiLibrary = {
   },
 
   clock_res_get__nothrow: true,
-  clock_res_get__sig: 'iip',
   clock_res_get__deps: ['emscripten_get_now', 'emscripten_get_now_res', '$nowIsMonotonic', '$checkWasiClock'],
   clock_res_get: function(clk_id, pres) {
     if (!checkWasiClock(clk_id)) {
@@ -267,7 +260,6 @@ var WasiLibrary = {
 #else
   fd_write__deps: ['$printChar'],
 #endif
-  fd_write__sig: 'iippp',
   fd_write: function(fd, iov, iovcnt, pnum) {
 #if SYSCALLS_REQUIRE_FILESYSTEM
     var stream = SYSCALLS.getStreamFromFD(fd);
@@ -294,7 +286,6 @@ var WasiLibrary = {
     '$doWritev',
 #endif
   ].concat(i53ConversionDeps),
-  fd_pwrite__sig: 'iippjp',
   fd_pwrite: function(fd, iov, iovcnt, {{{ defineI64Param('offset') }}}, pnum) {
 #if SYSCALLS_REQUIRE_FILESYSTEM
     {{{ receiveI64ParamAsI53('offset', cDefs.EOVERFLOW) }}}
@@ -309,7 +300,6 @@ var WasiLibrary = {
 #endif
   },
 
-  fd_close__sig: 'ii',
   fd_close: function(fd) {
 #if SYSCALLS_REQUIRE_FILESYSTEM
     var stream = SYSCALLS.getStreamFromFD(fd);
@@ -329,7 +319,6 @@ var WasiLibrary = {
 #endif // SYSCALLS_REQUIRE_FILESYSTEM
   },
 
-  fd_read__sig: 'iippp',
 #if SYSCALLS_REQUIRE_FILESYSTEM
   fd_read__deps: ['$doReadv'],
 #endif
@@ -351,7 +340,6 @@ var WasiLibrary = {
     '$doReadv',
 #endif
   ].concat(i53ConversionDeps),
-  fd_pread__sig: 'iippjp',
   fd_pread: function(fd, iov, iovcnt, {{{ defineI64Param('offset') }}}, pnum) {
 #if SYSCALLS_REQUIRE_FILESYSTEM
     {{{ receiveI64ParamAsI53('offset', cDefs.EOVERFLOW) }}}
@@ -366,7 +354,6 @@ var WasiLibrary = {
 #endif
   },
 
-  fd_seek__sig: 'iijip',
   fd_seek__deps: i53ConversionDeps,
   fd_seek: function(fd, {{{ defineI64Param('offset') }}}, whence, newOffset) {
 #if SYSCALLS_REQUIRE_FILESYSTEM
@@ -381,7 +368,6 @@ var WasiLibrary = {
 #endif
   },
 
-  fd_fdstat_get__sig: 'iip',
   fd_fdstat_get: function(fd, pbuf) {
 #if SYSCALLS_REQUIRE_FILESYSTEM
     var stream = SYSCALLS.getStreamFromFD(fd);
@@ -402,7 +388,6 @@ var WasiLibrary = {
     return 0;
   },
 
-  fd_sync__sig: 'ii',
   fd_sync: function(fd) {
 #if SYSCALLS_REQUIRE_FILESYSTEM
     var stream = SYSCALLS.getStreamFromFD(fd);
diff --git a/src/library_webaudio.js b/src/library_webaudio.js
index 149699838bb98..d0e6da3075404 100644
--- a/src/library_webaudio.js
+++ b/src/library_webaudio.js
@@ -95,7 +95,6 @@ let LibraryWebAudio = {
     return ['suspended', 'running', 'closed', 'interrupted'].indexOf(EmAudio[contextHandle].state);
   },
 
-  emscripten_destroy_audio_context__sig: 'vi',
   emscripten_destroy_audio_context: function(contextHandle) {
 #if ASSERTIONS
     assert(EmAudio[contextHandle], `Called emscripten_destroy_audio_context() on an already freed context handle ${contextHandle}`);
@@ -284,7 +283,6 @@ let LibraryWebAudio = {
     return typeof AudioWorkletGlobalScope !== 'undefined';
   },
 
-  emscripten_audio_worklet_post_function_v__sig: 'vip',
   emscripten_audio_worklet_post_function_v: function(audioContext, funcPtr) {
     (audioContext ? EmAudio[audioContext].audioWorklet.bootstrapMessage.port : globalThis['messagePort']).postMessage({'_wsc': funcPtr, 'x': [] }); // "WaSm Call"
   },
@@ -293,13 +291,11 @@ let LibraryWebAudio = {
     (audioContext ? EmAudio[audioContext].audioWorklet.bootstrapMessage.port : globalThis['messagePort']).postMessage({'_wsc': funcPtr, 'x': [arg0] }); // "WaSm Call"
   },
 
-  emscripten_audio_worklet_post_function_vi__sig: 'vipi',
   emscripten_audio_worklet_post_function_vi__deps: ['$emscripten_audio_worklet_post_function_1'],
   emscripten_audio_worklet_post_function_vi(audioContext, funcPtr, arg0) {
     emscripten_audio_worklet_post_function_1(audioContext, funcPtr, arg0)
   },
 
-  emscripten_audio_worklet_post_function_vd__sig: 'vipd',
   emscripten_audio_worklet_post_function_vd__deps: ['$emscripten_audio_worklet_post_function_1'],
   emscripten_audio_worklet_post_function_vd(audioContext, funcPtr, arg0) {
     emscripten_audio_worklet_post_function_1(audioContext, funcPtr, arg0)
@@ -309,13 +305,11 @@ let LibraryWebAudio = {
     (audioContext ? EmAudio[audioContext].audioWorklet.bootstrapMessage.port : globalThis['messagePort']).postMessage({'_wsc': funcPtr, 'x': [arg0, arg1] }); // "WaSm Call"
   },
 
-  emscripten_audio_worklet_post_function_vii__sig: 'vipii',
   emscripten_audio_worklet_post_function_vii__deps: ['$emscripten_audio_worklet_post_function_2'],
   emscripten_audio_worklet_post_function_vii: function(audioContext, funcPtr, arg0, arg1) {
     emscripten_audio_worklet_post_function_2(audioContext, funcPtr, arg0, arg1);
   },
 
-  emscripten_audio_worklet_post_function_vdd__sig: 'vipdd',
   emscripten_audio_worklet_post_function_vdd__deps: ['$emscripten_audio_worklet_post_function_2'],
   emscripten_audio_worklet_post_function_vdd: function(audioContext, funcPtr, arg0, arg1) {
     emscripten_audio_worklet_post_function_2(audioContext, funcPtr, arg0, arg1);
@@ -324,19 +318,16 @@ let LibraryWebAudio = {
   $emscripten_audio_worklet_post_function_3: function(audioContext, funcPtr, arg0, arg1, arg2) {
     (audioContext ? EmAudio[audioContext].audioWorklet.bootstrapMessage.port : globalThis['messagePort']).postMessage({'_wsc': funcPtr, 'x': [arg0, arg1, arg2] }); // "WaSm Call"
   },
-  emscripten_audio_worklet_post_function_viii__sig: 'vipiii',
   emscripten_audio_worklet_post_function_viii__deps: ['$emscripten_audio_worklet_post_function_3'],
   emscripten_audio_worklet_post_function_viii: function(audioContext, funcPtr, arg0, arg1, arg2) {
     emscripten_audio_worklet_post_function_3(audioContext, funcPtr, arg0, arg1, arg2);
   },
-  emscripten_audio_worklet_post_function_vddd__sig: 'vipddd',
   emscripten_audio_worklet_post_function_vddd__deps: ['$emscripten_audio_worklet_post_function_3'],
   emscripten_audio_worklet_post_function_vddd: function(audioContext, funcPtr, arg0, arg1, arg2) {
     emscripten_audio_worklet_post_function_3(audioContext, funcPtr, arg0, arg1, arg2);
   },
 
   emscripten_audio_worklet_post_function_sig__deps: ['$readAsmConstArgs'],
-  emscripten_audio_worklet_post_function_sig__sig: 'vippp',
   emscripten_audio_worklet_post_function_sig: function(audioContext, funcPtr, sigPtr, varargs) {
 #if ASSERTIONS
     assert(audioContext >= 0);
diff --git a/src/library_webgl.js b/src/library_webgl.js
index 7e7012379fbfc..c2e2066a2a17a 100644
--- a/src/library_webgl.js
+++ b/src/library_webgl.js
@@ -1141,7 +1141,6 @@ var LibraryGL = {
 #endif
   },
 
-  glPixelStorei__sig: 'vii',
   glPixelStorei: function(pname, param) {
     if (pname == 0xCF5 /* GL_UNPACK_ALIGNMENT */) {
       GL.unpackAlignment = param;
@@ -1149,7 +1148,6 @@ var LibraryGL = {
     GLctx.pixelStorei(pname, param);
   },
 
-  glGetString__sig: 'pi',
   glGetString__deps: ['$stringToNewUTF8'],
   glGetString: function(name_) {
     var ret = GL.stringCache[name_];
@@ -1400,25 +1398,21 @@ var LibraryGL = {
     }
   },
 
-  glGetIntegerv__sig: 'vip',
   glGetIntegerv__deps: ['$emscriptenWebGLGet'],
   glGetIntegerv: function(name_, p) {
     emscriptenWebGLGet(name_, p, {{{ cDefs.EM_FUNC_SIG_PARAM_I }}});
   },
 
-  glGetFloatv__sig: 'vip',
   glGetFloatv__deps: ['$emscriptenWebGLGet'],
   glGetFloatv: function(name_, p) {
     emscriptenWebGLGet(name_, p, {{{ cDefs.EM_FUNC_SIG_PARAM_F }}});
   },
 
-  glGetBooleanv__sig: 'vip',
   glGetBooleanv__deps: ['$emscriptenWebGLGet'],
   glGetBooleanv: function(name_, p) {
     emscriptenWebGLGet(name_, p, {{{ cDefs.EM_FUNC_SIG_PARAM_B }}});
   },
 
-  glDeleteTextures__sig: 'vip',
   glDeleteTextures: function(n, textures) {
     for (var i = 0; i < n; i++) {
       var id = {{{ makeGetValue('textures', 'i*4', 'i32') }}};
@@ -1430,7 +1424,6 @@ var LibraryGL = {
     }
   },
 
-  glCompressedTexImage2D__sig: 'viiiiiiip',
   glCompressedTexImage2D: function(target, level, internalFormat, width, height, border, imageSize, data) {
 #if MAX_WEBGL_VERSION >= 2
     if ({{{ isCurrentContextWebGL2() }}}) { // WebGL 2 provides new garbage-free entry points to call to WebGL. Use those always when possible.
@@ -1446,7 +1439,6 @@ var LibraryGL = {
   },
 
 
-  glCompressedTexSubImage2D__sig: 'viiiiiiiip',
   glCompressedTexSubImage2D: function(target, level, xoffset, yoffset, width, height, format, imageSize, data) {
 #if MAX_WEBGL_VERSION >= 2
     if ({{{ isCurrentContextWebGL2() }}}) { // WebGL 2 provides new garbage-free entry points to call to WebGL. Use those always when possible.
@@ -1520,7 +1512,6 @@ var LibraryGL = {
     return heap.subarray(pixels >> shift, pixels + bytes >> shift);
   },
 
-  glTexImage2D__sig: 'viiiiiiiip',
   glTexImage2D__deps: ['$emscriptenWebGLGetTexPixelData'
 #if MAX_WEBGL_VERSION >= 2
                        , '$heapObjectForWebGLType', '$heapAccessShiftForWebGLHeap'
@@ -1562,7 +1553,6 @@ var LibraryGL = {
     GLctx.texImage2D(target, level, internalFormat, width, height, border, format, type, pixels ? emscriptenWebGLGetTexPixelData(type, format, width, height, pixels, internalFormat) : null);
   },
 
-  glTexSubImage2D__sig: 'viiiiiiiip',
   glTexSubImage2D__deps: ['$emscriptenWebGLGetTexPixelData'
 #if MAX_WEBGL_VERSION >= 2
                           , '$heapObjectForWebGLType', '$heapAccessShiftForWebGLHeap'
@@ -1596,7 +1586,6 @@ var LibraryGL = {
     GLctx.texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixelData);
   },
 
-  glReadPixels__sig: 'viiiiiip',
   glReadPixels__deps: ['$emscriptenWebGLGetTexPixelData'
 #if MAX_WEBGL_VERSION >= 2
                        , '$heapObjectForWebGLType', '$heapAccessShiftForWebGLHeap'
@@ -1625,7 +1614,6 @@ var LibraryGL = {
     GLctx.readPixels(x, y, width, height, format, type, pixelData);
   },
 
-  glBindTexture__sig: 'vii',
   glBindTexture: function(target, texture) {
 #if GL_ASSERTIONS
     GL.validateGLObjectID(GL.textures, texture, 'glBindTexture', 'texture');
@@ -1633,7 +1621,6 @@ var LibraryGL = {
     GLctx.bindTexture(target, GL.textures[texture]);
   },
 
-  glGetTexParameterfv__sig: 'viip',
   glGetTexParameterfv: function(target, pname, params) {
     if (!params) {
       // GLES2 specification does not specify how to behave if params is a null pointer. Since calling this function does not make sense
@@ -1647,7 +1634,6 @@ var LibraryGL = {
     {{{ makeSetValue('params', '0', 'GLctx.getTexParameter(target, pname)', 'float') }}};
   },
 
-  glGetTexParameteriv__sig: 'viip',
   glGetTexParameteriv: function(target, pname, params) {
     if (!params) {
       // GLES2 specification does not specify how to behave if params is a null pointer. Since calling this function does not make sense
@@ -1661,19 +1647,16 @@ var LibraryGL = {
     {{{ makeSetValue('params', '0', 'GLctx.getTexParameter(target, pname)', 'i32') }}};
   },
 
-  glTexParameterfv__sig: 'viip',
   glTexParameterfv: function(target, pname, params) {
     var param = {{{ makeGetValue('params', '0', 'float') }}};
     GLctx.texParameterf(target, pname, param);
   },
 
-  glTexParameteriv__sig: 'viip',
   glTexParameteriv: function(target, pname, params) {
     var param = {{{ makeGetValue('params', '0', 'i32') }}};
     GLctx.texParameteri(target, pname, param);
   },
 
-  glIsTexture__sig: 'ii',
   glIsTexture: function(id) {
     var texture = GL.textures[id];
     if (!texture) return 0;
@@ -1706,7 +1689,6 @@ var LibraryGL = {
   },
 
   glGenBuffers__deps: ['$__glGenObject'],
-  glGenBuffers__sig: 'vip',
   glGenBuffers: function(n, buffers) {
     __glGenObject(n, buffers, 'createBuffer', GL.buffers
 #if GL_ASSERTIONS
@@ -1716,7 +1698,6 @@ var LibraryGL = {
   },
 
   glGenTextures__deps: ['$__glGenObject'],
-  glGenTextures__sig: 'vip',
   glGenTextures: function(n, textures) {
     __glGenObject(n, textures, 'createTexture', GL.textures
 #if GL_ASSERTIONS
@@ -1725,7 +1706,6 @@ var LibraryGL = {
       );
   },
 
-  glDeleteBuffers__sig: 'vip',
   glDeleteBuffers: function(n, buffers) {
     for (var i = 0; i < n; i++) {
       var id = {{{ makeGetValue('buffers', 'i*4', 'i32') }}};
@@ -1750,7 +1730,6 @@ var LibraryGL = {
     }
   },
 
-  glGetBufferParameteriv__sig: 'viip',
   glGetBufferParameteriv: function(target, value, data) {
     if (!data) {
       // GLES2 specification does not specify how to behave if data is a null pointer. Since calling this function does not make sense
@@ -1764,7 +1743,6 @@ var LibraryGL = {
     {{{ makeSetValue('data', '0', 'GLctx.getBufferParameter(target, value)', 'i32') }}};
   },
 
-  glBufferData__sig: 'vippi',
   glBufferData: function(target, size, data, usage) {
 #if LEGACY_GL_EMULATION
     switch (usage) { // fix usages, WebGL 1 only has *_DRAW
@@ -1803,7 +1781,6 @@ var LibraryGL = {
 #endif
   },
 
-  glBufferSubData__sig: 'vippp',
   glBufferSubData: function(target, offset, size, data) {
 #if MAX_WEBGL_VERSION >= 2
     if ({{{ isCurrentContextWebGL2() }}}) { // WebGL 2 provides new garbage-free entry points to call to WebGL. Use those always when possible.
@@ -1954,14 +1931,12 @@ var LibraryGL = {
   },
   glGetQueryObjectui64vEXT: 'glGetQueryObjecti64vEXT',
 
-  glIsBuffer__sig: 'ii',
   glIsBuffer: function(buffer) {
     var b = GL.buffers[buffer];
     if (!b) return 0;
     return GLctx.isBuffer(b);
   },
 
-  glGenRenderbuffers__sig: 'vip',
   glGenRenderbuffers__deps: ['$__glGenObject'],
   glGenRenderbuffers: function(n, renderbuffers) {
     __glGenObject(n, renderbuffers, 'createRenderbuffer', GL.renderbuffers
@@ -1971,7 +1946,6 @@ var LibraryGL = {
       );
   },
 
-  glDeleteRenderbuffers__sig: 'vip',
   glDeleteRenderbuffers: function(n, renderbuffers) {
     for (var i = 0; i < n; i++) {
       var id = {{{ makeGetValue('renderbuffers', 'i*4', 'i32') }}};
@@ -1983,7 +1957,6 @@ var LibraryGL = {
     }
   },
 
-  glBindRenderbuffer__sig: 'vii',
   glBindRenderbuffer: function(target, renderbuffer) {
 #if GL_ASSERTIONS
     GL.validateGLObjectID(GL.renderbuffers, renderbuffer, 'glBindRenderbuffer', 'renderbuffer');
@@ -1991,7 +1964,6 @@ var LibraryGL = {
     GLctx.bindRenderbuffer(target, GL.renderbuffers[renderbuffer]);
   },
 
-  glGetRenderbufferParameteriv__sig: 'viip',
   glGetRenderbufferParameteriv: function(target, pname, params) {
     if (!params) {
       // GLES2 specification does not specify how to behave if params is a null pointer. Since calling this function does not make sense
@@ -2005,7 +1977,6 @@ var LibraryGL = {
     {{{ makeSetValue('params', '0', 'GLctx.getRenderbufferParameter(target, pname)', 'i32') }}};
   },
 
-  glIsRenderbuffer__sig: 'ii',
   glIsRenderbuffer: function(renderbuffer) {
     var rb = GL.renderbuffers[renderbuffer];
     if (!rb) return 0;
@@ -2052,13 +2023,11 @@ var LibraryGL = {
     }
   },
 
-  glGetUniformfv__sig: 'viip',
   glGetUniformfv__deps: ['$emscriptenWebGLGetUniform'],
   glGetUniformfv: function(program, location, params) {
     emscriptenWebGLGetUniform(program, location, params, {{{ cDefs.EM_FUNC_SIG_PARAM_F }}});
   },
 
-  glGetUniformiv__sig: 'viip',
   glGetUniformiv__deps: ['$emscriptenWebGLGetUniform'],
   glGetUniformiv: function(program, location, params) {
     emscriptenWebGLGetUniform(program, location, params, {{{ cDefs.EM_FUNC_SIG_PARAM_I }}});
@@ -2150,7 +2119,6 @@ var LibraryGL = {
     return name.slice(-1) == ']' && name.lastIndexOf('[');
   },
 
-  glGetUniformLocation__sig: 'iip',
   glGetUniformLocation__deps: ['$jstoi_q', '$webglPrepareUniformLocationsBeforeFirstUse', '$webglGetLeftBracePos'],
   glGetUniformLocation: function(program, name) {
 
@@ -2249,7 +2217,6 @@ var LibraryGL = {
     }
   },
 
-  glGetVertexAttribfv__sig: 'viip',
   glGetVertexAttribfv__deps: ['$emscriptenWebGLGetVertexAttrib'],
   glGetVertexAttribfv: function(index, pname, params) {
     // N.B. This function may only be called if the vertex attribute was specified using the function glVertexAttrib*f(),
@@ -2257,7 +2224,6 @@ var LibraryGL = {
     emscriptenWebGLGetVertexAttrib(index, pname, params, {{{ cDefs.EM_FUNC_SIG_PARAM_F }}});
   },
 
-  glGetVertexAttribiv__sig: 'viip',
   glGetVertexAttribiv__deps: ['$emscriptenWebGLGetVertexAttrib'],
   glGetVertexAttribiv: function(index, pname, params) {
     // N.B. This function may only be called if the vertex attribute was specified using the function glVertexAttrib*f(),
@@ -2265,7 +2231,6 @@ var LibraryGL = {
     emscriptenWebGLGetVertexAttrib(index, pname, params, {{{ cDefs.EM_FUNC_SIG_PARAM_F2I }}});
   },
 
-  glGetVertexAttribPointerv__sig: 'viip',
   glGetVertexAttribPointerv: function(index, pname, pointer) {
     if (!pointer) {
       // GLES2 specification does not specify how to behave if pointer is a null pointer. Since calling this function does not make sense
@@ -2284,7 +2249,6 @@ var LibraryGL = {
     {{{ makeSetValue('pointer', '0', 'GLctx.getVertexAttribOffset(index, pname)', 'i32') }}};
   },
 
-  glUniform1f__sig: 'vif',
   glUniform1f__deps: ['$webglGetUniformLocation'],
   glUniform1f: function(location, v0) {
 #if GL_ASSERTIONS
@@ -2293,7 +2257,6 @@ var LibraryGL = {
     GLctx.uniform1f(webglGetUniformLocation(location), v0);
   },
 
-  glUniform2f__sig: 'viff',
   glUniform2f__deps: ['$webglGetUniformLocation'],
   glUniform2f: function(location, v0, v1) {
 #if GL_ASSERTIONS
@@ -2302,7 +2265,6 @@ var LibraryGL = {
     GLctx.uniform2f(webglGetUniformLocation(location), v0, v1);
   },
 
-  glUniform3f__sig: 'vifff',
   glUniform3f__deps: ['$webglGetUniformLocation'],
   glUniform3f: function(location, v0, v1, v2) {
 #if GL_ASSERTIONS
@@ -2311,7 +2273,6 @@ var LibraryGL = {
     GLctx.uniform3f(webglGetUniformLocation(location), v0, v1, v2);
   },
 
-  glUniform4f__sig: 'viffff',
   glUniform4f__deps: ['$webglGetUniformLocation'],
   glUniform4f: function(location, v0, v1, v2, v3) {
 #if GL_ASSERTIONS
@@ -2320,7 +2281,6 @@ var LibraryGL = {
     GLctx.uniform4f(webglGetUniformLocation(location), v0, v1, v2, v3);
   },
 
-  glUniform1i__sig: 'vii',
   glUniform1i__deps: ['$webglGetUniformLocation'],
   glUniform1i: function(location, v0) {
 #if GL_ASSERTIONS
@@ -2329,7 +2289,6 @@ var LibraryGL = {
     GLctx.uniform1i(webglGetUniformLocation(location), v0);
   },
 
-  glUniform2i__sig: 'viii',
   glUniform2i__deps: ['$webglGetUniformLocation'],
   glUniform2i: function(location, v0, v1) {
 #if GL_ASSERTIONS
@@ -2338,7 +2297,6 @@ var LibraryGL = {
     GLctx.uniform2i(webglGetUniformLocation(location), v0, v1);
   },
 
-  glUniform3i__sig: 'viiii',
   glUniform3i__deps: ['$webglGetUniformLocation'],
   glUniform3i: function(location, v0, v1, v2) {
 #if GL_ASSERTIONS
@@ -2347,7 +2305,6 @@ var LibraryGL = {
     GLctx.uniform3i(webglGetUniformLocation(location), v0, v1, v2);
   },
 
-  glUniform4i__sig: 'viiiii',
   glUniform4i__deps: ['$webglGetUniformLocation'],
   glUniform4i: function(location, v0, v1, v2, v3) {
 #if GL_ASSERTIONS
@@ -2356,7 +2313,6 @@ var LibraryGL = {
     GLctx.uniform4i(webglGetUniformLocation(location), v0, v1, v2, v3);
   },
 
-  glUniform1iv__sig: 'viip',
   glUniform1iv__deps: ['$webglGetUniformLocation'
 #if GL_POOL_TEMP_BUFFERS && MIN_WEBGL_VERSION == 1
     , '$miniTempWebGLIntBuffers'
@@ -2401,7 +2357,6 @@ var LibraryGL = {
 #endif // MIN_WEBGL_VERSION >= 2
   },
 
-  glUniform2iv__sig: 'viip',
   glUniform2iv__deps: ['$webglGetUniformLocation'
 #if GL_POOL_TEMP_BUFFERS && MIN_WEBGL_VERSION == 1
     , '$miniTempWebGLIntBuffers'
@@ -2447,7 +2402,6 @@ var LibraryGL = {
 #endif // MIN_WEBGL_VERSION >= 2
   },
 
-  glUniform3iv__sig: 'viip',
   glUniform3iv__deps: ['$webglGetUniformLocation'
 #if GL_POOL_TEMP_BUFFERS && MIN_WEBGL_VERSION == 1
     , '$miniTempWebGLIntBuffers'
@@ -2494,7 +2448,6 @@ var LibraryGL = {
 #endif // MIN_WEBGL_VERSION >= 2
   },
 
-  glUniform4iv__sig: 'viip',
   glUniform4iv__deps: ['$webglGetUniformLocation'
 #if GL_POOL_TEMP_BUFFERS && MIN_WEBGL_VERSION == 1
     , '$miniTempWebGLIntBuffers'
@@ -2542,7 +2495,6 @@ var LibraryGL = {
 #endif // MIN_WEBGL_VERSION >= 2
   },
 
-  glUniform1fv__sig: 'viip',
   glUniform1fv__deps: ['$webglGetUniformLocation'
 #if GL_POOL_TEMP_BUFFERS && MIN_WEBGL_VERSION == 1
     , '$miniTempWebGLFloatBuffers'
@@ -2587,7 +2539,6 @@ var LibraryGL = {
 #endif // MIN_WEBGL_VERSION >= 2
   },
 
-  glUniform2fv__sig: 'viip',
   glUniform2fv__deps: ['$webglGetUniformLocation'
 #if GL_POOL_TEMP_BUFFERS && MIN_WEBGL_VERSION == 1
     , '$miniTempWebGLFloatBuffers'
@@ -2633,7 +2584,6 @@ var LibraryGL = {
 #endif // MIN_WEBGL_VERSION >= 2
   },
 
-  glUniform3fv__sig: 'viip',
   glUniform3fv__deps: ['$webglGetUniformLocation'
 #if GL_POOL_TEMP_BUFFERS && MIN_WEBGL_VERSION == 1
     , '$miniTempWebGLFloatBuffers'
@@ -2680,7 +2630,6 @@ var LibraryGL = {
 #endif // MIN_WEBGL_VERSION >= 2
   },
 
-  glUniform4fv__sig: 'viip',
   glUniform4fv__deps: ['$webglGetUniformLocation'
 #if GL_POOL_TEMP_BUFFERS && MIN_WEBGL_VERSION == 1
     , '$miniTempWebGLFloatBuffers'
@@ -2732,7 +2681,6 @@ var LibraryGL = {
 #endif // MIN_WEBGL_VERSION >= 2
   },
 
-  glUniformMatrix2fv__sig: 'viiip',
   glUniformMatrix2fv__deps: ['$webglGetUniformLocation'
 #if GL_POOL_TEMP_BUFFERS && MIN_WEBGL_VERSION == 1
     , '$miniTempWebGLFloatBuffers'
@@ -2780,7 +2728,6 @@ var LibraryGL = {
 #endif // MIN_WEBGL_VERSION >= 2
   },
 
-  glUniformMatrix3fv__sig: 'viiip',
   glUniformMatrix3fv__deps: ['$webglGetUniformLocation'
 #if GL_POOL_TEMP_BUFFERS && MIN_WEBGL_VERSION == 1
     , '$miniTempWebGLFloatBuffers'
@@ -2833,7 +2780,6 @@ var LibraryGL = {
 #endif // MIN_WEBGL_VERSION >= 2
   },
 
-  glUniformMatrix4fv__sig: 'viiip',
   glUniformMatrix4fv__deps: ['$webglGetUniformLocation'
 #if GL_POOL_TEMP_BUFFERS && MIN_WEBGL_VERSION == 1
     , '$miniTempWebGLFloatBuffers'
@@ -2897,7 +2843,6 @@ var LibraryGL = {
 #endif // MIN_WEBGL_VERSION >= 2
   },
 
-  glBindBuffer__sig: 'vii',
   glBindBuffer: function(target, buffer) {
 #if GL_ASSERTIONS
     GL.validateGLObjectID(GL.buffers, buffer, 'glBindBuffer', 'buffer');
@@ -2931,7 +2876,6 @@ var LibraryGL = {
     GLctx.bindBuffer(target, GL.buffers[buffer]);
   },
 
-  glVertexAttrib1fv__sig: 'vip',
   glVertexAttrib1fv: function(index, v) {
 #if GL_ASSERTIONS
     assert((v & 3) == 0, 'Pointer to float data passed to glVertexAttrib1fv must be aligned to four bytes!');
@@ -2941,7 +2885,6 @@ var LibraryGL = {
     GLctx.vertexAttrib1f(index, HEAPF32[v>>2]);
   },
 
-  glVertexAttrib2fv__sig: 'vip',
   glVertexAttrib2fv: function(index, v) {
 #if GL_ASSERTIONS
     assert((v & 3) == 0, 'Pointer to float data passed to glVertexAttrib2fv must be aligned to four bytes!');
@@ -2951,7 +2894,6 @@ var LibraryGL = {
     GLctx.vertexAttrib2f(index, HEAPF32[v>>2], HEAPF32[v+4>>2]);
   },
 
-  glVertexAttrib3fv__sig: 'vip',
   glVertexAttrib3fv: function(index, v) {
 #if GL_ASSERTIONS
     assert((v & 3) == 0, 'Pointer to float data passed to glVertexAttrib3fv must be aligned to four bytes!');
@@ -2961,7 +2903,6 @@ var LibraryGL = {
     GLctx.vertexAttrib3f(index, HEAPF32[v>>2], HEAPF32[v+4>>2], HEAPF32[v+8>>2]);
   },
 
-  glVertexAttrib4fv__sig: 'vip',
   glVertexAttrib4fv: function(index, v) {
 #if GL_ASSERTIONS
     assert((v & 3) == 0, 'Pointer to float data passed to glVertexAttrib4fv must be aligned to four bytes!');
@@ -2971,7 +2912,6 @@ var LibraryGL = {
     GLctx.vertexAttrib4f(index, HEAPF32[v>>2], HEAPF32[v+4>>2], HEAPF32[v+8>>2], HEAPF32[v+12>>2]);
   },
 
-  glGetAttribLocation__sig: 'iip',
   glGetAttribLocation: function(program, name) {
     return GLctx.getAttribLocation(GL.programs[program], UTF8ToString(name));
   },
@@ -2990,19 +2930,16 @@ var LibraryGL = {
     }
   },
 
-  glGetActiveAttrib__sig: 'viiipppp',
   glGetActiveAttrib__deps: ['$__glGetActiveAttribOrUniform'],
   glGetActiveAttrib: function(program, index, bufSize, length, size, type, name) {
     __glGetActiveAttribOrUniform('getActiveAttrib', program, index, bufSize, length, size, type, name);
   },
 
-  glGetActiveUniform__sig: 'viiipppp',
   glGetActiveUniform__deps: ['$__glGetActiveAttribOrUniform'],
   glGetActiveUniform: function(program, index, bufSize, length, size, type, name) {
     __glGetActiveAttribOrUniform('getActiveUniform', program, index, bufSize, length, size, type, name);
   },
 
-  glCreateShader__sig: 'ii',
   glCreateShader: function(shaderType) {
     var id = GL.getNewId(GL.shaders);
     GL.shaders[id] = GLctx.createShader(shaderType);
@@ -3015,7 +2952,6 @@ var LibraryGL = {
     return id;
   },
 
-  glDeleteShader__sig: 'vi',
   glDeleteShader: function(id) {
     if (!id) return;
     var shader = GL.shaders[id];
@@ -3027,7 +2963,6 @@ var LibraryGL = {
     GL.shaders[id] = null;
   },
 
-  glGetAttachedShaders__sig: 'viipp',
   glGetAttachedShaders: function(program, maxCount, count, shaders) {
 #if GL_ASSERTIONS
     GL.validateGLObjectID(GL.programs, program, 'glGetAttachedShaders', 'program');
@@ -3047,7 +2982,6 @@ var LibraryGL = {
     }
   },
 
-  glShaderSource__sig: 'viipp',
 #if GL_EXPLICIT_UNIFORM_LOCATION || GL_EXPLICIT_UNIFORM_BINDING
   glShaderSource__deps: ['$preprocess_c_code', '$remove_cpp_comments_in_shaders', '$jstoi_q', '$find_closing_parens_index'],
 #endif
@@ -3212,7 +3146,6 @@ var LibraryGL = {
     GLctx.shaderSource(GL.shaders[shader], source);
   },
 
-  glGetShaderSource__sig: 'viipp',
   glGetShaderSource: function(shader, bufSize, length, source) {
 #if GL_ASSERTIONS
     GL.validateGLObjectID(GL.shaders, shader, 'glGetShaderSource', 'shader');
@@ -3223,7 +3156,6 @@ var LibraryGL = {
     if (length) {{{ makeSetValue('length', '0', 'numBytesWrittenExclNull', 'i32') }}};
   },
 
-  glCompileShader__sig: 'vi',
   glCompileShader: function(shader) {
 #if GL_ASSERTIONS
     GL.validateGLObjectID(GL.shaders, shader, 'glCompileShader', 'shader');
@@ -3235,7 +3167,6 @@ var LibraryGL = {
 #endif
   },
 
-  glGetShaderInfoLog__sig: 'viipp',
   glGetShaderInfoLog: function(shader, maxLength, length, infoLog) {
 #if GL_ASSERTIONS
     GL.validateGLObjectID(GL.shaders, shader, 'glGetShaderInfoLog', 'shader');
@@ -3248,7 +3179,6 @@ var LibraryGL = {
     if (length) {{{ makeSetValue('length', '0', 'numBytesWrittenExclNull', 'i32') }}};
   },
 
-  glGetShaderiv__sig: 'viip',
   glGetShaderiv : function(shader, pname, p) {
     if (!p) {
       // GLES2 specification does not specify how to behave if p is a null pointer. Since calling this function does not make sense
@@ -3284,7 +3214,6 @@ var LibraryGL = {
     }
   },
 
-  glGetProgramiv__sig: 'viip',
   glGetProgramiv : function(program, pname, p) {
     if (!p) {
       // GLES2 specification does not specify how to behave if p is a null pointer. Since calling this function does not make sense
@@ -3341,14 +3270,12 @@ var LibraryGL = {
     }
   },
 
-  glIsShader__sig: 'ii',
   glIsShader: function(shader) {
     var s = GL.shaders[shader];
     if (!s) return 0;
     return GLctx.isShader(s);
   },
 
-  glCreateProgram__sig: 'i',
   glCreateProgram: function() {
     var id = GL.getNewId(GL.programs);
     var program = GLctx.createProgram();
@@ -3361,7 +3288,6 @@ var LibraryGL = {
     return id;
   },
 
-  glDeleteProgram__sig: 'vi',
   glDeleteProgram: function(id) {
     if (!id) return;
     var program = GL.programs[id];
@@ -3374,7 +3300,6 @@ var LibraryGL = {
     GL.programs[id] = null;
   },
 
-  glAttachShader__sig: 'vii',
   glAttachShader: function(program, shader) {
 #if GL_ASSERTIONS
     GL.validateGLObjectID(GL.programs, program, 'glAttachShader', 'program');
@@ -3390,7 +3315,6 @@ var LibraryGL = {
 #endif
   },
 
-  glDetachShader__sig: 'vii',
   glDetachShader: function(program, shader) {
 #if GL_ASSERTIONS
     GL.validateGLObjectID(GL.programs, program, 'glDetachShader', 'program');
@@ -3399,7 +3323,6 @@ var LibraryGL = {
     GLctx.detachShader(GL.programs[program], GL.shaders[shader]);
   },
 
-  glGetShaderPrecisionFormat__sig: 'viipp',
   glGetShaderPrecisionFormat: function(shaderType, precisionType, range, precision) {
     var result = GLctx.getShaderPrecisionFormat(shaderType, precisionType);
     {{{ makeSetValue('range', '0', 'result.rangeMin', 'i32') }}};
@@ -3407,7 +3330,6 @@ var LibraryGL = {
     {{{ makeSetValue('precision', '0', 'result.precision', 'i32') }}};
   },
 
-  glLinkProgram__sig: 'vi',
   glLinkProgram: function(program) {
 #if GL_ASSERTIONS
     GL.validateGLObjectID(GL.programs, program, 'glLinkProgram', 'program');
@@ -3462,7 +3384,6 @@ var LibraryGL = {
 #endif
   },
 
-  glGetProgramInfoLog__sig: 'viipp',
   glGetProgramInfoLog: function(program, maxLength, length, infoLog) {
 #if GL_ASSERTIONS
     GL.validateGLObjectID(GL.programs, program, 'glGetProgramInfoLog', 'program');
@@ -3513,7 +3434,6 @@ var LibraryGL = {
   },
 #endif
 
-  glUseProgram__sig: 'vi',
 #if GL_EXPLICIT_UNIFORM_BINDING
   glUseProgram__deps: ['$webglApplyExplicitProgramBindings'],
 #endif
@@ -3534,7 +3454,6 @@ var LibraryGL = {
 #endif
   },
 
-  glValidateProgram__sig: 'vi',
   glValidateProgram: function(program) {
 #if GL_ASSERTIONS
     GL.validateGLObjectID(GL.programs, program, 'glValidateProgram', 'program');
@@ -3542,14 +3461,12 @@ var LibraryGL = {
     GLctx.validateProgram(GL.programs[program]);
   },
 
-  glIsProgram__sig: 'ii',
   glIsProgram: function(program) {
     program = GL.programs[program];
     if (!program) return 0;
     return GLctx.isProgram(program);
   },
 
-  glBindAttribLocation__sig: 'viip',
   glBindAttribLocation: function(program, index, name) {
 #if GL_ASSERTIONS
     GL.validateGLObjectID(GL.programs, program, 'glBindAttribLocation', 'program');
@@ -3557,7 +3474,6 @@ var LibraryGL = {
     GLctx.bindAttribLocation(GL.programs[program], index, UTF8ToString(name));
   },
 
-  glBindFramebuffer__sig: 'vii',
   glBindFramebuffer: function(target, framebuffer) {
 #if GL_ASSERTIONS
     GL.validateGLObjectID(GL.framebuffers, framebuffer, 'glBindFramebuffer', 'framebuffer');
@@ -3574,7 +3490,6 @@ var LibraryGL = {
 
   },
 
-  glGenFramebuffers__sig: 'vip',
   glGenFramebuffers__deps: ['$__glGenObject'],
   glGenFramebuffers: function(n, ids) {
     __glGenObject(n, ids, 'createFramebuffer', GL.framebuffers
@@ -3584,7 +3499,6 @@ var LibraryGL = {
       );
   },
 
-  glDeleteFramebuffers__sig: 'vip',
   glDeleteFramebuffers: function(n, framebuffers) {
     for (var i = 0; i < n; ++i) {
       var id = {{{ makeGetValue('framebuffers', 'i*4', 'i32') }}};
@@ -3596,7 +3510,6 @@ var LibraryGL = {
     }
   },
 
-  glFramebufferRenderbuffer__sig: 'viiii',
   glFramebufferRenderbuffer: function(target, attachment, renderbuffertarget, renderbuffer) {
 #if GL_ASSERTIONS
     GL.validateGLObjectID(GL.renderbuffers, renderbuffer, 'glFramebufferRenderbuffer', 'renderbuffer');
@@ -3605,7 +3518,6 @@ var LibraryGL = {
                                        GL.renderbuffers[renderbuffer]);
   },
 
-  glFramebufferTexture2D__sig: 'viiiii',
   glFramebufferTexture2D: function(target, attachment, textarget, texture, level) {
 #if GL_ASSERTIONS
     GL.validateGLObjectID(GL.textures, texture, 'glFramebufferTexture2D', 'texture');
@@ -3614,7 +3526,6 @@ var LibraryGL = {
                                     GL.textures[texture], level);
   },
 
-  glGetFramebufferAttachmentParameteriv__sig: 'viiip',
   glGetFramebufferAttachmentParameteriv: function(target, attachment, pname, params) {
     var result = GLctx.getFramebufferAttachmentParameter(target, attachment, pname);
     if (result instanceof WebGLRenderbuffer ||
@@ -3624,7 +3535,6 @@ var LibraryGL = {
     {{{ makeSetValue('params', '0', 'result', 'i32') }}};
   },
 
-  glIsFramebuffer__sig: 'ii',
   glIsFramebuffer: function(framebuffer) {
     var fb = GL.framebuffers[framebuffer];
     if (!fb) return 0;
@@ -3636,7 +3546,6 @@ var LibraryGL = {
   , 'emulGlGenVertexArrays'
 #endif
   ],
-  glGenVertexArrays__sig: 'vip',
   glGenVertexArrays: function (n, arrays) {
 #if LEGACY_GL_EMULATION
     _emulGlGenVertexArrays(n, arrays);
@@ -3655,7 +3564,6 @@ var LibraryGL = {
 #if LEGACY_GL_EMULATION
   glDeleteVertexArrays__deps: ['emulGlDeleteVertexArrays'],
 #endif
-  glDeleteVertexArrays__sig: 'vip',
   glDeleteVertexArrays: function(n, vaos) {
 #if LEGACY_GL_EMULATION
     _emulGlDeleteVertexArrays(n, vaos);
@@ -3674,7 +3582,6 @@ var LibraryGL = {
 #if LEGACY_GL_EMULATION
   glBindVertexArray__deps: ['emulGlBindVertexArray'],
 #endif
-  glBindVertexArray__sig: 'vi',
   glBindVertexArray: function(vao) {
 #if LEGACY_GL_EMULATION
     _emulGlBindVertexArray(vao);
@@ -3693,7 +3600,6 @@ var LibraryGL = {
 #if LEGACY_GL_EMULATION
   glIsVertexArray__deps: ['emulGlIsVertexArray'],
 #endif
-  glIsVertexArray__sig: 'ii',
   glIsVertexArray: function(array) {
 #if LEGACY_GL_EMULATION
     return _emulGlIsVertexArray(array);
@@ -3734,7 +3640,6 @@ var LibraryGL = {
 
   // GLES2 emulation
 
-  glVertexAttribPointer__sig: 'viiiiip',
   glVertexAttribPointer: function(index, size, type, normalized, stride, ptr) {
 #if FULL_ES2
     var cb = GL.currentContext.clientBuffers[index];
@@ -3761,7 +3666,6 @@ var LibraryGL = {
     GLctx.vertexAttribPointer(index, size, type, !!normalized, stride, ptr);
   },
 
-  glEnableVertexAttribArray__sig: 'vi',
   glEnableVertexAttribArray: function(index) {
 #if FULL_ES2
     var cb = GL.currentContext.clientBuffers[index];
@@ -3773,7 +3677,6 @@ var LibraryGL = {
     GLctx.enableVertexAttribArray(index);
   },
 
-  glDisableVertexAttribArray__sig: 'vi',
   glDisableVertexAttribArray: function(index) {
 #if FULL_ES2
     var cb = GL.currentContext.clientBuffers[index];
@@ -3786,7 +3689,6 @@ var LibraryGL = {
   },
 
 #if !LEGACY_GL_EMULATION
-  glDrawArrays__sig: 'viii',
   glDrawArrays: function(mode, first, count) {
 #if FULL_ES2
     // bind any client-side buffers
@@ -3800,7 +3702,6 @@ var LibraryGL = {
 #endif
   },
 
-  glDrawElements__sig: 'viiip',
   glDrawElements: function(mode, count, type, indices) {
 #if FULL_ES2
     var buf;
@@ -3831,7 +3732,6 @@ var LibraryGL = {
   },
 #endif // ~#if !LEGACY_GL_EMULATION
 
-  glShaderBinary__sig: 'vipipi',
   glShaderBinary: function(count, shaders, binaryformat, binary, length) {
     GL.recordError(0x500/*GL_INVALID_ENUM*/);
 #if GL_ASSERTIONS
@@ -3839,12 +3739,10 @@ var LibraryGL = {
 #endif
   },
 
-  glReleaseShaderCompiler__sig: 'v',
   glReleaseShaderCompiler: function() {
     // NOP (as allowed by GLES 2.0 spec)
   },
 
-  glGetError__sig: 'i',
   glGetError: function() {
 #if GL_TRACK_ERRORS
     var error = GLctx.getError() || GL.lastError;
@@ -3857,7 +3755,6 @@ var LibraryGL = {
 
   // ANGLE_instanced_arrays WebGL extension related functions (in core in WebGL 2)
 
-  glVertexAttribDivisor__sig: 'vii',
   glVertexAttribDivisor: function(index, divisor) {
 #if GL_ASSERTIONS
     assert(GLctx['vertexAttribDivisor'], 'Must have ANGLE_instanced_arrays extension or WebGL 2 to use WebGL instancing');
@@ -3865,7 +3762,6 @@ var LibraryGL = {
     GLctx['vertexAttribDivisor'](index, divisor);
   },
 
-  glDrawArraysInstanced__sig: 'viiii',
   glDrawArraysInstanced: function(mode, first, count, primcount) {
 #if GL_ASSERTIONS
     assert(GLctx['drawArraysInstanced'], 'Must have ANGLE_instanced_arrays extension or WebGL 2 to use WebGL instancing');
@@ -3873,7 +3769,6 @@ var LibraryGL = {
     GLctx['drawArraysInstanced'](mode, first, count, primcount);
   },
 
-  glDrawElementsInstanced__sig: 'viiipi',
   glDrawElementsInstanced: function(mode, count, type, indices, primcount) {
 #if GL_ASSERTIONS
     assert(GLctx['drawElementsInstanced'], 'Must have ANGLE_instanced_arrays extension or WebGL 2 to use WebGL instancing');
@@ -3898,7 +3793,6 @@ var LibraryGL = {
 
 
   glDrawBuffers__deps: ['$tempFixedLengthArray'],
-  glDrawBuffers__sig: 'vip',
   glDrawBuffers: function(n, bufs) {
 #if GL_ASSERTIONS
     assert(GLctx['drawBuffers'], 'Must have WebGL2 or WEBGL_draw_buffers extension to use drawBuffers');
@@ -3922,17 +3816,14 @@ var LibraryGL = {
 
   // passthrough functions with GLboolean parameters
 
-  glColorMask__sig: 'viiii',
   glColorMask: function(red, green, blue, alpha) {
     GLctx.colorMask(!!red, !!green, !!blue, !!alpha);
   },
 
-  glDepthMask__sig: 'vi',
   glDepthMask: function(flag) {
     GLctx.depthMask(!!flag);
   },
 
-  glSampleCoverage__sig: 'vfi',
   glSampleCoverage: function(value, invert) {
     GLctx.sampleCoverage(value, !!invert);
   },
@@ -4030,7 +3921,6 @@ var LibraryGL = {
     }
   },
 
-  glMapBufferRange__sig: 'pippi',
   glMapBufferRange__deps: ['$emscriptenWebGLGetBufferBinding', '$emscriptenWebGLValidateMapBufferTarget'],
   glMapBufferRange: function(target, offset, length, access) {
     if ((access & (0x1/*GL_MAP_READ_BIT*/ | 0x20/*GL_MAP_UNSYNCHRONIZED_BIT*/)) != 0) {
@@ -4066,7 +3956,6 @@ var LibraryGL = {
     return mem;
   },
 
-  glGetBufferPointerv__sig: 'viip',
   glGetBufferPointerv__deps: ['$emscriptenWebGLGetBufferBinding'],
   glGetBufferPointerv: function(target, pname, params) {
     if (pname == 0x88BD/*GL_BUFFER_MAP_POINTER*/) {
@@ -4082,7 +3971,6 @@ var LibraryGL = {
     }
   },
 
-  glFlushMappedBufferRange__sig: 'vipp',
   glFlushMappedBufferRange__deps: ['$emscriptenWebGLGetBufferBinding', '$emscriptenWebGLValidateMapBufferTarget'],
   glFlushMappedBufferRange: function(target, offset, length) {
     if (!emscriptenWebGLValidateMapBufferTarget(target)) {
@@ -4115,7 +4003,6 @@ var LibraryGL = {
       HEAPU8.subarray(mapping.mem + offset, mapping.mem + offset + length));
   },
 
-  glUnmapBuffer__sig: 'ii',
   glUnmapBuffer__deps: ['$emscriptenWebGLGetBufferBinding', '$emscriptenWebGLValidateMapBufferTarget'],
   glUnmapBuffer: function(target) {
     if (!emscriptenWebGLValidateMapBufferTarget(target)) {
@@ -4143,40 +4030,6 @@ var LibraryGL = {
     return 1;
   },
 #endif
-
-  // signatures of simple pass-through functions, see later
-
-  glActiveTexture__sig: 'vi',
-  glCheckFramebufferStatus__sig: 'ii',
-  glRenderbufferStorage__sig: 'viiii',
-  glClearStencil__sig: 'vi',
-  glStencilFunc__sig: 'viii',
-  glLineWidth__sig: 'vf',
-  glBlendEquation__sig: 'vi',
-  glBlendEquationSeparate__sig: 'vii',
-  glVertexAttrib1f__sig: 'vif',
-  glVertexAttrib2f__sig: 'viff',
-  glVertexAttrib3f__sig: 'vifff',
-  glVertexAttrib4f__sig: 'viffff',
-  glCullFace__sig: 'vi',
-  glBlendFunc__sig: 'vii',
-  glBlendFuncSeparate__sig: 'viiii',
-  glBlendColor__sig: 'vffff',
-  glPolygonOffset__sig: 'vff',
-  glStencilOp__sig: 'viii',
-  glStencilOpSeparate__sig: 'viiii',
-  glGenerateMipmap__sig: 'vi',
-  glHint__sig: 'vii',
-  glViewport__sig: 'viiii',
-  glDepthFunc__sig: 'vi',
-  glStencilMask__sig: 'vi',
-  glStencilMaskSeparate__sig: 'vii',
-  glClearDepthf__sig: 'vf',
-  glFinish__sig: 'v',
-  glFlush__sig: 'v',
-  glClearColor__sig: 'vffff',
-  glIsEnabled__sig: 'ii',
-  glFrontFace__sig: 'vi',
 };
 
 // Simple pass-through functions.
@@ -4218,7 +4071,7 @@ function createGLPassthroughFunctions(lib, funcs) {
       cName = 'gl' + cName[0].toUpperCase() + cName.substr(1);
       assert(!(cName in lib), "Cannot reimplement the existing function " + cName);
       lib[cName] = eval(stub.replace('NAME', name));
-      if (!lib[cName + '__sig']) lib[cName + '__sig'] = sig;
+      assert(lib[cName + '__sig'] || LibraryManager.library[cName + '__sig'], 'missing sig for ' + cName);
     });
   });
 }
diff --git a/src/library_websocket.js b/src/library_websocket.js
index 88f3f77839fff..0817853173d31 100644
--- a/src/library_websocket.js
+++ b/src/library_websocket.js
@@ -12,7 +12,6 @@ var LibraryWebSocket = {
 
   emscripten_websocket_get_ready_state__deps: ['$WS'],
   emscripten_websocket_get_ready_state__proxy: 'sync',
-  emscripten_websocket_get_ready_state__sig: 'iip',
   emscripten_websocket_get_ready_state: function(socketId, readyState) {
     var socket = WS.sockets[socketId];
     if (!socket) {
@@ -28,7 +27,6 @@ var LibraryWebSocket = {
 
   emscripten_websocket_get_buffered_amount__deps: ['$WS'],
   emscripten_websocket_get_buffered_amount__proxy: 'sync',
-  emscripten_websocket_get_buffered_amount__sig: 'iip',
   emscripten_websocket_get_buffered_amount: function(socketId, bufferedAmount) {
     var socket = WS.sockets[socketId];
     if (!socket) {
@@ -44,7 +42,6 @@ var LibraryWebSocket = {
 
   emscripten_websocket_get_extensions__deps: ['$WS'],
   emscripten_websocket_get_extensions__proxy: 'sync',
-  emscripten_websocket_get_extensions__sig: 'iipi',
   emscripten_websocket_get_extensions: function(socketId, extensions, extensionsLength) {
     var socket = WS.sockets[socketId];
     if (!socket) {
@@ -60,7 +57,6 @@ var LibraryWebSocket = {
 
   emscripten_websocket_get_extensions_length__deps: ['$WS'],
   emscripten_websocket_get_extensions_length__proxy: 'sync',
-  emscripten_websocket_get_extensions_length__sig: 'iip',
   emscripten_websocket_get_extensions_length: function(socketId, extensionsLength) {
     var socket = WS.sockets[socketId];
     if (!socket) {
@@ -76,7 +72,6 @@ var LibraryWebSocket = {
 
   emscripten_websocket_get_protocol__deps: ['$WS'],
   emscripten_websocket_get_protocol__proxy: 'sync',
-  emscripten_websocket_get_protocol__sig: 'iipi',
   emscripten_websocket_get_protocol: function(socketId, protocol, protocolLength) {
     var socket = WS.sockets[socketId];
     if (!socket) {
@@ -92,7 +87,6 @@ var LibraryWebSocket = {
 
   emscripten_websocket_get_protocol_length__deps: ['$WS'],
   emscripten_websocket_get_protocol_length__proxy: 'sync',
-  emscripten_websocket_get_protocol_length__sig: 'iip',
   emscripten_websocket_get_protocol_length: function(socketId, protocolLength) {
     var socket = WS.sockets[socketId];
     if (!socket) {
@@ -108,7 +102,6 @@ var LibraryWebSocket = {
 
   emscripten_websocket_get_url__deps: ['$WS'],
   emscripten_websocket_get_url__proxy: 'sync',
-  emscripten_websocket_get_url__sig: 'iipi',
   emscripten_websocket_get_url: function(socketId, url, urlLength) {
     var socket = WS.sockets[socketId];
     if (!socket) {
@@ -124,7 +117,6 @@ var LibraryWebSocket = {
 
   emscripten_websocket_get_url_length__deps: ['$WS'],
   emscripten_websocket_get_url_length__proxy: 'sync',
-  emscripten_websocket_get_url_length__sig: 'iip',
   emscripten_websocket_get_url_length: function(socketId, urlLength) {
     var socket = WS.sockets[socketId];
     if (!socket) {
@@ -140,7 +132,6 @@ var LibraryWebSocket = {
 
   emscripten_websocket_set_onopen_callback_on_thread__deps: ['$WS'],
   emscripten_websocket_set_onopen_callback_on_thread__proxy: 'sync',
-  emscripten_websocket_set_onopen_callback_on_thread__sig: 'iippp',
   emscripten_websocket_set_onopen_callback_on_thread: function(socketId, userData, callbackFunc, thread) {
 // TODO:
 //    if (thread == {{{ cDefs.EM_CALLBACK_THREAD_CONTEXT_CALLING_THREAD }}} ||
@@ -171,7 +162,6 @@ var LibraryWebSocket = {
 
   emscripten_websocket_set_onerror_callback_on_thread__deps: ['$WS'],
   emscripten_websocket_set_onerror_callback_on_thread__proxy: 'sync',
-  emscripten_websocket_set_onerror_callback_on_thread__sig: 'iippp',
   emscripten_websocket_set_onerror_callback_on_thread: function(socketId, userData, callbackFunc, thread) {
     if (!WS.socketEvent) WS.socketEvent = _malloc(1024); // TODO: sizeof(EmscriptenWebSocketCloseEvent), which is the largest event struct
 
@@ -198,7 +188,6 @@ var LibraryWebSocket = {
 
   emscripten_websocket_set_onclose_callback_on_thread__deps: ['$WS'],
   emscripten_websocket_set_onclose_callback_on_thread__proxy: 'sync',
-  emscripten_websocket_set_onclose_callback_on_thread__sig: 'iippp',
   emscripten_websocket_set_onclose_callback_on_thread: function(socketId, userData, callbackFunc, thread) {
     if (!WS.socketEvent) WS.socketEvent = _malloc(1024); // TODO: sizeof(EmscriptenWebSocketCloseEvent), which is the largest event struct
 
@@ -228,7 +217,6 @@ var LibraryWebSocket = {
 
   emscripten_websocket_set_onmessage_callback_on_thread__deps: ['$WS'],
   emscripten_websocket_set_onmessage_callback_on_thread__proxy: 'sync',
-  emscripten_websocket_set_onmessage_callback_on_thread__sig: 'iippp',
   emscripten_websocket_set_onmessage_callback_on_thread: function(socketId, userData, callbackFunc, thread) {
     if (!WS.socketEvent) WS.socketEvent = _malloc(1024); // TODO: sizeof(EmscriptenWebSocketCloseEvent), which is the largest event struct
 
@@ -283,7 +271,6 @@ var LibraryWebSocket = {
 
   emscripten_websocket_new__deps: ['$WS'],
   emscripten_websocket_new__proxy: 'sync',
-  emscripten_websocket_new__sig: 'ip',
   emscripten_websocket_new: function(createAttributes) {
     if (typeof WebSocket == 'undefined') {
 #if WEBSOCKET_DEBUG
@@ -319,7 +306,6 @@ var LibraryWebSocket = {
 
   emscripten_websocket_send_utf8_text__deps: ['$WS'],
   emscripten_websocket_send_utf8_text__proxy: 'sync',
-  emscripten_websocket_send_utf8_text__sig: 'iip',
   emscripten_websocket_send_utf8_text: function(socketId, textData) {
     var socket = WS.sockets[socketId];
     if (!socket) {
@@ -343,7 +329,6 @@ var LibraryWebSocket = {
 
   emscripten_websocket_send_binary__deps: ['$WS'],
   emscripten_websocket_send_binary__proxy: 'sync',
-  emscripten_websocket_send_binary__sig: 'iipi',
   emscripten_websocket_send_binary: function(socketId, binaryData, dataLength) {
     var socket = WS.sockets[socketId];
     if (!socket) {
@@ -375,7 +360,6 @@ var LibraryWebSocket = {
 
   emscripten_websocket_close__deps: ['$WS'],
   emscripten_websocket_close__proxy: 'sync',
-  emscripten_websocket_close__sig: 'iiip',
   emscripten_websocket_close: function(socketId, code, reason) {
     var socket = WS.sockets[socketId];
     if (!socket) {
@@ -402,7 +386,6 @@ var LibraryWebSocket = {
 
   emscripten_websocket_delete__deps: ['$WS'],
   emscripten_websocket_delete__proxy: 'sync',
-  emscripten_websocket_delete__sig: 'ii',
   emscripten_websocket_delete: function(socketId) {
     var socket = WS.sockets[socketId];
     if (!socket) {
@@ -421,14 +404,12 @@ var LibraryWebSocket = {
   },
 
   emscripten_websocket_is_supported__proxy: 'sync',
-  emscripten_websocket_is_supported__sig: 'i',
   emscripten_websocket_is_supported: function() {
     return typeof WebSocket != 'undefined';
   },
 
   emscripten_websocket_deinitialize__deps: ['$WS'],
   emscripten_websocket_deinitialize__proxy: 'sync',
-  emscripten_websocket_deinitialize__sig: 'v',
   emscripten_websocket_deinitialize__deps: ['emscripten_websocket_delete'],
   emscripten_websocket_deinitialize: function() {
 #if WEBSOCKET_DEBUG
diff --git a/src/library_wget.js b/src/library_wget.js
index 37ce96522212f..1be95d5b8085b 100644
--- a/src/library_wget.js
+++ b/src/library_wget.js
@@ -18,7 +18,6 @@ var LibraryWget = {
 
   emscripten_async_wget__deps: ['$PATH_FS', '$wget', '$callUserCallback', '$Browser', '$withStackSave', '$allocateUTF8OnStack'],
   emscripten_async_wget__proxy: 'sync',
-  emscripten_async_wget__sig: 'vpppp',
   emscripten_async_wget: function(url, file, onload, onerror) {
     {{{ runtimeKeepalivePush() }}}
 
@@ -61,7 +60,6 @@ var LibraryWget = {
 
   emscripten_async_wget_data__deps: ['$asyncLoad', 'malloc', 'free', '$callUserCallback'],
   emscripten_async_wget_data__proxy: 'sync',
-  emscripten_async_wget_data__sig: 'vpppp',
   emscripten_async_wget_data: function(url, arg, onload, onerror) {
     {{{ runtimeKeepalivePush() }}}
     asyncLoad(UTF8ToString(url), function(byteArray) {
@@ -84,7 +82,6 @@ var LibraryWget = {
 
   emscripten_async_wget2__deps: ['$PATH_FS', '$wget', '$withStackSave', '$allocateUTF8OnStack'],
   emscripten_async_wget2__proxy: 'sync',
-  emscripten_async_wget2__sig: 'ipppppppp',
   emscripten_async_wget2: function(url, file, request, param, arg, onload, onerror, onprogress) {
     {{{ runtimeKeepalivePush() }}}
 
@@ -163,7 +160,6 @@ var LibraryWget = {
 
   emscripten_async_wget2_data__deps: ['$wget', 'malloc', 'free'],
   emscripten_async_wget2_data__proxy: 'sync',
-  emscripten_async_wget2_data__sig: 'ippppippp',
   emscripten_async_wget2_data: function(url, request, param, arg, free, onload, onerror, onprogress) {
     var _url = UTF8ToString(url);
     var _request = UTF8ToString(request);
@@ -232,7 +228,6 @@ var LibraryWget = {
 
   emscripten_async_wget2_abort__deps: ['$wget'],
   emscripten_async_wget2_abort__proxy: 'sync',
-  emscripten_async_wget2_abort__sig: 'vi',
   emscripten_async_wget2_abort: function(handle) {
     var http = wget.wgetRequests[handle];
     if (http) {
diff --git a/src/modules.js b/src/modules.js
index d41779ce5bbbf..811ab7ddd8c57 100644
--- a/src/modules.js
+++ b/src/modules.js
@@ -37,9 +37,7 @@ global.LibraryManager = {
     // Core system libraries (always linked against)
     let libraries = [
       'library.js',
-      // TODO(sbc): Start using this auto-generated file instead of the hand
-      // written signatures in the indivudual libraries.
-      //'library_sigs.js',
+      'library_sigs.js',
       'library_int53.js',
       'library_ccall.js',
       'library_addfunction.js',
@@ -242,16 +240,6 @@ global.LibraryManager = {
         }
       }
     }
-
-    for (const ident of Object.keys(this.library)) {
-      if (isJsLibraryConfigIdentifier(ident)) {
-        const index = ident.lastIndexOf('__');
-        const basename = ident.slice(0, index);
-        if (!(basename in this.library)) {
-          error(`Missing library element '${basename}' for library config '${ident}'`);
-        }
-      }
-    }
   },
 };
 
diff --git a/src/utility.js b/src/utility.js
index abd503c43373c..7738f041147a1 100644
--- a/src/utility.js
+++ b/src/utility.js
@@ -128,6 +128,18 @@ function mergeInto(obj, other, options = null) {
     }
   }
 
+  if (!options || !options.allowMissing) {
+    for (const ident of Object.keys(other)) {
+      if (isJsLibraryConfigIdentifier(ident)) {
+        const index = ident.lastIndexOf('__');
+        const basename = ident.slice(0, index);
+        if (!(basename in obj) && !(basename in other)) {
+          error(`Missing library element '${basename}' for library config '${ident}'`);
+        }
+      }
+    }
+  }
+
   for (const key of Object.keys(other)) {
     if (key.endsWith('__sig')) {
       if (obj.hasOwnProperty(key)) {
diff --git a/test/test_other.py b/test/test_other.py
index 429e344794a11..53833b55b7582 100644
--- a/test/test_other.py
+++ b/test/test_other.py
@@ -11625,7 +11625,7 @@ def test_jslib_bad_config(self):
       });
       ''')
     err = self.expect_fail([EMCC, test_file('hello_world.c'), '--js-library=lib.js'])
-    self.assertContained("error: Missing library element 'foo' for library config 'foo__sig'", err)
+    self.assertContained("lib.js: Missing library element 'foo' for library config 'foo__sig'", err)
 
   def test_jslib_ifdef(self):
     create_file('lib.js', '''
diff --git a/tools/gen_sig_info.py b/tools/gen_sig_info.py
index b35ad23706987..6467f7db4b883 100755
--- a/tools/gen_sig_info.py
+++ b/tools/gen_sig_info.py
@@ -161,11 +161,17 @@ def write_sig_library(filename, sig_info):
   lines = [
       '/* Auto-generated by tools/gen_sig_info.py. DO NOT EDIT. */',
       '',
-      'sigs = {']
+      'sigs = {'
+  ]
   for s, sig in sorted(sig_info.items()):
     lines.append(f"  {s}__sig: '{sig}',")
-  lines.append('}')
-  lines.append('mergeInto(LibraryManager.library, sigs);')
+  lines += [
+      '}',
+      '',
+      '// We have to merge with `allowMissing` since this file contains signatures',
+      '// for functions that might not exist in all build configurations.',
+      'mergeInto(LibraryManager.library, sigs, {allowMissing: true});'
+  ]
   utils.write_file(filename, '\n'.join(lines) + '\n')