diff --git a/consolehandler.c b/consolehandler.c
index cc19494..97f5f20 100644
--- a/consolehandler.c
+++ b/consolehandler.c
@@ -4,8 +4,6 @@
  *  Created on: Aug 29, 2019
  *      Author: abody
  */
-#include "main.h"
-#include "globals.h"
 #include "f4ll_c/packetusart.h"
 #include "f4ll_c/strutil.h"
 
diff --git a/crcscheduler.c b/crcscheduler.c
index 3f90ef5..6271890 100644
--- a/crcscheduler.c
+++ b/crcscheduler.c
@@ -5,9 +5,10 @@
  *      Author: abody
  */
 #include <f4ll_c/crcscheduler.h>
-#include "main.h"
 #include <string.h>
+#if defined(HAVE_DIAG)
 #include "diag.h"
+#endif
 #include "f4ll_c/dmahelper.h"
 
 #ifndef DIAG_CRC_CALC_START
diff --git a/packetusart.c b/packetusart.c
index 4f10d42..6adc252 100644
--- a/packetusart.c
+++ b/packetusart.c
@@ -9,7 +9,9 @@
 #include <f4ll_c/packetusart.h>
 #include <string.h>
 #include <platform/usart_ll.h>
+#if defined(HAVE_DIAG)
 #include "diag.h"
+#endif
 #include "f4ll_c/dmahelper.h"
 #include "f4ll_c/crcscheduler.h"
 
@@ -105,13 +107,9 @@ static inline uint8_t CheckHeader(struct usartpacket_t *packet)
 
 uint8_t Pku_Post(struct usartstatus_t *status, uint8_t const *payload, uint16_t length, struct crcstatus_t *crcStatus, uint8_t waitForCrcQueue)
 {
-//	static uint32_t		count = 0;
-//	ITM->PORT[1].u32 = count++;
-
 	if(length > 256)
 		return 1;
 
-
 	BuildHeader(&status->txBuffer, status->txSerial++, length);
 	uint16_t payloadLength = RoundUpTo4(length);
 	if(payload)