Move the launcher core library into its own folder too

Now we have one target per folder, which makes it a lot easier to reason about dependencies here.
KDAB · Apr 4, 2017 · d4b3eed · d4b3eed
1 parent 284b8c6
commit d4b3eed
Show file tree

Hide file tree

Showing 75 changed files with 147 additions and 148 deletions.
diff --git a/app/main.cpp b/app/main.cpp
@@ -30,8 +30,8 @@
 
 #include <common/paths.h>
 
-#include <launcher/launcher.h>
-#include <launcher/launchoptions.h>
+#include <launcher/core/launcher.h>
+#include <launcher/core/launchoptions.h>
 #include <launcher/ui/launcherwindow.h>
 
 #include <client/clientconnectionmanager.h>

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
@@ -1,103 +1,6 @@
-add_subdirectory(injector)
-
 if(NOT GAMMARAY_PROBE_ONLY_BUILD)
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-# shared launcher code
-set(gammaray_launcher_shared_srcs
-  injector/abstractinjector.cpp
-  injector/processinjector.cpp
-  injector/injectorfactory.cpp
-  injector/styleinjector.cpp
-
-  libraryutil.cpp
-  probeabi.cpp
-  probeabidetector.cpp
-  probefinder.cpp
-  launchoptions.cpp
-  networkdiscoverymodel.cpp
-  clientlauncher.cpp
-  launcherfinder.cpp
-  launcher.cpp
-  selftest.cpp
-)
-
-if(WIN32)
-  list(APPEND gammaray_launcher_shared_srcs
-    probeabidetector_win.cpp
-    pefile.cpp
-    injector/windllinjector.cpp
-  )
-else()
-  list(APPEND gammaray_launcher_shared_srcs
-    injector/debuggerinjector.cpp
-    injector/gdbinjector.cpp
-    injector/lldbinjector.cpp
-    injector/preloadcheck.cpp
-    injector/preloadinjector.cpp
-  )
-  if(APPLE)
-    list(APPEND gammaray_launcher_shared_srcs probeabidetector_mac.cpp)
-  elseif(UNIX)
-    list(APPEND gammaray_launcher_shared_srcs probeabidetector_elf.cpp)
-  else()
-    list(APPEND gammaray_launcher_shared_srcs probeabidetector_dummy.cpp)
-  endif()
-endif()
-
-add_library(gammaray_launcher SHARED ${gammaray_launcher_shared_srcs})
-generate_export_header(gammaray_launcher)
-set_target_properties(gammaray_launcher PROPERTIES
-  ${GAMMARAY_DEFAULT_LIBRARY_PROPERTIES}
-)
-
-gammaray_target_relocatable_interfaces(gammaray_launcher_ipaths)
-target_include_directories(gammaray_launcher PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> $<INSTALL_INTERFACE:${gammaray_launcher_ipaths}>)
-target_link_libraries(gammaray_launcher LINK_PUBLIC ${QT_QTCORE_LIBRARIES} LINK_PRIVATE gammaray_common ${QT_QTNETWORK_LIBRARIES})
-if(HAVE_QT_WIDGETS)
-  target_link_libraries(gammaray_launcher LINK_PRIVATE ${QT_QTGUI_LIBRARIES})
-endif()
-if(WIN32)
-  target_link_libraries(gammaray_launcher LINK_PRIVATE version)
-elseif(APPLE)
-  target_link_libraries(gammaray_launcher LINK_PRIVATE "-framework CoreFoundation")
-endif()
-if(UNIX AND NOT APPLE AND NOT QNXNTO)
-  target_link_libraries(gammaray_launcher LINK_PRIVATE dl) # for preload check
-endif()
-
-if(NOT GAMMARAY_PROBE_ONLY_BUILD)
-  install(TARGETS gammaray_launcher EXPORT GammaRayTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-  gammaray_install_headers(
-      ${CMAKE_CURRENT_BINARY_DIR}/gammaray_launcher_export.h
-      launcher.h
-      launchoptions.h
-      probeabi.h
-      probeabidetector.h
-      probefinder.h
-      networkdiscoverymodel.h
-  )
-
-  ecm_generate_pri_file(BASE_NAME GammaRayLauncher
-                        LIB_NAME gammaray_launcher
-                        DEPS "core gui GammaRayCommon"
-                        FILENAME_VAR PRI_FILENAME
-                        INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}
-  )
-
-  install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
-else()
-  install(TARGETS gammaray_launcher ${INSTALL_TARGETS_DEFAULT_ARGS})
-endif()
-if(MSVC)
-  install(FILES "$<TARGET_PDB_FILE_DIR:gammaray_launcher>/$<TARGET_PDB_FILE_NAME:gammaray_launcher>" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug RelWithDebInfo)
-endif()
-
+add_subdirectory(core)
 add_subdirectory(cli)
