diff --git a/src/app/georeferencer/qgsgcpcanvasitem.cpp b/src/app/georeferencer/qgsgcpcanvasitem.cpp
index c8d541cb4b8f..24d9f9c294c3 100644
--- a/src/app/georeferencer/qgsgcpcanvasitem.cpp
+++ b/src/app/georeferencer/qgsgcpcanvasitem.cpp
@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsgcpcanvasitem.h"
+#include "qgsmapcanvas.h"
 #include "qgsgeorefdatapoint.h"
 #include "qgsproject.h"
 #include "qgsrasterlayer.h"
diff --git a/src/app/georeferencer/qgsgcpcanvasitem.h b/src/app/georeferencer/qgsgcpcanvasitem.h
index e814938ad6fd..e8f6473882b6 100644
--- a/src/app/georeferencer/qgsgcpcanvasitem.h
+++ b/src/app/georeferencer/qgsgcpcanvasitem.h
@@ -16,9 +16,12 @@
 #ifndef QGSGCPCANVASITEM_H
 #define QGSGCPCANVASITEM_H
 
-#include "qgsmapcanvas.h"
+#include <QBrush>
+#include <QPen>
+
 #include "qgsmapcanvasitem.h"
 
+class QgsMapCanvas;
 class QgsGeorefDataPoint;
 
 class QgsGCPCanvasItem : public QgsMapCanvasItem
diff --git a/src/app/georeferencer/qgsgeorefmainwindow.cpp b/src/app/georeferencer/qgsgeorefmainwindow.cpp
index 29fd57c6afbf..837781b2dae7 100644
--- a/src/app/georeferencer/qgsgeorefmainwindow.cpp
+++ b/src/app/georeferencer/qgsgeorefmainwindow.cpp
@@ -55,7 +55,6 @@
 #include "qgsgeoreftooladdpoint.h"
 #include "qgsgeoreftooldeletepoint.h"
 #include "qgsgeoreftoolmovepoint.h"
-#include "qgsgcpcanvasitem.h"
 #include "qgscoordinateutils.h"
 
 #include "qgsgcplistwidget.h"
diff --git a/src/app/georeferencer/qgsgeorefmainwindow.h b/src/app/georeferencer/qgsgeorefmainwindow.h
index 56298c23033e..eea426053e92 100644
--- a/src/app/georeferencer/qgsgeorefmainwindow.h
+++ b/src/app/georeferencer/qgsgeorefmainwindow.h
@@ -45,7 +45,6 @@ class QgsGeorefToolAddPoint;
 class QgsGeorefToolDeletePoint;
 class QgsGeorefToolMovePoint;
 class QgsGeorefToolMovePoint;
-class QgsGCPCanvasItem;
 class QgsGcpPoint;
 class QgsMapLayer;
 class QgsScreenHelper;
diff --git a/src/app/georeferencer/qgsmapcoordsdialog.cpp b/src/app/georeferencer/qgsmapcoordsdialog.cpp
index 96478be70085..0fcdf35186fe 100644
--- a/src/app/georeferencer/qgsmapcoordsdialog.cpp
+++ b/src/app/georeferencer/qgsmapcoordsdialog.cpp
@@ -23,8 +23,7 @@
 #include "qgsgui.h"
 #include "qgsapplication.h"
 #include "qgsprojectionselectionwidget.h"
-#include "qgsproject.h"
-#include "qgsgeorefdatapoint.h""
+#include "qgsgeorefdatapoint.h"
 
 QgsMapCoordsDialog::QgsMapCoordsDialog( QgsMapCanvas *qgisCanvas, QgsGeorefDataPoint *georefDataPoint, QgsCoordinateReferenceSystem &rasterCrs, QWidget *parent )
   : QDialog( parent, Qt::Dialog )