diff --git a/include/rocksdb/utilities/convenience.h b/include/rocksdb/utilities/convenience.h
index b68cdf2f9..fae420b77 100644
--- a/include/rocksdb/utilities/convenience.h
+++ b/include/rocksdb/utilities/convenience.h
@@ -5,8 +5,6 @@
 
 #pragma once
 
-#include "rocksdb/utilities/pragma_error.h"
-
-ROCKSDB_WARNING("This file was moved to rocksdb/convenience.h")
+// This file was moved to rocksdb/convenience.h"
 
 #include "rocksdb/convenience.h"
diff --git a/include/rocksdb/utilities/pragma_error.h b/include/rocksdb/utilities/pragma_error.h
deleted file mode 100644
index 35e7ab8ae..000000000
--- a/include/rocksdb/utilities/pragma_error.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//  Copyright (c) 2013, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
-//
-// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file. See the AUTHORS file for names of contributors.
-
-#ifndef STORAGE_LEVELDB_UTILITIES_PRAGMA_ERROR_H_
-#define STORAGE_LEVELDB_UTILITIES_PRAGMA_ERROR_H_
-
-#define RDB_STR__(x) #x
-#define RDB_STR(x) RDB_STR__(x)
-
-#if defined(__GNUC__) || defined(__clang__)
-// Wrap unportable warning macro
-
-#define ROCKSDB_WARNING(x) _Pragma(RDB_STR(GCC warning x))
-
-#elif defined(_WIN32)
-
-// Wrap unportable warning macro
-#if defined(_MSC_VER)
-// format it according to visual studio output (to get source lines and warnings
-// in the IDE)
-#define ROCKSDB_WARNING(x) \
-  __pragma(message(__FILE__ "(" RDB_STR(__LINE__) ") : warning: " x))
-#else
-// make #warning into #pragma GCC warning gcc 4.7+ and clang 3.2+ supported
-#define ROCKSDB_WARNING(x) _Pragma(RDB_STR(GCC warning(x)))
-#endif
-
-#endif
-
-#endif  // STORAGE_LEVELDB_UTILITIES_PRAGMA_ERROR_H_
diff --git a/include/utilities/backupable_db.h b/include/utilities/backupable_db.h
deleted file mode 100644
index c2ef2c2ac..000000000
--- a/include/utilities/backupable_db.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//  Copyright (c) 2013, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
-//
-// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file. See the AUTHORS file for names of contributors.
-
-#pragma once
-
-#include "rocksdb/utilities/pragma_error.h"
-
-ROCKSDB_WARNING(
-    "Warning: This file was moved to rocksdb/utilities/backupable_db.h")
-
-#include "rocksdb/utilities/backupable_db.h"
diff --git a/include/utilities/db_ttl.h b/include/utilities/db_ttl.h
deleted file mode 100644
index e50746be4..000000000
--- a/include/utilities/db_ttl.h
+++ /dev/null
@@ -1,12 +0,0 @@
-//  Copyright (c) 2013, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
-
-#pragma once
-
-#include "rocksdb/utilities/pragma_error.h"
-
-ROCKSDB_WARNING("This file was moved to rocksdb/utilities/db_ttl.h")
-
-#include "rocksdb/utilities/db_ttl.h"
diff --git a/include/utilities/document_db.h b/include/utilities/document_db.h
deleted file mode 100644
index de4b9d388..000000000
--- a/include/utilities/document_db.h
+++ /dev/null
@@ -1,12 +0,0 @@
-//  Copyright (c) 2013, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
-
-#pragma once
-
-#include "rocksdb/utilities/pragma_error.h"
-
-ROCKSDB_WARNING("This file was moved to rocksdb/utilities/document_db.h")
-
-#include "rocksdb/utilities/document_db.h"
diff --git a/include/utilities/geo_db.h b/include/utilities/geo_db.h
deleted file mode 100644
index d161cd122..000000000
--- a/include/utilities/geo_db.h
+++ /dev/null
@@ -1,12 +0,0 @@
-//  Copyright (c) 2013, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
-
-#pragma once
-
-#include "rocksdb/utilities/pragma_error.h"
-
-ROCKSDB_WARNING("This file was moved to rocksdb/utilities/geo_db.h")
-
-#include "rocksdb/utilities/geo_db.h"
diff --git a/include/utilities/json_document.h b/include/utilities/json_document.h
deleted file mode 100644
index 17e17c088..000000000
--- a/include/utilities/json_document.h
+++ /dev/null
@@ -1,11 +0,0 @@
-//  Copyright (c) 2013, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
-#pragma once
-
-#include "rocksdb/utilities/pragma_error.h"
-
-ROCKSDB_WARNING("This file was moved to rocksdb/utilities/json_document.h")
-
-#include "rocksdb/utilities/json_document.h"
diff --git a/include/utilities/stackable_db.h b/include/utilities/stackable_db.h
deleted file mode 100644
index 9fe43fabb..000000000
--- a/include/utilities/stackable_db.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file. See the AUTHORS file for names of contributors.
-
-#pragma once
-#include "rocksdb/utilities/pragma_error.h"
-
-ROCKSDB_WARNING("This file was moved to rocksdb/utilities/stackable_db.h")
-
-#include "rocksdb/utilities/stackable_db.h"
diff --git a/include/utilities/utility_db.h b/include/utilities/utility_db.h
deleted file mode 100644
index 1e71fae22..000000000
--- a/include/utilities/utility_db.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file. See the AUTHORS file for names of contributors.
-
-#pragma once
-
-#include "rocksdb/utilities/pragma_error.h"
-
-ROCKSDB_WARNING("This file was moved to rocksdb/utilities/utility_db.h")
-
-#include "rocksdb/utilities/utility_db.h"