Index: libcxxabi/trunk/src/config.h
===================================================================
--- libcxxabi/trunk/src/config.h
+++ libcxxabi/trunk/src/config.h
@@ -1,17 +0,0 @@
-//===----------------------------- config.h -------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//
-//  Defines macros used within the libc++abi project.
-//
-//===----------------------------------------------------------------------===//
-
-
-#ifndef LIBCXXABI_CONFIG_H
-#define LIBCXXABI_CONFIG_H
-
-#endif // LIBCXXABI_CONFIG_H
Index: libcxxabi/trunk/src/cxa_default_handlers.cpp
===================================================================
--- libcxxabi/trunk/src/cxa_default_handlers.cpp
+++ libcxxabi/trunk/src/cxa_default_handlers.cpp
@@ -14,7 +14,6 @@
 #include <exception>
 #include <cstdlib>
 #include "abort_message.h"
-#include "config.h" // For __sync_swap
 #include "cxxabi.h"
 #include "cxa_handlers.hpp"
 #include "cxa_exception.hpp"
Index: libcxxabi/trunk/src/cxa_exception.cpp
===================================================================
--- libcxxabi/trunk/src/cxa_exception.cpp
+++ libcxxabi/trunk/src/cxa_exception.cpp
@@ -11,7 +11,6 @@
 //  
 //===----------------------------------------------------------------------===//
 
-#include "config.h"
 #include "cxxabi.h"
 
 #include <exception>        // for std::terminate
Index: libcxxabi/trunk/src/cxa_exception_storage.cpp
===================================================================
--- libcxxabi/trunk/src/cxa_exception_storage.cpp
+++ libcxxabi/trunk/src/cxa_exception_storage.cpp
@@ -13,7 +13,6 @@
 
 #include "cxa_exception.hpp"
 
-#include "config.h"
 #include <__threading_support>
 
 #if defined(_LIBCXXABI_HAS_NO_THREADS)
Index: libcxxabi/trunk/src/cxa_guard.cpp
===================================================================
--- libcxxabi/trunk/src/cxa_guard.cpp
+++ libcxxabi/trunk/src/cxa_guard.cpp
@@ -10,7 +10,6 @@
 #include "__cxxabi_config.h"
 
 #include "abort_message.h"
-#include "config.h"
 #include <__threading_support>
 
 #include <stdint.h>
Index: libcxxabi/trunk/src/cxa_handlers.cpp
===================================================================
--- libcxxabi/trunk/src/cxa_handlers.cpp
+++ libcxxabi/trunk/src/cxa_handlers.cpp
@@ -14,7 +14,6 @@
 #include <new>
 #include <exception>
 #include "abort_message.h"
-#include "config.h"
 #include "cxxabi.h"
 #include "cxa_handlers.hpp"
 #include "cxa_exception.hpp"
Index: libcxxabi/trunk/src/cxa_personality.cpp
===================================================================
--- libcxxabi/trunk/src/cxa_personality.cpp
+++ libcxxabi/trunk/src/cxa_personality.cpp
@@ -18,7 +18,6 @@
 #include <typeinfo>
 
 #include "__cxxabi_config.h"
-#include "config.h"
 #include "cxa_exception.hpp"
 #include "cxa_handlers.hpp"
 #include "private_typeinfo.h"
Index: libcxxabi/trunk/src/fallback_malloc.cpp
===================================================================
--- libcxxabi/trunk/src/fallback_malloc.cpp
+++ libcxxabi/trunk/src/fallback_malloc.cpp
@@ -9,7 +9,6 @@
 
 #include "fallback_malloc.h"
 
-#include "config.h"
 #include <__threading_support>
 
 #include <cstdlib> // for malloc, calloc, free
Index: libcxxabi/trunk/test/test_exception_storage.pass.cpp
===================================================================
--- libcxxabi/trunk/test/test_exception_storage.pass.cpp
+++ libcxxabi/trunk/test/test_exception_storage.pass.cpp
@@ -11,7 +11,6 @@
 // This breaks this test when compiled in C++17. For now fix this by manually
 // re-enabling the STL functions.
 #define _LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS
-#include "../src/config.h"
 
 #include <cstdlib>
 #include <algorithm>
Index: libcxxabi/trunk/test/test_guard.pass.cpp
===================================================================
--- libcxxabi/trunk/test/test_guard.pass.cpp
+++ libcxxabi/trunk/test/test_guard.pass.cpp
@@ -7,7 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "../src/config.h"
 #include "cxxabi.h"
 
 #include <cassert>