diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0b9039b..a3ec4164 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,9 +49,12 @@ add_definitions(${CLANG_DEFINITIONS})
 add_subdirectory(src/lib)
 add_subdirectory(src/external)
 
-add_library(${LIB_PROJECT_NAME} ${LIB_FILES} ${EXTERNAL_FILES})
+set_source_files_properties(${CLANG_FILES} PROPERTIES COMPILE_FLAGS "-fno-rtti")
+
+add_library(${LIB_PROJECT_NAME} ${LIB_FILES} ${CLANG_FILES} ${EXTERNAL_FILES})
 
 create_source_groups(${LIB_FILES})
+create_source_groups(${CLANG_FILES})
 create_source_groups(${EXTERNAL_FILES})
 
 set_target_properties(
diff --git a/cmake/CLANGConfig.cmake b/cmake/CLANGConfig.cmake
index 2825742c..60d91341 100644
--- a/cmake/CLANGConfig.cmake
+++ b/cmake/CLANGConfig.cmake
@@ -3,8 +3,6 @@ execute_process(
 	OUTPUT_VARIABLE CLANG_DEFINITIONS
 )
 
-set(CLANG_DEFINITIONS ${CLANG_DEFINITIONS} "-fno-rtti")
-
 set(CLANG_INCLUDE_DIRS
 	"$ENV{CLANG_DIR}/llvm/tools/clang/include"
 	"$ENV{CLANG_DIR}/build/tools/clang/include"
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 05c879ba..14e382c1 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -1,3 +1,10 @@
+add_files(
+	CLANG_FILES
+
+	data/parser/clang.cpp
+	data/parser/clang.h
+)
+
 add_files(
 	LIB_FILES
 
@@ -25,9 +32,6 @@ add_files(
 	data/access/GraphAccess.cpp
 	data/access/GraphAccess.h
 
-	data/parser/clang.cpp
-	data/parser/clang.h
-
 	data/Edge.cpp
 	data/Edge.h
 	data/Element.cpp