-# UI launcher
 if(HAVE_QT_CONCURRENT AND GAMMARAY_BUILD_UI)
   add_subdirectory(ui)
   add_subdirectory(app)

diff --git a/launcher/app/main.cpp b/launcher/app/main.cpp
@@ -27,9 +27,10 @@
 */
 
 #include <config-gammaray.h>
-#include "launcherwindow.h"
-#include "launchoptions.h"
-#include "launcherfinder.h"
+
+#include <launcher/ui/launcherwindow.h>
+#include <launcher/core/launchoptions.h>
+#include <launcher/core/launcherfinder.h>
 
 #include <common/paths.h>
 #include <common/translator.h>

diff --git a/launcher/cli/main.cpp b/launcher/cli/main.cpp
@@ -28,18 +28,19 @@
 
 #include <config-gammaray.h>
 #include "config-gammaray-version.h"
-#include "injector/injectorfactory.h"
-#include "clientlauncher.h"
-#include "launchoptions.h"
-#include "launcherfinder.h"
-#include "launcher.h"
-#include "probefinder.h"
-#include "selftest.h"
+
+#include <launcher/core/injector/injectorfactory.h>
+#include <launcher/core/clientlauncher.h>
+#include <launcher/core/launchoptions.h>
+#include <launcher/core/launcherfinder.h>
+#include <launcher/core/launcher.h>
+#include <launcher/core/probeabi.h>
+#include <launcher/core/probeabidetector.h>
+#include <launcher/core/probefinder.h>
+#include <launcher/core/selftest.h>
 
 #include <common/paths.h>
 #include <common/protocol.h>
-#include <launcher/probeabi.h>
-#include <launcher/probeabidetector.h>
 
 #ifdef HAVE_QT_WIDGETS
 #include <QApplication>

