diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
index b12eb4b9..5d32a3f0 100644
--- a/dependencies/CMakeLists.txt
+++ b/dependencies/CMakeLists.txt
@@ -61,13 +61,15 @@ message(STATUS "Using flatbuffers compiler: " ${FLATBUFFERS_FLATC_EXECUTABLE})
 function(compile_flattbuffer_schema SRC_FBS OUTPUT_DIR)
 	string(REGEX REPLACE "\\.fbs$" "_generated.h" GEN_HEADER ${SRC_FBS})
 	set_property(SOURCE ${GEN_HEADER} PROPERTY SKIP_AUTOMOC ON)
+
 	if (ENABLE_AMLOGIC)
 		add_custom_command(
 			OUTPUT ${GEN_HEADER}
 			COMMAND "${FLATBUFFERS_FLATC_EXECUTABLE}" -c --no-includes --gen-mutable
 					--gen-object-api
 					-o "${OUTPUT_DIR}"
-					"${SRC_FBS}")
+					"${SRC_FBS}"
+			DEPENDS ${SRC_FBS})
 	else()
 		add_custom_command(
 			OUTPUT ${GEN_HEADER}
@@ -75,7 +77,7 @@ function(compile_flattbuffer_schema SRC_FBS OUTPUT_DIR)
 					--gen-object-api
 					-o "${OUTPUT_DIR}"
 					"${SRC_FBS}"
-			DEPENDS flatc)
+			DEPENDS flatc ${SRC_FBS})
 	endif()
 endfunction()
 
diff --git a/include/flatbufserver/FlatBufferConnection.h b/include/flatbufserver/FlatBufferConnection.h
index e0259548..d98dd13e 100644
--- a/include/flatbufserver/FlatBufferConnection.h
+++ b/include/flatbufserver/FlatBufferConnection.h
@@ -14,9 +14,12 @@
 #include <utils/VideoMode.h>
 #include <utils/Logger.h>
 
-// flatbuffer FBS
-#include "hyperion_reply_generated.h"
-#include "hyperion_request_generated.h"
+#include <flatbuffers/flatbuffers.h>
+
+namespace hyperionnet
+{
+class Reply;
+}
 
 ///
 /// Connection class to setup an connection to the hyperion server and execute commands.
diff --git a/libsrc/flatbufserver/FlatBufferConnection.cpp b/libsrc/flatbufserver/FlatBufferConnection.cpp
index ec28f59b..3e39ebde 100644
--- a/libsrc/flatbufserver/FlatBufferConnection.cpp
+++ b/libsrc/flatbufserver/FlatBufferConnection.cpp
@@ -7,6 +7,10 @@
 // flatbuffer includes
 #include <flatbufserver/FlatBufferConnection.h>
 
+// flatbuffer FBS
+#include "hyperion_reply_generated.h"
+#include "hyperion_request_generated.h"
+
 FlatBufferConnection::FlatBufferConnection(const QString& origin, const QString & address, const int& priority, const bool& skipReply)
 	: _socket()
 	, _origin(origin)