diff --git a/src/Clients/BasePrinterClient.h b/src/Clients/BasePrinterClient.h
index 82b8456..a5751b5 100644
--- a/src/Clients/BasePrinterClient.h
+++ b/src/Clients/BasePrinterClient.h
@@ -4,13 +4,7 @@
 #include <base64.h>
 #include "Debug.h"
 #include "../Network/JsonRequestClient.h"
-
-#define PRINTER_STATE_OFFLINE       (int)-2
-#define PRINTER_STATE_ERROR         (int)-1
-#define PRINTER_STATE_STANDBY       (int)0
-#define PRINTER_STATE_PRINTING      (int)1
-#define PRINTER_STATE_PAUSED        (int)2
-#define PRINTER_STATE_COMPLETED     (int)3
+#include "PrinterDataStruct.h"
 
 class BasePrinterClient {
 public:
diff --git a/src/Clients/BasePrinterClientImpl.h b/src/Clients/BasePrinterClientImpl.h
index b373f48..56fd002 100644
--- a/src/Clients/BasePrinterClientImpl.h
+++ b/src/Clients/BasePrinterClientImpl.h
@@ -10,29 +10,7 @@ protected:
     JsonRequestClient *jsonRequestClient;
     String printerType = "Octoprint";
 
-    typedef struct {
-        String averagePrintTime;
-        String estimatedPrintTime;
-        String fileName;
-        String fileSize;
-        String lastPrintTime;
-        String progressCompletion;
-        String progressFilepos;
-        String progressPrintTime;
-        String progressPrintTimeLeft;
-        int state;
-        String toolTemp;
-        String toolTargetTemp;
-        String filamentLength;
-        String bedTemp;
-        String bedTargetTemp;
-        boolean isPrinting;
-        boolean isPSUoff;
-        String error;
-        String printerName;
-    } PrinterStruct;
-
-    PrinterStruct printerData;
+    PrinterDataStruct printerData;
     String result;
     String encodedAuth = "";
     
diff --git a/src/Clients/PrinterDataStruct.h b/src/Clients/PrinterDataStruct.h
new file mode 100644
index 0000000..c8ad8cc
--- /dev/null
+++ b/src/Clients/PrinterDataStruct.h
@@ -0,0 +1,33 @@
+#pragma once
+#include <Arduino.h>
+#include <ESP8266WiFi.h>
+#include <base64.h>
+
+#define PRINTER_STATE_OFFLINE       (int)-2
+#define PRINTER_STATE_ERROR         (int)-1
+#define PRINTER_STATE_STANDBY       (int)0
+#define PRINTER_STATE_PRINTING      (int)1
+#define PRINTER_STATE_PAUSED        (int)2
+#define PRINTER_STATE_COMPLETED     (int)3
+
+typedef struct {
+    String averagePrintTime;
+    String estimatedPrintTime;
+    String fileName;
+    String fileSize;
+    String lastPrintTime;
+    String progressCompletion;
+    String progressFilepos;
+    String progressPrintTime;
+    String progressPrintTimeLeft;
+    int state;
+    String toolTemp;
+    String toolTargetTemp;
+    String filamentLength;
+    String bedTemp;
+    String bedTargetTemp;
+    boolean isPrinting;
+    boolean isPSUoff;
+    String error;
+    String printerName;
+} PrinterDataStruct;
\ No newline at end of file