diff --git a/src/blackcore/context_all_impl.h b/src/blackcore/context_all_impl.h
new file mode 100644
index 000000000..ee643995d
--- /dev/null
+++ b/src/blackcore/context_all_impl.h
@@ -0,0 +1,10 @@
+#ifndef BLACKCORE_CONTEXT_ALL_IMPL_H
+#define BLACKCORE_CONTEXT_ALL_IMPL_H
+
+#include "context_application_impl.h"
+#include "context_audio_impl.h"
+#include "context_network_impl.h"
+#include "context_settings_impl.h"
+#include "context_simulator_impl.h"
+
+#endif // guard
diff --git a/src/blackcore/context_all_interfaces.h b/src/blackcore/context_all_interfaces.h
new file mode 100644
index 000000000..b22d978dd
--- /dev/null
+++ b/src/blackcore/context_all_interfaces.h
@@ -0,0 +1,10 @@
+#ifndef BLACKCORE_CONTEXT_ALL_ITERFACES_H
+#define BLACKCORE_CONTEXT_ALL_ITERFACES_H
+
+#include "context_application.h"
+#include "context_audio.h"
+#include "context_network.h"
+#include "context_settings.h"
+#include "context_simulator.h"
+
+#endif // guard
diff --git a/src/blackcore/context_all_proxies.h b/src/blackcore/context_all_proxies.h
new file mode 100644
index 000000000..47694c700
--- /dev/null
+++ b/src/blackcore/context_all_proxies.h
@@ -0,0 +1,10 @@
+#ifndef BLACKCORE_CONTEXT_ALL_PROXIES_H
+#define BLACKCORE_CONTEXT_ALL_PROXIES_H
+
+#include "context_application_proxy.h"
+#include "context_audio_proxy.h"
+#include "context_network_proxy.h"
+#include "context_settings_proxy.h"
+#include "context_simulator_proxy.h"
+
+#endif // guard
diff --git a/src/blackcore/context_runtime.cpp b/src/blackcore/context_runtime.cpp
index 7d83144b8..ae72b33b9 100644
--- a/src/blackcore/context_runtime.cpp
+++ b/src/blackcore/context_runtime.cpp
@@ -1,16 +1,6 @@
 #include "blackcore/context_runtime.h"
-
-#include "blackcore/context_application_impl.h"
-#include "blackcore/context_network_impl.h"
-#include "blackcore/context_settings_impl.h"
-#include "blackcore/context_audio_impl.h"
-#include "blackcore/context_simulator_impl.h"
-
-#include "blackcore/context_application_proxy.h"
-#include "blackcore/context_network_proxy.h"
-#include "blackcore/context_settings_proxy.h"
-#include "blackcore/context_audio_proxy.h"
-#include "blackcore/context_simulator_proxy.h"
+#include "blackcore/context_all_impl.h"
+#include "blackcore/context_all_proxies.h"
 
 #include "blacksim/blacksimfreefunctions.h"
 
@@ -450,14 +440,14 @@ namespace BlackCore
             this->m_dbusConnection = QDBusConnection::connectToPeer(address, "BlackBoxRuntime");
     }
 
-    IContextNetwork *CRuntime::getIContextNetwork()
+    const IContextApplication *CRuntime::getIContextApplication() const
     {
-        return this->m_contextNetwork;
+        return this->m_contextApplication;
     }
 
-    const IContextNetwork *CRuntime::getIContextNetwork() const
+    IContextApplication *CRuntime::getIContextApplication()
     {
-        return this->m_contextNetwork;
+        return this->m_contextApplication;
     }
 
     IContextAudio *CRuntime::getIContextAudio()
@@ -470,6 +460,16 @@ namespace BlackCore
         return this->m_contextAudio;
     }
 
+    IContextNetwork *CRuntime::getIContextNetwork()
+    {
+        return this->m_contextNetwork;
+    }
+
+    const IContextNetwork *CRuntime::getIContextNetwork() const
+    {
+        return this->m_contextNetwork;
+    }
+
     IContextSettings *CRuntime::getIContextSettings()
     {
         return this->m_contextSettings;
@@ -480,16 +480,6 @@ namespace BlackCore
         return this->m_contextSettings;
     }
 
-    const IContextApplication *CRuntime::getIContextApplication() const
-    {
-        return this->m_contextApplication;
-    }
-
-    IContextApplication *CRuntime::getIContextApplication()
-    {
-        return this->m_contextApplication;
-    }
-
     const IContextSimulator *CRuntime::getIContextSimulator() const
     {
         return this->m_contextSimulator;