Remove unnecessary headers

diff --git a/source/binary.h b/source/binary.h
index 923a834..0d9ef28 100644 (file)
--- a/source/binary.h
+++ b/source/binary.h
@@ -28,7 +28,8 @@
 #define LIBSPIRV_BINARY_H_
 
 #include "spirv-tools/libspirv.h"
-#include "table.h"
+#include "spirv/1.1/spirv.h"
+#include "spirv_definition.h"
 
 // Functions
 

diff --git a/source/instruction.h b/source/instruction.h
index 37b35b2..f203dd0 100644 (file)
--- a/source/instruction.h
+++ b/source/instruction.h
@@ -30,10 +30,9 @@
 #include <cstdint>
 #include <vector>
 
+#include "spirv-tools/libspirv.h"
 #include "spirv/1.1/spirv.h"
 
-#include "table.h"
-
 // Describes an instruction.
 struct spv_instruction_t {
   // Normally, both opcode and extInstType contain valid data.

diff --git a/source/spirv_definition.h b/source/spirv_definition.h
index 59f8509..9cd3f36 100644 (file)
--- a/source/spirv_definition.h
+++ b/source/spirv_definition.h
@@ -29,7 +29,7 @@
 
 #include <cstdint>
 
-#include "spirv-tools/libspirv.h"
+#include "spirv/1.1/spirv.h"
 
 #define spvIsInBitfield(value, bitfield) ((value) == ((value)&bitfield))
 

diff --git a/source/val/ValidationState.h b/source/val/ValidationState.h
index 65a3ce3..6a43c90 100644 (file)
--- a/source/val/ValidationState.h
+++ b/source/val/ValidationState.h
@@ -39,6 +39,7 @@
 #include "spirv-tools/libspirv.h"
 #include "spirv/1.1/spirv.h"
 #include "spirv_definition.h"
+#include "val/Function.h"
 #include "val/Id.h"
 
 namespace libspirv {
@@ -61,8 +62,6 @@ enum ModuleLayoutSection {
   kLayoutFunctionDefinitions    /// < Section 2.4 #11
 };
 
-class Function;
-
 /// This class manages the state of the SPIR-V validation as it is being parsed.
 class ValidationState_t {
  public:

diff --git a/source/validate.h b/source/validate.h
index a4d7d23..c6ffac0 100644 (file)
--- a/source/validate.h
+++ b/source/validate.h
@@ -27,30 +27,18 @@
 #ifndef LIBSPIRV_VALIDATE_H_
 #define LIBSPIRV_VALIDATE_H_
 
-#include <algorithm>
-#include <array>
 #include <functional>
-#include <map>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
 #include <utility>
 #include <vector>
 
-#include "assembly_grammar.h"
-#include "binary.h"
-#include "diagnostic.h"
 #include "instruction.h"
 #include "spirv-tools/libspirv.h"
-#include "spirv_definition.h"
 #include "table.h"
-#include "val/BasicBlock.h"
-
-// Structures
 
 namespace libspirv {
 
 class ValidationState_t;
+class BasicBlock;
 
 /// A function that returns a vector of BasicBlocks given a BasicBlock. Used to
 /// get the successor and predecessor nodes of a CFG block

diff --git a/source/validate_id.cpp b/source/validate_id.cpp
index 8473646..b94e861 100644 (file)
--- a/source/validate_id.cpp
+++ b/source/validate_id.cpp
@@ -28,6 +28,7 @@
 
 #include <cassert>
 
+#include <algorithm>
 #include <iostream>
 #include <unordered_map>
 #include <vector>