6 files changed, 6 insertions, 8 deletions
diff --git a/dev/boot/BootKit/BootKit.h b/dev/boot/BootKit/BootKit.h
index 3fed8944..a47cc045 100644
--- a/dev/boot/BootKit/BootKit.h
+++ b/dev/boot/BootKit/BootKit.h
@@ -215,7 +215,7 @@ namespace Boot
 
 		~BDiskFormatFactory() = default;
 
-		NE_COPY_DELETE(BDiskFormatFactory);
+		NE_COPY_DELETE(BDiskFormatFactory)
 
 		/// @brief Format disk using partition name and blob.
 		/// @param Partition part_name the target partition name.
diff --git a/dev/boot/BootKit/Device.h b/dev/boot/BootKit/Device.h
index dd77a811..77c6cd32 100644
--- a/dev/boot/BootKit/Device.h
+++ b/dev/boot/BootKit/Device.h
@@ -18,7 +18,7 @@ public:
 	explicit Device() = default;
 	virtual ~Device() = default;
 
-	NE_MOVE_DEFAULT(Device);
+	NE_MOVE_DEFAULT(Device)
 
 	struct Trait
 	{
diff --git a/dev/boot/BootKit/HW/ATA.h b/dev/boot/BootKit/HW/ATA.h
index 1bf4aa9c..cc5e1166 100644
--- a/dev/boot/BootKit/HW/ATA.h
+++ b/dev/boot/BootKit/HW/ATA.h
@@ -23,7 +23,7 @@ public:
 	explicit BootDeviceATA() noexcept;
 	~BootDeviceATA() = default;
 
-	NE_COPY_DELETE(BootDeviceATA);
+	NE_COPY_DELETE(BootDeviceATA)
 
 	enum
 	{
diff --git a/dev/boot/BootKit/HW/SATA.h b/dev/boot/BootKit/HW/SATA.h
index c7672cf6..4073d959 100644
--- a/dev/boot/BootKit/HW/SATA.h
+++ b/dev/boot/BootKit/HW/SATA.h
@@ -15,7 +15,7 @@ public:
 	explicit BootDeviceSATA() noexcept;
 	~BootDeviceSATA() = default;
 
-	NE_COPY_DEFAULT(BootDeviceSATA);
+	NE_COPY_DEFAULT(BootDeviceSATA)
 
 	struct SATATrait final
 	{
diff --git a/dev/boot/BootKit/Qr.h b/dev/boot/BootKit/Qr.h
index 61ae2234..231fcee7 100644
--- a/dev/boot/BootKit/Qr.h
+++ b/dev/boot/BootKit/Qr.h
@@ -954,7 +954,7 @@ namespace qr
 		explicit QrDelegate() = default;
 		~QrDelegate()		  = default;
 
-		NE_COPY_DEFAULT(QrDelegate);
+		NE_COPY_DEFAULT(QrDelegate)
 
 		/// @brief Draw method delegate.
 		template <int V>
diff --git a/dev/boot/amd64-ci.make b/dev/boot/amd64-ci.make
index 62ecb88c..ae451e26 100644
--- a/dev/boot/amd64-ci.make
+++ b/dev/boot/amd64-ci.make
@@ -44,9 +44,7 @@ ifneq ($(AHCI_SUPPORT), )
 DISK_DRV =  -D__AHCI__
 endif
 
-ifneq ($(DEBUG_SUPPORT), )
 DEBUG_MACRO = -D__DEBUG__
-endif
 
 ifeq ($(shell uname), Darwin)
 EMU_FLAGS=-M q35 -smp 4 -m 8G \
@@ -68,7 +66,7 @@ REM_FLAG=-f
 
 FLAG_ASM=-f win64
 FLAG_GNU=-fshort-wchar -Wall -Wpedantic -Wextra -Werror -D__EFI_x86_64__ -mno-red-zone -D__NEOSKRNL__ -D__BOOTZ__ \
-			-DEFI_FUNCTION_WRAPPER -I./ -I../kernel $(DISK_DRV) -I../ -c -nostdlib -fno-rtti -fno-exceptions \
+			-DEFI_FUNCTION_WRAPPER -I./ -I../kernel $(DEBUG_MACRO) $(DISK_DRV) -I../ -c -nostdlib -fno-rtti -fno-exceptions \
                         -std=c++20 -DBOOTZ_GPT_SUPPORT -DBOOTZ_EPM_SUPPORT -D__HAVE_NE_APIS__ -DZBA_USE_FB -D__NE_AMD64__ -D__NE__ -DNE_AUTO_FORMAT
 
 BOOTLOADER=bootz.efi