diff --git a/connections/canconnectionmodel.h b/connections/canconnectionmodel.h
index 190dd27..f4a0094 100644
--- a/connections/canconnectionmodel.h
+++ b/connections/canconnectionmodel.h
@@ -5,9 +5,8 @@
 #include <QAbstractTableModel>
 
 #include "canbus.h"
-#include "connections/canconnection.h"
-#include "connectionwindow.h"
 
+class CANConnection;
 
 class CANConnectionModel : public QAbstractTableModel
 {
diff --git a/mainwindow.cpp b/mainwindow.cpp
index c346ff0..9cf225d 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -5,6 +5,7 @@
 #include <QFileDialog>
 #include <QtSerialPort/QSerialPortInfo>
 #include "connections/canconmanager.h"
+#include "connections/connectionwindow.h"
 #include "utility.h"
 
 /*
diff --git a/mainwindow.h b/mainwindow.h
index abdd0a2..fffe39f 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -22,7 +22,6 @@
 #include "mainsettingsdialog.h"
 #include "firmwareuploaderwindow.h"
 #include "re/discretestatewindow.h"
-#include "connections/connectionwindow.h"
 #include "scriptingwindow.h"
 #include "re/rangestatewindow.h"
 #include "dbc/dbcloadsavewindow.h"
@@ -33,6 +32,7 @@
 #include "motorcontrollerconfigwindow.h"
 #include "signalviewerwindow.h"
 
+class CANConnection;
 class ConnectionWindow;
 class ISOTP_InterpreterWindow;
 class ScriptingWindow;