diff --git a/launcher/core/CMakeLists.txt b/launcher/core/CMakeLists.txt
@@ -0,0 +1,91 @@
+add_subdirectory(injector)
+
+set(gammaray_launcher_shared_srcs
+  injector/abstractinjector.cpp
+  injector/processinjector.cpp
+  injector/injectorfactory.cpp
+  injector/styleinjector.cpp
+
+  libraryutil.cpp
+  probeabi.cpp
+  probeabidetector.cpp
+  probefinder.cpp
+  launchoptions.cpp
+  networkdiscoverymodel.cpp
+  clientlauncher.cpp
+  launcherfinder.cpp
+  launcher.cpp
+  selftest.cpp
+)
+
+if(WIN32)
+  list(APPEND gammaray_launcher_shared_srcs
+    probeabidetector_win.cpp
+    pefile.cpp
+    injector/windllinjector.cpp
+  )
+else()
+  list(APPEND gammaray_launcher_shared_srcs
+    injector/debuggerinjector.cpp
+    injector/gdbinjector.cpp
+    injector/lldbinjector.cpp
+    injector/preloadcheck.cpp
+    injector/preloadinjector.cpp
+  )
+  if(APPLE)
+    list(APPEND gammaray_launcher_shared_srcs probeabidetector_mac.cpp)
+  elseif(UNIX)
+    list(APPEND gammaray_launcher_shared_srcs probeabidetector_elf.cpp)
+  else()
+    list(APPEND gammaray_launcher_shared_srcs probeabidetector_dummy.cpp)
+  endif()
+endif()
+
+add_library(gammaray_launcher SHARED ${gammaray_launcher_shared_srcs})
+generate_export_header(gammaray_launcher)
+set_target_properties(gammaray_launcher PROPERTIES
+  ${GAMMARAY_DEFAULT_LIBRARY_PROPERTIES}
+)
+
+gammaray_target_relocatable_interfaces(gammaray_launcher_ipaths)
+target_include_directories(gammaray_launcher PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> $<INSTALL_INTERFACE:${gammaray_launcher_ipaths}>)
+target_link_libraries(gammaray_launcher LINK_PUBLIC ${QT_QTCORE_LIBRARIES} LINK_PRIVATE gammaray_common ${QT_QTNETWORK_LIBRARIES})
+if(HAVE_QT_WIDGETS)
+  target_link_libraries(gammaray_launcher LINK_PRIVATE ${QT_QTGUI_LIBRARIES})
+endif()
+if(WIN32)
+  target_link_libraries(gammaray_launcher LINK_PRIVATE version)
+elseif(APPLE)
+  target_link_libraries(gammaray_launcher LINK_PRIVATE "-framework CoreFoundation")
+endif()
+if(UNIX AND NOT APPLE AND NOT QNXNTO)
+  target_link_libraries(gammaray_launcher LINK_PRIVATE dl) # for preload check
+endif()
+
+if(NOT GAMMARAY_PROBE_ONLY_BUILD)
+  install(TARGETS gammaray_launcher EXPORT GammaRayTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+  gammaray_install_headers(DESTINATION launcher
+      ${CMAKE_CURRENT_BINARY_DIR}/gammaray_launcher_export.h
+      launcher.h
+      launchoptions.h
+      probeabi.h
+      probeabidetector.h
+      probefinder.h
+      networkdiscoverymodel.h
+  )
+
+  ecm_generate_pri_file(BASE_NAME GammaRayLauncher
+                        LIB_NAME gammaray_launcher
+                        DEPS "core gui GammaRayCommon"
+                        FILENAME_VAR PRI_FILENAME
+                        INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}
+  )
+
+  install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
+else()
+  install(TARGETS gammaray_launcher ${INSTALL_TARGETS_DEFAULT_ARGS})
+endif()
+if(MSVC)
+  install(FILES "$<TARGET_PDB_FILE_DIR:gammaray_launcher>/$<TARGET_PDB_FILE_NAME:gammaray_launcher>" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug RelWithDebInfo)
+endif()
diff --git a/launcher/clientlauncher.cpp → launcher/core/clientlauncher.cpp b/launcher/clientlauncher.cpp → launcher/core/clientlauncher.cpp
diff --git a/launcher/clientlauncher.h → launcher/core/clientlauncher.h b/launcher/clientlauncher.h → launcher/core/clientlauncher.h
diff --git a/launcher/injector/CMakeLists.txt → launcher/core/injector/CMakeLists.txt b/launcher/injector/CMakeLists.txt → launcher/core/injector/CMakeLists.txt
diff --git a/launcher/injector/abstractinjector.cpp → launcher/core/injector/abstractinjector.cpp b/launcher/injector/abstractinjector.cpp → launcher/core/injector/abstractinjector.cpp
diff --git a/launcher/injector/abstractinjector.h → launcher/core/injector/abstractinjector.h b/launcher/injector/abstractinjector.h → launcher/core/injector/abstractinjector.h
@@ -29,7 +29,7 @@
 #ifndef GAMMARAY_ABSTRACTINJECTOR_H
 #define GAMMARAY_ABSTRACTINJECTOR_H
 
-#include <launcher/probeabi.h>
+#include <launcher/core/probeabi.h>
 
 #include <QProcess>
 #include <QSharedPointer>

diff --git a/launcher/injector/debuggerinjector.cpp → launcher/core/injector/debuggerinjector.cpp b/launcher/injector/debuggerinjector.cpp → launcher/core/injector/debuggerinjector.cpp
diff --git a/launcher/injector/debuggerinjector.h → launcher/core/injector/debuggerinjector.h b/launcher/injector/debuggerinjector.h → launcher/core/injector/debuggerinjector.h
diff --git a/launcher/injector/gdbinjector.cpp → launcher/core/injector/gdbinjector.cpp b/launcher/injector/gdbinjector.cpp → launcher/core/injector/gdbinjector.cpp
diff --git a/launcher/injector/gdbinjector.h → launcher/core/injector/gdbinjector.h b/launcher/injector/gdbinjector.h → launcher/core/injector/gdbinjector.h
diff --git a/launcher/injector/injectorfactory.cpp → launcher/core/injector/injectorfactory.cpp b/launcher/injector/injectorfactory.cpp → launcher/core/injector/injectorfactory.cpp
@@ -37,7 +37,7 @@
 #include "preloadinjector.h"
 #endif
 
