Merge branch 'siri/typer/remove-application/OTP-14251'

* siri/typer/remove-application/OTP-14251:
  Remove typer application

35 files changed, 14 insertions, 2390 deletions

diff --git a/Makefile.in b/Makefile.in
index 377eebbbc2..6b5ce8c53f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -125,7 +125,7 @@ BINDIR      = $(DESTDIR)$(EXTRA_PREFIX)$(bindir)
 #
 # Erlang base public files
 #
-ERL_BASE_PUB_FILES=erl erlc epmd run_erl to_erl dialyzer typer escript ct_run
+ERL_BASE_PUB_FILES=erl erlc epmd run_erl to_erl dialyzer escript ct_run
 
 # ERLANG_INST_LIBDIR is the top directory where the Erlang installation
 # will be located when running.
@@ -438,7 +438,7 @@ BOOT_BINDIR=$(BOOTSTRAP_ROOT)/bootstrap/erts/bin
 BEAM_EVM=$(ERL_TOP)/bin/$(TARGET)/beam_evm
 BOOTSTRAP_COMPILER  =  $(BOOTSTRAP_TOP)/primary_compiler
 
-.PHONY: emulator libs kernel stdlib compiler hipe typer syntax_tools preloaded
+.PHONY: emulator libs kernel stdlib compiler hipe syntax_tools preloaded
 
 emulator:
 	$(make_verbose)cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) NO_START_SCRIPTS=true $(TYPE) FLAVOR=$(FLAVOR)
@@ -474,11 +474,6 @@ hipe:
 	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
 		$(MAKE) opt BUILD_ALL=true
 
-typer:
-	$(make_verbose)cd lib/typer && \
-	ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
-	    $(MAKE) opt BUILD_ALL=true
-
 syntax_tools:
 	$(make_verbose)cd lib/syntax_tools && \
 	ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
diff --git a/erts/Makefile.in b/erts/Makefile.in
index 3052dc3065..cddabbecee 100644
--- a/erts/Makefile.in
+++ b/erts/Makefile.in
@@ -75,12 +75,10 @@ local_setup:
 		$(ERL_TOP)/bin/erl.exe $(ERL_TOP)/bin/erlc.exe \
 		$(ERL_TOP)/bin/escript $(ERL_TOP)/bin/escript.exe \
 		$(ERL_TOP)/bin/dialyzer $(ERL_TOP)/bin/dialyzer.exe \
-		$(ERL_TOP)/bin/typer $(ERL_TOP)/bin/typer.exe \
 		$(ERL_TOP)/bin/ct_run $(ERL_TOP)/bin/ct_run.exe \
 		$(ERL_TOP)/bin/start*.boot $(ERL_TOP)/bin/start*.script
 	@if [ "X$(TARGET)" = "Xwin32" ]; then \
 		cp $(ERL_TOP)/bin/$(TARGET)/dialyzer.exe $(ERL_TOP)/bin/dialyzer.exe; \
-		cp $(ERL_TOP)/bin/$(TARGET)/typer.exe $(ERL_TOP)/bin/typer.exe; \
 		cp $(ERL_TOP)/bin/$(TARGET)/ct_run.exe $(ERL_TOP)/bin/ct_run.exe; \
 		cp $(ERL_TOP)/bin/$(TARGET)/erlc.exe $(ERL_TOP)/bin/erlc.exe; \
 		cp $(ERL_TOP)/bin/$(TARGET)/erl.exe $(ERL_TOP)/bin/erl.exe; \
@@ -100,7 +98,6 @@ local_setup:
 		-e "s;%VSN%;$(VSN);"    \
 	        $(ERL_TOP)/erts/etc/unix/cerl.src > $(ERL_TOP)/bin/cerl; \
 		cp $(ERL_TOP)/bin/$(TARGET)/dialyzer $(ERL_TOP)/bin/dialyzer; \
-		cp $(ERL_TOP)/bin/$(TARGET)/typer $(ERL_TOP)/bin/typer; \
 		cp $(ERL_TOP)/bin/$(TARGET)/ct_run $(ERL_TOP)/bin/ct_run; \
 		cp $(ERL_TOP)/bin/$(TARGET)/erlc $(ERL_TOP)/bin/erlc; \
 		cp $(ERL_TOP)/bin/$(TARGET)/escript $(ERL_TOP)/bin/escript; \
diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
index cb053a1b7c..d3af634729 100644
--- a/erts/etc/common/Makefile.in
+++ b/erts/etc/common/Makefile.in
@@ -143,7 +143,7 @@ MC_OUTPUTS=$(OBJDIR)/erlsrv_logmess.h $(OBJDIR)/erlsrv_logmess.res
 MT_FLAG="-MD"
 endif
 INET_GETHOST = $(BINDIR)/inet_gethost.exe
-INSTALL_EMBEDDED_PROGS += $(BINDIR)/typer.exe $(BINDIR)/dialyzer.exe $(BINDIR)/erlc.exe $(BINDIR)/start_erl.exe $(BINDIR)/escript.exe $(BINDIR)/ct_run.exe
+INSTALL_EMBEDDED_PROGS += $(BINDIR)/dialyzer.exe $(BINDIR)/erlc.exe $(BINDIR)/start_erl.exe $(BINDIR)/escript.exe $(BINDIR)/ct_run.exe
 INSTALL_SRC = $(WINETC)/start_erl.c $(WINETC)/Nmakefile.start_erl
 ERLEXECDIR=.
 INSTALL_LIBS =
@@ -176,7 +176,7 @@ ENTRY_OBJ=
 ERLSRV_OBJECTS= 
 MC_OUTPUTS=
 INET_GETHOST = $(BINDIR)/inet_gethost@EXEEXT@
-INSTALL_EMBEDDED_PROGS += $(BINDIR)/typer@EXEEXT@ $(BINDIR)/dialyzer@EXEEXT@ \
+INSTALL_EMBEDDED_PROGS += $(BINDIR)/dialyzer@EXEEXT@ \
  $(BINDIR)/erlc@EXEEXT@ $(BINDIR)/escript@EXEEXT@ $(BINDIR)/ct_run@EXEEXT@ \
  $(BINDIR)/run_erl $(BINDIR)/to_erl $(BINDIR)/dyn_erl
 INSTALL_EMBEDDED_DATA = $(UXETC)/start.src $(UXETC)/start_erl.src
@@ -242,7 +242,6 @@ endif
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/safe_string.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/run_erl.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/to_erl.o
-	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/typer.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/ct_run.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/vxcall.o
 	rm -f $(ERL_TOP)/erts/obj*/$(TARGET)/erl.o
@@ -433,12 +432,6 @@ $(BINDIR)/dialyzer@EXEEXT@: $(OBJDIR)/dialyzer.o $(ERTS_LIB)
 $(OBJDIR)/dialyzer.o: dialyzer.c $(RC_GENERATED)
 	$(V_CC) $(CFLAGS) -o $@ -c dialyzer.c
 
-$(BINDIR)/typer@EXEEXT@: $(OBJDIR)/typer.o $(ERTS_LIB)
-	$(ld_verbose)$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/typer.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
-
-$(OBJDIR)/typer.o: typer.c $(RC_GENERATED)
-	$(V_CC) $(CFLAGS) -o $@ -c typer.c
-
 $(BINDIR)/escript@EXEEXT@: $(OBJDIR)/escript.o $(ERTS_LIB)
 	$(ld_verbose)$(PURIFY) $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/escript.o -L$(OBJDIR) $(LIBS) $(ERTS_INTERNAL_LIBS)
 
