9 files changed, 9 insertions, 52 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cc3efc3..47d4bf8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,22 +28,13 @@ set(TARGETS_WM windowmanager-service)
 add_library(${TARGETS_WM} MODULE
    main.cpp
    wayland_ivi_wm.cpp
-   wayland_ivi_wm.hpp
    util.cpp
-   util.hpp
    layout.cpp
-   layout.hpp
    ${IVI_CON_PROTO}
    json_helper.cpp
-   json_helper.hpp
-   app.hpp app.cpp
-   result.hpp
+   app.cpp
    layers.cpp
-   layers.hpp
-   controller_hooks.hpp
-   config.cpp
-   config.hpp
-   policy.hpp)
+   config.cpp)
 
 target_include_directories(${TARGETS_WM}
     PRIVATE
diff --git a/src/app.cpp b/src/app.cpp
index 4076f85..e7048c4 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -14,26 +14,12 @@
  * limitations under the License.
  */
 
-#include "app.hpp"
-#include "json_helper.hpp"
-#include "layers.hpp"
-#include "layout.hpp"
-#include "util.hpp"
-#include "wayland_ivi_wm.hpp"
-
-#include <cstdio>
-#include <memory>
-
-#include <cassert>
-
-#include <json-c/json.h>
-
-#include <algorithm>
-#include <csignal>
 #include <fstream>
-#include <json.hpp>
 #include <regex>
-#include <thread>
+
+#include "app.hpp"
+#include "../include/json.hpp"
+
 
 namespace wm {
 
diff --git a/src/app.hpp b/src/app.hpp
index a0da1ba..0db2e06 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -18,18 +18,15 @@
 #define TMCAGLWM_APP_HPP
 
 #include <json-c/json.h>
-
 #include <atomic>
 #include <memory>
 #include <unordered_map>
-#include <unordered_set>
 #include <experimental/optional>
 #include "config.hpp"
 #include "controller_hooks.hpp"
 #include "layers.hpp"
 #include "layout.hpp"
 #include "policy.hpp"
-#include "result.hpp"
 #include "wayland_ivi_wm.hpp"
 #include "hmi-debug.h"
 
diff --git a/src/json_helper.hpp b/src/json_helper.hpp
index 6c9cdab..125473e 100644
--- a/src/json_helper.hpp
+++ b/src/json_helper.hpp
@@ -17,9 +17,8 @@
 #ifndef TMCAGLWM_JSON_HELPER_HPP
 #define TMCAGLWM_JSON_HELPER_HPP
 
-#include "result.hpp"
+#include "../include/json.hpp"
 #include "wayland_ivi_wm.hpp"
-#include <json.hpp>
 
 struct json_object;
 
diff --git a/src/layers.cpp b/src/layers.cpp
index 4e7af91..92c19bf 100644
--- a/src/layers.cpp
+++ b/src/layers.cpp
@@ -14,12 +14,9 @@
  * limitations under the License.
  */
 
-#include <algorithm>
 #include <regex>
 
-#include "json_helper.hpp"
 #include "layers.hpp"
-#include "util.hpp"
 #include "hmi-debug.h"
 
 namespace wm
diff --git a/src/layers.hpp b/src/layers.hpp
index 6ecf2e7..e4160a5 100644
--- a/src/layers.hpp
+++ b/src/layers.hpp
@@ -17,12 +17,9 @@
 #ifndef TMCAGLWM_LAYERS_H
 #define TMCAGLWM_LAYERS_H
 
-#include <json.hpp>
-
-#include <regex>
-#include <set>
 #include <string>
 
+#include "../include/json.hpp"
 #include "layout.hpp"
 #include "result.hpp"
 #include "wayland_ivi_wm.hpp"
diff --git a/src/layout.hpp b/src/layout.hpp
index d8c9b88..3430ef3 100644
--- a/src/layout.hpp
+++ b/src/layout.hpp
@@ -17,11 +17,6 @@
 #ifndef TMCAGLWM_LAYOUT_HPP
 #define TMCAGLWM_LAYOUT_HPP
 
-#include <cstdint>
-#include <string>
-
-#include "result.hpp"
-
 namespace wm
 {
 
diff --git a/src/main.cpp b/src/main.cpp
index f7c6dd0..602e1f6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,11 +18,9 @@
 #include <algorithm>
 #include <mutex>
 #include <json.h>
-#include <json.hpp>
+#include "../include/json.hpp"
 #include "app.hpp"
-#include "result.hpp"
 #include "json_helper.hpp"
-#include "util.hpp"
 #include "wayland_ivi_wm.hpp"
 
 extern "C"
diff --git a/src/wayland_ivi_wm.cpp b/src/wayland_ivi_wm.cpp
index 5cc16b2..6a1c84a 100644
--- a/src/wayland_ivi_wm.cpp
+++ b/src/wayland_ivi_wm.cpp
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-#include <utility>
-
-#include "util.hpp"
 #include "wayland_ivi_wm.hpp"
 #include "hmi-debug.h"