-#include <launcher/probeabi.h>
+#include <launcher/core/probeabi.h>
 
 #include <QString>
 

diff --git a/launcher/injector/injectorfactory.h → launcher/core/injector/injectorfactory.h b/launcher/injector/injectorfactory.h → launcher/core/injector/injectorfactory.h
diff --git a/launcher/injector/injectorstyle.json → launcher/core/injector/injectorstyle.json b/launcher/injector/injectorstyle.json → launcher/core/injector/injectorstyle.json
diff --git a/launcher/injector/injectorstyleplugin.cpp → ...her/core/injector/injectorstyleplugin.cpp b/launcher/injector/injectorstyleplugin.cpp → ...her/core/injector/injectorstyleplugin.cpp
diff --git a/launcher/injector/injectorstyleplugin.h → launcher/core/injector/injectorstyleplugin.h b/launcher/injector/injectorstyleplugin.h → launcher/core/injector/injectorstyleplugin.h
diff --git a/launcher/injector/lldbinjector.cpp → launcher/core/injector/lldbinjector.cpp b/launcher/injector/lldbinjector.cpp → launcher/core/injector/lldbinjector.cpp
diff --git a/launcher/injector/lldbinjector.h → launcher/core/injector/lldbinjector.h b/launcher/injector/lldbinjector.h → launcher/core/injector/lldbinjector.h
diff --git a/launcher/injector/preloadcheck.cpp → launcher/core/injector/preloadcheck.cpp b/launcher/injector/preloadcheck.cpp → launcher/core/injector/preloadcheck.cpp
diff --git a/launcher/injector/preloadcheck.h → launcher/core/injector/preloadcheck.h b/launcher/injector/preloadcheck.h → launcher/core/injector/preloadcheck.h
diff --git a/launcher/injector/preloadcheck_mips.cpp → launcher/core/injector/preloadcheck_mips.cpp b/launcher/injector/preloadcheck_mips.cpp → launcher/core/injector/preloadcheck_mips.cpp
diff --git a/launcher/injector/preloadinjector.cpp → launcher/core/injector/preloadinjector.cpp b/launcher/injector/preloadinjector.cpp → launcher/core/injector/preloadinjector.cpp
diff --git a/launcher/injector/preloadinjector.h → launcher/core/injector/preloadinjector.h b/launcher/injector/preloadinjector.h → launcher/core/injector/preloadinjector.h
diff --git a/launcher/injector/processinjector.cpp → launcher/core/injector/processinjector.cpp b/launcher/injector/processinjector.cpp → launcher/core/injector/processinjector.cpp
diff --git a/launcher/injector/processinjector.h → launcher/core/injector/processinjector.h b/launcher/injector/processinjector.h → launcher/core/injector/processinjector.h
diff --git a/launcher/injector/styleinjector.cpp → launcher/core/injector/styleinjector.cpp b/launcher/injector/styleinjector.cpp → launcher/core/injector/styleinjector.cpp
diff --git a/launcher/injector/styleinjector.h → launcher/core/injector/styleinjector.h b/launcher/injector/styleinjector.h → launcher/core/injector/styleinjector.h
diff --git a/launcher/injector/windllinjector.cpp → launcher/core/injector/windllinjector.cpp b/launcher/injector/windllinjector.cpp → launcher/core/injector/windllinjector.cpp
diff --git a/launcher/injector/windllinjector.h → launcher/core/injector/windllinjector.h b/launcher/injector/windllinjector.h → launcher/core/injector/windllinjector.h
diff --git a/launcher/launcher.cpp → launcher/core/launcher.cpp b/launcher/launcher.cpp → launcher/core/launcher.cpp
diff --git a/launcher/launcher.h → launcher/core/launcher.h b/launcher/launcher.h → launcher/core/launcher.h
diff --git a/launcher/launcherfinder.cpp → launcher/core/launcherfinder.cpp b/launcher/launcherfinder.cpp → launcher/core/launcherfinder.cpp
diff --git a/launcher/launcherfinder.h → launcher/core/launcherfinder.h b/launcher/launcherfinder.h → launcher/core/launcherfinder.h
diff --git a/launcher/launchoptions.cpp → launcher/core/launchoptions.cpp b/launcher/launchoptions.cpp → launcher/core/launchoptions.cpp
diff --git a/launcher/launchoptions.h → launcher/core/launchoptions.h b/launcher/launchoptions.h → launcher/core/launchoptions.h
diff --git a/launcher/libraryutil.cpp → launcher/core/libraryutil.cpp b/launcher/libraryutil.cpp → launcher/core/libraryutil.cpp
diff --git a/launcher/libraryutil.h → launcher/core/libraryutil.h b/launcher/libraryutil.h → launcher/core/libraryutil.h
diff --git a/launcher/networkdiscoverymodel.cpp → launcher/core/networkdiscoverymodel.cpp b/launcher/networkdiscoverymodel.cpp → launcher/core/networkdiscoverymodel.cpp
diff --git a/launcher/networkdiscoverymodel.h → launcher/core/networkdiscoverymodel.h b/launcher/networkdiscoverymodel.h → launcher/core/networkdiscoverymodel.h
diff --git a/launcher/pefile.cpp → launcher/core/pefile.cpp b/launcher/pefile.cpp → launcher/core/pefile.cpp
diff --git a/launcher/pefile.h → launcher/core/pefile.h b/launcher/pefile.h → launcher/core/pefile.h
diff --git a/launcher/probeabi.cpp → launcher/core/probeabi.cpp b/launcher/probeabi.cpp → launcher/core/probeabi.cpp
diff --git a/launcher/probeabi.h → launcher/core/probeabi.h b/launcher/probeabi.h → launcher/core/probeabi.h
diff --git a/launcher/probeabidetector.cpp → launcher/core/probeabidetector.cpp b/launcher/probeabidetector.cpp → launcher/core/probeabidetector.cpp
diff --git a/launcher/probeabidetector.h → launcher/core/probeabidetector.h b/launcher/probeabidetector.h → launcher/core/probeabidetector.h
diff --git a/launcher/probeabidetector_dummy.cpp → launcher/core/probeabidetector_dummy.cpp b/launcher/probeabidetector_dummy.cpp → launcher/core/probeabidetector_dummy.cpp
diff --git a/launcher/probeabidetector_elf.cpp → launcher/core/probeabidetector_elf.cpp b/launcher/probeabidetector_elf.cpp → launcher/core/probeabidetector_elf.cpp
diff --git a/launcher/probeabidetector_mac.cpp → launcher/core/probeabidetector_mac.cpp b/launcher/probeabidetector_mac.cpp → launcher/core/probeabidetector_mac.cpp
diff --git a/launcher/probeabidetector_win.cpp → launcher/core/probeabidetector_win.cpp b/launcher/probeabidetector_win.cpp → launcher/core/probeabidetector_win.cpp
diff --git a/launcher/probefinder.cpp → launcher/core/probefinder.cpp b/launcher/probefinder.cpp → launcher/core/probefinder.cpp
diff --git a/launcher/probefinder.h → launcher/core/probefinder.h b/launcher/probefinder.h → launcher/core/probefinder.h
diff --git a/launcher/selftest.cpp → launcher/core/selftest.cpp b/launcher/selftest.cpp → launcher/core/selftest.cpp
diff --git a/launcher/selftest.h → launcher/core/selftest.h b/launcher/selftest.h → launcher/core/selftest.h
diff --git a/launcher/ui/attachdialog.cpp b/launcher/ui/attachdialog.cpp
@@ -28,12 +28,12 @@
 
 #include <config-gammaray.h>
 #include "attachdialog.h"
