diff --git a/src/raspberrypi/devices/scsi_daynaport.h b/src/raspberrypi/devices/scsi_daynaport.h
index 760aee84..ba57844a 100644
--- a/src/raspberrypi/devices/scsi_daynaport.h
+++ b/src/raspberrypi/devices/scsi_daynaport.h
@@ -181,3 +181,11 @@ private:
 	static const BYTE m_bcast_addr[6];
 	static const BYTE m_apple_talk_addr[6];
 };
+
+typedef struct __attribute__((packed)) {
+	BYTE operation_code;
+	BYTE lba_msb_bits_4_0;
+	uint16_t logical_block_address;
+	BYTE transfer_length;
+	BYTE control;
+} scsi_cmd_read_6_t;
diff --git a/src/raspberrypi/scsi.h b/src/raspberrypi/scsi.h
index 30ac2115..7a6558bd 100644
--- a/src/raspberrypi/scsi.h
+++ b/src/raspberrypi/scsi.h
@@ -9,8 +9,7 @@
 //
 //---------------------------------------------------------------------------
 
-#if !defined(scsi_h)
-#define scsi_h
+#pragma once
 
 //===========================================================================
 //
@@ -139,7 +138,6 @@ public:
 	virtual int ReceiveHandShake(BYTE *buf, int count) = 0;
 	virtual int SendHandShake(BYTE *buf, int count, int delay_after_bytes) = 0;
 
-
 	virtual BOOL GetSignal(int pin) = 0;
 										// Get SCSI input signal value
 	virtual void SetSignal(int pin, BOOL ast) = 0;
@@ -154,85 +152,3 @@ private:
 
 	static const char* phase_str_table[];
 };
-
-
-typedef struct __attribute__((packed)) {
-	BYTE operation_code;
-	BYTE misc_cdb_information;
-    BYTE page_code;
-	WORD length;
-	BYTE control;
-} scsi_cdb_6_byte_t;
-
-
-typedef struct __attribute__((packed)) {
-	BYTE operation_code;
-	BYTE service_action;
-    DWORD logical_block_address;
-	BYTE misc_cdb_information;
-	WORD length;
-	BYTE control;
-} scsi_cdb_10_byte_t;
-
-typedef struct __attribute__((packed)) {
-	BYTE operation_code;
-	BYTE service_action;
-    DWORD logical_block_address;
-	DWORD length;
-	BYTE misc_cdb_information;
-	BYTE control;
-} scsi_cdb_12_byte_t;
-
-typedef struct __attribute__((packed)) {
-	BYTE operation_code;
-	BYTE service_action;
-    DWORD logical_block_address;
-	DWORD length;
-	BYTE misc_cdb_information;
-	BYTE control;
-} scsi_cdb_16_byte_t;
-
-typedef struct __attribute__((packed)) {
-	BYTE operation_code;
-	BYTE reserved;
-	BYTE page_code;
-	WORD allocation_length;
-	BYTE control;
-} scsi_cmd_inquiry_t;
-
-typedef struct __attribute__((packed)) {
-	BYTE operation_code;
-	BYTE lba_msb_bits_4_0;
-	WORD logical_block_address;
-	BYTE transfer_length;
-	BYTE control;
-} scsi_cmd_read_6_t;
-
-typedef struct __attribute__((packed)) {
-	BYTE operation_code;
-	BYTE flags;
-	DWORD logical_block_address;
-	BYTE group_number;
-	WORD transfer_length;
-	BYTE control;
-} scsi_cmd_read_10_t;
-
-typedef struct __attribute__((packed)) {
-	BYTE operation_code;
-	BYTE flags;
-	DWORD logical_block_address;
-	DWORD transfer_length;
-	BYTE group_number;
-	BYTE control;
-} scsi_cmd_read_12_t;
-
-typedef struct __attribute__((packed)) {
-	BYTE operation_code;
-	BYTE descriptor_format;
-	WORD reserved;
-	BYTE allocation_length;
-	BYTE control;
-} scsi_cmd_request_sense_t;
-
-
-#endif	// scsi_h