Index: sources/view/VView.h
===================================================================
diff -u -rd2dc4f817892454cf43d9d3daffeeb167cd880e6 -r5d5d783779f1554f5ed3c13f2c0f369842d5e79e
--- sources/view/VView.h	(.../VView.h)	(revision d2dc4f817892454cf43d9d3daffeeb167cd880e6)
+++ sources/view/VView.h	(.../VView.h)	(revision 5d5d783779f1554f5ed3c13f2c0f369842d5e79e)
@@ -231,6 +231,13 @@
     REGISTER_TYPE( VTreatmentAdjustmentRecirculate                      ) \
     REGISTER_TYPE( VTreatmentAdjustmentEnd                              ) \
     REGISTER_TYPE( VTreatmentAdjustmentPressuresLimits                  ) \
+    REGISTER_TYPE( VTreatmentAdjustmentBloodFlowRate                    ) \
+    REGISTER_TYPE( VTreatmentAdjustmentBolusVolume                      ) \
+    REGISTER_TYPE( VTreatmentAdjustmentDialysateFlowRate                ) \
+    REGISTER_TYPE( VTreatmentAdjustmentDialysateTemperature             ) \
+    REGISTER_TYPE( VTreatmentAdjustmentDurationConfirm                  ) \
+    REGISTER_TYPE( VTreatmentAdjustmentDurationEdit                     ) \
+    REGISTER_TYPE( VTreatmentAdjustmentSetPoints                        ) \
     REGISTER_TYPE( VTreatmentCreate                                     ) \
     /* Post-Treatment */                                                  \
     REGISTER_TYPE( VPostTreatmentAdjustmentPatientDisconnectionConfirm  ) \
Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.cpp
===================================================================
diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -r5d5d783779f1554f5ed3c13f2c0f369842d5e79e
--- sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.cpp	(.../VTreatmentAdjustmentBloodFlowRate.cpp)	(revision 62797b3c6e0539e22a04404e16daa7c4465e178f)
+++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.cpp	(.../VTreatmentAdjustmentBloodFlowRate.cpp)	(revision 5d5d783779f1554f5ed3c13f2c0f369842d5e79e)
@@ -14,23 +14,11 @@
  */
 #include "VTreatmentAdjustmentBloodFlowRate.h"
 
-#include <QCoreApplication>
-#include <QQmlEngine>
-
 // Project
 #include "GuiController.h"
 
 VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentBloodFlowRate)
 
-/*!
- * \brief   Function called during startup to register this class with the QMetaObject system
- */
-static void qRegister()
-{
-    qmlRegisterType<VTreatmentAdjustmentBloodFlowRate>("VTreatmentAdjustmentBloodFlowRate", 0, 1, "VTreatmentAdjustmentBloodFlowRate");
-}
-Q_COREAPP_STARTUP_FUNCTION(qRegister)
-
 void VTreatmentAdjustmentBloodFlowRate::initConnections()
 {
     ACTION_VIEW_CONNECTION(AdjustBloodFlowRateResponseData);
Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp
===================================================================
diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -r5d5d783779f1554f5ed3c13f2c0f369842d5e79e
--- sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp	(.../VTreatmentAdjustmentBolusVolume.cpp)	(revision 62797b3c6e0539e22a04404e16daa7c4465e178f)
+++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp	(.../VTreatmentAdjustmentBolusVolume.cpp)	(revision 5d5d783779f1554f5ed3c13f2c0f369842d5e79e)
@@ -14,23 +14,11 @@
  */
 #include "VTreatmentAdjustmentBolusVolume.h"
 
-#include <QCoreApplication>
-#include <QQmlEngine>
-
 // Project
 #include "GuiController.h"
 
 VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentBolusVolume)
 
-/*!
- * \brief   Function called during startup to register this class with the QMetaObject system
- */
-static void qRegister()
-{
-    qmlRegisterType<VTreatmentAdjustmentBolusVolume>("VTreatmentAdjustmentBolusVolume", 0, 1, "VTreatmentAdjustmentBolusVolume");
-}
-Q_COREAPP_STARTUP_FUNCTION(qRegister)
-
 void VTreatmentAdjustmentBolusVolume::initConnections()
 {
     ACTION_VIEW_CONNECTION(AdjustBolusVolumeResponseData);
Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.cpp
===================================================================
diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -r5d5d783779f1554f5ed3c13f2c0f369842d5e79e
--- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.cpp	(.../VTreatmentAdjustmentDialysateFlowRate.cpp)	(revision 62797b3c6e0539e22a04404e16daa7c4465e178f)
+++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.cpp	(.../VTreatmentAdjustmentDialysateFlowRate.cpp)	(revision 5d5d783779f1554f5ed3c13f2c0f369842d5e79e)
@@ -14,23 +14,11 @@
  */
 #include "VTreatmentAdjustmentDialysateFlowRate.h"
 
-#include <QCoreApplication>
-#include <QQmlEngine>
-
 // Project
 #include "GuiController.h"
 
 VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentDialysateFlowRate)
 
-/*!
- * \brief   Function called during startup to register this class with the QMetaObject system
- */
-static void qRegister()
-{
-    qmlRegisterType<VTreatmentAdjustmentDialysateFlowRate>("VTreatmentAdjustmentDialysateFlowRate", 0, 1, "VTreatmentAdjustmentDialysateFlowRate");
-}
-Q_COREAPP_STARTUP_FUNCTION(qRegister)
-
 void VTreatmentAdjustmentDialysateFlowRate::initConnections()
 {
     ACTION_VIEW_CONNECTION(AdjustDialysateFlowRateResponseData);
Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.cpp
===================================================================
diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -r5d5d783779f1554f5ed3c13f2c0f369842d5e79e
--- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.cpp	(.../VTreatmentAdjustmentDialysateTemperature.cpp)	(revision 62797b3c6e0539e22a04404e16daa7c4465e178f)
+++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.cpp	(.../VTreatmentAdjustmentDialysateTemperature.cpp)	(revision 5d5d783779f1554f5ed3c13f2c0f369842d5e79e)
@@ -14,23 +14,11 @@
  */
 #include "VTreatmentAdjustmentDialysateTemperature.h"
 
-#include <QCoreApplication>
-#include <QQmlEngine>
-
 // Project
 #include "GuiController.h"
 
 VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentDialysateTemperature)
 
-/*!
- * \brief   Function called during startup to register this class with the QMetaObject system
- */
-static void qRegister()
-{
-    qmlRegisterType<VTreatmentAdjustmentDialysateTemperature>("VTreatmentAdjustmentDialysateTemperature", 0, 1, "VTreatmentAdjustmentDialysateTemperature");
-}
-Q_COREAPP_STARTUP_FUNCTION(qRegister)
-
 void VTreatmentAdjustmentDialysateTemperature::initConnections()
 {
     ACTION_VIEW_CONNECTION(AdjustDialysateTemperatureResponseData);
Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp
===================================================================
diff -u -r48343520806859178923efdcca8a95f6af8599e9 -r5d5d783779f1554f5ed3c13f2c0f369842d5e79e
--- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp	(.../VTreatmentAdjustmentDurationConfirm.cpp)	(revision 48343520806859178923efdcca8a95f6af8599e9)
+++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp	(.../VTreatmentAdjustmentDurationConfirm.cpp)	(revision 5d5d783779f1554f5ed3c13f2c0f369842d5e79e)
@@ -14,23 +14,11 @@
  */
 #include "VTreatmentAdjustmentDurationConfirm.h"
 
-#include <QCoreApplication>
-#include <QQmlEngine>
-
 // Project
 #include "GuiController.h"
 
 VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentDurationConfirm)
 
-/*!
- * \brief   Function called during startup to register this class with the QMetaObject system
- */
-static void qRegister()
-{
-    qmlRegisterType<VTreatmentAdjustmentDurationConfirm>("VTreatmentAdjustmentDurationConfirm", 0, 1, "VTreatmentAdjustmentDurationConfirm");
-}
-Q_COREAPP_STARTUP_FUNCTION(qRegister)
-
 void VTreatmentAdjustmentDurationConfirm::initConnections() {
     ACTION_VIEW_CONNECTION(AdjustDurationConfirmResponseData);
     ADJUST_VIEW_CONNECTION( AdjustDurationConfirmRequestData);
Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp
===================================================================
diff -u -rdd02afaf66a118eb50deb9313e6a809dd17b5864 -r5d5d783779f1554f5ed3c13f2c0f369842d5e79e
--- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp	(.../VTreatmentAdjustmentDurationEdit.cpp)	(revision dd02afaf66a118eb50deb9313e6a809dd17b5864)
+++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp	(.../VTreatmentAdjustmentDurationEdit.cpp)	(revision 5d5d783779f1554f5ed3c13f2c0f369842d5e79e)
@@ -14,23 +14,11 @@
  */
 #include "VTreatmentAdjustmentDurationEdit.h"
 
-#include <QCoreApplication>
-#include <QQmlEngine>
-
 // Project
 #include "GuiController.h"
 
 VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentDurationEdit)
 
-/*!
- * \brief   Function called during startup to register this class with the QMetaObject system
- */
-static void qRegister()
-{
-    qmlRegisterType<VTreatmentAdjustmentDurationEdit>("VTreatmentAdjustmentDurationEdit", 0, 1, "VTreatmentAdjustmentDurationEdit");
-}
-Q_COREAPP_STARTUP_FUNCTION(qRegister)
-
 void VTreatmentAdjustmentDurationEdit::initConnections() {
     ACTION_VIEW_CONNECTION(AdjustDurationEditResponseData);
     ADJUST_VIEW_CONNECTION( AdjustDurationEditRequestData);
Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp
===================================================================
diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -r5d5d783779f1554f5ed3c13f2c0f369842d5e79e
--- sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp	(.../VTreatmentAdjustmentSetPoints.cpp)	(revision 62797b3c6e0539e22a04404e16daa7c4465e178f)
+++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp	(.../VTreatmentAdjustmentSetPoints.cpp)	(revision 5d5d783779f1554f5ed3c13f2c0f369842d5e79e)
@@ -14,23 +14,11 @@
  */
 #include "VTreatmentAdjustmentSetPoints.h"
 
-#include <QCoreApplication>
-#include <QQmlEngine>
-
 // Project
 #include "GuiController.h"
 
 VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentSetPoints)
 
-/*!
- * \brief   Function called during startup to register this class with the QMetaObject system
- */
-static void qRegister()
-{
-    qmlRegisterType<VTreatmentAdjustmentSetPoints>("VTreatmentAdjustmentSetPoints", 0, 1, "VTreatmentAdjustmentSetPoints");
-}
-Q_COREAPP_STARTUP_FUNCTION(qRegister)
-
 void VTreatmentAdjustmentSetPoints::initConnections()
 {
     ACTION_VIEW_CONNECTION(AdjustSetPointsResponseData);