-
-#include "launchoptions.h"
 #include "processfiltermodel.h"
 #include "processmodel.h"
 #include "probeabimodel.h"
 
+#include <launcher/core/launchoptions.h>
+
 #include <ui/searchlinecontroller.h>
 
 #include <QPushButton>

diff --git a/launcher/ui/connectpage.cpp b/launcher/ui/connectpage.cpp
@@ -28,8 +28,9 @@
 
 #include "connectpage.h"
 #include "ui_connectpage.h"
-#include "networkdiscoverymodel.h"
-#include "clientlauncher.h"
+
+#include <launcher/core/networkdiscoverymodel.h>
+#include <launcher/core/clientlauncher.h>
 
 #include <common/endpoint.h>
 

diff --git a/launcher/ui/launcherwindow.cpp b/launcher/ui/launcherwindow.cpp
@@ -28,7 +28,8 @@
 
 #include "launcherwindow.h"
 #include "ui_launcherwindow.h"
-#include "launchoptions.h"
+
+#include <launcher/core/launchoptions.h>
 
 #include <ui/aboutdata.h>
 #include <ui/helpcontroller.h>

diff --git a/launcher/ui/launchpage.cpp b/launcher/ui/launchpage.cpp
@@ -29,10 +29,11 @@
 #include <config-gammaray.h>
 #include "launchpage.h"
 #include "ui_launchpage.h"
-#include "launchoptions.h"
-#include "probefinder.h"
 #include "probeabimodel.h"
 
+#include <launcher/core/launchoptions.h>
+#include <launcher/core/probefinder.h>
+
 #include <QCompleter>
 #include <QFileDialog>
 #include <QFileSystemModel>

diff --git a/launcher/ui/launchpage.h b/launcher/ui/launchpage.h
@@ -29,7 +29,7 @@
 #ifndef GAMMARAY_LAUNCHPAGE_H
 #define GAMMARAY_LAUNCHPAGE_H
 
-#include <launcher/probeabidetector.h>
+#include <launcher/core/probeabidetector.h>
 
 #include <QWidget>
 

diff --git a/launcher/ui/probeabimodel.cpp b/launcher/ui/probeabimodel.cpp
@@ -28,7 +28,7 @@
 
 #include "probeabimodel.h"
 
-#include <probefinder.h>
+#include <launcher/core/probefinder.h>
 
 using namespace GammaRay;
 

diff --git a/launcher/ui/probeabimodel.h b/launcher/ui/probeabimodel.h
@@ -29,7 +29,7 @@
 #ifndef GAMMARAY_PROBEABIMODEL_H
 #define GAMMARAY_PROBEABIMODEL_H
 
-#include <launcher/probeabi.h>
+#include <launcher/core/probeabi.h>
 
 #include <QAbstractListModel>
 #include <QVector>

diff --git a/launcher/ui/processlist.h b/launcher/ui/processlist.h
@@ -33,7 +33,7 @@
 #ifndef GAMMARAY_PROCESSLIST_H
 #define GAMMARAY_PROCESSLIST_H
 
-#include <launcher/probeabi.h>
+#include <launcher/core/probeabi.h>
 
 #include <QString>
 #include <QList>

diff --git a/launcher/ui/processlist_unix.cpp b/launcher/ui/processlist_unix.cpp
@@ -32,7 +32,7 @@
 
 #include "processlist.h"
 
-#include <launcher/probeabidetector.h>
+#include <launcher/core/probeabidetector.h>
 
 #include <QProcess>
 #include <QDir>

diff --git a/launcher/ui/processlist_win.cpp b/launcher/ui/processlist_win.cpp
@@ -32,7 +32,7 @@
 
 #include "processlist.h"
 
-#include <launcher/probeabidetector.h>
+#include <launcher/core/probeabidetector.h>
 
 #include <QLibrary>
 

diff --git a/launcher/ui/processmodel.cpp b/launcher/ui/processmodel.cpp
@@ -29,7 +29,7 @@
 #include "processmodel.h"
 #include "probeabimodel.h"
 
-#include <probefinder.h>
+#include <launcher/core/probefinder.h>
 
 #include <QDebug>
 

diff --git a/launcher/ui/processmodel.h b/launcher/ui/processmodel.h
@@ -29,7 +29,7 @@
 #ifndef GAMMARAY_PROCESSMODEL_H
 #define GAMMARAY_PROCESSMODEL_H
 
-#include <launcher/probeabi.h>
+#include <launcher/core/probeabi.h>
 
 #include <QAbstractTableModel>
 #include <QVector>