1 files changed, 9 insertions, 11 deletions
diff --git a/source/Core/Opcode.cpp b/source/Core/Opcode.cpp
index 11b913841ecb..b4e691c1ddcd 100644
--- a/source/Core/Opcode.cpp
+++ b/source/Core/Opcode.cpp
@@ -9,17 +9,15 @@
 
 #include "lldb/Core/Opcode.h"
 
-// C Includes
-// C++ Includes
-// Other libraries and framework includes
-#include "llvm/ADT/Triple.h"
+#include "lldb/Utility/DataBufferHeap.h"
+#include "lldb/Utility/DataExtractor.h"
+#include "lldb/Utility/Endian.h"
+#include "lldb/Utility/Stream.h"
+#include "lldb/lldb-forward.h" // for DataBufferSP
 
-// Project includes
-#include "lldb/Core/ArchSpec.h"
-#include "lldb/Core/DataBufferHeap.h"
-#include "lldb/Core/DataExtractor.h"
-#include "lldb/Core/Stream.h"
-#include "lldb/Host/Endian.h"
+#include <memory> // for make_shared
+
+#include <inttypes.h> // for PRIx64
 
 using namespace lldb;
 using namespace lldb_private;
@@ -132,7 +130,7 @@ uint32_t Opcode::GetData(DataExtractor &data) const {
   if (buf != nullptr) {
     DataBufferSP buffer_sp;
 
-    buffer_sp.reset(new DataBufferHeap(buf, byte_size));
+    buffer_sp = std::make_shared<DataBufferHeap>(buf, byte_size);
     data.SetByteOrder(GetDataByteOrder());
     data.SetData(buffer_sp);
     return byte_size;