diff --git a/lib/wiiuse/CMakeLists.txt b/lib/wiiuse/CMakeLists.txt
index 223256ebd..84889cf2c 100644
--- a/lib/wiiuse/CMakeLists.txt
+++ b/lib/wiiuse/CMakeLists.txt
@@ -2,19 +2,18 @@
 
 set(WIIUSE_SOURCES
     classic.c
-	dynamics.c
-	events.c
-	guitar_hero_3.c
-	io.c
-	io_win.c
-	ir.c
-	motion_plus.c
-	nunchuk.c
-	os_nix.c
-	os_win.c
-	util.c
-	wiiboard.c
-	wiiuse.c
+    dynamics.c
+    events.c
+    guitar_hero_3.c
+    io.c
+    ir.c
+    motion_plus.c
+    nunchuk.c
+    os_nix.c
+    os_win.c
+    util.c
+    wiiboard.c
+    wiiuse.c
 )
 
 
diff --git a/lib/wiiuse/io_nix.c b/lib/wiiuse/io_nix.c
deleted file mode 100644
index 56affe352..000000000
--- a/lib/wiiuse/io_nix.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- *	wiiuse
- *
- *	Written By:
- *		Michael Laforest	< para >
- *		Email: < thepara (--AT--) g m a i l [--DOT--] com >
- *
- *	Copyright 2006-2007
- *
- *	This file is part of wiiuse.
- *
- *	This program is free software; you can redistribute it and/or modify
- *	it under the terms of the GNU General Public License as published by
- *	the Free Software Foundation; either version 3 of the License, or
- *	(at your option) any later version.
- *
- *	This program is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *	GNU General Public License for more details.
- *
- *	You should have received a copy of the GNU General Public License
- *	along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *	$Header$
- *
- */
-
-/**
- *	@file
- *	@brief Handles device I/O for *nix.
- */
-
-#ifndef WIN32
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
-#include <bluetooth/l2cap.h>
-
-#include "definitions.h"
-#include "wiiuse_internal.h"
-#include "io.h"
-
-static int wiiuse_connect_single(struct wiimote_t* wm, char* address);
-
-/**
- *	@brief Find a wiimote or wiimotes.
- *
- *	@param wm			An array of wiimote_t structures.
- *	@param max_wiimotes	The number of wiimote structures in \a wm.
- *	@param timeout		The number of seconds before the search times out.
- *
- *	@return The number of wiimotes found.
- *
- *	@see wiimote_connect()
- *
- *	This function will only look for wiimote devices.						\n
- *	When a device is found the address in the structures will be set.		\n
- *	You can then call wiimote_connect() to connect to the found				\n
- *	devices.
- */
-int wiiuse_find(struct wiimote_t** wm, int max_wiimotes, int timeout) {
-	int device_id;
-	int device_sock;
-	int found_devices;
-	int found_wiimotes;
-
-	/* reset all wiimote bluetooth device addresses */
-	for (found_wiimotes = 0; found_wiimotes < max_wiimotes; ++found_wiimotes)
-		wm[found_wiimotes]->bdaddr = *BDADDR_ANY;
-	found_wiimotes = 0;
-
-	/* get the id of the first bluetooth device. */
-	device_id = hci_get_route(NULL);
-	if (device_id < 0) {
-		perror("hci_get_route");
-		return 0;
-	}
-
-	/* create a socket to the device */
-	device_sock = hci_open_dev(device_id);
-	if (device_sock < 0) {
-		perror("hci_open_dev");
-		return 0;
-	}
-
-	inquiry_info scan_info_arr[128];
-	inquiry_info* scan_info = scan_info_arr;
-	memset(&scan_info_arr, 0, sizeof(scan_info_arr));
-
-	/* scan for bluetooth devices for 'timeout' seconds */
-	found_devices = hci_inquiry(device_id, timeout, 128, NULL, &scan_info, IREQ_CACHE_FLUSH);
-	if (found_devices < 0) {
-		perror("hci_inquiry");
-		return 0;
-	}
-
-	WIIUSE_INFO("Found %i bluetooth device(s).", found_devices);
-
-	int i = 0;
-
-	/* display discovered devices */
-	for (; (i < found_devices) && (found_wiimotes < max_wiimotes); ++i) {
-		if ((scan_info[i].dev_class[0] == WM_DEV_CLASS_0) &&
-			(scan_info[i].dev_class[1] == WM_DEV_CLASS_1) &&
-			(scan_info[i].dev_class[2] == WM_DEV_CLASS_2))
-		{
-			/* found a device */
-			ba2str(&scan_info[i].bdaddr, wm[found_wiimotes]->bdaddr_str);
-
-			WIIUSE_INFO("Found wiimote (%s) [id %i].", wm[found_wiimotes]->bdaddr_str, wm[found_wiimotes]->unid);
-
-			wm[found_wiimotes]->bdaddr = scan_info[i].bdaddr;
-			WIIMOTE_ENABLE_STATE(wm[found_wiimotes], WIIMOTE_STATE_DEV_FOUND);
-			++found_wiimotes;
-		}
-	}
-
-	close(device_sock);
-	return found_wiimotes;
-}
-
-
-/**
- *	@brief Connect to a wiimote or wiimotes once an address is known.
- *
- *	@param wm			An array of wiimote_t structures.
- *	@param wiimotes		The number of wiimote structures in \a wm.
- *
- *	@return The number of wiimotes that successfully connected.
- *
- *	@see wiiuse_find()
- *	@see wiiuse_connect_single()
- *	@see wiiuse_disconnect()
- *
- *	Connect to a number of wiimotes when the address is already set
- *	in the wiimote_t structures.  These addresses are normally set
- *	by the wiiuse_find() function, but can also be set manually.
- */
-int wiiuse_connect(struct wiimote_t** wm, int wiimotes) {
-	int connected = 0;
-	int i = 0;
-
-	for (; i < wiimotes; ++i) {
-		if (!WIIMOTE_IS_SET(wm[i], WIIMOTE_STATE_DEV_FOUND))
-			/* if the device address is not set, skip it */
-			continue;
-
-		if (wiiuse_connect_single(wm[i], NULL))
-			++connected;
-	}
-
-	return connected;
-}
-
-
-/**
- *	@brief Connect to a wiimote with a known address.
- *
- *	@param wm		Pointer to a wiimote_t structure.
- *	@param address	The address of the device to connect to.
- *					If NULL, use the address in the struct set by wiiuse_find().
- *
- *	@return 1 on success, 0 on failure
- */
-static int wiiuse_connect_single(struct wiimote_t* wm, char* address) {
-	struct sockaddr_l2 addr;
-
-	memset(&addr, 0, sizeof(addr));
-
-	if (!wm || WIIMOTE_IS_CONNECTED(wm))
-		return 0;
-
-	addr.l2_family = AF_BLUETOOTH;
-
-	if (address)
-		/* use provided address */
-		str2ba(address, &addr.l2_bdaddr);
-	else
-		/* use address of device discovered */
-		addr.l2_bdaddr = wm->bdaddr;
-
-	/*
-	 *	OUTPUT CHANNEL
-	 */
-	wm->out_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP);
-	if (wm->out_sock == -1)
-		return 0;
-
-	addr.l2_psm = htobs(WM_OUTPUT_CHANNEL);
-
-	/* connect to wiimote */
-	if (connect(wm->out_sock, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
-		perror("connect() output sock");
-		return 0;
-	}
-
-	/*
-	 *	INPUT CHANNEL
-	 */
-	wm->in_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP);
-	if (wm->in_sock == -1) {
-		close(wm->out_sock);
-		wm->out_sock = -1;
-		return 0;
-	}
-
-	addr.l2_psm = htobs(WM_INPUT_CHANNEL);
-
-	/* connect to wiimote */
-	if (connect(wm->in_sock, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
-		perror("connect() interrupt sock");
-		close(wm->out_sock);
-		wm->out_sock = -1;
-		return 0;
-	}
-
-	WIIUSE_INFO("Connected to wiimote [id %i].", wm->unid);
-
-	/* do the handshake */
-	WIIMOTE_ENABLE_STATE(wm, WIIMOTE_STATE_CONNECTED);
-	wiiuse_handshake(wm, NULL, 0);
-
-	wiiuse_set_report_type(wm);
-
-	return 1;
-}
-
-
-/**
- *	@brief Disconnect a wiimote.
- *
- *	@param wm		Pointer to a wiimote_t structure.
- *
- *	@see wiiuse_connect()
- *
- *	Note that this will not free the wiimote structure.
- */
-void wiiuse_disconnect(struct wiimote_t* wm) {
-	if (!wm || WIIMOTE_IS_CONNECTED(wm))
-		return;
-
-	close(wm->out_sock);
-	close(wm->in_sock);
-
-	wm->out_sock = -1;
-	wm->in_sock = -1;
-	wm->event = WIIUSE_NONE;
-
-	WIIMOTE_DISABLE_STATE(wm, WIIMOTE_STATE_CONNECTED);
-	WIIMOTE_DISABLE_STATE(wm, WIIMOTE_STATE_HANDSHAKE);
-}
-
-
-int wiiuse_io_read(struct wiimote_t* wm) {
-	/* not used */
-	return 0;
-}
-
-
-int wiiuse_io_write(struct wiimote_t* wm, byte* buf, int len) {
-	return write(wm->out_sock, buf, len);
-}
-
-
-
-#endif /* ifndef WIN32 */
diff --git a/lib/wiiuse/io_win.c b/lib/wiiuse/io_win.c
deleted file mode 100644
index c6a33e032..000000000
--- a/lib/wiiuse/io_win.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- *	wiiuse
- *
- *	Written By:
- *		Michael Laforest	< para >
- *		Email: < thepara (--AT--) g m a i l [--DOT--] com >
- *
- *	Copyright 2006-2007
- *
- *	This file is part of wiiuse.
- *
- *	This program is free software; you can redistribute it and/or modify
- *	it under the terms of the GNU General Public License as published by
- *	the Free Software Foundation; either version 3 of the License, or
- *	(at your option) any later version.
- *
- *	This program is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *	GNU General Public License for more details.
- *
- *	You should have received a copy of the GNU General Public License
- *	along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *	$Header$
- *
- */
-
-/**
- *	@file
- *	@brief Handles device I/O for Windows.
- */
-
-#ifdef WIN32
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#define _WINSOCKAPI_  
-#include <windows.h>
-#include <hidsdi.h>
-#include <setupapi.h>
-
-#include "definitions.h"
-#include "wiiuse_internal.h"
-#include "io.h"
-
-
-int wiiuse_find(struct wiimote_t** wm, int max_wiimotes, int timeout) {
-	GUID device_id;
-	HANDLE dev;
-	HDEVINFO device_info;
-	int i, index;
-	DWORD len;
-	SP_DEVICE_INTERFACE_DATA device_data;
-	PSP_DEVICE_INTERFACE_DETAIL_DATA detail_data = NULL;
-	HIDD_ATTRIBUTES	attr;
-	int found = 0;
-
-	(void) timeout; // unused
-
-	device_data.cbSize = sizeof(device_data);
-	index = 0;
-
-	/* get the device id */
-	HidD_GetHidGuid(&device_id);
-
-	/* get all hid devices connected */
-	device_info = SetupDiGetClassDevs(&device_id, NULL, NULL, (DIGCF_DEVICEINTERFACE | DIGCF_PRESENT));
-
-	for (;; ++index) {
-
-		if (detail_data) {
-			free(detail_data);
-			detail_data = NULL;
-		}
-
-		/* query the next hid device info */
-		if (!SetupDiEnumDeviceInterfaces(device_info, NULL, &device_id, index, &device_data))
-			break;
-
-		/* get the size of the data block required */
-		i = SetupDiGetDeviceInterfaceDetail(device_info, &device_data, NULL, 0, &len, NULL);
-		detail_data = (PSP_DEVICE_INTERFACE_DETAIL_DATA)malloc(len);
-		detail_data->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA);
-
-		/* query the data for this device */
-		if (!SetupDiGetDeviceInterfaceDetail(device_info, &device_data, detail_data, len, NULL, NULL))
-			continue;
-
-		/* open the device */
-		dev = CreateFile(detail_data->DevicePath,
-						(GENERIC_READ | GENERIC_WRITE),
-						(FILE_SHARE_READ | FILE_SHARE_WRITE),
-						NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
-		if (dev == INVALID_HANDLE_VALUE)
-			continue;
-
-		/* get device attributes */
-		attr.Size = sizeof(attr);
-		i = HidD_GetAttributes(dev, &attr);
-
-		if ((attr.VendorID == WM_VENDOR_ID) && (attr.ProductID == WM_PRODUCT_ID)) {
-			/* this is a wiimote */
-			wm[found]->dev_handle = dev;
-
-			wm[found]->hid_overlap.hEvent = CreateEvent(NULL, 1, 1, "");
-			wm[found]->hid_overlap.Offset = 0;
-			wm[found]->hid_overlap.OffsetHigh = 0;
-
-			WIIMOTE_ENABLE_STATE(wm[found], WIIMOTE_STATE_DEV_FOUND);
-			WIIMOTE_ENABLE_STATE(wm[found], WIIMOTE_STATE_CONNECTED);
-
-			/* try to set the output report to see if the device is actually connected */
-			if (!wiiuse_set_report_type(wm[found])) {
-				WIIMOTE_DISABLE_STATE(wm[found], WIIMOTE_STATE_CONNECTED);
-				continue;
-			}
-
-			/* do the handshake */
-			wiiuse_handshake(wm[found], NULL, 0);
-
-			WIIUSE_INFO("Connected to wiimote [id %i].", wm[found]->unid);
-
-			++found;
-			if (found >= max_wiimotes)
-				break;
-		} else {
-			/* not a wiimote */
-			CloseHandle(dev);
-		}
-	}
-
-	if (detail_data)
-		free(detail_data);
-
-	SetupDiDestroyDeviceInfoList(device_info);
-
-	return found;
-}
-
-
-int wiiuse_connect(struct wiimote_t** wm, int wiimotes) {
-	int connected = 0;
-	int i = 0;
-
-	for (; i < wiimotes; ++i) {
-		if (WIIMOTE_IS_SET(wm[i], WIIMOTE_STATE_CONNECTED))
-			++connected;
-	}
-
-	return connected;
-}
-
-
-void wiiuse_disconnect(struct wiimote_t* wm) {
-	if (!wm || WIIMOTE_IS_CONNECTED(wm))
-		return;
-
-	CloseHandle(wm->dev_handle);
-	wm->dev_handle = 0;
-
-	ResetEvent(&wm->hid_overlap);
-
-	wm->event = WIIUSE_NONE;
-
-	WIIMOTE_DISABLE_STATE(wm, WIIMOTE_STATE_CONNECTED);
-	WIIMOTE_DISABLE_STATE(wm, WIIMOTE_STATE_HANDSHAKE);
-}
-
-
-int wiiuse_io_read(struct wiimote_t* wm) {
-	DWORD b, r;
-
-	if (!wm || !WIIMOTE_IS_CONNECTED(wm))
-		return 0;
-
-	if (!ReadFile(wm->dev_handle, wm->event_buf, sizeof(wm->event_buf), &b, &wm->hid_overlap)) {
-		/* partial read */
-		b = GetLastError();
-
-		if ((b == ERROR_HANDLE_EOF) || (b == ERROR_DEVICE_NOT_CONNECTED)) {
-			/* remote disconnect */
-			wiiuse_disconnected(wm);
-			return 0;
-		}
-
-		r = WaitForSingleObject(wm->hid_overlap.hEvent, wm->timeout);
-		if (r == WAIT_TIMEOUT) {
-			/* timeout - cancel and continue */
-
-			if (*wm->event_buf)
-				WIIUSE_WARNING("Packet ignored.  This may indicate a problem (timeout is %i ms).", wm->timeout);
-
-			CancelIo(wm->dev_handle);
-			ResetEvent(wm->hid_overlap.hEvent);
-			return 0;
-		} else if (r == WAIT_FAILED) {
-			WIIUSE_WARNING("A wait error occured on reading from wiimote %i.", wm->unid);
-			return 0;
-		}
-
-		if (!GetOverlappedResult(wm->dev_handle, &wm->hid_overlap, &b, 0))
-			return 0;
-	}
-
-	ResetEvent(wm->hid_overlap.hEvent);
-	return 1;
-}
-
-
-int wiiuse_io_write(struct wiimote_t* wm, byte* buf, int len) {
-	DWORD bytes;
-	int i;
-
-	if (!wm || !WIIMOTE_IS_CONNECTED(wm))
-		return 0;
-
-	switch (wm->stack) {
-		case WIIUSE_STACK_UNKNOWN:
-		{
-			/* try to auto-detect the stack type */
-			if (i = WriteFile(wm->dev_handle, buf, 22, &bytes, &wm->hid_overlap)) {
-				/* bluesoleil will always return 1 here, even if it's not connected */
-				wm->stack = WIIUSE_STACK_BLUESOLEIL;
-				return i;
-			}
-
-			if (i = HidD_SetOutputReport(wm->dev_handle, buf, len)) {
-				wm->stack = WIIUSE_STACK_MS;
-				return i;
-			}
-
-			WIIUSE_ERROR("Unable to determine bluetooth stack type.");
-			return 0;
-		}
-
-		case WIIUSE_STACK_MS:
-			return HidD_SetOutputReport(wm->dev_handle, buf, len);
-
-		case WIIUSE_STACK_BLUESOLEIL:
-			return WriteFile(wm->dev_handle, buf, 22, &bytes, &wm->hid_overlap);
-	}
-
-	return 0;
-}
-
-#endif /* ifdef WIN32 */