diff --git a/dicmote.h b/aaruremote.h
similarity index 99%
rename from dicmote.h
rename to aaruremote.h
index 0acbaf0..0ce2a70 100644
--- a/dicmote.h
+++ b/aaruremote.h
@@ -15,8 +15,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DICREMOTE__DICMOTE_H_
-#define DICREMOTE__DICMOTE_H_
+#ifndef DICREMOTE__AARUREMOTE_H_
+#define DICREMOTE__AARUREMOTE_H_
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/ata.c b/ata.c
index 36e0ec3..542c699 100644
--- a/ata.c
+++ b/ata.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dicmote.h"
+#include "aaruremote.h"
 
 #if defined(__linux__) && !defined(__ANDROID__)
 #include "linux/linux.h"
diff --git a/device.c b/device.c
index f513b61..f324634 100644
--- a/device.c
+++ b/device.c
@@ -21,7 +21,7 @@
 #include "win32/win32.h"
 #endif
 
-#include "dicmote.h"
+#include "aaruremote.h"
 
 #include <stdint.h>
 
diff --git a/linux/linux.h b/linux/linux.h
index 3a88002..955dedb 100644
--- a/linux/linux.h
+++ b/linux/linux.h
@@ -18,7 +18,7 @@
 #ifndef DICREMOTE_LINUX_LINUX_H_
 #define DICREMOTE_LINUX_LINUX_H_
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 
 #define PATH_SYS_DEVBLOCK "/sys/block"
 
diff --git a/linux/list_devices.c b/linux/list_devices.c
index 95328b5..52cba67 100644
--- a/linux/list_devices.c
+++ b/linux/list_devices.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 #include "linux.h"
 
 #include <ctype.h>
diff --git a/linux/scsi.c b/linux/scsi.c
index ff82449..e907f91 100644
--- a/linux/scsi.c
+++ b/linux/scsi.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 #include "linux.h"
 
 #include <malloc.h>
diff --git a/list_devices.c b/list_devices.c
index b97b643..1137176 100644
--- a/list_devices.c
+++ b/list_devices.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dicmote.h"
+#include "aaruremote.h"
 
 #if defined(__linux__) && !defined(__ANDROID__)
 #include "linux/linux.h"
diff --git a/main.c b/main.c
index c0ceb8d..3cd78b1 100644
--- a/main.c
+++ b/main.c
@@ -15,11 +15,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dicmote.h"
+#include "aaruremote.h"
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 
 int main()
 {
diff --git a/unix/hello.c b/unix/hello.c
index 7697cb0..1ddf614 100644
--- a/unix/hello.c
+++ b/unix/hello.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 
 #include <malloc.h>
 #include <string.h>
diff --git a/unix/network.c b/unix/network.c
index ad9725d..7c986fe 100644
--- a/unix/network.c
+++ b/unix/network.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 #include "../unix/unix.h"
 
 #include <arpa/inet.h>
diff --git a/unix/unix.c b/unix/unix.c
index 2389ed1..89eb489 100644
--- a/unix/unix.c
+++ b/unix/unix.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 
 #include <unistd.h>
 
diff --git a/wii/hello.c b/wii/hello.c
index dc4d340..9efbede 100644
--- a/wii/hello.c
+++ b/wii/hello.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 #include "../endian.h"
 
 #include <gccore.h>
diff --git a/wii/list_devices.c b/wii/list_devices.c
index bca5d0f..8980469 100644
--- a/wii/list_devices.c
+++ b/wii/list_devices.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 #include "wii.h"
 
 #include <gccore.h>
diff --git a/wii/network.c b/wii/network.c
index cddf284..0cf9011 100644
--- a/wii/network.c
+++ b/wii/network.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 #include "wii.h"
 
 #include <network.h>
diff --git a/wii/wii.c b/wii/wii.c
index cb61cf5..11ed1ae 100644
--- a/wii/wii.c
+++ b/wii/wii.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 
 #include <debug.h>
 #include <errno.h>
diff --git a/wii/wii.h b/wii/wii.h
index 190aa2f..5140d4f 100644
--- a/wii/wii.h
+++ b/wii/wii.h
@@ -18,7 +18,7 @@
 #ifndef DICREMOTE_WII_WII_H_
 #define DICREMOTE_WII_WII_H_
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 
 #define DICREMOTE_WII_DEVICE_FD_NAND 1
 #define DICREMOTE_WII_DEVICE_FD_DVD 2
diff --git a/win32/ata.c b/win32/ata.c
index 2558750..f505ace 100644
--- a/win32/ata.c
+++ b/win32/ata.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 #include "ntioctl.h"
 #include "win32.h"
 
diff --git a/win32/device.c b/win32/device.c
index 8e4e7c9..cf07c0b 100644
--- a/win32/device.c
+++ b/win32/device.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 #include "win32.h"
 
 #include <errno.h>
diff --git a/win32/hello.c b/win32/hello.c
index 24ae2c1..c06d3bb 100644
--- a/win32/hello.c
+++ b/win32/hello.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 #include "../endian.h"
 #include "win32.h"
 
diff --git a/win32/list_devices.c b/win32/list_devices.c
index b71f152..a9172a2 100644
--- a/win32/list_devices.c
+++ b/win32/list_devices.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 
 #include <stddef.h>
 #include <stdio.h>
diff --git a/win32/network.c b/win32/network.c
index 4e2d4ed..c51e89e 100644
--- a/win32/network.c
+++ b/win32/network.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 #include "win32.h"
 
 #include <iphlpapi.h>
diff --git a/win32/scsi.c b/win32/scsi.c
index e91e102..dbadc5c 100644
--- a/win32/scsi.c
+++ b/win32/scsi.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 #include "ntioctl.h"
 #include "win32.h"
 
diff --git a/win32/win32.c b/win32/win32.c
index cad37f0..2f42d4d 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 
 void Initialize()
 {
diff --git a/win32/win32.h b/win32/win32.h
index 0afdc93..dc053b9 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -18,7 +18,7 @@
 #ifndef DICREMOTE_WIN32_WIN32_H_
 #define DICREMOTE_WIN32_WIN32_H_
 
-#include "../dicmote.h"
+#include "../aaruremote.h"
 
 #define PROCESSOR_ARCHITECTURE_INTEL 0
 #define PROCESSOR_ARCHITECTURE_MIPS 1
diff --git a/worker.c b/worker.c
index 0730c04..a828d90 100644
--- a/worker.c
+++ b/worker.c
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dicmote.h"
+#include "aaruremote.h"
 #include "endian.h"
 
 #include <errno.h>