diff --git a/include/llvm/SmallVector.h b/3rd_party/llvm/SmallVector.h
similarity index 100%
rename from include/llvm/SmallVector.h
rename to 3rd_party/llvm/SmallVector.h
diff --git a/include/llvm/type_traits.h b/3rd_party/llvm/type_traits.h
similarity index 100%
rename from include/llvm/type_traits.h
rename to 3rd_party/llvm/type_traits.h
diff --git a/include/rapidjson/itoa.h b/3rd_party/rapidjson/itoa.h
similarity index 100%
rename from include/rapidjson/itoa.h
rename to 3rd_party/rapidjson/itoa.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0ef5ee6..8cddb982 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,13 +22,13 @@ set(CMAKE_INSTALL_INCLUDE include CACHE PATH "Output directory for header files"
 set(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries")
 
 include_directories(include)
+include_directories(3rd_party)
 
 FILE(
     GLOB mc_HEADERS
     include/*.h
     include/hashkit/*.h
-    include/llvm/*.h
-    include/rapidjson/*.h
+    3rd_party/rapidjson/*.h
 )
 FILE(
     GLOB mc_SOURCES
diff --git a/misc/.cppcheck-supp b/misc/.cppcheck-supp
index 98143539..6f1d33a4 100644
--- a/misc/.cppcheck-supp
+++ b/misc/.cppcheck-supp
@@ -1,15 +1,3 @@
-*:include/llvm/SmallVector.h:55
-*:include/llvm/SmallVector.h:88
-*:include/llvm/SmallVector.h:134
-*:include/llvm/SmallVector.h:162
-*:include/llvm/SmallVector.h:214
-*:include/llvm/SmallVector.h:515
-*:include/llvm/SmallVector.h:516
-*:include/llvm/SmallVector.h:715
-*:include/llvm/SmallVector.h:718
-*:include/llvm/SmallVector.h:726
-*:include/llvm/SmallVector.h:735
-*:include/llvm/SmallVector.h:796
 unusedFunction:src/Client.cpp:216
 unusedFunction:src/c_client.cpp:90
 unusedFunction:src/c_client.cpp:92
diff --git a/setup.py b/setup.py
index 1ee171cb..29b1b142 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@
 
 sources = (glob("src/*.cpp") +
            ["libmc/_client.pyx"])
-include_dirs = ["include"]
+include_dirs = ["include", "3rd_party"]
 
 COMPILER_FLAGS = ["-fno-strict-aliasing", "-fno-exceptions", "-fno-rtti",
                   "-Wall", "-DMC_USE_SMALL_VECTOR", "-O3", "-DNDEBUG"]
diff --git a/src/golibmc.go b/src/golibmc.go
index 547745e9..7d5631b8 100644
--- a/src/golibmc.go
+++ b/src/golibmc.go
@@ -1,8 +1,8 @@
 package golibmc
 
 /*
-#cgo CFLAGS: -I ./../include
-#cgo CXXFLAGS: -I ./../include
+#cgo CFLAGS: -I ./../include -I ./../3rd_party
+#cgo CXXFLAGS: -I ./../include -I ./../3rd_party
 #include "c_client.h"
 */
 import "C"