diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@
       ERROR_QUIET
       OUTPUT_STRIP_TRAILING_WHITESPACE)
     MESSAGE( STATUS "Git Commit: ${GIT_VERSION}" )
-        add_definitions( -DGIT_REVISION="${GIT_VERSION}")
+    add_definitions( -DGIT_REVISION="${GIT_VERSION}")
   ENDIF(GIT_FOUND)
 ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
 
diff --git a/src/atcore.cpp b/src/atcore.cpp
--- a/src/atcore.cpp
+++ b/src/atcore.cpp
@@ -299,7 +299,9 @@
     }
 
     //Check if have temperature info and decode it
-    temperature().decodeTemp(message);
+    if (d->lastMessage.contains("T:") || d->lastMessage.contains("B:")) {
+        temperature().decodeTemp(message);
+    }
     emit(receivedMessage(d->lastMessage));
 }
 
diff --git a/src/ifirmware.cpp b/src/ifirmware.cpp
--- a/src/ifirmware.cpp
+++ b/src/ifirmware.cpp
@@ -22,7 +22,6 @@
     License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "ifirmware.h"
-#include "temperature.h"
 #include "atcore.h"
 /**
  * @brief The IFirmwarePrivate struct
diff --git a/src/plugins/aprinterplugin.cpp b/src/plugins/aprinterplugin.cpp
--- a/src/plugins/aprinterplugin.cpp
+++ b/src/plugins/aprinterplugin.cpp
@@ -26,7 +26,6 @@
 #include <QString>
 
 #include "aprinterplugin.h"
-#include "temperature.h"
 #include "atcore.h"
 
 QString AprinterPlugin::_ok = QStringLiteral("ok");
diff --git a/src/plugins/marlinplugin.cpp b/src/plugins/marlinplugin.cpp
--- a/src/plugins/marlinplugin.cpp
+++ b/src/plugins/marlinplugin.cpp
@@ -26,7 +26,6 @@
 #include <QString>
 
 #include "marlinplugin.h"
-#include "temperature.h"
 #include "atcore.h"
 
 QString MarlinPlugin::_ok = QStringLiteral("ok");
diff --git a/src/plugins/repetierplugin.cpp b/src/plugins/repetierplugin.cpp
--- a/src/plugins/repetierplugin.cpp
+++ b/src/plugins/repetierplugin.cpp
@@ -26,7 +26,6 @@
 #include <QString>
 
 #include "repetierplugin.h"
-#include "temperature.h"
 #include "atcore.h"
 
 QString RepetierPlugin::_ok = QStringLiteral("ok");
diff --git a/src/plugins/smoothieplugin.cpp b/src/plugins/smoothieplugin.cpp
--- a/src/plugins/smoothieplugin.cpp
+++ b/src/plugins/smoothieplugin.cpp
@@ -26,7 +26,6 @@
 #include <QString>
 
 #include "smoothieplugin.h"
-#include "temperature.h"
 #include "atcore.h"
 
 QString SmoothiePlugin::_ok = QStringLiteral("ok");
diff --git a/src/plugins/sprinterplugin.cpp b/src/plugins/sprinterplugin.cpp
--- a/src/plugins/sprinterplugin.cpp
+++ b/src/plugins/sprinterplugin.cpp
@@ -26,7 +26,6 @@
 #include <QLoggingCategory>
 
 #include "sprinterplugin.h"
-#include "temperature.h"
 #include "atcore.h"
 
 QString SprinterPlugin::_ok = QStringLiteral("ok");
diff --git a/src/plugins/teacupplugin.cpp b/src/plugins/teacupplugin.cpp
--- a/src/plugins/teacupplugin.cpp
+++ b/src/plugins/teacupplugin.cpp
@@ -26,7 +26,6 @@
 #include <QLoggingCategory>
 
 #include "teacupplugin.h"
-#include "temperature.h"
 #include "atcore.h"
 
 QString TeacupPlugin::_ok = QStringLiteral("ok");