diff --git a/Makefile b/Makefile
index aaea6a5..0deab5a 100644
--- a/Makefile
+++ b/Makefile
@@ -47,10 +47,9 @@ ICON		:=	icon.jpg
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
 
-override CFLAGS	+=	`sdl2-config --cflags`	-g -Wall -O2 -ffunction-sections -ffast-math \
-			$(ARCH) $(DEFINES)
-
-override CFLAGS	+=	$(INCLUDE) -D__SWITCH__ `freetype-config --cflags` `curl-config --cflags`
+override CFLAGS	+=	$(INCLUDE) -D__SWITCH__
+override CFLAGS += 	`sdl2-config --cflags` `freetype-config --cflags` `curl-config --cflags`
+override CFLAGS	+=	-g -Wall -O2 -ffunction-sections -ffast-math $(ARCH) $(DEFINES)
 
 CXXFLAGS:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++17
 
diff --git a/inc/rfs.h b/inc/rfs.h
index 8bfabec..f098f89 100644
--- a/inc/rfs.h
+++ b/inc/rfs.h
@@ -1,14 +1,9 @@
-//
-// Created by Martin Riedel on 7/7/23.
-//
+#pragma once
 
 #include <string>
 #include "curlfuncs.h"
 #include <mutex>
 
-#ifndef JKSV_RFS_H
-#define JKSV_RFS_H
-
 #define UPLOAD_BUFFER_SIZE 0x8000
 #define DOWNLOAD_BUFFER_SIZE 0xC00000
 #define USER_AGENT "JKSV"
@@ -56,5 +51,3 @@ namespace rfs {
     void writeThread_t(void *a);
     size_t writeDataBufferThreaded(uint8_t *buff, size_t sz, size_t cnt, void *u);
 }
-
-#endif //JKSV_RFS_H
diff --git a/inc/webdav.h b/inc/webdav.h
index cbaf197..bb25a99 100644
--- a/inc/webdav.h
+++ b/inc/webdav.h
@@ -1,6 +1,4 @@
-//
-// Created by Martin Riedel on 7/7/23.
-//
+#pragma once
 
 #include <curl/curl.h>
 #include <string>
@@ -8,9 +6,6 @@
 
 #include "rfs.h"
 
-#ifndef JKSV_WEBDAV_H
-#define JKSV_WEBDAV_H
-
 namespace rfs {
 
     // Note: Everything declared an "id" is the full path component from the origin to the resource starting with a "/".
@@ -55,5 +50,3 @@ namespace rfs {
         std::vector<RfsItem> getListWithParent(const std::string& _parent);
     };
 }
-
-#endif //JKSV_WEBDAV_H