diff --git a/fet.h b/fet.h
index e37c1ce..2307c83 100644
--- a/fet.h
+++ b/fet.h
@@ -21,6 +21,18 @@
 
 #include <sys/types.h>
 
+/* This function is for opening an eZ430-F2013 or FET430UIF device via
+ * a kernel-supported serial interface. The argument given should be the
+ * filename of the relevant tty device.
+ */
+int uif_open(const char *device, int want_jtag);
+
+/* Search the USB bus for the first eZ430-RF2500, and initialize it. If
+ * successful, 0 is returned and the fet_* functions are ready for use.
+ * If an error occurs, -1 is returned.
+ */
+int rf2500_open(void);
+
 /* This structure is used to provide an interface to a lower-level
  * transport. The transport mechanism is viewed as a stream by the FET
  * controller, which handles packet encapsulation, checksums and other
diff --git a/main.c b/main.c
index 0c4b4dc..ccc8b14 100644
--- a/main.c
+++ b/main.c
@@ -26,8 +26,6 @@
 
 #include "dis.h"
 #include "fet.h"
-#include "rf2500.h"
-#include "uif.h"
 
 void hexdump(int addr, const char *data, int len)
 {
diff --git a/rf2500.h b/rf2500.h
deleted file mode 100644
index cdfb847..0000000
--- a/rf2500.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* MSPDebug - debugging tool for the eZ430
- * Copyright (C) 2009 Daniel Beer
- *
- * 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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef RF2500_H_
-#define RF2500_H_
-
-/* Search the USB bus for the first eZ430-RF2500, and initialize it. If
- * successful, 0 is returned and the fet_* functions are ready for use.
- * If an error occurs, -1 is returned.
- */
-int rf2500_open(void);
-
-#endif
diff --git a/uif.c b/uif.c
index f52ee44..d871e64 100644
--- a/uif.c
+++ b/uif.c
@@ -26,7 +26,6 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include "uif.h"
 #include "fet.h"
 
 void hexdump(int addr, const char *data, int len);
diff --git a/uif.h b/uif.h
deleted file mode 100644
index 28d6963..0000000
--- a/uif.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* MSPDebug - debugging tool for the eZ430
- * Copyright (C) 2009 Daniel Beer
- *
- * 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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef UIF_H_
-#define UIF_H_
-
-/* This function is for opening an eZ430-F2013 or FET430UIF device via
- * a kernel-supported serial interface. The argument given should be the
- * filename of the relevant tty device.
- */
-int uif_open(const char *device, int want_jtag);
-
-#endif