resolves conflicts

2 files changed, 1 insertions, 6 deletions

diff --git a/src/touchhandler/TouchHandler.cpp b/src/touchhandler/TouchHandler.cpp
index 735b311a..0be33476 100644
--- a/src/touchhandler/TouchHandler.cpp
+++ b/src/touchhandler/TouchHandler.cpp
@@ -1,4 +1,4 @@
-#include "TouchHandler.h"
+#include "touchhandler/TouchHandler.h"
 
 using namespace Pinetime::Controllers;
 
diff --git a/src/touchhandler/TouchHandler.h b/src/touchhandler/TouchHandler.h
index f5442939..ed452b3a 100644
--- a/src/touchhandler/TouchHandler.h
+++ b/src/touchhandler/TouchHandler.h
@@ -1,8 +1,6 @@
 #pragma once
 #include "drivers/Cst816s.h"
 #include "systemtask/SystemTask.h"
-#include <FreeRTOS.h>
-#include <task.h>
 
 namespace Pinetime {
   namespace Components {
@@ -11,9 +9,6 @@ namespace Pinetime {
   namespace Drivers {
     class Cst816S;
   }
-  namespace System {
-    class SystemTask;
-  }
   namespace Controllers {
     class TouchHandler {
       public: