diff --git a/include/grub/disk.h b/include/grub/disk.h
index 101303205..66db1149a 100644
--- a/include/grub/disk.h
+++ b/include/grub/disk.h
@@ -42,8 +42,7 @@ enum grub_disk_dev_id
     GRUB_DISK_DEVICE_PXE_ID,
     GRUB_DISK_DEVICE_SCSI_ID,
     GRUB_DISK_DEVICE_FILE_ID,
-    GRUB_DISK_DEVICE_LUKS_ID,
-    GRUB_DISK_DEVICE_OFNET_ID
+    GRUB_DISK_DEVICE_LUKS_ID
   };
 
 struct grub_disk;
@@ -117,23 +116,6 @@ struct grub_disk
 };
 typedef struct grub_disk *grub_disk_t;
 
-/* Net Disk */
-enum grub_netdisk_protocol 
-{
-  GRUB_NETDISK_PROTOCOL_TFTP
-};
-typedef enum grub_netdisk_protocol grub_netdisk_protocol_t;
-
-struct grub_netdisk_data
-{
-  grub_netdisk_protocol_t protocol;
-  grub_uint32_t server_ip;
-  grub_uint32_t port;
-  char *username;
-  char *password;
-};
-typedef struct grub_netdisk_data *grub_netdisk_data_t;
-
 #ifdef GRUB_UTIL
 struct grub_disk_memberlist
 {
diff --git a/include/grub/ieee1275/ofnet.h b/include/grub/ieee1275/ofnet.h
index 9a0ae29e3..c7284df38 100644
--- a/include/grub/ieee1275/ofnet.h
+++ b/include/grub/ieee1275/ofnet.h
@@ -23,9 +23,6 @@
 #include <grub/err.h>
 #include <grub/types.h>
 
-void grub_ofnet_init(void);
-void grub_ofnet_fini(void);
-
 struct grub_ofnet
 {
   /* The net name.  */
diff --git a/include/grub/net/ieee1275/interface.h b/include/grub/net/ieee1275/interface.h
deleted file mode 100644
index c369e35a6..000000000
--- a/include/grub/net/ieee1275/interface.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef GRUB_IEEE1275_INTERFACE_HEADER
-#define GRUB_IEEE1275_INTERFACE_HEADER	1
-
-#include <grub/misc.h>
-#include <grub/ieee1275/ieee1275.h>
-#include <grub/ieee1275/ofnet.h>
-#include <grub/net/netbuff.h>
-
-grub_bootp_t bootp_pckt;
-#endif 
diff --git a/include/grub/net/mem.h b/include/grub/net/mem.h
deleted file mode 100644
index bbdac512b..000000000
--- a/include/grub/net/mem.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef GRUB_NETMM_H
-#define GRUB_NETMM_H	1
-
-#include <grub/types.h>
-#include <grub/symbol.h>
-
-void *EXPORT_FUNC(grub_net_malloc) (grub_size_t size);
-
-#endif /* ! GRUB_MM_H */