diff --git a/fsfw b/fsfw
index cd3153b4..96babff6 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit cd3153b4640cec7428ebf71fbfbf0b2a1c5e1de3
+Subproject commit 96babff67ea7859cc9802db63c5d07a7f64c8255
diff --git a/generators/fsfwgen b/generators/fsfwgen
index 9a92c7de..5ad9fb94 160000
--- a/generators/fsfwgen
+++ b/generators/fsfwgen
@@ -1 +1 @@
-Subproject commit 9a92c7de0a2fedfcc638c0517e3edea123e977f8
+Subproject commit 5ad9fb94af3312d29863527106396395f7b808a5
diff --git a/tmtc b/tmtc
index 091cf2dd..8a30f669 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 091cf2dd632c71a0fa8000312bb11e84f1a755db
+Subproject commit 8a30f669f075c284494d7c1c6618e42e2aec8f15
diff --git a/watchdog/CMakeLists.txt b/watchdog/CMakeLists.txt
index 88908436..ecb50627 100644
--- a/watchdog/CMakeLists.txt
+++ b/watchdog/CMakeLists.txt
@@ -6,3 +6,5 @@ target_sources(${WATCHDOG_NAME} PRIVATE
 target_include_directories(${WATCHDOG_NAME} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
+
+install(TARGETS ${WATCHDOG_NAME} RUNTIME DESTINATION bin)
diff --git a/watchdog/Watchdog.cpp b/watchdog/Watchdog.cpp
index 9ae60548..a14bae53 100644
--- a/watchdog/Watchdog.cpp
+++ b/watchdog/Watchdog.cpp
@@ -1,5 +1,5 @@
 #include "Watchdog.h"
-#include "watchdogConf.h"
+#include "definitions.h"
 
 #include <errno.h>
 #include <sys/types.h>
diff --git a/watchdog/definitions.h b/watchdog/definitions.h
index 991de54d..bfb1ec13 100644
--- a/watchdog/definitions.h
+++ b/watchdog/definitions.h
@@ -1,6 +1,8 @@
 #ifndef WATCHDOG_DEFINITIONS_H_
 #define WATCHDOG_DEFINITIONS_H_
 
+#include <watchdogConf.h>
+
 namespace watchdog {
 
 // Suspend watchdog operations temporarily
diff --git a/watchdog/watchdogConf.h.in b/watchdog/watchdogConf.h.in
index b1b9956b..41bebe72 100644
--- a/watchdog/watchdogConf.h.in
+++ b/watchdog/watchdogConf.h.in
@@ -1,8 +1,6 @@
 #include <cstdint>
 #include <string>
 
-#include "watchdog/definitions.h"
-
 #define WATCHDOG_VERBOSE_LEVEL              1
 /**
  * This flag instructs the watchdog to create a special file in /tmp if the OBSW is running