intel · wcwang · Jan 7, 2022 · Dec 28, 2021 · Dec 28, 2021 · Dec 28, 2021
diff --git a/core/chunk.c b/core/chunk.c
@@ -28,10 +28,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "../include/hax.h"
-#include "include/memory.h"
-#include "../include/hax_host_mem.h"
-#include "include/paging.h"
+#include "memory.h"
+
+#include "hax.h"
+#include "hax_host_mem.h"
+
+#include "paging.h"
 
 int chunk_alloc(uint64_t base_uva, uint64_t size, hax_chunk **chunk)
 {

diff --git a/core/cpu.c b/core/cpu.c
@@ -28,16 +28,16 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "../include/hax.h"
-#include "include/ia32_defs.h"
-#include "include/cpu.h"
-#include "include/cpuid.h"
-#include "include/vcpu.h"
-#include "include/debug.h"
-#include "include/dump.h"
-#include "include/name.h"
-#include "include/intr.h"
-#include "include/ept.h"
+#include "cpu.h"
+
+#include "hax.h"
+
+#include "cpuid.h"
+#include "dump.h"
+#include "ia32_defs.h"
+#include "intr.h"
+#include "name.h"
+#include "vcpu.h"
 
 static void cpu_vmentry_failed(struct vcpu_t *vcpu, vmx_result_t result);
 static int cpu_vmexit_handler(struct vcpu_t *vcpu, exit_reason_t exit_reason,

diff --git a/core/cpuid.c b/core/cpuid.c
@@ -29,8 +29,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "include/cpuid.h"
-#include "include/hax_driver.h"
+#include "cpuid.h"
+
+#include "driver.h"
+#include "ia32.h"
 
 #define CPUID_CACHE_SIZE        6
 #define CPUID_FEATURE_SET_SIZE  2

diff --git a/core/dump.c b/core/dump.c
@@ -28,11 +28,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "include/compiler.h"
-#include "include/name.h"
-#include "include/vmx.h"
-#include "include/dump.h"
-#include "../include/hax.h"
+#include "dump.h"
+
+#include "hax.h"
+
+#include "compiler.h"
+#include "name.h"
 
 static uint32_t dump_vmcs_list[] = {
     VMX_PIN_CONTROLS,

diff --git a/core/emulate.c b/core/emulate.c
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "include/emulate.h"
+#include "emulate.h"
 
 /* Instruction flags */
 /* Instruction does not read from destination */

diff --git a/core/ept.c b/core/ept.c
@@ -37,8 +37,9 @@
  *    mapping.
  */
 
-#include "include/ept.h"
-#include "include/cpu.h"
+#include "ept.h"
+
+#include "cpu.h"
 
 static uint64_t ept_capabilities;
 

diff --git a/core/ept2.c b/core/ept2.c
@@ -28,11 +28,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "include/ept2.h"
+#include "ept2.h"
 
-#include "../include/hax.h"
-#include "include/paging.h"
-#include "../include/hax_host_mem.h"
+#include "hax.h"
+#include "hax_host_mem.h"
+
+#include "paging.h"
 
 void ept_handle_mapping_removed(hax_gpa_space_listener *listener,
                                 uint64_t start_gfn, uint64_t npages, uint64_t uva,

diff --git a/core/ept_tree.c b/core/ept_tree.c
@@ -28,11 +28,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "include/ept2.h"
+#include "ept2.h"
 
-#include "../include/hax.h"
-#include "../include/hax_host_mem.h"
-#include "include/paging.h"
+#include "hax.h"
+#include "hax_host_mem.h"
+
+#include "paging.h"
 
 static hax_epte INVALID_EPTE = {
     .pfn = INVALID_PFN

diff --git a/core/gpa_space.c b/core/gpa_space.c
@@ -28,11 +28,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "include/memory.h"
+#include "memory.h"
 
-#include "../include/hax.h"
-#include "include/paging.h"
-#include "../include/hax_host_mem.h"
+#include "hax.h"
+#include "hax_host_mem.h"
+
+#include "paging.h"
 
 int gpa_space_init(hax_gpa_space *gpa_space)
 {

diff --git a/core/hax.c b/core/hax.c
@@ -28,15 +28,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "include/ia32_defs.h"
-#include "include/vmx.h"
-
-#include "include/cpu.h"
-#include "include/config.h"
-#include "include/hax_driver.h"
-#include "include/vm.h"
-#include "../include/hax.h"
-#include "../include/hax_release_ver.h"
+#include "hax.h"
+
+#include "hax_release_ver.h"
+
+#include "cpu.h"
+#include "driver.h"
+#include "ia32_defs.h"
 
 /* deal with module parameter */
 struct config_t config = {

diff --git a/core/ia32.c b/core/ia32.c
@@ -28,7 +28,7 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "include/ia32.h"
+#include "ia32.h"
 
 struct qword_val {
     uint32_t low;

diff --git a/core/include/config.h b/core/include/config.h
@@ -31,8 +31,6 @@
 #ifndef HAX_CORE_CONFIG_H_
 #define HAX_CORE_CONFIG_H_
 
-#include "../../include/hax_types.h"
-
 struct config_t {
     int memory_pass_through;
     int disable_ept;

diff --git a/core/include/cpu.h b/core/include/cpu.h
@@ -31,11 +31,11 @@
 #ifndef HAX_CORE_CPU_H_
 #define HAX_CORE_CPU_H_
 
-#include "vmx.h"
-#include "segments.h"
 #include "config.h"
-#include "vm.h"
 #include "pmu.h"
+#include "segments.h"
+#include "vm.h"
+#include "vmx.h"
 
 #define VMXON_SUCCESS 0x0
 #define VMXON_FAIL    0x1

diff --git a/core/include/cpuid.h b/core/include/cpuid.h
@@ -31,7 +31,8 @@
 #ifndef HAX_CORE_CPUID_H_
 #define HAX_CORE_CPUID_H_
 
-#include "../../include/hax.h"
+#include "hax.h"
+
 #include "types.h"
 
 #define CPUID_REG_EAX 0

diff --git a/core/include/hax_driver.h → core/include/driver.h b/core/include/hax_driver.h → core/include/driver.h
@@ -28,11 +28,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef HAX_CORE_HAX_DRIVER_H_
-#define HAX_CORE_HAX_DRIVER_H_
+#ifndef HAX_CORE_DRIVER_H_
+#define HAX_CORE_DRIVER_H_
 
-#include "vm.h"
 #include "pmu.h"
+
 #define CONFIG_VM_NUM 16
 
 struct hax_t {
@@ -63,4 +63,4 @@ struct hax_t {
 
 uint64_t hax_get_memory_threshold(void);
 extern struct hax_t *hax;
-#endif  // HAX_CORE_HAX_DRIVER_H_
+#endif  // HAX_CORE_DRIVER_H_
diff --git a/core/include/dump.h b/core/include/dump.h
@@ -31,6 +31,8 @@
 #ifndef HAX_CORE_DUMP_H_
 #define HAX_CORE_DUMP_H_
 
+#include "vmx.h"
+
 void dump_vmcs(struct vcpu_t *vcpu);
 
 void dump_vmx_info(struct info_t *info);

diff --git a/core/include/emulate.h b/core/include/emulate.h
@@ -31,8 +31,6 @@
 #ifndef HAX_CORE_EMULATE_H_
 #define HAX_CORE_EMULATE_H_
 
-#include "../../include/hax_types.h"
-
 #include "emulate_ops.h"
 
 typedef enum {

diff --git a/core/include/emulate_ops.h b/core/include/emulate_ops.h
@@ -31,6 +31,8 @@
 #ifndef HAX_CORE_EMULATE_OPS_H_
 #define HAX_CORE_EMULATE_OPS_H_
 
+#include "types.h"
+
 #define FASTOP_ALIGN  0x10
 #define FASTOP_OFFSET(size) ( \
     ((size) == 8) ? (3 * FASTOP_ALIGN) : \

diff --git a/core/include/ept.h b/core/include/ept.h
@@ -31,7 +31,6 @@
 #ifndef HAX_CORE_EPT_H_
 #define HAX_CORE_EPT_H_
 
-#include "../../include/hax_types.h"
 #include "vm.h"
 
 #define ept_cap_rwX             ((uint64_t)1 << 0)

diff --git a/core/include/ept2.h b/core/include/ept2.h
@@ -31,8 +31,6 @@
 #ifndef HAX_CORE_EPT2_H_
 #define HAX_CORE_EPT2_H_
 
-#include "../../include/hax_types.h"
-#include "../../include/hax_list.h"
 #include "memory.h"
 #include "vmx.h"
 

diff --git a/core/include/ia32.h b/core/include/ia32.h
@@ -31,7 +31,7 @@
 #ifndef HAX_CORE_IA32_H_
 #define HAX_CORE_IA32_H_
 
-#include "../../include/hax_types.h"
+#include "types.h"
 
 union cpuid_args_t;
 struct system_desc_t;

diff --git a/core/include/ia32_defs.h b/core/include/ia32_defs.h
@@ -31,7 +31,7 @@
 #ifndef HAX_CORE_IA32_DEFS_H_
 #define HAX_CORE_IA32_DEFS_H_
 
-#include "../../include/hax_types.h"
+#include "types.h"
 
 #define IA32_FXSAVE_SIZE 512
 

diff --git a/core/include/hax_core_interface.h → core/include/interface.h b/core/include/hax_core_interface.h → core/include/interface.h
@@ -28,10 +28,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef HAX_CORE_HAX_CORE_INTERFACE_H_
-#define HAX_CORE_HAX_CORE_INTERFACE_H_
+#ifndef HAX_CORE_INTERFACE_H_
+#define HAX_CORE_INTERFACE_H_
+
+#include "hax.h"
 
-#include "../../include/hax.h"
 struct vcpu_t;
 struct vm_t;
 
@@ -98,4 +99,4 @@ int vcpu_event_pending(struct vcpu_t *vcpu);
 }
 #endif
 
-#endif  // HAX_CORE_HAX_CORE_INTERFACE_H_
+#endif  // HAX_CORE_INTERFACE_H_
diff --git a/core/include/intr.h b/core/include/intr.h
@@ -31,7 +31,6 @@
 #ifndef HAX_CORE_INTR_H_
 #define HAX_CORE_INTR_H_
 
-#include "../../include/hax.h"
 #include "vcpu.h"
 
 #define NO_ERROR_CODE ~0U

diff --git a/core/include/memory.h b/core/include/memory.h
@@ -31,8 +31,9 @@
 #ifndef HAX_CORE_MEMORY_H_
 #define HAX_CORE_MEMORY_H_
 
-#include "../../include/hax_types.h"
-#include "../../include/hax_list.h"
+#include "hax_list.h"
+
+#include "types.h"
 
 #define HAX_CHUNK_SHIFT 21
 #define HAX_CHUNK_SIZE  (1U << HAX_CHUNK_SHIFT)  // 2MB

diff --git a/core/include/page_walker.h b/core/include/page_walker.h
@@ -31,6 +31,9 @@
 #ifndef HAX_CORE_PAGE_WALKER_H_
 #define HAX_CORE_PAGE_WALKER_H_
 
+#include "types.h"
+#include "vcpu.h"
+
 typedef uint64_t ADDRESS;
 
 #define ALIGN_BACKWARD(__address, __bytes)  \

diff --git a/core/include/paging.h b/core/include/paging.h
@@ -31,7 +31,7 @@
 #ifndef HAX_CORE_PAGING_H_
 #define HAX_CORE_PAGING_H_
 
-#include "../../include/hax.h"
+#include "hax.h"
 
 #define PM_INVALID    0
 #define PM_FLAT       1

diff --git a/core/include/segments.h b/core/include/segments.h
@@ -31,9 +31,10 @@
 #ifndef HAX_CORE_SEGMENTS_H_
 #define HAX_CORE_SEGMENTS_H_
 
-#include "ia32.h"
 // TODO: Get rid of is_compatible(), and then delete the following #include
-#include "../../include/hax_interface.h"
+#include "hax_interface.h"
+
+#include "ia32.h"
 
 #ifdef HAX_COMPILER_MSVC
 #pragma pack(push, 1)

diff --git a/core/include/types.h b/core/include/types.h
@@ -32,7 +32,7 @@
 #ifndef HAX_CORE_TYPES_H_
 #define HAX_CORE_TYPES_H_
 
-#include "../../include/hax_types.h"
+#include "hax_types.h"
 
 #ifndef min
 #define min(a,b)  (((a)<(b))?(a):(b))

diff --git a/core/include/vcpu.h b/core/include/vcpu.h
@@ -31,14 +31,13 @@
 #ifndef HAX_CORE_VCPU_H_
 #define HAX_CORE_VCPU_H_
 
+#include "config.h"
 #include "cpuid.h"
 #include "emulate.h"
-#include "vmx.h"
 #include "mtrr.h"
-#include "vm.h"
 #include "pmu.h"
-#include "../../include/hax_interface.h"
-#include "config.h"
+#include "vm.h"
+#include "vmx.h"
 
 #define NR_GMSR     5
 #define NR_EMT64MSR 6