diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index 63a1808e3d7938a8afad717760d54773354068d9..3ca1db880995ff0101cf697fea9a741c0766a13e 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -231,7 +231,7 @@ QString CppToolsPlugin::correspondingHeaderOrSourceI(const QString &fileName) co
         return QString();
 
     const QDir absoluteDir = fi.absoluteDir();
-    const QString baseName = fi.baseName();
+    const QString baseName = fi.completeBaseName();
     const QStringList suffixes = matchingCandidateSuffixes(mimeDatase, type);
 
     const QString privateHeaderSuffix = QLatin1String("_p");
diff --git a/src/plugins/projectexplorer/dependenciespanel.cpp b/src/plugins/projectexplorer/dependenciespanel.cpp
index 8d88fbfa54840351e4263c714c86239d53f3dd13..d3eb7d810c5b7e3c2844ec1ade1a95b704a9f01e 100644
--- a/src/plugins/projectexplorer/dependenciespanel.cpp
+++ b/src/plugins/projectexplorer/dependenciespanel.cpp
@@ -43,9 +43,9 @@
 namespace ProjectExplorer {
 namespace Internal {
 
-///
-/// DependenciesModel
-///
+//
+// DependenciesModel
+//
 
 class DependenciesModel : public QAbstractListModel
 {
@@ -137,9 +137,9 @@ Qt::ItemFlags DependenciesModel::flags(const QModelIndex &index) const
     return rc;
 }
 
-///
-/// DependenciesWidget
-///
+//
+// DependenciesWidget
+//
 
 class DependenciesWidget : public QWidget
 {
@@ -165,9 +165,9 @@ DependenciesWidget::DependenciesWidget(SessionManager *session,
     m_ui.dependenciesView->setHeaderHidden(true);
 }
 
-///
-/// DependenciesPanel
-///
+//
+// DependenciesPanel
+//
 
 DependenciesPanel::DependenciesPanel(SessionManager *session, Project *project)
     : PropertiesPanel()
@@ -190,9 +190,9 @@ QWidget *DependenciesPanel::widget()
     return m_widget;
 }
 
-///
-/// DependenciesPanelFactory
-///
+//
+// DependenciesPanelFactory
+//
 
 DependenciesPanelFactory::DependenciesPanelFactory(SessionManager *session)
     : m_session(session)