diff --git a/lib/CompilerDriver/Makefile b/lib/CompilerDriver/Makefile
index a5ecfd5d324..66c6d11552f 100644
--- a/lib/CompilerDriver/Makefile
+++ b/lib/CompilerDriver/Makefile
@@ -22,6 +22,7 @@ else
 endif
 
 REQUIRES_EH := 1
+REQUIRES_RTTI := 1
 
 include $(LEVEL)/Makefile.common
 
diff --git a/lib/System/Makefile b/lib/System/Makefile
index d4fd60eee5f..bb013b9f1f1 100644
--- a/lib/System/Makefile
+++ b/lib/System/Makefile
@@ -10,7 +10,7 @@
 LEVEL = ../..
 LIBRARYNAME = LLVMSystem
 BUILD_ARCHIVE = 1
-
+REQUIRES_RTTI = 1
 include $(LEVEL)/Makefile.config
 
 ifeq ($(HOST_OS),MingW)
diff --git a/lib/VMCore/Makefile b/lib/VMCore/Makefile
index ecadaeeb276..bc5e77d22de 100644
--- a/lib/VMCore/Makefile
+++ b/lib/VMCore/Makefile
@@ -9,7 +9,7 @@
 LEVEL = ../..
 LIBRARYNAME = LLVMCore
 BUILD_ARCHIVE = 1
-#CXXFLAGS = -fno-rtti
+REQUIRES_RTTI = 1
 
 BUILT_SOURCES = $(PROJ_OBJ_ROOT)/include/llvm/Intrinsics.gen
 
diff --git a/tools/llvmc/Makefile b/tools/llvmc/Makefile
index df91728ea36..8f995265d2c 100644
--- a/tools/llvmc/Makefile
+++ b/tools/llvmc/Makefile
@@ -11,6 +11,7 @@ LEVEL = ../..
 
 export LLVMC_BASED_DRIVER_NAME = llvmc
 export LLVMC_BUILTIN_PLUGINS = Base Clang
+REQUIRES_RTTI = 1
 
 DIRS = plugins driver