diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1c35b3830..af8db62e53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,9 +160,9 @@ endif(LLVM_SPIRV_INCLUDE_TESTS)
 
 install(
   FILES
-    ${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVLib.h
-    ${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVOpts.h
-    ${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVExtensions.inc
+    ${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVLib/LLVMSPIRVLib.h
+    ${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVLib/LLVMSPIRVOpts.h
+    ${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVLib/LLVMSPIRVExtensions.inc
   DESTINATION
     ${CMAKE_INSTALL_PREFIX}/include/LLVMSPIRVLib
 )
diff --git a/include/LLVMSPIRVExtensions.inc b/include/LLVMSPIRVLib/LLVMSPIRVExtensions.inc
similarity index 100%
rename from include/LLVMSPIRVExtensions.inc
rename to include/LLVMSPIRVLib/LLVMSPIRVExtensions.inc
diff --git a/include/LLVMSPIRVLib.h b/include/LLVMSPIRVLib/LLVMSPIRVLib.h
similarity index 99%
rename from include/LLVMSPIRVLib.h
rename to include/LLVMSPIRVLib/LLVMSPIRVLib.h
index f1737040f7..8af98b22c2 100644
--- a/include/LLVMSPIRVLib.h
+++ b/include/LLVMSPIRVLib/LLVMSPIRVLib.h
@@ -41,7 +41,7 @@
 #ifndef SPIRV_H
 #define SPIRV_H
 
-#include "LLVMSPIRVOpts.h"
+#include "LLVMSPIRVLib/LLVMSPIRVOpts.h"
 
 #include <cstdint>
 #include <iostream>
diff --git a/include/LLVMSPIRVOpts.h b/include/LLVMSPIRVLib/LLVMSPIRVOpts.h
similarity index 100%
rename from include/LLVMSPIRVOpts.h
rename to include/LLVMSPIRVLib/LLVMSPIRVOpts.h
diff --git a/lib/SPIRV/LLVMSPIRVOpts.cpp b/lib/SPIRV/LLVMSPIRVOpts.cpp
index a96fe0c9df..ce747379ed 100644
--- a/lib/SPIRV/LLVMSPIRVOpts.cpp
+++ b/lib/SPIRV/LLVMSPIRVOpts.cpp
@@ -38,7 +38,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "LLVMSPIRVOpts.h"
+#include "LLVMSPIRVLib/LLVMSPIRVOpts.h"
 
 #include "SPIRVEnum.h"
 #include <llvm/ADT/SmallVector.h>
@@ -51,7 +51,7 @@ using namespace SPIRV;
 
 void TranslatorOpts::enableAllExtensions() {
 #define EXT(X) ExtStatusMap[ExtensionID::X] = true;
-#include "LLVMSPIRVExtensions.inc"
+#include "LLVMSPIRVLib/LLVMSPIRVExtensions.inc"
 #undef EXT
 }
 
diff --git a/lib/SPIRV/OCLTypeToSPIRV.h b/lib/SPIRV/OCLTypeToSPIRV.h
index 2ee77a954d..28a0e5600d 100644
--- a/lib/SPIRV/OCLTypeToSPIRV.h
+++ b/lib/SPIRV/OCLTypeToSPIRV.h
@@ -42,7 +42,7 @@
 #ifndef SPIRV_OCLTYPETOSPIRV_H
 #define SPIRV_OCLTYPETOSPIRV_H
 
-#include "LLVMSPIRVLib.h"
+#include "LLVMSPIRVLib/LLVMSPIRVLib.h"
 #include "SPIRVBuiltinHelper.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/LLVMContext.h"
diff --git a/lib/SPIRV/SPIRVBuiltinHelper.h b/lib/SPIRV/SPIRVBuiltinHelper.h
index 0b859fb616..5bb38ae823 100644
--- a/lib/SPIRV/SPIRVBuiltinHelper.h
+++ b/lib/SPIRV/SPIRVBuiltinHelper.h
@@ -40,7 +40,7 @@
 #ifndef SPIRVBUILTINHELPER_H
 #define SPIRVBUILTINHELPER_H
 
-#include "LLVMSPIRVLib.h"
+#include "LLVMSPIRVLib/LLVMSPIRVLib.h"
 #include "libSPIRV/SPIRVOpCode.h"
 #include "libSPIRV/SPIRVType.h"
 #include "llvm/ADT/SmallVector.h"
diff --git a/lib/SPIRV/SPIRVInternal.h b/lib/SPIRV/SPIRVInternal.h
index 68f8cbd7d3..8962f75e85 100644
--- a/lib/SPIRV/SPIRVInternal.h
+++ b/lib/SPIRV/SPIRVInternal.h
@@ -46,7 +46,7 @@
 #include "libSPIRV/SPIRVType.h"
 #include "libSPIRV/SPIRVUtil.h"
 
-#include "LLVMSPIRVLib.h"
+#include "LLVMSPIRVLib/LLVMSPIRVLib.h"
 #include "llvm/IR/Attributes.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/Instructions.h"
diff --git a/lib/SPIRV/SPIRVLowerBitCastToNonStandardType.h b/lib/SPIRV/SPIRVLowerBitCastToNonStandardType.h
index 006df3c7a3..c50e530819 100644
--- a/lib/SPIRV/SPIRVLowerBitCastToNonStandardType.h
+++ b/lib/SPIRV/SPIRVLowerBitCastToNonStandardType.h
@@ -35,7 +35,7 @@
 #ifndef SPIRV_SPIRVLOWERBITCASTTONONSTANDARDTYPE_H
 #define SPIRV_SPIRVLOWERBITCASTTONONSTANDARDTYPE_H
 
-#include "LLVMSPIRVOpts.h"
+#include "LLVMSPIRVLib/LLVMSPIRVOpts.h"
 
 #include "llvm/IR/PassManager.h"
 #include "llvm/Pass.h"
diff --git a/lib/SPIRV/SPIRVLowerLLVMIntrinsic.cpp b/lib/SPIRV/SPIRVLowerLLVMIntrinsic.cpp
index e6984f3353..4cf5b4b6a6 100644
--- a/lib/SPIRV/SPIRVLowerLLVMIntrinsic.cpp
+++ b/lib/SPIRV/SPIRVLowerLLVMIntrinsic.cpp
@@ -32,7 +32,7 @@
 #include "LLVMBitreverse.h"
 #include "LLVMSaddWithOverflow.h"
 
-#include "LLVMSPIRVLib.h"
+#include "LLVMSPIRVLib/LLVMSPIRVLib.h"
 #include "SPIRVError.h"
 #include "libSPIRV/SPIRVDebug.h"
 
diff --git a/lib/SPIRV/SPIRVLowerLLVMIntrinsic.h b/lib/SPIRV/SPIRVLowerLLVMIntrinsic.h
index ed419a7aed..965b962d7f 100644
--- a/lib/SPIRV/SPIRVLowerLLVMIntrinsic.h
+++ b/lib/SPIRV/SPIRVLowerLLVMIntrinsic.h
@@ -36,7 +36,7 @@
 #ifndef SPIRV_SPIRVLOWERLLVMINTRINSIC_H
 #define SPIRV_SPIRVLOWERLLVMINTRINSIC_H
 
-#include "LLVMSPIRVOpts.h"
+#include "LLVMSPIRVLib/LLVMSPIRVOpts.h"
 
 #include "llvm/IR/InstVisitor.h"
 #include "llvm/IR/PassManager.h"
diff --git a/lib/SPIRV/SPIRVWriterPass.cpp b/lib/SPIRV/SPIRVWriterPass.cpp
index 4e211d0567..0c94850bf9 100644
--- a/lib/SPIRV/SPIRVWriterPass.cpp
+++ b/lib/SPIRV/SPIRVWriterPass.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "SPIRVWriterPass.h"
-#include "LLVMSPIRVLib.h"
+#include "LLVMSPIRVLib/LLVMSPIRVLib.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/PassManager.h"
 #include "llvm/Pass.h"
diff --git a/lib/SPIRV/SPIRVWriterPass.h b/lib/SPIRV/SPIRVWriterPass.h
index fe80217230..055427e04e 100644
--- a/lib/SPIRV/SPIRVWriterPass.h
+++ b/lib/SPIRV/SPIRVWriterPass.h
@@ -15,7 +15,7 @@
 #ifndef SPIRV_SPIRVWRITERPASS_H
 #define SPIRV_SPIRVWRITERPASS_H
 
-#include "LLVMSPIRVOpts.h"
+#include "LLVMSPIRVLib/LLVMSPIRVOpts.h"
 #include "llvm/ADT/StringRef.h"
 
 namespace llvm {
diff --git a/lib/SPIRV/libSPIRV/SPIRVEnum.h b/lib/SPIRV/libSPIRV/SPIRVEnum.h
index 26c6b4cef5..9ce2239f78 100644
--- a/lib/SPIRV/libSPIRV/SPIRVEnum.h
+++ b/lib/SPIRV/libSPIRV/SPIRVEnum.h
@@ -40,7 +40,7 @@
 #ifndef SPIRV_LIBSPIRV_SPIRVENUM_H
 #define SPIRV_LIBSPIRV_SPIRVENUM_H
 
-#include "LLVMSPIRVOpts.h"
+#include "LLVMSPIRVLib/LLVMSPIRVOpts.h"
 #include "SPIRVOpCode.h"
 #include "spirv/unified1/spirv.hpp"
 #include "spirv_internal.hpp"
@@ -122,7 +122,7 @@ template <> inline void SPIRVMap<ExtensionID, std::string>::init() {
 #define _STRINGIFY(X) #X
 #define STRINGIFY(X) _STRINGIFY(X)
 #define EXT(X) add(ExtensionID::X, STRINGIFY(X));
-#include "LLVMSPIRVExtensions.inc"
+#include "LLVMSPIRVLib/LLVMSPIRVExtensions.inc"
 #undef EXT
 #undef STRINGIFY
 #undef _STRINGIFY
diff --git a/lib/SPIRV/libSPIRV/SPIRVError.cpp b/lib/SPIRV/libSPIRV/SPIRVError.cpp
index 9c40039b6e..461166d4de 100644
--- a/lib/SPIRV/libSPIRV/SPIRVError.cpp
+++ b/lib/SPIRV/libSPIRV/SPIRVError.cpp
@@ -36,7 +36,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "LLVMSPIRVLib.h"
+#include "LLVMSPIRVLib/LLVMSPIRVLib.h"
 
 #include "SPIRVError.h"
 #include <string>
diff --git a/lib/SPIRV/libSPIRV/SPIRVModule.h b/lib/SPIRV/libSPIRV/SPIRVModule.h
index 3960922674..d4af3942ba 100644
--- a/lib/SPIRV/libSPIRV/SPIRVModule.h
+++ b/lib/SPIRV/libSPIRV/SPIRVModule.h
@@ -40,7 +40,7 @@
 #ifndef SPIRV_LIBSPIRV_SPIRVMODULE_H
 #define SPIRV_LIBSPIRV_SPIRVMODULE_H
 
-#include "LLVMSPIRVOpts.h"
+#include "LLVMSPIRVLib/LLVMSPIRVOpts.h"
 #include "SPIRVEntry.h"
 
 #include "llvm/IR/Metadata.h"
diff --git a/tools/llvm-spirv/llvm-spirv.cpp b/tools/llvm-spirv/llvm-spirv.cpp
index 1dbf38b2dc..45e7c1b9f1 100644
--- a/tools/llvm-spirv/llvm-spirv.cpp
+++ b/tools/llvm-spirv/llvm-spirv.cpp
@@ -74,7 +74,7 @@
 #define _SPIRV_SUPPORT_TEXT_FMT
 #endif
 
-#include "LLVMSPIRVLib.h"
+#include "LLVMSPIRVLib/LLVMSPIRVLib.h"
 
 #include <fstream>
 #include <iostream>
@@ -582,7 +582,7 @@ static int parseSPVExtOption(
 #define _STRINGIFY(X) #X
 #define STRINGIFY(X) _STRINGIFY(X)
 #define EXT(X) ExtensionNamesMap[STRINGIFY(X)] = ExtensionID::X;
-#include "LLVMSPIRVExtensions.inc"
+#include "LLVMSPIRVLib/LLVMSPIRVExtensions.inc"
 #undef EXT
 #undef STRINGIFY
 #undef _STRINGIFY