diff --git a/erts/etc/common/typer.c b/erts/etc/common/typer.c
deleted file mode 100644
index 77a95ccded..0000000000
--- a/erts/etc/common/typer.c
+++ /dev/null
@@ -1,455 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2006-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- */
-/*
- * Purpose: Typer front-end.
- */
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "sys.h"
-#ifdef __WIN32__
-#include <winbase.h>
-#endif
-
-#include <ctype.h>
-
-#define NO 0
-#define YES 1
-
-#define ASIZE(a) (sizeof(a)/sizeof(a[0]))
-
-static int debug = 0;		/* Bit flags for debug printouts. */
-
-static char** eargv_base;	/* Base of vector. */
-static char** eargv;		/* First argument for erl. */
-
-static int eargc;		/* Number of arguments in eargv. */
-
-#ifdef __WIN32__
-#  define QUOTE(s) possibly_quote(s)
-#  define IS_DIRSEP(c) ((c) == '/' || (c) == '\\')
-#  define ERL_NAME "erl.exe"
-#else
-#  define QUOTE(s) s
-#  define IS_DIRSEP(c) ((c) == '/')
-#  define ERL_NAME "erl"
-#endif
-
-#define UNSHIFT(s) eargc++, eargv--; eargv[0] = QUOTE(s)
-#define PUSH(s) eargv[eargc++] = QUOTE(s)
-#define PUSH2(s, t) PUSH(s); PUSH(t)
-#define PUSH3(s, t, u) PUSH2(s, t); PUSH(u)
-
-/*
- * Local functions.
- */
-
-static void error(char* format, ...);
-static void* emalloc(size_t size);
-static char* strsave(char* string);
-static void push_words(char* src);
-static int run_erlang(char* name, char** argv);
-static char* get_default_emulator(char* progname);
-#ifdef __WIN32__
-static char* possibly_quote(char* arg);
-static void* erealloc(void *p, size_t size);
-#endif
-
-/*
- * Supply a strerror() function if libc doesn't.
- */
-#ifndef HAVE_STRERROR
-
-extern int sys_nerr;
-
-#ifndef SYS_ERRLIST_DECLARED
-extern const char * const sys_errlist[];
-#endif /* !SYS_ERRLIST_DECLARED */
-
-char *strerror(int errnum)
-{
-  static char *emsg[1024];
-
-  if (errnum != 0) {
-    if (errnum > 0 && errnum < sys_nerr) 
-      sprintf((char *) &emsg[0], "(%s)", sys_errlist[errnum]);
-    else 
-      sprintf((char *) &emsg[0], "errnum = %d ", errnum);
-  }
-  else {
-    emsg[0] = '\0';
-  }
-  return (char *) &emsg[0];
-}
-#endif /* !HAVE_STRERROR */
-
-#ifdef __WIN32__
-int wmain(int argc, wchar_t **wcargv)
-{
-    char** argv;
-#else
-int
-main(int argc, char** argv)
-{
-#endif
-    int eargv_size;
-    int eargc_base;		/* How many arguments in the base of eargv. */
-    char* emulator;
-    int need_shell = 0;
-
-#ifdef __WIN32__
-    int i;
-    int len;
-    /* Convert argv to utf8 */
-    argv = emalloc((argc+1) * sizeof(char*));
-    for (i=0; i<argc; i++) {
-	len = WideCharToMultiByte(CP_UTF8, 0, wcargv[i], -1, NULL, 0, NULL, NULL);
-	argv[i] = emalloc(len*sizeof(char));
-	WideCharToMultiByte(CP_UTF8, 0, wcargv[i], -1, argv[i], len, NULL, NULL);
-    }
-    argv[argc] = NULL;
-#endif
-
-    emulator = get_default_emulator(argv[0]);
-
-    /*
-     * Allocate the argv vector to be used for arguments to Erlang.
-     * Arrange for starting to pushing information in the middle of
-     * the array, to allow easy addition of commands in the beginning.
-     */
-
-    eargv_size = argc*4+100;
-    eargv_base = (char **) emalloc(eargv_size*sizeof(char*));
-    eargv = eargv_base;
-    eargc = 0;
-    push_words(emulator);
-    eargc_base = eargc;
-    eargv = eargv + eargv_size/2;
-    eargc = 0;
-
-    /*
-     * Push initial arguments.
-     */
-
-    if (argc > 1 && strcmp(argv[1], "-smp") == 0) {
-        PUSH("-smpauto");
-	argc--, argv++;
-    }
-
-    PUSH("+B");
-    PUSH2("-boot", "start_clean");
-    PUSH3("-run", "typer", "start");
-    PUSH("-extra");
-
-    /*
-     * Push everything except --shell.
-     */
-
-    while (argc > 1) {
-	if (strcmp(argv[1], "--shell") == 0) {
-	    need_shell = 1;
-	} else {
-	    PUSH(argv[1]);
-	}
-	argc--, argv++;
-    }
-
-    if (!need_shell) {
-	UNSHIFT("-noinput");
-    }
-
-    /*
-     * Move up the commands for invoking the emulator and adjust eargv
-     * accordingly.
-     */
-
-    while (--eargc_base >= 0) {
-	UNSHIFT(eargv_base[eargc_base]);
-    }
-    
-    /*
-     * Invoke Erlang with the collected options.
-     */
-
-    PUSH(NULL);
-    return run_erlang(eargv[0], eargv);
-}
-
-static void
-push_words(char* src)
-{
-    char sbuf[MAXPATHLEN];
-    char* dst;
-
-    dst = sbuf;
-    while ((*dst++ = *src++) != '\0') {
-	if (isspace((int)*src)) {
-	    *dst = '\0';
-	    PUSH(strsave(sbuf));
-	    dst = sbuf;
-	    do {
-		src++;
-	    } while (isspace((int)*src));
-	}
-    }
-    if (sbuf[0])
-	PUSH(strsave(sbuf));
-}
-#ifdef __WIN32__
-wchar_t *make_commandline(char **argv)
-{
-    static wchar_t *buff = NULL;
-    static int siz = 0;
-    int num = 0, len;
-    char **arg;
-    wchar_t *p;
-
-    if (*argv == NULL) { 
-	return L"";
-    }
-    for (arg = argv; *arg != NULL; ++arg) {
-	num += strlen(*arg)+1;
-    }
-    if (!siz) {
-	siz = num;
-	buff = (wchar_t *) emalloc(siz*sizeof(wchar_t));
-    } else if (siz < num) {
-	siz = num;
-	buff = (wchar_t *) erealloc(buff,siz*sizeof(wchar_t));
-    }
-    p = buff;
-    num=0;
-    for (arg = argv; *arg != NULL; ++arg) {
-	len = MultiByteToWideChar(CP_UTF8, 0, *arg, -1, p, siz);
-	p+=(len-1);
-	*p++=L' ';
-    }
-    *(--p) = L'\0';
-
-    if (debug) {
-	printf("Processed command line:%S\n",buff);
-    }
-    return buff;
-}
-
-int my_spawnvp(char **argv)
-{
-    STARTUPINFOW siStartInfo;
-    PROCESS_INFORMATION piProcInfo;
-    DWORD ec;
-
-    memset(&siStartInfo,0,sizeof(STARTUPINFOW));
-    siStartInfo.cb = sizeof(STARTUPINFOW); 
-    siStartInfo.dwFlags = STARTF_USESTDHANDLES;
-    siStartInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
-    siStartInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
-    siStartInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE);
-
-    if (!CreateProcessW(NULL, 
-			make_commandline(argv),
-			NULL, 
-			NULL, 
-			TRUE, 
-			0,
-			NULL, 
-			NULL, 
-			&siStartInfo, 
-			&piProcInfo)) {
-	return -1;
-    }
-    CloseHandle(piProcInfo.hThread);
-
-    WaitForSingleObject(piProcInfo.hProcess,INFINITE);
-    if (!GetExitCodeProcess(piProcInfo.hProcess,&ec)) {
-	return 0;
-    }
-    return (int) ec;
-}    
-#endif /* __WIN32__ */
-
-
-static int
-run_erlang(char* progname, char** argv)
-{
-#ifdef __WIN32__
-    int status;
-#endif
-
-    if (debug) {
-	int i = 0;
-	while (argv[i] != NULL)
-	    printf(" %s", argv[i++]);
-	printf("\n");
-    }
-
-#ifdef __WIN32__
-    /*
-     * Alas, we must wait here for the program to finish.
-     * Otherwise, the shell from which we were executed will think
-     * we are finished and print a prompt and read keyboard input.
-     */
-
-    status = my_spawnvp(argv)/*_spawnvp(_P_WAIT,progname,argv)*/;
-    if (status == -1) {
-	fprintf(stderr, "typer: Error executing '%s': %d", progname, 
-		GetLastError());
-    }
-    return status;
-#else
-    execvp(progname, argv);
-    error("Error %d executing \'%s\'.", errno, progname);
-    return 2;
-#endif
-}
-
-static void
-error(char* format, ...)
-{
-    char sbuf[1024];
-    va_list ap;
-    
-    va_start(ap, format);
-    erts_vsnprintf(sbuf, sizeof(sbuf), format, ap);
-    va_end(ap);
-    fprintf(stderr, "typer: %s\n", sbuf);
-    exit(1);
-}
-
-static void*
-emalloc(size_t size)
-{
-  void *p = malloc(size);
-  if (p == NULL)
-    error("Insufficient memory");
-  return p;
-}
-
-#ifdef __WIN32__
-static void *
-erealloc(void *p, size_t size)
-{
-    void *res = realloc(p, size);
-    if (res == NULL)
-    error("Insufficient memory");
-    return res;
-}
-#endif
-
-static char*
-strsave(char* string)
-{
-    char* p = emalloc(strlen(string)+1);
-    strcpy(p, string);
-    return p;
-}
-
-static int 
-file_exists(char *progname) 
-{
-#ifdef __WIN32__
-    wchar_t wcsbuf[MAXPATHLEN];
-    MultiByteToWideChar(CP_UTF8, 0, progname, -1, wcsbuf, MAXPATHLEN);
-    return (_waccess(wcsbuf, 0) != -1);
-#else
-    return (access(progname, 1) != -1);
-#endif
-}
-
-static char*
-get_default_emulator(char* progname)
-{
-    char sbuf[MAXPATHLEN];
-    char* s;
-
-    if (strlen(progname) >= sizeof(sbuf))
-        return ERL_NAME;
-
-    strcpy(sbuf, progname);
-    for (s = sbuf+strlen(sbuf); s >= sbuf; s--) {
-	if (IS_DIRSEP(*s)) {
-	    strcpy(s+1, ERL_NAME);
-	    if(file_exists(sbuf))
-		return strsave(sbuf);
-	    break;
-	}
-    }
-    return ERL_NAME;
-}
-
-#ifdef __WIN32__
-static char*
-possibly_quote(char* arg)
-{
-    int mustQuote = NO;
-    int n = 0;
-    char* s;
-    char* narg;
-
-    if (arg == NULL) {
-	return arg;
-    }
-
-    /*
-     * Scan the string to find out if it needs quoting and return
-     * the original argument if not.
-     */
-
-    for (s = arg; *s; s++, n++) {
-	switch(*s) {
-	case ' ':
-	    mustQuote = YES;
-	    continue;
-	case '"':
-	    mustQuote = YES;
-	    n++;
-	    continue;
-	case '\\':
-	    if(s[1] == '"')
-		n++;
-	    continue;
-	default:
-	    continue;
-	}
-    }
-    if (!mustQuote) {
-	return arg;
-    }
-
-    /*
-     * Insert the quotes and put a backslash in front of every quote
-     * inside the string.
-     */
-
-    s = narg = emalloc(n+2+1);
-    for (*s++ = '"'; *arg; arg++, s++) {
-	if (*arg == '"' || (*arg == '\\' && arg[1] == '"')) {
-	    *s++ = '\\';
-	}
-	*s = *arg;
-    }
-    if (s[-1] == '\\') {
-	*s++ ='\\';
-    }
-    *s++ = '"';
-    *s = '\0';
-    return narg;
-}
-#endif /* __WIN32__ */
diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src
index e71308edbe..8be696b16f 100644
--- a/erts/etc/unix/Install.src
+++ b/erts/etc/unix/Install.src
@@ -89,7 +89,6 @@ cd "$ERL_ROOT/bin"
 cp -p "$ERL_ROOT/erts-%I_VSN%/bin/erl" .
 cp -p "$ERL_ROOT/erts-%I_VSN%/bin/erlc" .
 cp -p "$ERL_ROOT/erts-%I_VSN%/bin/dialyzer" .
-cp -p "$ERL_ROOT/erts-%I_VSN%/bin/typer" .
 cp -p "$ERL_ROOT/erts-%I_VSN%/bin/ct_run" .
 cp -p "$ERL_ROOT/erts-%I_VSN%/bin/escript" .
 
diff --git a/erts/etc/win32/Install.c b/erts/etc/win32/Install.c
index 43930ff284..04522a0779 100644
--- a/erts/etc/win32/Install.c
+++ b/erts/etc/win32/Install.c
@@ -48,7 +48,7 @@ int wmain(int argc, wchar_t **argv)
     InitSection *ini_section;
     HANDLE module = GetModuleHandle(NULL);
     wchar_t *binaries[] = { L"erl.exe", L"werl.exe", L"erlc.exe",
-			    L"dialyzer.exe", L"typer.exe",
+			    L"dialyzer.exe",
 			    L"escript.exe", L"ct_run.exe", NULL };
     wchar_t *scripts[] = { L"start_clean.boot", L"start_sasl.boot", L"no_dot_erlang.boot", NULL };
     wchar_t fromname[MAX_PATH];
diff --git a/erts/test/upgrade_SUITE.erl b/erts/test/upgrade_SUITE.erl
index f93da8955f..086e54f8a4 100644
--- a/erts/test/upgrade_SUITE.erl
+++ b/erts/test/upgrade_SUITE.erl
@@ -37,10 +37,9 @@
 %% In specific:
 %% - hipe does not support any upgrade at all
 %% - dialyzer requires hipe (in the .app file)
-%% - typer requires hipe (in the .app file)
 %% - erl_interface, jinterface support no upgrade
 -define(appup_exclude, 
-	[dialyzer,hipe,typer,erl_interface,jinterface,ose]).
+	[dialyzer,hipe,erl_interface,jinterface,ose]).
 
 init_per_suite(Config) ->
     %% Check that a real release is running, not e.g. cerl
diff --git a/lib/Makefile b/lib/Makefile
index 4740e6eb59..ae466ed518 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -35,7 +35,7 @@ ALL_ERLANG_APPLICATIONS = xmerl edoc erl_docgen snmp otp_mibs erl_interface \
 	          public_key ssl observer odbc diameter \
 	          cosTransactions cosEvent cosTime cosNotification \
 	          cosProperty cosFileTransfer cosEventDomain et megaco \
-		  eunit ssh typer eldap dialyzer hipe
+		  eunit ssh eldap dialyzer hipe
 
 ifdef BUILD_ALL
   ERLANG_APPLICATIONS += $(ALL_ERLANG_APPLICATIONS)
