Make header structure compatible with simulator

Currently, the generated Makefile doesn't successfully compile. But it
is possible to run the simulator again by manually editing the Makefile.

TouchGFX/gui/include/gui/driverview_screen/DriverViewView.hpp

@@ -5,10 +5,11 @@
 #include "gui/containers/DriverViewFieldSelection.hpp"
 #include "touchgfx/Unicode.hpp"
 #include "touchgfx/containers/scrollers/DrawableList.hpp"
-#include "vehicle.h"
 #include <gui/driverview_screen/DriverViewPresenter.hpp>
 #include <gui_generated/driverview_screen/DriverViewViewBase.hpp>
 
+#include "vehicle_state.h"
+
 enum class DriverViewProgressType { PRECHARGE, R2D };
 
 class DriverViewView : public DriverViewViewBase {

TouchGFX/gui/include/gui/model/Model.hpp

@@ -2,7 +2,8 @@
 #define MODEL_HPP
 
 #include "stw_defines.h"
-#include "vehicle.h"
+#include "vehicle_state.h"
+
 class ModelListener;
 
 class Model {