diff --git a/arch/generic/bits/ioctl.h b/arch/generic/bits/ioctl.h
index 9d75118e..ef44b15e 100644
--- a/arch/generic/bits/ioctl.h
+++ b/arch/generic/bits/ioctl.h
@@ -46,7 +46,6 @@
 #define TIOCSETD	0x5423
 #define TIOCGETD	0x5424
 #define TCSBRKP		0x5425
-#define TIOCTTYGSTRUCT	0x5426
 #define TIOCSBRK	0x5427
 #define TIOCCBRK	0x5428
 #define TIOCGSID	0x5429
@@ -72,8 +71,6 @@
 
 #define TIOCMIWAIT	0x545C
 #define TIOCGICOUNT	0x545D
-#define TIOCGHAYESESP   0x545E
-#define TIOCSHAYESESP   0x545F
 #define FIOQSIZE	0x5460
 
 #define TIOCPKT_DATA		 0
@@ -108,7 +105,6 @@ struct winsize {
 #define TIOCM_OUT1      0x2000
 #define TIOCM_OUT2      0x4000
 #define TIOCM_LOOP      0x8000
-#define TIOCM_MODEM_BITS TIOCM_OUT2
 
 #define N_TTY           0
 #define N_SLIP          1
diff --git a/arch/mips/bits/ioctl.h b/arch/mips/bits/ioctl.h
index 83fb1678..21390e44 100644
--- a/arch/mips/bits/ioctl.h
+++ b/arch/mips/bits/ioctl.h
@@ -80,10 +80,7 @@
 #define TIOCSERSETMULTI 0x5490
 #define TIOCMIWAIT	0x5491
 #define TIOCGICOUNT	0x5492
-#define TIOCGHAYESESP   0x5493
-#define TIOCSHAYESESP   0x5494
 
-#define TIOCTTYGSTRUCT	0x5426          // RICH: Not sure about these.
 #define TCGETX		0x5432          // RICH: Not sure about these.
 #define TCSETX		0x5433          // RICH: Not sure about these.
 #define TCSETXF		0x5434          // RICH: Not sure about these.
@@ -121,7 +118,6 @@ struct winsize {
 #define TIOCM_OUT1      0x2000
 #define TIOCM_OUT2      0x4000
 #define TIOCM_LOOP      0x8000
-#define TIOCM_MODEM_BITS TIOCM_OUT2
 
 #define N_TTY           0
 #define N_SLIP          1
diff --git a/arch/mips64/bits/ioctl.h b/arch/mips64/bits/ioctl.h
index 041be560..97f9b05e 100644
--- a/arch/mips64/bits/ioctl.h
+++ b/arch/mips64/bits/ioctl.h
@@ -80,10 +80,7 @@
 #define TIOCSERSETMULTI 0x5490
 #define TIOCMIWAIT	0x5491
 #define TIOCGICOUNT	0x5492
-#define TIOCGHAYESESP   0x5493
-#define TIOCSHAYESESP   0x5494
 
-#define TIOCTTYGSTRUCT	0x5426
 #define TCGETX		0x5432
 #define TCSETX		0x5433
 #define TCSETXF		0x5434
@@ -121,7 +118,6 @@ struct winsize {
 #define TIOCM_OUT1      0x2000
 #define TIOCM_OUT2      0x4000
 #define TIOCM_LOOP      0x8000
-#define TIOCM_MODEM_BITS TIOCM_OUT2
 
 #define N_TTY           0
 #define N_SLIP          1
diff --git a/arch/mipsn32/bits/ioctl.h b/arch/mipsn32/bits/ioctl.h
index 041be560..97f9b05e 100644
--- a/arch/mipsn32/bits/ioctl.h
+++ b/arch/mipsn32/bits/ioctl.h
@@ -80,10 +80,7 @@
 #define TIOCSERSETMULTI 0x5490
 #define TIOCMIWAIT	0x5491
 #define TIOCGICOUNT	0x5492
-#define TIOCGHAYESESP   0x5493
-#define TIOCSHAYESESP   0x5494
 
-#define TIOCTTYGSTRUCT	0x5426
 #define TCGETX		0x5432
 #define TCSETX		0x5433
 #define TCSETXF		0x5434
@@ -121,7 +118,6 @@ struct winsize {
 #define TIOCM_OUT1      0x2000
 #define TIOCM_OUT2      0x4000
 #define TIOCM_LOOP      0x8000
-#define TIOCM_MODEM_BITS TIOCM_OUT2
 
 #define N_TTY           0
 #define N_SLIP          1
diff --git a/arch/powerpc/bits/ioctl.h b/arch/powerpc/bits/ioctl.h
index 0c903dcb..193ba6e4 100644
--- a/arch/powerpc/bits/ioctl.h
+++ b/arch/powerpc/bits/ioctl.h
@@ -120,16 +120,11 @@
 /* end kernel header ioctls.h */
 
 
-#define TIOCTTYGSTRUCT	0x5426
-
 #define TCGETX		0x5432
 #define TCSETX		0x5433
 #define TCSETXF		0x5434
 #define TCSETXW		0x5435
 
-#define TIOCGHAYESESP   0x545E
-#define TIOCSHAYESESP   0x545F
-
 struct winsize {
 	unsigned short ws_row;
 	unsigned short ws_col;
@@ -137,8 +132,6 @@ struct winsize {
 	unsigned short ws_ypixel;
 };
 
-#define TIOCM_MODEM_BITS TIOCM_OUT2
-
 #define N_TTY           0
 #define N_SLIP          1
 #define N_MOUSE         2
diff --git a/arch/powerpc64/bits/ioctl.h b/arch/powerpc64/bits/ioctl.h
index 44a6cb65..f26bb757 100644
--- a/arch/powerpc64/bits/ioctl.h
+++ b/arch/powerpc64/bits/ioctl.h
@@ -123,16 +123,11 @@
 /* end kernel header ioctls.h */
 
 
-#define TIOCTTYGSTRUCT	0x5426
-
 #define TCGETX		0x5432
 #define TCSETX		0x5433
 #define TCSETXF		0x5434
 #define TCSETXW		0x5435
 
-#define TIOCGHAYESESP   0x545E
-#define TIOCSHAYESESP   0x545F
-
 struct winsize {
 	unsigned short ws_row;
 	unsigned short ws_col;
@@ -140,8 +135,6 @@ struct winsize {
 	unsigned short ws_ypixel;
 };
 
-#define TIOCM_MODEM_BITS TIOCM_OUT2
-
 #define N_TTY           0
 #define N_SLIP          1
 #define N_MOUSE         2
diff --git a/arch/sh/bits/ioctl.h b/arch/sh/bits/ioctl.h
index 2f63d06f..8f01f4f6 100644
--- a/arch/sh/bits/ioctl.h
+++ b/arch/sh/bits/ioctl.h
@@ -119,8 +119,6 @@ struct winsize {
     unsigned short ws_ypixel;
 };
 
-#define TIOCM_MODEM_BITS TIOCM_OUT2
-
 #define N_TTY           0
 #define N_SLIP          1
 #define N_MOUSE         2