diff --git a/lib/common_test/src/ct_release_test.erl b/lib/common_test/src/ct_release_test.erl
index d783f8d04e..c53e72ee88 100644
--- a/lib/common_test/src/ct_release_test.erl
+++ b/lib/common_test/src/ct_release_test.erl
@@ -132,7 +132,7 @@
 
 %%-----------------------------------------------------------------
 -define(testnode, 'ct_release_test-upgrade').
--define(exclude_apps, [hipe, typer, dialyzer]). % never include these apps
+-define(exclude_apps, [hipe, dialyzer]). % never include these apps
 
 %%-----------------------------------------------------------------
 -record(ct_data, {from,to}).
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 1f4591a5a3..19d36a7613 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -1360,9 +1360,8 @@ create_big_boot(Config) ->
 %% corresponding beam file (if hipe is not enabled).
 filter_app("hipe",_) -> false;
 
-%% Dialyzer and typer depends on hipe
+%% Dialyzer depends on hipe
 filter_app("dialyzer",_) -> false;
-filter_app("typer",_) -> false;
 
 %% Orber requires explicit configuration
 filter_app("orber",_) -> false;
diff --git a/lib/reltool/src/reltool.hrl b/lib/reltool/src/reltool.hrl
index 3b1e868757..c61c3a0c71 100644
--- a/lib/reltool/src/reltool.hrl
+++ b/lib/reltool/src/reltool.hrl
@@ -289,8 +289,8 @@
 				      "^lib",
 				      "^releases"]).
 -define(EMBEDDED_EXCL_SYS_FILTERS,
-	["^bin/(erlc|dialyzer|typer)(|\\.exe)\$",
-	 "^erts.*/bin/(erlc|dialyzer|typer)(|\\.exe)\$",
+	["^bin/(erlc|dialyzer)(|\\.exe)\$",
+	 "^erts.*/bin/(erlc|dialyzer)(|\\.exe)\$",
 	 "^erts.*/bin/.*(debug|pdb)"]).
 -define(EMBEDDED_INCL_APP_FILTERS,    ["^ebin",
 				       "^include",
@@ -303,7 +303,7 @@
 				       "^erts.*/bin",
 				       "^lib\$"]).
 -define(STANDALONE_EXCL_SYS_FILTERS,
-	["^erts.*/bin/(erlc|dialyzer|typer)(|\\.exe)\$",
+	["^erts.*/bin/(erlc|dialyzer)(|\\.exe)\$",
 	 "^erts.*/bin/(start|escript|to_erl|run_erl)(|\\.exe)\$",
 	 "^erts.*/bin/.*(debug|pdb)"]).
 -define(STANDALONE_INCL_APP_FILTERS,  ["^ebin",
diff --git a/lib/tools/emacs/erldoc.el b/lib/tools/emacs/erldoc.el
index e1fd661348..348800f880 100644
--- a/lib/tools/emacs/erldoc.el
+++ b/lib/tools/emacs/erldoc.el
@@ -407,7 +407,7 @@ up the indexing."
 (defvar erldoc-user-guides nil)
 
 (defvar erldoc-missing-user-guides
-  '("compiler" "hipe" "kernel" "os_mon" "parsetools" "typer")
+  '("compiler" "hipe" "kernel" "os_mon" "parsetools")
   "List of standard Erlang applications with no user guides.")
 
 ;; Search in `code:lib_dir/0' using find LIB_DIR -type f -name
@@ -417,7 +417,7 @@ up the indexing."
                              "runtime_tools" "sasl" "snmp"
                              "ssl" "test_server"
                              ("ssh" . "SSH") ("stdlib" . "STDLIB")
-                             ("hipe" . "HiPE") ("typer" . "TypEr"))
+                             ("hipe" . "HiPE"))
   "List of applications that come with a manual.")
 
 (defun erldoc-user-guide-chapters (user-guide)
diff --git a/lib/typer/Makefile b/lib/typer/Makefile
deleted file mode 100644
index bd1b6458a8..0000000000
--- a/lib/typer/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2006-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#=============================================================================
-#
-#    File:  lib/typer/Makefile
-# Authors:  Bingwen He, Tobias Lindahl, and Kostis Sagonas
-#
-#=============================================================================
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-#
-# Macros
-#
-
-SUB_DIRECTORIES = src doc/src
-
-include vsn.mk
-VSN = $(TYPER_VSN)
-
-SPECIAL_TARGETS =
-
-#
-# Default Subdir Targets
-#
-include $(ERL_TOP)/make/otp_subdir.mk
-
diff --git a/lib/typer/RELEASE_NOTES b/lib/typer/RELEASE_NOTES
deleted file mode 100644
index d91a815ee9..0000000000
--- a/lib/typer/RELEASE_NOTES
+++ /dev/null
@@ -1,22 +0,0 @@
-==============================================================================
-	Major features, additions and changes between Typer versions
-		(in reversed chronological order)
-==============================================================================
-
-Version 0.9 (in Erlang/OTP R14B02)
-----------------------------------
- - Major rewrite; all code has been cleaned up and placed in one file.
-   The only reason why this is not version 1.0 yet is that there is no proper
-   documentation for typer which can be displayed in the www.erlang.org site.
- - Added ability to receive the set of exported types and report unknown ones.
- - Better handling of overloaded contracts; especially erroneous ones on which
-   typer does not crash anymore.
- - Fixed problem that caused typer to hang when given a file whose module name
-   did not correspond to the file name. 
- - Added two undocumented options that may come very handy when trying to
-   understand why typer reports some particular set of types for the functions
-   in a module. These options are mainly for typer developers at this point,
-   but may become documented in some future version.
-
-Older versions
---------------
diff --git a/lib/typer/doc/Makefile b/lib/typer/doc/Makefile
deleted file mode 100644
index 1015ca78eb..0000000000
--- a/lib/typer/doc/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2006-2016. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# %CopyrightEnd%
-#
-SHELL=/bin/sh
-
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-clean:
-	-rm -f *.html edoc-info stylesheet.css erlang.png
-
-distclean: clean
-realclean: clean
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
diff --git a/lib/typer/doc/html/.gitignore b/lib/typer/doc/html/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/typer/doc/html/.gitignore
+++ /dev/null
diff --git a/lib/typer/doc/pdf/.gitignore b/lib/typer/doc/pdf/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/typer/doc/pdf/.gitignore
+++ /dev/null
diff --git a/lib/typer/doc/src/Makefile b/lib/typer/doc/src/Makefile
deleted file mode 100644
index 3724a2e4d1..0000000000
--- a/lib/typer/doc/src/Makefile
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2006-2016. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# %CopyrightEnd%
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(TYPER_VSN)
-APPLICATION=typer
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES =  ref_man.xml
-XML_REF3_FILES = 
-
-XML_PART_FILES = part_notes.xml
-XML_CHAPTER_FILES = notes.xml
-
-BOOK_FILES = book.xml
-
-XML_FILES = \
-	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
-	$(XML_PART_FILES) $(XML_REF3_FILES) $(XML_APPLICATION_FILES)
-
-GIF_FILES = 
-
-# ----------------------------------------------------
-
-HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
-
-INFO_FILE = ../../info
-EXTRA_FILES = \
-	$(DEFAULT_GIF_FILES) \
-	$(DEFAULT_HTML_FILES) \
-	$(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html)
-
-MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
-
-HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
-
-TOP_PDF_FILE =  $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
-
-# ----------------------------------------------------
-# FLAGS 
-# ----------------------------------------------------
-XML_FLAGS += 
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif
-	$(INSTALL_DATA) $< $@
-
-docs: pdf html man
-
-$(TOP_PDF_FILE): $(XML_FILES)
-
-pdf: $(TOP_PDF_FILE)
-
-html: gifs $(HTML_REF_MAN_FILE)
-
-man: $(MAN3_FILES)
-
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
-
-debug opt: 
-
-clean clean_docs:
-	rm -rf $(HTMLDIR)/*
-	rm -f $(MAN3DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~ 
-
-distclean: clean
-realclean: clean
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_docs_spec: docs
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(HTMLDIR)/* \
-		"$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
-
-
-release_spec:
diff --git a/lib/typer/doc/src/book.xml b/lib/typer/doc/src/book.xml
deleted file mode 100644
index 20da44ae04..0000000000
--- a/lib/typer/doc/src/book.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header titlestyle="normal">
-    <copyright>
-      <year>2006</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>TypEr</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <pagetext></pagetext>
-  <preamble>
-  </preamble>
-  <pagetext>TypEr</pagetext>
-  <applications>
-    <xi:include href="ref_man.xml"/>
-  </applications>
-  <releasenotes>
-    <xi:include href="notes.xml"/>
-  </releasenotes>
-</book>
-
diff --git a/lib/typer/doc/src/fascicules.xml b/lib/typer/doc/src/fascicules.xml
deleted file mode 100644
index b15610fa8b..0000000000
--- a/lib/typer/doc/src/fascicules.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE fascicules SYSTEM "fascicules.dtd">
-
-<fascicules>
-  <fascicule file="part_notes" href="part_notes_frame.html" entry="yes">
-    Release Notes
-  </fascicule>
-  <fascicule file="" href="../../../../doc/print.html" entry="no">
-    Off-Print
-  </fascicule>
-</fascicules>
-
diff --git a/lib/typer/doc/src/notes.xml b/lib/typer/doc/src/notes.xml
deleted file mode 100644
index 9ef5ca1c70..0000000000
--- a/lib/typer/doc/src/notes.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2014</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>TypEr Release Notes</title>
-    <prepared>otp_appnotes</prepared>
-    <docno>nil</docno>
-    <date>nil</date>
-    <rev>nil</rev>
-    <file>notes.xml</file>
-  </header>
-  <p>This document describes the changes made to TypEr.</p>
-
-<section><title>TypEr 0.9.11</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>TypEr 0.9.10</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p>Fix a bug that could result in a crash when printing
-	    warnings onto standard error. </p>
-          <p>
-	    Own Id: OTP-13010</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>TypEr 0.9.9</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Properly extract annotations from core code. </p>
-          <p>
-	    Own Id: OTP-12727</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>TypEr 0.9.8</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> The name of a compiler option has been fixed in the
-	    Makefile. </p>
-          <p>
-	    Own Id: OTP-11996</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>TypEr 0.9.7</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Added initial documentation framework for TypEr.</p>
-          <p>
-	    Own Id: OTP-11860</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-
-
-</chapter>
-
diff --git a/lib/typer/doc/src/part_notes.xml b/lib/typer/doc/src/part_notes.xml
deleted file mode 100644
index 3234f0903e..0000000000
--- a/lib/typer/doc/src/part_notes.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2006</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>TypEr Release Notes</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <description>
-    <p><em>TypEr</em></p>
-  </description>
-  <xi:include href="notes.xml"/>
-</part>
-
diff --git a/lib/typer/doc/src/ref_man.xml b/lib/typer/doc/src/ref_man.xml
deleted file mode 100644
index c793207443..0000000000
--- a/lib/typer/doc/src/ref_man.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE application SYSTEM "application.dtd">
-
-<application xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2014</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>TypEr</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-    <file>ref_man.xml</file>
-  </header>
-  <description>
-  </description>
-  <xi:include href="typer_app.xml"/>
-</application>
-
diff --git a/lib/typer/doc/src/typer_app.xml b/lib/typer/doc/src/typer_app.xml
deleted file mode 100644
index d52df5d0da..0000000000
--- a/lib/typer/doc/src/typer_app.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE appref SYSTEM "appref.dtd">
-
-<appref>
-  <header>
-    <copyright>
-      <year>2014</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>TypEr</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date></date>
-    <rev></rev>
-    <file>typer.xml</file>
-  </header>
-  <app>TypEr</app>
-  <appsummary>The TypEr Application</appsummary>
-  <description>
-    <p>An Erlang/OTP application that shows type information
-    for Erlang modules to the user. Additionally, it can
-    annotate the code of files with such type information.</p>
-  </description>  
-
-</appref>
-
diff --git a/lib/typer/ebin/.gitignore b/lib/typer/ebin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/typer/ebin/.gitignore
+++ /dev/null
diff --git a/lib/typer/info b/lib/typer/info
deleted file mode 100644
index 5145fbcfff..0000000000
--- a/lib/typer/info
+++ /dev/null
@@ -1,2 +0,0 @@
-group: tools
-short: TypEr
diff --git a/lib/typer/src/Makefile b/lib/typer/src/Makefile
deleted file mode 100644
index 6c5d8b0726..0000000000
--- a/lib/typer/src/Makefile
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2006-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#=============================================================================
-#
-#    File:  lib/typer/src/Makefile
-# Authors:  Kostis Sagonas
-#
-#=============================================================================
-
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(TYPER_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/typer-$(VSN)
-
-# ----------------------------------------------------
-# Orientation information -- find dialyzer's dir
-# ----------------------------------------------------
-DIALYZER_DIR = $(ERL_TOP)/lib/dialyzer
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-MODULES = typer
-
-HRL_FILES=
-ERL_FILES= $(MODULES:%=%.erl)
-INSTALL_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
-TARGET_FILES= $(INSTALL_FILES)
-
-APP_FILE= typer.app
-APP_SRC= $(APP_FILE).src
-APP_TARGET= $(EBIN)/$(APP_FILE)
-
-APPUP_FILE= typer.appup
-APPUP_SRC= $(APPUP_FILE).src
-APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_COMPILE_FLAGS += +warn_export_vars +warn_untyped_record +warn_missing_spec
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: $(TARGET_FILES)
-
-docs:
-
-clean:
-	rm -f $(TARGET_FILES)
-	rm -f core
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-$(EBIN)/typer.$(EMULATOR): typer.erl ../vsn.mk Makefile
-	$(erlc_verbose)erlc -W  $(ERL_COMPILE_FLAGS) -DVSN="\"v$(VSN)\"" -o$(EBIN) typer.erl
-
-$(APP_TARGET): $(APP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-# ---------------------------------------------------------------------
-# dependencies
-# ---------------------------------------------------------------------
-
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(YRL_FILES) \
-		"$(RELSYSDIR)/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
-
-release_docs_spec:
diff --git a/lib/typer/src/typer.app.src b/lib/typer/src/typer.app.src
deleted file mode 100644
index e0be937cc3..0000000000
--- a/lib/typer/src/typer.app.src
+++ /dev/null
@@ -1,11 +0,0 @@
-% This is an -*- erlang -*- file.
-
-{application, typer,
- [{description, "TYPe annotator for ERlang programs, version %VSN%"},
-  {vsn, "%VSN%"},
-  {modules, [typer]},
-  {registered, []},
-  {applications, [compiler, dialyzer, hipe, kernel, stdlib]},
-  {env, []},
-  {runtime_dependencies, ["stdlib-3.0","kernel-5.0","hipe-3.15.4","erts-8.0",
-			  "dialyzer-3.1","compiler-7.0"]}]}.
diff --git a/lib/typer/src/typer.appup.src b/lib/typer/src/typer.appup.src
deleted file mode 100644
index 3b7464a97c..0000000000
--- a/lib/typer/src/typer.appup.src
+++ /dev/null
@@ -1,22 +0,0 @@
-%% -*- erlang -*-
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2014-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-{"%VSN%",
- [{<<".*">>,[{restart_application, typer}]}],
- [{<<".*">>,[{restart_application, typer}]}]
-}.
diff --git a/lib/typer/src/typer.erl b/lib/typer/src/typer.erl
deleted file mode 100644
index 18c4fe902d..0000000000
--- a/lib/typer/src/typer.erl
+++ /dev/null
@@ -1,1110 +0,0 @@
-%% -*- erlang-indent-level: 2 -*-
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-
-%%-----------------------------------------------------------------------
-%% File        : typer.erl
-%% Author(s)   : The first version of typer was written by Bingwen He
-%%               with guidance from Kostis Sagonas and Tobias Lindahl.
-%%               Since June 2008 typer is maintained by Kostis Sagonas.
-%% Description : An Erlang/OTP application that shows type information
-%%               for Erlang modules to the user.  Additionally, it can
-%%               annotate the code of files with such type information.
-%%-----------------------------------------------------------------------
-
--module(typer).
-
--export([start/0]).
-
-%%-----------------------------------------------------------------------
-
--define(SHOW, show).
--define(SHOW_EXPORTED, show_exported).
--define(ANNOTATE, annotate).
--define(ANNOTATE_INC_FILES, annotate_inc_files).
-
--type mode() :: ?SHOW | ?SHOW_EXPORTED | ?ANNOTATE | ?ANNOTATE_INC_FILES.
-
-%%-----------------------------------------------------------------------
-
--type files()      :: [file:filename()].
--type callgraph()  :: dialyzer_callgraph:callgraph().
--type codeserver() :: dialyzer_codeserver:codeserver().
--type plt()        :: dialyzer_plt:plt().
-
--record(analysis,
-	{mode				 :: mode() | 'undefined',
-	 macros     = []		 :: [{atom(), term()}],
-	 includes   = []		 :: files(),
-	 codeserver = dialyzer_codeserver:new():: codeserver(),
-	 callgraph  = dialyzer_callgraph:new() :: callgraph(),
-	 files      = []		 :: files(),   % absolute names
-	 plt        = none		 :: 'none' | file:filename(),
-	 no_spec    = false              :: boolean(),
-	 show_succ  = false              :: boolean(),
-	 %% For choosing between specs or edoc @spec comments
-	 edoc       = false		 :: boolean(),
-	 %% Files in 'fms' are compilable with option 'to_pp'; we keep them
-	 %% as {FileName, ModuleName} in case the ModuleName is different
-	 fms        = []		 :: [{file:filename(), module()}],
-	 ex_func    = map__new()	 :: map_dict(),
-	 record     = map__new()	 :: map_dict(),
-	 func       = map__new()	 :: map_dict(),
-	 inc_func   = map__new()	 :: map_dict(),
-	 trust_plt  = dialyzer_plt:new() :: plt()}).
--type analysis() :: #analysis{}.
-
--record(args, {files   = [] :: files(),
-	       files_r = [] :: files(),
-	       trusted = [] :: files()}).
--type args() :: #args{}.
-
-%%--------------------------------------------------------------------
-
--spec start() -> no_return().
-
-start() ->
-  {Args, Analysis} = process_cl_args(),
-  %% io:format("Args: ~p\n", [Args]),
-  %% io:format("Analysis: ~p\n", [Analysis]),
-  Timer = dialyzer_timing:init(false),
-  TrustedFiles = filter_fd(Args#args.trusted, [], fun is_erl_file/1),
-  Analysis2 = extract(Analysis, TrustedFiles),
-  All_Files = get_all_files(Args),
-  %% io:format("All_Files: ~p\n", [All_Files]),
-  Analysis3 = Analysis2#analysis{files = All_Files},
-  Analysis4 = collect_info(Analysis3),
-  %% io:format("Final: ~p\n", [Analysis4#analysis.fms]),
-  TypeInfo = get_type_info(Analysis4),
-  dialyzer_timing:stop(Timer),
-  show_or_annotate(TypeInfo),
-  %% io:format("\nTyper analysis finished\n"),
-  erlang:halt(0).
-
-%%--------------------------------------------------------------------
-
--spec extract(analysis(), files()) -> analysis().
-
-extract(#analysis{macros = Macros,
-		  includes = Includes,
-		  trust_plt = TrustPLT} = Analysis, TrustedFiles) ->
-  %% io:format("--- Extracting trusted typer_info... "),
-  Ds = [{d, Name, Value} || {Name, Value} <- Macros],
-  CodeServer = dialyzer_codeserver:new(),
-  Fun =
-    fun(File, CS) ->
-	%% We include one more dir; the one above the one we are trusting
-	%% E.g, for /home/tests/typer_ann/test.ann.erl, we should include
-	%% /home/tests/ rather than /home/tests/typer_ann/
-	AllIncludes = [filename:dirname(filename:dirname(File)) | Includes],
-	Is = [{i, Dir} || Dir <- AllIncludes],
-	CompOpts = dialyzer_utils:src_compiler_opts() ++ Is ++ Ds,
-	case dialyzer_utils:get_abstract_code_from_src(File, CompOpts) of
-	  {ok, AbstractCode} -> 
-	    case dialyzer_utils:get_record_and_type_info(AbstractCode) of
-	      {ok, RecDict} ->
-		Mod = list_to_atom(filename:basename(File, ".erl")),
-		case dialyzer_utils:get_spec_info(Mod, AbstractCode, RecDict) of
-		  {ok, SpecDict, CbDict} ->
-		    CS1 = dialyzer_codeserver:store_temp_records(Mod, RecDict, CS),
-		    dialyzer_codeserver:store_temp_contracts(Mod, SpecDict, CbDict, CS1);
-		  {error, Reason} -> compile_error([Reason])
-		end;
-	      {error, Reason} -> compile_error([Reason])
-	    end;
-	  {error, Reason} -> compile_error(Reason)
-	end
-    end,
-  CodeServer1 = lists:foldl(Fun, CodeServer, TrustedFiles),
-  %% Process remote types
-  NewCodeServer =
-    try
-      CodeServer2 =
-        dialyzer_utils:merge_types(CodeServer1,
-                                   TrustPLT), % XXX change to the PLT?
-      NewExpTypes = dialyzer_codeserver:get_temp_exported_types(CodeServer1),
-      case sets:size(NewExpTypes) of 0 -> ok end,
-      CodeServer3 = dialyzer_codeserver:finalize_exported_types(NewExpTypes, CodeServer2),
-      CodeServer4 = dialyzer_utils:process_record_remote_types(CodeServer3),
-      dialyzer_contracts:process_contract_remote_types(CodeServer4)
-    catch
-      throw:{error, ErrorMsg} ->
-	compile_error(ErrorMsg)
-    end,
-  %% Create TrustPLT
-  ContractsDict = dialyzer_codeserver:get_contracts(NewCodeServer),
-  Contracts = orddict:from_list(dict:to_list(ContractsDict)),
-  NewTrustPLT = dialyzer_plt:insert_contract_list(TrustPLT, Contracts),
-  Analysis#analysis{trust_plt = NewTrustPLT}.
-
-%%--------------------------------------------------------------------
-
--spec get_type_info(analysis()) -> analysis().
-
-get_type_info(#analysis{callgraph = CallGraph,
-			trust_plt = TrustPLT,
-			codeserver = CodeServer} = Analysis) ->
-  StrippedCallGraph = remove_external(CallGraph, TrustPLT),
-  %% io:format("--- Analyzing callgraph... "),
-  try 
-    NewMiniPlt = dialyzer_succ_typings:analyze_callgraph(StrippedCallGraph,
-                                                         TrustPLT,
-                                                         CodeServer),
-    NewPlt = dialyzer_plt:restore_full_plt(NewMiniPlt),
-    Analysis#analysis{callgraph = StrippedCallGraph, trust_plt = NewPlt}
-  catch
-    error:What ->
-      fatal_error(io_lib:format("Analysis failed with message: ~p", 
-				[{What, erlang:get_stacktrace()}]));
-    throw:{dialyzer_succ_typing_error, Msg} ->
-      fatal_error(io_lib:format("Analysis failed with message: ~s", [Msg]))
-  end.
-
--spec remove_external(callgraph(), plt()) -> callgraph().
-
-remove_external(CallGraph, PLT) ->
-  {StrippedCG0, Ext} = dialyzer_callgraph:remove_external(CallGraph),
-  case get_external(Ext, PLT) of
-    [] -> ok;
-    Externals ->
-      msg(io_lib:format(" Unknown functions: ~p\n", [lists:usort(Externals)])),
-      ExtTypes = rcv_ext_types(),
-      case ExtTypes of
-        [] -> ok;
-        _ -> msg(io_lib:format(" Unknown types: ~p\n", [ExtTypes]))
-      end
-  end,
-  StrippedCG0.
-
--spec get_external([{mfa(), mfa()}], plt()) -> [mfa()].
-
-get_external(Exts, Plt) ->
-  Fun = fun ({_From, To = {M, F, A}}, Acc) ->
-	    case dialyzer_plt:contains_mfa(Plt, To) of
-	      false ->
-		case erl_bif_types:is_known(M, F, A) of
-		  true -> Acc;
-		  false -> [To|Acc]
-		end;
-	      true -> Acc
-	    end
-	end,
-  lists:foldl(Fun, [], Exts).
-
-%%--------------------------------------------------------------------
-%% Showing type information or annotating files with such information.
-%%--------------------------------------------------------------------
-
--define(TYPER_ANN_DIR, "typer_ann").
-
--type line()      :: non_neg_integer().
--type fa()        :: {atom(), arity()}.
--type func_info() :: {line(), atom(), arity()}.
-
--record(info, {records = maps:new() :: erl_types:type_table(),
-	       functions = []       :: [func_info()],
-	       types = map__new()   :: map_dict(),
-	       edoc = false	    :: boolean()}).
--record(inc, {map = map__new() :: map_dict(), filter = [] :: files()}).
--type inc() :: #inc{}.
-
--spec show_or_annotate(analysis()) -> 'ok'.
-
-show_or_annotate(#analysis{mode = Mode, fms = Files} = Analysis) ->
-  case Mode of
-    ?SHOW -> show(Analysis);
-    ?SHOW_EXPORTED -> show(Analysis);
-    ?ANNOTATE ->
-      Fun = fun ({File, Module}) ->
-		Info = get_final_info(File, Module, Analysis),
-		write_typed_file(File, Info)
-	    end,
-      lists:foreach(Fun, Files);
-    ?ANNOTATE_INC_FILES ->
-      IncInfo = write_and_collect_inc_info(Analysis),
-      write_inc_files(IncInfo)
-  end.
-
-write_and_collect_inc_info(Analysis) ->
-  Fun = fun ({File, Module}, Inc) ->
-	    Info = get_final_info(File, Module, Analysis),
-	    write_typed_file(File, Info),
-	    IncFuns = get_functions(File, Analysis),
-	    collect_imported_functions(IncFuns, Info#info.types, Inc)
-	end,
-  NewInc = lists:foldl(Fun, #inc{}, Analysis#analysis.fms),
-  clean_inc(NewInc).
-
-write_inc_files(Inc) ->
-  Fun =
-    fun (File) ->
-	Val = map__lookup(File, Inc#inc.map),
-	%% Val is function with its type info
-	%% in form [{{Line,F,A},Type}]
-	Functions = [Key || {Key, _} <- Val],
-	Val1 = [{{F,A},Type} || {{_Line,F,A},Type} <- Val],
-	Info = #info{types = map__from_list(Val1),
-		     records = maps:new(),
-		     %% Note we need to sort functions here!
-		     functions = lists:keysort(1, Functions)},
-	%% io:format("Types ~p\n", [Info#info.types]),
-	%% io:format("Functions ~p\n", [Info#info.functions]),
-	%% io:format("Records ~p\n", [Info#info.records]),
-	write_typed_file(File, Info)
-    end,
-  lists:foreach(Fun, dict:fetch_keys(Inc#inc.map)).
-
-show(Analysis) ->
-  Fun = fun ({File, Module}) ->
-	    Info = get_final_info(File, Module, Analysis),
-	    show_type_info(File, Info)
-	end,
-  lists:foreach(Fun, Analysis#analysis.fms).
-
-get_final_info(File, Module, Analysis) ->
-  Records = get_records(File, Analysis),
-  Types = get_types(Module, Analysis, Records),
-  Functions = get_functions(File, Analysis),
-  Edoc = Analysis#analysis.edoc,
-  #info{records = Records, functions = Functions, types = Types, edoc = Edoc}.
-
-collect_imported_functions(Functions, Types, Inc) ->
-  %% Coming from other sourses, including:
-  %% FIXME: How to deal with yecc-generated file????
-  %%     --.yrl (yecc-generated file)???
-  %%     -- yeccpre.hrl (yecc-generated file)???
-  %%     -- other cases
-  Fun = fun ({File, _} = Obj, I) ->
-	    case is_yecc_gen(File, I) of
-	      {true, NewI} -> NewI;
-	      {false, NewI} ->
-		check_imported_functions(Obj, NewI, Types)
-	    end
-	end,
-  lists:foldl(Fun, Inc, Functions).
-
--spec is_yecc_gen(file:filename(), inc()) -> {boolean(), inc()}.
-
-is_yecc_gen(File, #inc{filter = Fs} = Inc) ->
-  case lists:member(File, Fs) of
-    true -> {true, Inc};
-    false ->
-      case filename:extension(File) of
-	".yrl" ->
-	  Rootname = filename:rootname(File, ".yrl"),
-	  Obj = Rootname ++ ".erl",
-	  case lists:member(Obj, Fs) of
-	    true -> {true, Inc};
-	    false ->
-	      NewInc = Inc#inc{filter = [Obj|Fs]},
-	      {true, NewInc}
-	  end;
-	_ ->
-	  case filename:basename(File) of
-	    "yeccpre.hrl" -> {true, Inc};
-	    _ -> {false, Inc}
-	  end
-      end
-  end.
-
-check_imported_functions({File, {Line, F, A}}, Inc, Types) ->
-  IncMap = Inc#inc.map,
-  FA = {F, A},
-  Type = get_type_info(FA, Types),
-  case map__lookup(File, IncMap) of
-    none -> %% File is not added. Add it
-      Obj = {File,[{FA, {Line, Type}}]},
-      NewMap = map__insert(Obj, IncMap),
-      Inc#inc{map = NewMap};
-    Val -> %% File is already in. Check.
-      case lists:keyfind(FA, 1, Val) of
-	false ->
-	  %% Function is not in; add it
-	  Obj = {File, Val ++ [{FA, {Line, Type}}]},
-	  NewMap = map__insert(Obj, IncMap),
-	  Inc#inc{map = NewMap};
-	Type ->
-	  %% Function is in and with same type
-	  Inc;
-	_ ->
-	  %% Function is in but with diff type
-	  inc_warning(FA, File),
-	  Elem = lists:keydelete(FA, 1, Val),
-	  NewMap = case Elem of
-		     [] -> map__remove(File, IncMap);
-		     _  -> map__insert({File, Elem}, IncMap)
-		   end,
-	  Inc#inc{map = NewMap}
-      end
-  end.
-
-inc_warning({F, A}, File) ->
-  io:format("      ***Warning: Skip function ~p/~p ", [F, A]),
-  io:format("in file ~p because of inconsistent type\n", [File]).
-
-clean_inc(Inc) ->
-  Inc1 = remove_yecc_generated_file(Inc),
-  normalize_obj(Inc1).
-
-remove_yecc_generated_file(#inc{filter = Filter} = Inc) ->
-  Fun = fun (Key, #inc{map = Map} = I) ->
-	    I#inc{map = map__remove(Key, Map)}
-	end,
-  lists:foldl(Fun, Inc, Filter).
-
-normalize_obj(TmpInc) ->
-  Fun = fun (Key, Val, Inc) ->
-	    NewVal = [{{Line,F,A},Type} || {{F,A},{Line,Type}} <- Val],
-	    map__insert({Key, NewVal}, Inc)
-	end,
-  TmpInc#inc{map = map__fold(Fun, map__new(), TmpInc#inc.map)}.
-
-get_records(File, Analysis) ->
-  map__lookup(File, Analysis#analysis.record).
-
-get_types(Module, Analysis, Records) ->
-  TypeInfoPlt = Analysis#analysis.trust_plt,
-  TypeInfo = 
-    case dialyzer_plt:lookup_module(TypeInfoPlt, Module) of
-      none -> [];
-      {value, List} -> List
-    end,
-  CodeServer = Analysis#analysis.codeserver,
-  TypeInfoList =
-    case Analysis#analysis.show_succ of
-      true ->
-	[convert_type_info(I) || I <- TypeInfo];
-      false ->
-	[get_type(I, CodeServer, Records) || I <- TypeInfo]
-    end,
-  map__from_list(TypeInfoList).
-
-convert_type_info({{_M, F, A}, Range, Arg}) ->
-  {{F, A}, {Range, Arg}}.
-
-get_type({{M, F, A} = MFA, Range, Arg}, CodeServer, Records) ->
-  case dialyzer_codeserver:lookup_mfa_contract(MFA, CodeServer) of
-    error ->
-      {{F, A}, {Range, Arg}};
-    {ok, {_FileLine, Contract, _Xtra}} ->
-      Sig = erl_types:t_fun(Arg, Range),
-      case dialyzer_contracts:check_contract(Contract, Sig) of
-	ok -> {{F, A}, {contract, Contract}};
-	{error, {extra_range, _, _}} ->
-	  {{F, A}, {contract, Contract}};
-	{error, {overlapping_contract, []}} ->
-	  {{F, A}, {contract, Contract}};
-	{error, invalid_contract} ->
-	  CString = dialyzer_contracts:contract_to_string(Contract),
-	  SigString = dialyzer_utils:format_sig(Sig, Records),
-	  Msg = io_lib:format("Error in contract of function ~w:~w/~w\n" 
-			      "\t The contract is: " ++ CString ++ "\n" ++
-			      "\t but the inferred signature is: ~s",
-			      [M, F, A, SigString]),
-	  fatal_error(Msg);
-	{error, ErrorStr} when is_list(ErrorStr) -> % ErrorStr is a string()
-	  Msg = io_lib:format("Error in contract of function ~w:~w/~w: ~s",
-			      [M, F, A, ErrorStr]),
-	  fatal_error(Msg)
-      end
-  end.
-
-get_functions(File, Analysis) ->
-  case Analysis#analysis.mode of
-    ?SHOW ->
-      Funcs = map__lookup(File, Analysis#analysis.func),
-      Inc_Funcs = map__lookup(File, Analysis#analysis.inc_func),
-      remove_module_info(Funcs) ++ normalize_incFuncs(Inc_Funcs);
-    ?SHOW_EXPORTED ->
-      Ex_Funcs = map__lookup(File, Analysis#analysis.ex_func),
-      remove_module_info(Ex_Funcs);
-    ?ANNOTATE ->
-      Funcs = map__lookup(File, Analysis#analysis.func),
-      remove_module_info(Funcs);
-    ?ANNOTATE_INC_FILES ->
-      map__lookup(File, Analysis#analysis.inc_func)
-  end.
-
-normalize_incFuncs(Functions) ->
-  [FunInfo || {_FileName, FunInfo} <- Functions].
-
--spec remove_module_info([func_info()]) -> [func_info()].
-
-remove_module_info(FunInfoList) ->
-  F = fun ({_,module_info,0}) -> false;
-	  ({_,module_info,1}) -> false;
-	  ({Line,F,A}) when is_integer(Line), is_atom(F), is_integer(A) -> true
-      end,
-  lists:filter(F, FunInfoList).
-
-write_typed_file(File, Info) ->
-  io:format("      Processing file: ~p\n", [File]),
-  Dir = filename:dirname(File),
-  RootName = filename:basename(filename:rootname(File)),
-  Ext = filename:extension(File),
-  TyperAnnDir = filename:join(Dir, ?TYPER_ANN_DIR),
-  TmpNewFilename = lists:concat([RootName, ".ann", Ext]),
-  NewFileName = filename:join(TyperAnnDir, TmpNewFilename),
-  case file:make_dir(TyperAnnDir) of
-    {error, Reason} ->
-      case Reason of
-	eexist -> %% TypEr dir exists; remove old typer files if they exist
-	  case file:delete(NewFileName) of
-	    ok -> ok;
-	    {error, enoent} -> ok;
-	    {error, _} ->
-	      Msg = io_lib:format("Error in deleting file ~s\n", [NewFileName]),
-	      fatal_error(Msg)
-	  end,
-	  write_typed_file(File, Info, NewFileName);
-	enospc ->
-	  Msg = io_lib:format("Not enough space in ~p\n", [Dir]),
-	  fatal_error(Msg);
-	eacces ->
-	  Msg = io_lib:format("No write permission in ~p\n", [Dir]),
-	  fatal_error(Msg);
-	_ ->
-	  Msg = io_lib:format("Unhandled error ~s when writing ~p\n",
-			      [Reason, Dir]),
-	  fatal_error(Msg)
-      end;
-    ok -> %% Typer dir does NOT exist
-      write_typed_file(File, Info, NewFileName)
-  end.
-
-write_typed_file(File, Info, NewFileName) ->
-  {ok, Binary} = file:read_file(File),
-  Chars = binary_to_list(Binary),
-  write_typed_file(Chars, NewFileName, Info, 1, []),
-  io:format("             Saved as: ~p\n", [NewFileName]).
-
-write_typed_file(Chars, File, #info{functions = []}, _LNo, _Acc) ->
-  ok = file:write_file(File, list_to_binary(Chars), [append]);
-write_typed_file([Ch|Chs] = Chars, File, Info, LineNo, Acc) ->
-  [{Line,F,A}|RestFuncs] = Info#info.functions,
-  case Line of
-    1 -> %% This will happen only for inc files
-      ok = raw_write(F, A, Info, File, []),
-      NewInfo = Info#info{functions = RestFuncs},
-      NewAcc = [],
-      write_typed_file(Chars, File, NewInfo, Line, NewAcc);
-    _ ->
-      case Ch of
-	10 ->
-	  NewLineNo = LineNo + 1,
-	  {NewInfo, NewAcc} =
-	    case NewLineNo of
-	      Line ->
-		ok = raw_write(F, A, Info, File, [Ch|Acc]),
-		{Info#info{functions = RestFuncs}, []};
-	      _ ->
-		{Info, [Ch|Acc]}
-	    end,
-	  write_typed_file(Chs, File, NewInfo, NewLineNo, NewAcc);
-	_ ->
-	  write_typed_file(Chs, File, Info, LineNo, [Ch|Acc])
-      end
-  end.
-
-raw_write(F, A, Info, File, Content) ->
-  TypeInfo = get_type_string(F, A, Info, file),
-  ContentList = lists:reverse(Content) ++ TypeInfo ++ "\n",
-  ContentBin = list_to_binary(ContentList),
-  file:write_file(File, ContentBin, [append]).
-
-get_type_string(F, A, Info, Mode) ->
-  Type = get_type_info({F,A}, Info#info.types),
-  TypeStr =
-    case Type of
-      {contract, C} -> 
-        dialyzer_contracts:contract_to_string(C);
-      {RetType, ArgType} ->
-	Sig = erl_types:t_fun(ArgType, RetType),
-        dialyzer_utils:format_sig(Sig, Info#info.records)
-    end,
-  case Info#info.edoc of
-    false ->
-      case {Mode, Type} of
-	{file, {contract, _}} -> "";
-	_ ->
-	  Prefix = lists:concat(["-spec ", erl_types:atom_to_string(F)]),
-	  lists:concat([Prefix, TypeStr, "."])
-      end;
-    true ->
-      Prefix = lists:concat(["%% @spec ", F]),
-      lists:concat([Prefix, TypeStr, "."])
-  end.
- 
-show_type_info(File, Info) ->
-  io:format("\n%% File: ~p\n%% ", [File]),
-  OutputString = lists:concat(["~.", length(File)+8, "c~n"]),
-  io:fwrite(OutputString, [$-]),
-  Fun = fun ({_LineNo, F, A}) ->
-	    TypeInfo = get_type_string(F, A, Info, show),
-	    io:format("~s\n", [TypeInfo])
-	end,
-  lists:foreach(Fun, Info#info.functions).
-
-get_type_info(Func, Types) ->
-  case map__lookup(Func, Types) of
-    none ->
-      %% Note: Typeinfo of any function should exist in
-      %% the result offered by dialyzer, otherwise there 
-      %% *must* be something wrong with the analysis
-      Msg = io_lib:format("No type info for function: ~p\n", [Func]),
-      fatal_error(Msg);
-    {contract, _Fun} = C -> C;
-    {_RetType, _ArgType} = RA -> RA 
-  end.
-
-%%--------------------------------------------------------------------
-%% Processing of command-line options and arguments.
-%%--------------------------------------------------------------------
-
--spec process_cl_args() -> {args(), analysis()}.
-
-process_cl_args() ->
-  ArgList = init:get_plain_arguments(),
-  %% io:format("Args is ~p\n", [ArgList]),
-  {Args, Analysis} = analyze_args(ArgList, #args{}, #analysis{}),
-  %% if the mode has not been set, set it to the default mode (show)
-  {Args, case Analysis#analysis.mode of
-	   undefined -> Analysis#analysis{mode = ?SHOW};
-	   Mode when is_atom(Mode) -> Analysis
-	 end}.
-
-analyze_args([], Args, Analysis) ->
-  {Args, Analysis};
-analyze_args(ArgList, Args, Analysis) ->
-  {Result, Rest} = cl(ArgList),
-  {NewArgs, NewAnalysis} = analyze_result(Result, Args, Analysis),
-  analyze_args(Rest, NewArgs, NewAnalysis).
-
-cl(["-h"|_])     -> help_message();
-cl(["--help"|_]) -> help_message();
-cl(["-v"|_])        -> version_message();
-cl(["--version"|_]) -> version_message();
-cl(["--edoc"|Opts]) -> {edoc, Opts};
-cl(["--show"|Opts]) -> {{mode, ?SHOW}, Opts};
-cl(["--show_exported"|Opts]) -> {{mode, ?SHOW_EXPORTED}, Opts};
-cl(["--show-exported"|Opts]) -> {{mode, ?SHOW_EXPORTED}, Opts};
-cl(["--show_success_typings"|Opts]) -> {show_succ, Opts};
-cl(["--show-success-typings"|Opts]) -> {show_succ, Opts};
-cl(["--annotate"|Opts]) -> {{mode, ?ANNOTATE}, Opts};
-cl(["--annotate-inc-files"|Opts]) -> {{mode, ?ANNOTATE_INC_FILES}, Opts};
-cl(["--no_spec"|Opts]) -> {no_spec, Opts};
-cl(["--plt",Plt|Opts]) -> {{plt, Plt}, Opts};
-cl(["-D"++Def|Opts]) ->
-  case Def of
-    "" -> fatal_error("no variable name specified after -D");
-    _ ->
-      DefPair = process_def_list(re:split(Def, "=", [{return, list}])),
-      {{def, DefPair}, Opts}
-  end;
-cl(["-I",Dir|Opts]) -> {{inc, Dir}, Opts};
-cl(["-I"++Dir|Opts]) ->
-  case Dir of
-    "" -> fatal_error("no include directory specified after -I");
-    _ -> {{inc, Dir}, Opts}
-  end;
-cl(["-T"|Opts]) ->
-  {Files, RestOpts} = dialyzer_cl_parse:collect_args(Opts),
-  case Files of
-    [] -> fatal_error("no file or directory specified after -T");
-    [_|_] -> {{trusted, Files}, RestOpts}
-  end;
-cl(["-r"|Opts]) ->
-  {Files, RestOpts} = dialyzer_cl_parse:collect_args(Opts),
-  {{files_r, Files}, RestOpts};
-cl(["-pa",Dir|Opts]) -> {{pa,Dir}, Opts};
-cl(["-pz",Dir|Opts]) -> {{pz,Dir}, Opts};
-cl(["-"++H|_]) -> fatal_error("unknown option -"++H);
-cl(Opts) -> 
-  {Files, RestOpts} = dialyzer_cl_parse:collect_args(Opts),
-  {{files, Files}, RestOpts}.
-
-process_def_list(L) ->
-  case L of
-    [Name, Value] ->
-      {ok, Tokens, _} = erl_scan:string(Value ++ "."),
-      {ok, ErlValue} = erl_parse:parse_term(Tokens),
-      {list_to_atom(Name), ErlValue};
-    [Name] ->
-      {list_to_atom(Name), true}
-  end.
-
-%% Get information about files that the user trusts and wants to analyze
-analyze_result({files, Val}, Args, Analysis) ->
-  NewVal = Args#args.files ++ Val,
-  {Args#args{files = NewVal}, Analysis};
-analyze_result({files_r, Val}, Args, Analysis) ->
-  NewVal = Args#args.files_r ++ Val,
-  {Args#args{files_r = NewVal}, Analysis};
-analyze_result({trusted, Val}, Args, Analysis) ->
-  NewVal = Args#args.trusted ++ Val,
-  {Args#args{trusted = NewVal}, Analysis};
-analyze_result(edoc, Args, Analysis) ->
-  {Args, Analysis#analysis{edoc = true}};
-%% Get useful information for actual analysis
-analyze_result({mode, Mode}, Args, Analysis) ->
-  case Analysis#analysis.mode of
-    undefined -> {Args, Analysis#analysis{mode = Mode}};
-    OldMode -> mode_error(OldMode, Mode)
-  end;
-analyze_result({def, Val}, Args, Analysis) ->
-  NewVal = Analysis#analysis.macros ++ [Val],
-  {Args, Analysis#analysis{macros = NewVal}};
-analyze_result({inc, Val}, Args, Analysis) ->
-  NewVal = Analysis#analysis.includes ++ [Val],
-  {Args, Analysis#analysis{includes = NewVal}};
-analyze_result({plt, Plt}, Args, Analysis) ->
-  {Args, Analysis#analysis{plt = Plt}};
-analyze_result(show_succ, Args, Analysis) ->
-  {Args, Analysis#analysis{show_succ = true}};
-analyze_result(no_spec, Args, Analysis) ->
-  {Args, Analysis#analysis{no_spec = true}};
-analyze_result({pa, Dir}, Args, Analysis) ->
-  true = code:add_patha(Dir),
-  {Args, Analysis};
-analyze_result({pz, Dir}, Args, Analysis) ->
-  true = code:add_pathz(Dir),
-  {Args, Analysis}.
-
-%%--------------------------------------------------------------------
-%% File processing.
-%%--------------------------------------------------------------------
-
--spec get_all_files(args()) -> [file:filename(),...].
-
-get_all_files(#args{files = Fs, files_r = Ds}) ->
-  case filter_fd(Fs, Ds, fun test_erl_file_exclude_ann/1) of
-    [] -> fatal_error("no file(s) to analyze");
-    AllFiles -> AllFiles
-  end.
-
--spec test_erl_file_exclude_ann(file:filename()) -> boolean().
-
-test_erl_file_exclude_ann(File) ->
-  case is_erl_file(File) of
-    true -> %% Exclude files ending with ".ann.erl"
-      case re:run(File, "[\.]ann[\.]erl$") of
-	{match, _} -> false;
-	nomatch -> true
-      end;
-    false -> false
-  end.
-
--spec is_erl_file(file:filename()) -> boolean().
-
-is_erl_file(File) ->
-  filename:extension(File) =:= ".erl".
-
--type test_file_fun() :: fun((file:filename()) -> boolean()).
-
--spec filter_fd(files(), files(), test_file_fun()) -> files().
-
-filter_fd(File_Dir, Dir_R, Fun) ->
-  All_File_1 = process_file_and_dir(File_Dir, Fun),
-  All_File_2 = process_dir_rec(Dir_R, Fun),
-  remove_dup(All_File_1 ++ All_File_2).
-
--spec process_file_and_dir(files(), test_file_fun()) -> files().
-
-process_file_and_dir(File_Dir, TestFun) ->
-  Fun =
-    fun (Elem, Acc) ->
-	case filelib:is_regular(Elem) of
-	  true  -> process_file(Elem, TestFun, Acc);
-	  false -> check_dir(Elem, false, Acc, TestFun)
-	end
-    end,
-  lists:foldl(Fun, [], File_Dir).
-
--spec process_dir_rec(files(), test_file_fun()) -> files().
-
-process_dir_rec(Dirs, TestFun) ->
-  Fun = fun (Dir, Acc) -> check_dir(Dir, true, Acc, TestFun) end,
-  lists:foldl(Fun, [], Dirs).
-
--spec check_dir(file:filename(), boolean(), files(), test_file_fun()) -> files().
-
-check_dir(Dir, Recursive, Acc, Fun) ->
-  case file:list_dir(Dir) of
-    {ok, Files} ->
-      {TmpDirs, TmpFiles} = split_dirs_and_files(Files, Dir),
-      case Recursive of
-	false ->
-	  FinalFiles = process_file_and_dir(TmpFiles, Fun),
-	  Acc ++ FinalFiles;
-	true ->
-	  TmpAcc1 = process_file_and_dir(TmpFiles, Fun),
-	  TmpAcc2 = process_dir_rec(TmpDirs, Fun),
-	  Acc ++ TmpAcc1 ++ TmpAcc2
-      end;
-    {error, eacces} ->
-      fatal_error("no access permission to dir \""++Dir++"\"");
-    {error, enoent} ->
-      fatal_error("cannot access "++Dir++": No such file or directory");
-    {error, _Reason} ->
-      fatal_error("error involving a use of file:list_dir/1")
-  end.
-
-%% Same order as the input list
--spec process_file(file:filename(), test_file_fun(), files()) -> files().
-
-process_file(File, TestFun, Acc) ->
-  case TestFun(File) of
-    true  -> Acc ++ [File];
-    false -> Acc
-  end.
-
-%% Same order as the input list
--spec split_dirs_and_files(files(), file:filename()) -> {files(), files()}.
-
-split_dirs_and_files(Elems, Dir) ->
-  Test_Fun =
-    fun (Elem, {DirAcc, FileAcc}) ->
-	File = filename:join(Dir, Elem),
-	case filelib:is_regular(File) of
-	  false -> {[File|DirAcc], FileAcc}; 
-	  true  -> {DirAcc, [File|FileAcc]}
-	end
-    end,
-  {Dirs, Files} = lists:foldl(Test_Fun, {[], []}, Elems),
-  {lists:reverse(Dirs), lists:reverse(Files)}.  
-
-%% Removes duplicate filenames but keeps the order of the input list
--spec remove_dup(files()) -> files().
-
-remove_dup(Files) ->
-  Test_Dup = fun (File, Acc) ->
-		 case lists:member(File, Acc) of
-		   true  -> Acc;
-		   false -> [File|Acc]
-		 end
-	     end,
-  Reversed_Elems = lists:foldl(Test_Dup, [], Files),
-  lists:reverse(Reversed_Elems).
-
-%%--------------------------------------------------------------------
-%% Collect information.
-%%--------------------------------------------------------------------
-
--type inc_file_info() :: {file:filename(), func_info()}.
-
--record(tmpAcc, {file		  :: file:filename(),
-		 module		  :: atom(),
-		 funcAcc = []	  :: [func_info()],
-		 incFuncAcc = []  :: [inc_file_info()],
-		 dialyzerObj = [] :: [{mfa(), {_, _}}]}).
-
--spec collect_info(analysis()) -> analysis().
-
-collect_info(Analysis) ->
-  NewPlt =
-    try get_dialyzer_plt(Analysis) of
-	DialyzerPlt ->
-	dialyzer_plt:merge_plts([Analysis#analysis.trust_plt, DialyzerPlt])
-    catch
-      throw:{dialyzer_error,_Reason} ->
-	fatal_error("Dialyzer's PLT is missing or is not up-to-date; please (re)create it")
-    end,
-  NewAnalysis = lists:foldl(fun collect_one_file_info/2, 
-			    Analysis#analysis{trust_plt = NewPlt}, 
-			    Analysis#analysis.files),
-  %% Process Remote Types
-  TmpCServer = NewAnalysis#analysis.codeserver,
-  NewCServer =
-    try
-      TmpCServer1 = dialyzer_utils:merge_types(TmpCServer, NewPlt),
-      NewExpTypes = dialyzer_codeserver:get_temp_exported_types(TmpCServer),
-      OldExpTypes = dialyzer_plt:get_exported_types(NewPlt),
-      MergedExpTypes = sets:union(NewExpTypes, OldExpTypes),
-      TmpCServer2 =
-        dialyzer_codeserver:finalize_exported_types(MergedExpTypes, TmpCServer1),
-      TmpCServer3 = dialyzer_utils:process_record_remote_types(TmpCServer2),
-      dialyzer_contracts:process_contract_remote_types(TmpCServer3)
-    catch
-      throw:{error, ErrorMsg} ->
-	fatal_error(ErrorMsg)
-    end,
-  NewAnalysis#analysis{codeserver = NewCServer}.
-
-collect_one_file_info(File, Analysis) ->
-  Ds = [{d,Name,Val} || {Name,Val} <- Analysis#analysis.macros],
-  %% Current directory should also be included in "Includes".
-  Includes = [filename:dirname(File)|Analysis#analysis.includes],
-  Is = [{i,Dir} || Dir <- Includes],
-  Options = dialyzer_utils:src_compiler_opts() ++ Is ++ Ds,
-  case dialyzer_utils:get_abstract_code_from_src(File, Options) of
-    {error, Reason} ->
-      %% io:format("File=~p\n,Options=~p\n,Error=~p\n", [File,Options,Reason]),
-      compile_error(Reason);
-    {ok, AbstractCode} ->
-      case dialyzer_utils:get_core_from_abstract_code(AbstractCode, Options) of
-	error -> compile_error(["Could not get core erlang for "++File]);
-	{ok, Core} ->
-	  case dialyzer_utils:get_record_and_type_info(AbstractCode) of
-	    {error, Reason} -> compile_error([Reason]);
-	    {ok, Records} ->
-	      Mod = cerl:concrete(cerl:module_name(Core)),
-	      case dialyzer_utils:get_spec_info(Mod, AbstractCode, Records) of
-		{error, Reason} -> compile_error([Reason]);
-		{ok, SpecInfo, CbInfo} ->
-                  ExpTypes = get_exported_types_from_core(Core),
-		  analyze_core_tree(Core, Records, SpecInfo, CbInfo,
-				    ExpTypes, Analysis, File)
-	      end
-	  end
-      end
-  end.
-
-analyze_core_tree(Core, Records, SpecInfo, CbInfo, ExpTypes, Analysis, File) ->
-  Module = cerl:concrete(cerl:module_name(Core)),
-  TmpTree = cerl:from_records(Core),
-  CS1 = Analysis#analysis.codeserver,
-  NextLabel = dialyzer_codeserver:get_next_core_label(CS1),
-  {Tree, NewLabel} = cerl_trees:label(TmpTree, NextLabel),
-  CS2 = dialyzer_codeserver:insert(Module, Tree, CS1),
-  CS3 = dialyzer_codeserver:set_next_core_label(NewLabel, CS2),
-  CS4 = dialyzer_codeserver:store_temp_records(Module, Records, CS3),
-  CS5 =
-    case Analysis#analysis.no_spec of
-      true -> CS4;
-      false ->
-	dialyzer_codeserver:store_temp_contracts(Module, SpecInfo, CbInfo, CS4)
-    end,
-  OldExpTypes = dialyzer_codeserver:get_temp_exported_types(CS5),
-  MergedExpTypes = sets:union(ExpTypes, OldExpTypes),
-  CS6 = dialyzer_codeserver:insert_temp_exported_types(MergedExpTypes, CS5),
-  Ex_Funcs = [{0,F,A} || {_,_,{F,A}} <- cerl:module_exports(Tree)],
-  CG = Analysis#analysis.callgraph,
-  {V, E} = dialyzer_callgraph:scan_core_tree(Tree, CG),
-  dialyzer_callgraph:add_edges(E, V, CG),
-  Fun = fun analyze_one_function/2,
-  All_Defs = cerl:module_defs(Tree),
-  Acc = lists:foldl(Fun, #tmpAcc{file = File, module = Module}, All_Defs),
-  Exported_FuncMap = map__insert({File, Ex_Funcs}, Analysis#analysis.ex_func),
-  %% we must sort all functions in the file which
-  %% originate from this file by *numerical order* of lineNo
-  Sorted_Functions = lists:keysort(1, Acc#tmpAcc.funcAcc),
-  FuncMap = map__insert({File, Sorted_Functions}, Analysis#analysis.func),
-  %% we do not need to sort functions which are imported from included files
-  IncFuncMap = map__insert({File, Acc#tmpAcc.incFuncAcc},
-			   Analysis#analysis.inc_func),
-  FMs = Analysis#analysis.fms ++ [{File, Module}],
-  RecordMap = map__insert({File, Records}, Analysis#analysis.record),
-  Analysis#analysis{fms = FMs,
-		    callgraph = CG,
-		    codeserver = CS6,
-		    ex_func = Exported_FuncMap,
-		    inc_func = IncFuncMap,
-		    record = RecordMap,
-		    func = FuncMap}.
-
-analyze_one_function({Var, FunBody} = Function, Acc) ->
-  F = cerl:fname_id(Var),
-  A = cerl:fname_arity(Var),
-  TmpDialyzerObj = {{Acc#tmpAcc.module, F, A}, Function},
-  NewDialyzerObj = Acc#tmpAcc.dialyzerObj ++ [TmpDialyzerObj],  
-  Anno = cerl:get_ann(FunBody),
-  LineNo = get_line(Anno),
-  FileName = get_file(Anno),
-  BaseName = filename:basename(FileName),
-  FuncInfo = {LineNo, F, A},
-  OriginalName = Acc#tmpAcc.file,
-  {FuncAcc, IncFuncAcc} =
-    case (FileName =:= OriginalName) orelse (BaseName =:= OriginalName) of
-      true -> %% Coming from original file
-	%% io:format("Added function ~p\n", [{LineNo, F, A}]),
-	{Acc#tmpAcc.funcAcc ++ [FuncInfo], Acc#tmpAcc.incFuncAcc};
-      false ->
-	%% Coming from other sourses, including:
-	%%     -- .yrl (yecc-generated file)
-	%%     -- yeccpre.hrl (yecc-generated file)
-	%%     -- other cases
-	{Acc#tmpAcc.funcAcc, Acc#tmpAcc.incFuncAcc ++ [{FileName, FuncInfo}]}
-    end,
-  Acc#tmpAcc{funcAcc = FuncAcc,
-	     incFuncAcc = IncFuncAcc,
-	     dialyzerObj = NewDialyzerObj}.
-
-get_line([Line|_]) when is_integer(Line) -> Line;
-get_line([_|T]) -> get_line(T);
-get_line([]) -> none.
-
-get_file([{file,File}|_]) -> File;
-get_file([_|T]) -> get_file(T);
-get_file([]) -> "no_file". % should not happen
-
--spec get_dialyzer_plt(analysis()) -> plt().
-
-get_dialyzer_plt(#analysis{plt = PltFile0}) ->
-  PltFile =
-    case PltFile0 =:= none of
-      true -> dialyzer_plt:get_default_plt();
-      false -> PltFile0
-    end,
-  dialyzer_plt:from_file(PltFile).
-
-%% Exported Types
-
-get_exported_types_from_core(Core) ->
-  Attrs = cerl:module_attrs(Core),
-  ExpTypes1 = [cerl:concrete(L2) || {L1, L2} <- Attrs,
-                                    cerl:is_literal(L1),
-                                    cerl:is_literal(L2),
-                                    cerl:concrete(L1) =:= 'export_type'],
-  ExpTypes2 = lists:flatten(ExpTypes1),
-  M = cerl:atom_val(cerl:module_name(Core)),
-  sets:from_list([{M, F, A} || {F, A} <- ExpTypes2]).
-
-%%--------------------------------------------------------------------
-%% Utilities for error reporting.
-%%--------------------------------------------------------------------
-
--spec fatal_error(string()) -> no_return().
-
-fatal_error(Slogan) ->
-  msg(io_lib:format("typer: ~s\n", [Slogan])),
-  erlang:halt(1).
-
--spec mode_error(mode(), mode()) -> no_return().
-
-mode_error(OldMode, NewMode) ->
-  Msg = io_lib:format("Mode was previously set to '~s'; "
-		      "can not set it to '~s' now",
-		      [OldMode, NewMode]),
-  fatal_error(Msg).
-
--spec compile_error([string()]) -> no_return().
-
-compile_error(Reason) ->
-  JoinedString = lists:flatten([X ++ "\n" || X <- Reason]),
-  Msg = "Analysis failed with error report:\n" ++ JoinedString,
-  fatal_error(Msg).
-
--spec msg(string()) -> 'ok'.
-
-msg(Msg) ->
-  io:format(standard_error, "~s", [Msg]).
-
-%%--------------------------------------------------------------------
-%% Version and help messages.
-%%--------------------------------------------------------------------
-
--spec version_message() -> no_return().
-
-version_message() ->
-  io:format("TypEr version "++?VSN++"\n"),
-  erlang:halt(0).
-
--spec help_message() -> no_return().
-
-help_message() ->
-  S = <<" Usage: typer [--help] [--version] [--plt PLT] [--edoc]
-              [--show | --show-exported | --annotate | --annotate-inc-files]
-              [-Ddefine]* [-I include_dir]* [-pa dir]* [-pz dir]*
-              [-T application]* [-r] file*
-
- Options:
-   -r dir*
-       search directories recursively for .erl files below them
-   --show
-       Prints type specifications for all functions on stdout.
-       (this is the default behaviour; this option is not really needed)
-   --show-exported (or --show_exported)
-       Same as --show, but prints specifications for exported functions only
-       Specs are displayed sorted alphabetically on the function's name
-   --annotate
-       Annotates the specified files with type specifications
-   --annotate-inc-files
-       Same as --annotate but annotates all -include() files as well as
-       all .erl files (use this option with caution - has not been tested much)
-   --edoc
-       Prints type information as Edoc @spec comments, not as type specs
-   --plt PLT
-       Use the specified dialyzer PLT file rather than the default one
-   -T file*
-       The specified file(s) already contain type specifications and these
-       are to be trusted in order to print specs for the rest of the files
-       (Multiple files or dirs, separated by spaces, can be specified.)
-   -Dname (or -Dname=value)
-       pass the defined name(s) to TypEr
-       (The syntax of defines is the same as that used by \"erlc\".)
-   -I include_dir
-       pass the include_dir to TypEr
-       (The syntax of includes is the same as that used by \"erlc\".)
-   -pa dir
-   -pz dir
-       Set code path options to TypEr
-       (This is useful for files that use parse tranforms.)
-   --version (or -v)
-       prints the Typer version and exits
-   --help (or -h)
-       prints this message and exits
-
- Note:
-   * denotes that multiple occurrences of these options are possible.
-">>,
-  io:put_chars(S),
-  erlang:halt(0).
-
-%%--------------------------------------------------------------------
-%% Handle messages.                         
-%%-------------------------------------------------------------------- 
-
-rcv_ext_types() ->
-  Self = self(),
-  Self ! {Self, done},
-  rcv_ext_types(Self, []).
-
-rcv_ext_types(Self, ExtTypes) ->
-  receive
-    {Self, ext_types, ExtType} ->
-      rcv_ext_types(Self, [ExtType|ExtTypes]);
-    {Self, done} ->
-      lists:usort(ExtTypes)
-  end.
-
-%%--------------------------------------------------------------------
-%% A convenient abstraction of a Key-Value mapping data structure
-%% specialized for the uses in this module
-%%--------------------------------------------------------------------
-
--type map_dict() :: dict:dict().
-
--spec map__new() -> map_dict().
-map__new() ->
-  dict:new().
-
--spec map__insert({term(), term()}, map_dict()) -> map_dict().
-map__insert(Object, Map) ->
-  {Key, Value} = Object,
-  dict:store(Key, Value, Map).
-
--spec map__lookup(term(), map_dict()) -> term().
-map__lookup(Key, Map) ->
-  try dict:fetch(Key, Map) catch error:_ -> none end.
-
--spec map__from_list([{fa(), term()}]) -> map_dict().
-map__from_list(List) ->
-  dict:from_list(List).
-
--spec map__remove(term(), map_dict()) -> map_dict().
-map__remove(Key, Dict) ->
-  dict:erase(Key, Dict).
-
--spec map__fold(fun((term(), term(), term()) -> map_dict()), map_dict(), map_dict()) -> map_dict().
-map__fold(Fun, Acc0, Dict) -> 
-  dict:fold(Fun, Acc0, Dict).
diff --git a/lib/typer/test/Makefile b/lib/typer/test/Makefile
deleted file mode 100644
index fb5570d9f0..0000000000
--- a/lib/typer/test/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES= \
-	typer_SUITE
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
-INSTALL_PROGS= $(TARGET_FILES)
-
-EMAKEFILE=Emakefile
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/typer_test
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-
-ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS +=
-
-EBIN = .
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-make_emakefile:
-	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) \
-	> $(EMAKEFILE)
-	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' \
-	>> $(EMAKEFILE)
-
-tests debug opt: make_emakefile
-	erl $(ERL_MAKE_FLAGS) -make
-
-clean:
-	rm -f $(EMAKEFILE)
-	rm -f $(TARGET_FILES) $(GEN_FILES)
-	rm -f core
-
-docs:
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-
-release_tests_spec: make_emakefile
-	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) "$(RELSYSDIR)"
-	$(INSTALL_DATA) typer.spec "$(RELSYSDIR)"
-	chmod -R u+w "$(RELSYSDIR)"
-
-release_docs_spec:
diff --git a/lib/typer/test/typer.spec b/lib/typer/test/typer.spec
deleted file mode 100644
index 79f51b6781..0000000000
--- a/lib/typer/test/typer.spec
+++ /dev/null
@@ -1 +0,0 @@
-{suites,"../typer_test",all}.
diff --git a/lib/typer/test/typer_SUITE.erl b/lib/typer/test/typer_SUITE.erl
deleted file mode 100644
index 25f0229640..0000000000
--- a/lib/typer/test/typer_SUITE.erl
+++ /dev/null
@@ -1,57 +0,0 @@
-%% ``Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%%
--module(typer_SUITE).
-
--compile([export_all]).
--include_lib("common_test/include/ct.hrl").
-
-suite() ->
-    [{ct_hooks, [ts_install_cth]}].
-
-all() ->
-    case application:ensure_all_started(typer) of
-        {ok, Apps} ->
-            [application:stop(App) || App <- lists:reverse(Apps)],
-            [app, appup];
-        _ ->
-            [appup]
-    end.
-
-groups() ->
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-     ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-app() ->
-    [{doc, "Test that the typer app file is ok"}].
-app(Config) when is_list(Config) ->
-    ok = ?t:app_test(typer).
-
-appup() ->
-    [{doc, "Test that the typer appup file is ok"}].
-appup(Config) when is_list(Config) ->
-    ok = ?t:appup_test(typer).
diff --git a/lib/typer/vsn.mk b/lib/typer/vsn.mk
deleted file mode 100644
index ed12e067c1..0000000000
--- a/lib/typer/vsn.mk
+++ /dev/null
@@ -1 +0,0 @@
-TYPER_VSN = 0.9.11
diff --git a/system/COPYRIGHT b/system/COPYRIGHT
index ed06dcf69c..db7035bcf9 100644
--- a/system/COPYRIGHT
+++ b/system/COPYRIGHT
@@ -219,23 +219,6 @@ terms specified in this license.
 %% limitations under the License.
 
 ---------------------------------------------------------------------------
-[typer]
-
-%% Copyright 2006-2016 Bingwen He, Tobias Lindahl, Kostis Sagonas
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-
----------------------------------------------------------------------------
 [hipe]
 
 %% Copyright 1997-2016 Erik Stenman (Johansson), Kostis Sagonas,
@@ -356,4 +339,3 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 ---------------------------------------------------------------------------
-[typer]
\ No newline at end of file