Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision ca207e039a3c4881e7ab829333a6c310abb4962c)
+++ HelenOS.config	(revision d75dc0561c7ce077e18de03f15c1afa664e05d5e)
@@ -298,14 +298,6 @@
 @ "clang" Clang
 @ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
-@ "icc" Intel C Compiler
 @ "gcc_native" GNU C Compiler (native)
-! [PLATFORM=amd64|PLATFORM=ia32|PLATFORM=ia64] COMPILER (choice)
-
-% Compiler
-@ "gcc_cross" GNU C Compiler (cross-compiler)
-@ "clang" Clang
-@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
-@ "gcc_native" GNU C Compiler (native)
-! [PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=sparc64|PLATFORM=riscv64] COMPILER (choice)
+! COMPILER (choice)
 
 % Clang Integrated Assembler
Index: boot/Makefile.build
===================================================================
--- boot/Makefile.build	(revision ca207e039a3c4881e7ab829333a6c310abb4962c)
+++ boot/Makefile.build	(revision d75dc0561c7ce077e18de03f15c1afa664e05d5e)
@@ -52,6 +52,4 @@
 	-pipe
 
-ICC_CFLAGS = -Wall -Wmissing-prototypes -Werror-implicit-function-declaration -wd170
-
 CLANG_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
 	-Werror-implicit-function-declaration -Wwrite-strings \
@@ -78,10 +76,4 @@
 ifeq ($(COMPILER),gcc_helenos)
 	CFLAGS = $(COMMON_CFLAGS) $(GCC_CFLAGS) $(EXTRA_CFLAGS)
-	DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-endif
-
-
-ifeq ($(COMPILER),icc)
-	CFLAGS = $(COMMON_CFLAGS) $(ICC_CFLAGS) $(EXTRA_CFLAGS)
 	DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
Index: contrib/tools/random_check.sh
===================================================================
--- contrib/tools/random_check.sh	(revision ca207e039a3c4881e7ab829333a6c310abb4962c)
+++ contrib/tools/random_check.sh	(revision d75dc0561c7ce077e18de03f15c1afa664e05d5e)
@@ -52,5 +52,4 @@
 		echo "COMPILER=gcc_native" >>"$PRUNE_CONFIG_FILE"
 		echo "COMPILER=gcc_helenos" >>"$PRUNE_CONFIG_FILE"
-		echo "COMPILER=icc" >>"$PRUNE_CONFIG_FILE"
 		;;
 	*|h)
Index: kernel/Makefile
===================================================================
--- kernel/Makefile	(revision ca207e039a3c4881e7ab829333a6c310abb4962c)
+++ kernel/Makefile	(revision d75dc0561c7ce077e18de03f15c1afa664e05d5e)
@@ -92,7 +92,4 @@
 	-Wwrite-strings -pipe
 
-ICC_CFLAGS = -Wall -Wmissing-prototypes \
-	-Werror-implicit-function-declaration -wd170
-
 CLANG_CFLAGS = -std=gnu99 -Wall -Wextra -Wno-unused-parameter \
 	-Wno-missing-field-initializers -Wno-unused-command-line-argument \
@@ -171,10 +168,4 @@
 	DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 	INSTRUMENTATION = -finstrument-functions
-endif
-
-ifeq ($(COMPILER),icc)
-	CFLAGS = $(COMMON_CFLAGS) $(ICC_CFLAGS)
-	DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-	INSTRUMENTATION =
 endif
 
Index: tools/autotool.py
===================================================================
--- tools/autotool.py	(revision ca207e039a3c4881e7ab829333a6c310abb4962c)
+++ tools/autotool.py	(revision d75dc0561c7ce077e18de03f15c1afa664e05d5e)
@@ -893,12 +893,4 @@
 			common['CC_AUTOGEN'] = common['CC']
 		
-		if (config['COMPILER'] == "icc"):
-			check_app([common['CC'], "-V"], "Intel C++ Compiler", "support is experimental")
-			check_gcc(None, "", common, PACKAGE_GCC)
-			check_binutils(None, binutils_prefix, common, PACKAGE_BINUTILS)
-			
-			common['CC'] = "icc"
-			common['CC_AUTOGEN'] = common['CC']
-		
 		if (config['COMPILER'] == "clang"):
 			check_binutils(path, prefix, common, PACKAGE_CROSS)
Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision ca207e039a3c4881e7ab829333a6c310abb4962c)
+++ uspace/Makefile.common	(revision d75dc0561c7ce077e18de03f15c1afa664e05d5e)
@@ -244,8 +244,4 @@
 	-Wwrite-strings -pipe
 
-ICC_CFLAGS = -Wall -Wextra -Wno-clobbered -Wno-unused-parameter \
-	-Wmissing-prototypes -Werror-implicit-function-declaration \
-	-Wwrite-strings -pipe
-
 # -Wno-missing-prototypes is there because it warns about main().
 # This should be fixed elsewhere.
@@ -261,5 +257,4 @@
 ifeq ($(CONFIG_LINE_DEBUG),y)
 	GCC_CFLAGS += -ggdb
-	ICC_CFLAGS += -g
 	CLANG_CFLAGS += -g
 endif
@@ -293,9 +288,4 @@
 ifeq ($(COMPILER),gcc_native)
 	CFLAGS += $(COMMON_CFLAGS) $(GCC_CFLAGS)
-	DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-endif
-
-ifeq ($(COMPILER),icc)
-	CFLAGS += $(COMMON_CFLAGS) $(ICC_CFLAGS)
 	DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif