12 files changed, 8 insertions, 7 deletions
diff --git a/src/plugins/debugger/cdb/cdbdumperhelper.cpp b/src/plugins/debugger/cdb/cdbdumperhelper.cpp
index 7a9c2efd7b..a0cac62c6c 100644
--- a/src/plugins/debugger/cdb/cdbdumperhelper.cpp
+++ b/src/plugins/debugger/cdb/cdbdumperhelper.cpp
@@ -35,7 +35,7 @@
 #include "cdbsymbolgroupcontext.h"
 #include "watchhandler.h"
 
-#include "sharedlibraryinjector.h"
+#include "shared/sharedlibraryinjector.h"
 
 #include <QtCore/QRegExp>
 #include <QtCore/QCoreApplication>
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index 77f6f88177..b66a6a911d 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -86,10 +86,11 @@ HEADERS += $$PWD/modeltest.h
 DEFINES += USE_MODEL_TEST=1
 }
 
-include(gdb/gdb.pri)
-include(tcf/tcf.pri)
-include(win/win.pri)
 include(cdb/cdb.pri)
+include(gdb/gdb.pri)
 include(script/script.pri)
+include(tcf/tcf.pri)
+
+include(shared/shared.pri)
 
 OTHER_FILES += Debugger.pluginspec
diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index 6b43214def..316d4fbf08 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -36,7 +36,7 @@
 #include "ui_startremotedialog.h"
 
 #ifdef Q_OS_WIN
-#  include "dbgwinutils.h"
+#  include "shared/dbgwinutils.h"
 #endif
 
 #include <QtCore/QDebug>
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index f00d100c70..842fe92479 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -55,7 +55,7 @@
 
 #include "debuggerdialogs.h"
 #ifdef Q_OS_WIN
-#  include "peutils.h"
+#  include "shared/peutils.h"
 #endif
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 2930760149..98e1b9b9a0 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -69,7 +69,7 @@
 #include <QtGui/QDialogButtonBox>
 #include <QtGui/QPushButton>
 #ifdef Q_OS_WIN
-#    include "sharedlibraryinjector.h"
+#    include "shared/sharedlibraryinjector.h"
 #endif
 
 #if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
diff --git a/src/plugins/debugger/win/dbgwinutils.cpp b/src/plugins/debugger/shared/dbgwinutils.cpp
index 9ef66aa1ad..9ef66aa1ad 100644
--- a/src/plugins/debugger/win/dbgwinutils.cpp
+++ b/src/plugins/debugger/shared/dbgwinutils.cpp
diff --git a/src/plugins/debugger/win/dbgwinutils.h b/src/plugins/debugger/shared/dbgwinutils.h
index af16913a8e..af16913a8e 100644
--- a/src/plugins/debugger/win/dbgwinutils.h
+++ b/src/plugins/debugger/shared/dbgwinutils.h
diff --git a/src/plugins/debugger/win/peutils.cpp b/src/plugins/debugger/shared/peutils.cpp
index 084e511f46..084e511f46 100644
--- a/src/plugins/debugger/win/peutils.cpp
+++ b/src/plugins/debugger/shared/peutils.cpp
diff --git a/src/plugins/debugger/win/peutils.h b/src/plugins/debugger/shared/peutils.h
index 7b4b0061fc..7b4b0061fc 100644
--- a/src/plugins/debugger/win/peutils.h
+++ b/src/plugins/debugger/shared/peutils.h
diff --git a/src/plugins/debugger/win/sharedlibraryinjector.cpp b/src/plugins/debugger/shared/sharedlibraryinjector.cpp
index 1c5bf8d96a..1c5bf8d96a 100644
--- a/src/plugins/debugger/win/sharedlibraryinjector.cpp
+++ b/src/plugins/debugger/shared/sharedlibraryinjector.cpp
diff --git a/src/plugins/debugger/win/sharedlibraryinjector.h b/src/plugins/debugger/shared/sharedlibraryinjector.h
index f1356b03f1..f1356b03f1 100644
--- a/src/plugins/debugger/win/sharedlibraryinjector.h
+++ b/src/plugins/debugger/shared/sharedlibraryinjector.h
diff --git a/src/plugins/debugger/win/win.pri b/src/plugins/debugger/shared/win.pri
index a3dc29a6b3..a3dc29a6b3 100644
--- a/src/plugins/debugger/win/win.pri
+++ b/src/plugins/debugger/shared/win.pri