diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77cbe49ea63db6bb5dd8aaa073e74096d69823f0..bf94f5270133ed1fc5640b080cc6d32ad1d3e6c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8)
 
 add_subdirectory(core)
 add_subdirectory(crypto)
-add_subdirectory(http)
 add_subdirectory(client)
+add_subdirectory(http)
 
 include_directories("${dap_core_INCLUDE_DIRS}")
 include_directories("${dap_crypto_INCLUDE_DIRS}")
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index c8a3bee84e4c9bacfd258793ba0f12240777ad7c..cf25b426094a914ef48aa087cbf50f63028d29b5 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library(${PROJECT_NAME} STATIC ${CLIENT_SRCS})
 
 include_directories("${dap_core_INCLUDE_DIRS}")
 include_directories("${dap_crypto_INCLUDE_DIRS}")
-include_directories("${dap_http_INCLUDE_DIRS}")
+#include_directories("${dap_http_INCLUDE_DIRS}")
 add_definitions ("${dap_core_DEFINITIONS}")
 add_definitions ("${dap_crypto_DEFINITIONS}")
 add_definitions ("${dap_http_DEFINITIONS}")
diff --git a/client/dap_client.c b/client/dap_client.c
index a7aa519560ae6854fc4b77ff489b4880e1314a74..7c9f2883145cef1af62c48bbf0c2dd6205164d36 100644
--- a/client/dap_client.c
+++ b/client/dap_client.c
@@ -2,7 +2,7 @@
 
 #include "dap_common.h"
 
-#include "dap_http_client.h"
+#include "../http/dap_http_client.h"
 
 #include "dap_client.h"
 #include "dap_client_internal.h"
diff --git a/client/dap_client_internal.c b/client/dap_client_internal.c
index 3121f559193d7ae328fa71f2e9e4e60f35e649d2..536c43452b33eb638239f8f91fa4690202b39d03 100644
--- a/client/dap_client_internal.c
+++ b/client/dap_client_internal.c
@@ -8,7 +8,7 @@
 #include "dap_enc.h"
 #include "dap_common.h"
 
-#include "dap_http_client_simple.h"
+#include "../http/dap_http_client_simple.h"
 #include "dap_client_internal.h"
 
 #define LOG_TAG "dap_client_internal"
diff --git a/core/dap_math_ops.h b/core/dap_math_ops.h
index 5e90589443e291f333c86eaf111f21e4a813e205..1f13c9c435eedb12b7a1299b9f0d38cf7908ce8c 100644
--- a/core/dap_math_ops.h
+++ b/core/dap_math_ops.h
@@ -1,8 +1,6 @@
-#ifndef _DAP_MATH_OPS_H_
-#define _DAP_MATH_OPS_H_
-
+#pragma once
 #include <stdint.h>
-#include "common/int-util.h"
+//#include "common/int-util.h"
 
 #if defined(__GNUC__) ||defined (__clang__)
 
@@ -21,4 +19,3 @@ typedef union dap_uint128{
 #endif
 } dap_uint128_t;
 
-#endif