diff --git a/packages/material-ui/package.json b/packages/material-ui/package.json
index 13cbe2a23272e4..794b52e77a00eb 100644
--- a/packages/material-ui/package.json
+++ b/packages/material-ui/package.json
@@ -62,6 +62,9 @@
     "scroll": "^2.0.3",
     "warning": "^4.0.1"
   },
+  "devDependencies": {
+    "@types/react-router-dom": "^4.2.7"
+  },
   "sideEffects": false,
   "publishConfig": {
     "access": "public"
diff --git a/packages/material-ui/src/AppBar/AppBar.d.ts b/packages/material-ui/src/AppBar/AppBar.d.ts
index fa5ca4a3f06676..25d011af11c70d 100644
--- a/packages/material-ui/src/AppBar/AppBar.d.ts
+++ b/packages/material-ui/src/AppBar/AppBar.d.ts
@@ -1,7 +1,8 @@
+import * as React from 'react';
 import { PropTypes, StandardProps } from '..';
 import { PaperProps } from '../Paper';
 
-export interface AppBarProps extends StandardProps<PaperProps, AppBarClassKey> {
+export interface AppBarProps<C = {}> extends StandardProps<PaperProps<C>, AppBarClassKey> {
   color?: PropTypes.Color;
   position?: 'fixed' | 'absolute' | 'sticky' | 'static';
 }
@@ -16,6 +17,6 @@ export type AppBarClassKey =
   | 'colorPrimary'
   | 'colorSecondary';
 
-declare const AppBar: React.ComponentType<AppBarProps>;
+declare class AppBar<C> extends React.Component<C & AppBarProps<C>> {}
 
 export default AppBar;
diff --git a/packages/material-ui/src/Avatar/Avatar.d.ts b/packages/material-ui/src/Avatar/Avatar.d.ts
index dc494ad952a0bd..f85acba7c1fc57 100644
--- a/packages/material-ui/src/Avatar/Avatar.d.ts
+++ b/packages/material-ui/src/Avatar/Avatar.d.ts
@@ -1,19 +1,21 @@
 import * as React from 'react';
-import { StandardProps } from '..';
+import { AnyComponent, PassthruProps, StandardProps } from '..';
 
-export interface AvatarProps
-  extends StandardProps<React.HTMLAttributes<HTMLDivElement>, AvatarClassKey> {
+export type AvatarProps<C extends AnyComponent = AnyComponent> = StandardProps<
+  PassthruProps<C, 'div'>,
+  AvatarClassKey
+> & {
   alt?: string;
   childrenClassName?: string;
-  component?: React.ReactType<AvatarProps>;
+  component?: C;
   imgProps?: React.HtmlHTMLAttributes<HTMLImageElement>;
   sizes?: string;
   src?: string;
   srcSet?: string;
-}
+};
 
 export type AvatarClassKey = 'root' | 'colorDefault' | 'img';
 
-declare const Avatar: React.ComponentType<AvatarProps>;
+declare class Avatar<C extends AnyComponent> extends React.Component<AvatarProps<C>> {}
 
 export default Avatar;
diff --git a/packages/material-ui/src/Badge/Badge.d.ts b/packages/material-ui/src/Badge/Badge.d.ts
index 45a15eef116dfb..e30a8d55a7f6a2 100644
--- a/packages/material-ui/src/Badge/Badge.d.ts
+++ b/packages/material-ui/src/Badge/Badge.d.ts
@@ -1,16 +1,16 @@
 import * as React from 'react';
 import { StandardProps, PropTypes } from '..';
 
-export interface BadgeProps
+export interface BadgeProps<C = {}>
   extends StandardProps<React.HTMLAttributes<HTMLDivElement>, BadgeClassKey> {
   badgeContent: React.ReactNode;
   children: React.ReactNode;
   color?: PropTypes.Color | 'error';
-  component?: React.ReactType<BadgeProps>;
+  component?: React.ReactType<C>;
 }
 
 export type BadgeClassKey = 'root' | 'badge' | 'colorPrimary' | 'colorSecondary';
 
-declare const Badge: React.ComponentType<BadgeProps>;
+declare class Badge<C> extends React.Component<C & BadgeProps<C>> {}
 
 export default Badge;
diff --git a/packages/material-ui/src/BottomNavigationAction/BottomNavigationAction.d.ts b/packages/material-ui/src/BottomNavigationAction/BottomNavigationAction.d.ts
index 9a891c40808096..6727181b218dc1 100644
--- a/packages/material-ui/src/BottomNavigationAction/BottomNavigationAction.d.ts
+++ b/packages/material-ui/src/BottomNavigationAction/BottomNavigationAction.d.ts
@@ -2,8 +2,8 @@ import * as React from 'react';
 import { StandardProps } from '..';
 import { ButtonBaseProps } from '../ButtonBase';
 
-export interface BottomNavigationActionProps
-  extends StandardProps<ButtonBaseProps, BottomNavigationActionClassKey, 'onChange'> {
+export interface BottomNavigationActionProps<C = {}>
+  extends StandardProps<ButtonBaseProps<C>, BottomNavigationActionClassKey, 'onChange'> {
   icon?: string | React.ReactElement<any>;
   label?: React.ReactNode;
   onChange?: (event: React.ChangeEvent<{}>, value: any) => void;
@@ -15,6 +15,8 @@ export interface BottomNavigationActionProps
 
 export type BottomNavigationActionClassKey = 'root' | 'selected' | 'iconOnly' | 'wrapper' | 'label';
 
-declare const BottomNavigationAction: React.ComponentType<BottomNavigationActionProps>;
+declare class BottomNavigationAction<C> extends React.Component<
+  C & BottomNavigationActionProps<C>
+> {}
 
 export default BottomNavigationAction;
diff --git a/packages/material-ui/src/Button/Button.d.ts b/packages/material-ui/src/Button/Button.d.ts
index a01e336643eaa3..87b1962a2d6745 100644
--- a/packages/material-ui/src/Button/Button.d.ts
+++ b/packages/material-ui/src/Button/Button.d.ts
@@ -2,9 +2,10 @@ import * as React from 'react';
 import { StandardProps, PropTypes } from '..';
 import { ButtonBaseProps } from '../ButtonBase';
 
-export interface ButtonProps extends StandardProps<ButtonBaseProps, ButtonClassKey, 'component'> {
+export interface ButtonProps<C = {}>
+  extends StandardProps<ButtonBaseProps<C>, ButtonClassKey, 'component'> {
   color?: PropTypes.Color;
-  component?: React.ReactType<ButtonProps>;
+  component?: React.ReactType<C>;
   disabled?: boolean;
   disableFocusRipple?: boolean;
   disableRipple?: boolean;
@@ -41,6 +42,6 @@ export type ButtonClassKey =
   | 'sizeLarge'
   | 'fullWidth';
 
-declare const Button: React.ComponentType<ButtonProps>;
+declare class Button<C> extends React.Component<C & ButtonProps<C>> {}
 
 export default Button;
diff --git a/packages/material-ui/src/ButtonBase/ButtonBase.d.ts b/packages/material-ui/src/ButtonBase/ButtonBase.d.ts
index 22c7eade399b1c..40f003bb846033 100644
--- a/packages/material-ui/src/ButtonBase/ButtonBase.d.ts
+++ b/packages/material-ui/src/ButtonBase/ButtonBase.d.ts
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { StandardProps } from '..';
 import { TouchRippleProps } from './TouchRipple';
 
-export interface ButtonBaseProps
+export interface ButtonBaseProps<C = {}>
   extends StandardProps<
       React.AnchorHTMLAttributes<HTMLElement> & React.ButtonHTMLAttributes<HTMLElement>,
       ButtonBaseClassKey
@@ -10,7 +10,7 @@ export interface ButtonBaseProps
   action?: (actions: ButtonBaseActions) => void;
   buttonRef?: React.Ref<any> | React.RefObject<any>;
   centerRipple?: boolean;
-  component?: React.ReactType<ButtonBaseProps>;
+  component?: React.ReactType<C>;
   disableRipple?: boolean;
   disableTouchRipple?: boolean;
   focusRipple?: boolean;
@@ -25,6 +25,6 @@ export interface ButtonBaseActions {
   focusVisible(): void;
 }
 
-declare const ButtonBase: React.ComponentType<ButtonBaseProps>;
+declare class ButtonBase<C> extends React.Component<C & ButtonBaseProps<C>> {}
 
 export default ButtonBase;
diff --git a/packages/material-ui/src/Card/Card.d.ts b/packages/material-ui/src/Card/Card.d.ts
index 0104856e1ed363..2ca72e68ece77f 100644
--- a/packages/material-ui/src/Card/Card.d.ts
+++ b/packages/material-ui/src/Card/Card.d.ts
@@ -2,12 +2,12 @@ import * as React from 'react';
 import { StandardProps } from '..';
 import { PaperProps } from '../Paper';
 
-export interface CardProps extends StandardProps<PaperProps, CardClassKey> {
+export interface CardProps<C = {}> extends StandardProps<PaperProps<C>, CardClassKey> {
   raised?: boolean;
 }
 
 export type CardClassKey = 'root';
 
-declare const Card: React.ComponentType<CardProps>;
+declare class Card<C> extends React.Component<C & CardProps<C>> {}
 
 export default Card;
diff --git a/packages/material-ui/src/CardContent/CardContent.d.ts b/packages/material-ui/src/CardContent/CardContent.d.ts
index 3d3e2c2c6c712e..742202b335a882 100644
--- a/packages/material-ui/src/CardContent/CardContent.d.ts
+++ b/packages/material-ui/src/CardContent/CardContent.d.ts
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface CardContentProps
+export interface CardContentProps<C = {}>
   extends StandardProps<React.HTMLAttributes<HTMLDivElement>, CardContentClassKey> {
-  component?: React.ReactType<CardContentProps>;
+  component?: React.ReactType<C>;
 }
 
 export type CardContentClassKey = 'root';
 
-declare const CardContent: React.ComponentType<CardContentProps>;
+declare class CardContent<C> extends React.Component<C & CardContentProps<C>> {}
 
 export default CardContent;
diff --git a/packages/material-ui/src/CardHeader/CardHeader.d.ts b/packages/material-ui/src/CardHeader/CardHeader.d.ts
index 0a824fdfc06139..26c280b70b00b8 100644
--- a/packages/material-ui/src/CardHeader/CardHeader.d.ts
+++ b/packages/material-ui/src/CardHeader/CardHeader.d.ts
@@ -2,17 +2,17 @@ import * as React from 'react';
 import { StandardProps } from '..';
 import { CardContentProps } from '../CardContent';
 
-export interface CardHeaderProps
+export interface CardHeaderProps<C = {}>
   extends StandardProps<React.HTMLAttributes<HTMLDivElement>, CardHeaderClassKey, 'title'> {
   action?: React.ReactNode;
   avatar?: React.ReactNode;
-  component?: React.ReactType<CardHeaderProps>;
+  component?: React.ReactType<C>;
   subheader?: React.ReactNode;
   title?: React.ReactNode;
 }
 
 export type CardHeaderClassKey = 'root' | 'avatar' | 'action' | 'content' | 'title' | 'subheader';
 
-declare const CardHeader: React.ComponentType<CardHeaderProps>;
+declare class CardHeader<C> extends React.Component<C & CardHeaderProps<C>> {}
 
 export default CardHeader;
diff --git a/packages/material-ui/src/CardMedia/CardMedia.d.ts b/packages/material-ui/src/CardMedia/CardMedia.d.ts
index 9f69e46e067a79..8a0b6c977b75ea 100644
--- a/packages/material-ui/src/CardMedia/CardMedia.d.ts
+++ b/packages/material-ui/src/CardMedia/CardMedia.d.ts
@@ -1,15 +1,15 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface CardMediaProps
+export interface CardMediaProps<C = {}>
   extends StandardProps<React.HTMLAttributes<HTMLDivElement>, CardMediaClassKey> {
-  component?: React.ReactType<CardMediaProps>;
+  component?: React.ReactType<C>;
   image?: string;
   src?: string;
 }
 
 export type CardMediaClassKey = 'root' | 'media';
 
-declare const CardMedia: React.ComponentType<CardMediaProps>;
+declare class CardMedia<C> extends React.Component<C & CardMediaProps<C>> {}
 
 export default CardMedia;
diff --git a/packages/material-ui/src/Checkbox/Checkbox.d.ts b/packages/material-ui/src/Checkbox/Checkbox.d.ts
index 5dbe9824adcdd6..f92510715628c6 100644
--- a/packages/material-ui/src/Checkbox/Checkbox.d.ts
+++ b/packages/material-ui/src/Checkbox/Checkbox.d.ts
@@ -2,8 +2,8 @@ import * as React from 'react';
 import { StandardProps } from '..';
 import { SwitchBaseProps, SwitchBaseClassKey } from '../internal/SwitchBase';
 
-export interface CheckboxProps
-  extends StandardProps<SwitchBaseProps, CheckboxClassKey, 'checkedIcon' | 'color' | 'icon'> {
+export interface CheckboxProps<C = {}>
+  extends StandardProps<SwitchBaseProps<C>, CheckboxClassKey, 'checkedIcon' | 'color' | 'icon'> {
   checkedIcon?: React.ReactNode;
   color?: 'primary' | 'secondary' | 'default';
   icon?: React.ReactNode;
@@ -11,6 +11,6 @@ export interface CheckboxProps
 
 export type CheckboxClassKey = SwitchBaseClassKey | 'colorPrimary' | 'colorSecondary';
 
-declare const Checkbox: React.ComponentType<CheckboxProps>;
+declare class Checkbox<C> extends React.Component<C & CheckboxProps<C>> {}
 
 export default Checkbox;
diff --git a/packages/material-ui/src/Chip/Chip.d.ts b/packages/material-ui/src/Chip/Chip.d.ts
index a7c5698fb4a62c..394110e7acdd01 100644
--- a/packages/material-ui/src/Chip/Chip.d.ts
+++ b/packages/material-ui/src/Chip/Chip.d.ts
@@ -1,11 +1,11 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface ChipProps
+export interface ChipProps<C = {}>
   extends StandardProps<React.HTMLAttributes<HTMLDivElement>, ChipClassKey> {
   avatar?: React.ReactElement<any>;
   clickable?: boolean;
-  component?: React.ReactType<ChipProps>;
+  component?: React.ReactType<C>;
   deleteIcon?: React.ReactElement<any>;
   label?: React.ReactNode;
   onDelete?: React.EventHandler<any>;
@@ -21,6 +21,6 @@ export type ChipClassKey =
   | 'label'
   | 'deleteIcon';
 
-declare const Chip: React.ComponentType<ChipProps>;
+declare class Chip<C> extends React.Component<C & ChipProps<C>> {}
 
 export default Chip;
diff --git a/packages/material-ui/src/Collapse/Collapse.d.ts b/packages/material-ui/src/Collapse/Collapse.d.ts
index 6342f9ab6f25b4..42c40d84029e2f 100644
--- a/packages/material-ui/src/Collapse/Collapse.d.ts
+++ b/packages/material-ui/src/Collapse/Collapse.d.ts
@@ -3,16 +3,17 @@ import { StandardProps } from '..';
 import { Theme } from '../styles/createMuiTheme';
 import { TransitionProps } from '../transitions/transition';
 
-export interface CollapseProps extends StandardProps<TransitionProps, CollapseClassKey, 'timeout'> {
+export interface CollapseProps<C = {}>
+  extends StandardProps<TransitionProps, CollapseClassKey, 'timeout'> {
   children?: React.ReactNode;
   collapsedHeight?: string;
-  component?: React.ReactType<CollapseProps>;
+  component?: React.ReactType<C>;
   theme?: Theme;
   timeout?: TransitionProps['timeout'] | 'auto';
 }
 
 export type CollapseClassKey = 'container' | 'entered';
 
-declare const Collapse: React.ComponentType<CollapseProps>;
+declare class Collapse<C> extends React.Component<C & CollapseProps<C>> {}
 
 export default Collapse;
diff --git a/packages/material-ui/src/Dialog/Dialog.d.ts b/packages/material-ui/src/Dialog/Dialog.d.ts
index 416749422c0dc2..9f575f7fe2edb3 100644
--- a/packages/material-ui/src/Dialog/Dialog.d.ts
+++ b/packages/material-ui/src/Dialog/Dialog.d.ts
@@ -1,16 +1,15 @@
 import * as React from 'react';
 import { StandardProps } from '..';
-import { PaperProps } from '../Paper';
 import { ModalProps } from '../Modal';
 import { TransitionHandlerProps, TransitionProps } from '../transitions/transition';
 
-export interface DialogProps
+export interface DialogProps<C = {}>
   extends StandardProps<ModalProps & Partial<TransitionHandlerProps>, DialogClassKey, 'children'> {
   children?: React.ReactNode;
   fullScreen?: boolean;
   fullWidth?: boolean;
   maxWidth?: 'xs' | 'sm' | 'md' | false;
-  PaperProps?: Partial<PaperProps>;
+  PaperProps?: Partial<C>;
   scroll?: 'body' | 'paper';
   TransitionComponent?: React.ReactType;
   transitionDuration?: TransitionProps['timeout'];
@@ -30,6 +29,6 @@ export type DialogClassKey =
   | 'paperFullWidth'
   | 'paperFullScreen';
 
-declare const Dialog: React.ComponentType<DialogProps>;
+declare class Dialog<C> extends React.Component<C & DialogProps<C>> { }
 
 export default Dialog;
diff --git a/packages/material-ui/src/Divider/Divider.d.ts b/packages/material-ui/src/Divider/Divider.d.ts
index a38a8de451bb37..d6048258c13df5 100644
--- a/packages/material-ui/src/Divider/Divider.d.ts
+++ b/packages/material-ui/src/Divider/Divider.d.ts
@@ -1,16 +1,16 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface DividerProps
+export interface DividerProps<C = {}>
   extends StandardProps<React.HTMLAttributes<HTMLHRElement>, DividerClassKey> {
   absolute?: boolean;
-  component?: React.ReactType<DividerProps>;
+  component?: React.ReactType<C>;
   inset?: boolean;
   light?: boolean;
 }
 
 export type DividerClassKey = 'root' | 'absolute' | 'inset' | 'light';
 
-declare const Divider: React.ComponentType<DividerProps>;
+declare class Divider<C> extends React.Component<C & DividerProps<C>> {}
 
 export default Divider;
diff --git a/packages/material-ui/src/Drawer/Drawer.d.ts b/packages/material-ui/src/Drawer/Drawer.d.ts
index 019a424df99549..42c08fade71684 100644
--- a/packages/material-ui/src/Drawer/Drawer.d.ts
+++ b/packages/material-ui/src/Drawer/Drawer.d.ts
@@ -6,7 +6,7 @@ import { PaperProps } from '../Paper';
 import { Theme } from '../styles/createMuiTheme';
 import { TransitionHandlerProps, TransitionProps } from '../transitions/transition';
 
-export interface DrawerProps
+export interface DrawerProps<C = {}>
   extends StandardProps<
       ModalProps & Partial<TransitionHandlerProps>,
       DrawerClassKey,
@@ -17,7 +17,7 @@ export interface DrawerProps
   elevation?: number;
   ModalProps?: Partial<ModalProps>;
   open?: boolean;
-  PaperProps?: Partial<PaperProps>;
+  PaperProps?: Partial<PaperProps<C>>;
   SlideProps?: Partial<SlideProps>;
   theme?: Theme;
   transitionDuration?: TransitionProps['timeout'];
@@ -37,6 +37,6 @@ export type DrawerClassKey =
   | 'paperAnchorDockedBottom'
   | 'modal';
 
-declare const Drawer: React.ComponentType<DrawerProps>;
+declare class Drawer<C> extends React.Component<DrawerProps<C>> {}
 
 export default Drawer;
diff --git a/packages/material-ui/src/ExpansionPanel/ExpansionPanel.d.ts b/packages/material-ui/src/ExpansionPanel/ExpansionPanel.d.ts
index ff825d6dd6b252..525b1f7fac0458 100644
--- a/packages/material-ui/src/ExpansionPanel/ExpansionPanel.d.ts
+++ b/packages/material-ui/src/ExpansionPanel/ExpansionPanel.d.ts
@@ -3,9 +3,9 @@ import { StandardProps } from '..';
 import { CollapseProps } from '../Collapse';
 import { PaperProps } from '../Paper';
 
-export interface ExpansionPanelProps
-  extends StandardProps<PaperProps, ExpansionPanelClassKey, 'onChange'> {
-  CollapseProps?: Partial<CollapseProps>;
+export interface ExpansionPanelProps<C = {}>
+  extends StandardProps<PaperProps<C>, ExpansionPanelClassKey, 'onChange'> {
+  CollapseProps?: Partial<CollapseProps<C>>;
   defaultExpanded?: boolean;
   disabled?: boolean;
   expanded?: boolean;
@@ -14,6 +14,6 @@ export interface ExpansionPanelProps
 
 export type ExpansionPanelClassKey = 'root' | 'expanded' | 'disabled';
 
-declare const ExpansionPanel: React.ComponentType<ExpansionPanelProps>;
+declare class ExpansionPanel<C> extends React.Component<ExpansionPanelProps<C>> {}
 
 export default ExpansionPanel;
diff --git a/packages/material-ui/src/ExpansionPanelSummary/ExpansionPanelSummary.d.ts b/packages/material-ui/src/ExpansionPanelSummary/ExpansionPanelSummary.d.ts
index 922baea5816ce1..2071c92cc155fd 100644
--- a/packages/material-ui/src/ExpansionPanelSummary/ExpansionPanelSummary.d.ts
+++ b/packages/material-ui/src/ExpansionPanelSummary/ExpansionPanelSummary.d.ts
@@ -2,8 +2,8 @@ import * as React from 'react';
 import { StandardProps } from '..';
 import { ButtonBaseProps } from '../ButtonBase';
 
-export interface ExpansionPanelSummaryProps
-  extends StandardProps<ButtonBaseProps, ExpansionPanelSummaryClassKey> {
+export interface ExpansionPanelSummaryProps<C = {}>
+  extends StandardProps<ButtonBaseProps<C>, ExpansionPanelSummaryClassKey> {
   disabled?: boolean;
   expanded?: boolean;
   expandIcon?: React.ReactNode;
@@ -18,6 +18,6 @@ export type ExpansionPanelSummaryClassKey =
   | 'content'
   | 'expandIcon';
 
-declare const ExpansionPanelSummary: React.ComponentType<ExpansionPanelSummaryProps>;
+declare class ExpansionPanelSummary<C> extends React.Component<C & ExpansionPanelSummaryProps<C>> {}
 
 export default ExpansionPanelSummary;
diff --git a/packages/material-ui/src/FormControl/FormControl.d.ts b/packages/material-ui/src/FormControl/FormControl.d.ts
index 2815a0c5c728fe..1d15ffeb94233a 100644
--- a/packages/material-ui/src/FormControl/FormControl.d.ts
+++ b/packages/material-ui/src/FormControl/FormControl.d.ts
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { StandardProps, PropTypes } from '..';
 
-export interface FormControlProps
+export interface FormControlProps<C = {}>
   extends StandardProps<React.HtmlHTMLAttributes<HTMLDivElement>, FormControlClassKey> {
-  component?: React.ReactType<FormControlProps>;
+  component?: React.ReactType<C>;
   disabled?: boolean;
   error?: boolean;
   fullWidth?: boolean;
@@ -15,6 +15,6 @@ export interface FormControlProps
 
 export type FormControlClassKey = 'root' | 'marginNormal' | 'marginDense' | 'fullWidth';
 
-declare const FormControl: React.ComponentType<FormControlProps>;
+declare class FormControl<C> extends React.Component<C & FormControlProps<C>> {}
 
 export default FormControl;
diff --git a/packages/material-ui/src/FormHelperText/FormHelperText.d.ts b/packages/material-ui/src/FormHelperText/FormHelperText.d.ts
index 4ceeff56f64051..bc293d62d2f134 100644
--- a/packages/material-ui/src/FormHelperText/FormHelperText.d.ts
+++ b/packages/material-ui/src/FormHelperText/FormHelperText.d.ts
@@ -1,16 +1,16 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface FormHelperTextProps
+export interface FormHelperTextProps<C = {}>
   extends StandardProps<React.HTMLAttributes<HTMLParagraphElement>, FormHelperTextClassKey> {
   disabled?: boolean;
   error?: boolean;
-  component?: React.ReactType<FormHelperTextProps>;
+  component?: React.ReactType<C>;
   margin?: 'dense';
 }
 
 export type FormHelperTextClassKey = 'root' | 'error' | 'disabled' | 'marginDense';
 
-declare const FormHelperText: React.ComponentType<FormHelperTextProps>;
+declare class FormHelperText<C> extends React.Component<C & FormHelperTextProps<C>> {}
 
 export default FormHelperText;
diff --git a/packages/material-ui/src/FormLabel/FormLabel.d.ts b/packages/material-ui/src/FormLabel/FormLabel.d.ts
index f1cdffccdf3573..debd1be9b5bfec 100644
--- a/packages/material-ui/src/FormLabel/FormLabel.d.ts
+++ b/packages/material-ui/src/FormLabel/FormLabel.d.ts
@@ -1,18 +1,19 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface FormLabelProps extends StandardProps<FormLabelBaseProps, FormLabelClassKey> {
-  component?: React.ReactType<FormLabelBaseProps>;
+export interface FormLabelProps<C = {}>
+  extends StandardProps<FormLabelBaseProps<C>, FormLabelClassKey> {
+  component?: React.ReactType<C>;
   disabled?: boolean;
   error?: boolean;
   focused?: boolean;
   required?: boolean;
 }
 
-export type FormLabelBaseProps = React.LabelHTMLAttributes<HTMLLabelElement>;
+export type FormLabelBaseProps<C> = React.LabelHTMLAttributes<C & HTMLLabelElement>;
 
 export type FormLabelClassKey = 'root' | 'focused' | 'disabled' | 'error' | 'asterisk';
 
-declare const FormLabel: React.ComponentType<FormLabelProps>;
+declare class FormLabel<C> extends React.Component<C & FormLabelProps<C>> {}
 
 export default FormLabel;
diff --git a/packages/material-ui/src/Grid/Grid.d.ts b/packages/material-ui/src/Grid/Grid.d.ts
index 24f5b8bd2de4b5..f08078dbb4b1bd 100644
--- a/packages/material-ui/src/Grid/Grid.d.ts
+++ b/packages/material-ui/src/Grid/Grid.d.ts
@@ -27,7 +27,7 @@ export type GridWrap = 'nowrap' | 'wrap' | 'wrap-reverse';
 
 export type GridSize = 'auto' | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12;
 
-export interface GridProps
+export interface GridProps<C = {}>
   extends StandardProps<
       React.HTMLAttributes<HTMLElement> & Partial<Record<Breakpoint, boolean | GridSize>>,
       GridClassKey,
@@ -35,7 +35,7 @@ export interface GridProps
     > {
   alignContent?: GridContentAlignment;
   alignItems?: GridItemsAlignment;
-  component?: string | React.ComponentType<Omit<GridProps, StrippedProps>>;
+  component?: string | React.ComponentType<Omit<GridProps<C>, StrippedProps>>;
   container?: boolean;
   direction?: GridDirection;
   item?: boolean;
@@ -85,7 +85,7 @@ export type GridClassKey =
   | 'grid-xs-11'
   | 'grid-xs-12';
 
-declare const Grid: React.ComponentType<GridProps>;
+declare class Grid<C> extends React.Component<C & GridProps<C>> {}
 
 export default Grid;
 
diff --git a/packages/material-ui/src/GridList/GridList.d.ts b/packages/material-ui/src/GridList/GridList.d.ts
index 06f97a8c9b35a8..9bcdda36ec4c4c 100644
--- a/packages/material-ui/src/GridList/GridList.d.ts
+++ b/packages/material-ui/src/GridList/GridList.d.ts
@@ -1,16 +1,16 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface GridListProps
+export interface GridListProps<C = {}>
   extends StandardProps<React.HTMLAttributes<HTMLUListElement>, GridListClassKey> {
   cellHeight?: number | 'auto';
   cols?: number;
-  component?: React.ReactType<GridListProps>;
+  component?: React.ReactType<C>;
   spacing?: number;
 }
 
 export type GridListClassKey = 'root';
 
-declare const GridList: React.ComponentType<GridListProps>;
+declare class GridList<C> extends React.Component<C & GridListProps<C>> {}
 
 export default GridList;
diff --git a/packages/material-ui/src/GridListTile/GridListTile.d.ts b/packages/material-ui/src/GridListTile/GridListTile.d.ts
index ddd1eab6d0fe18..7f3090174b763f 100644
--- a/packages/material-ui/src/GridListTile/GridListTile.d.ts
+++ b/packages/material-ui/src/GridListTile/GridListTile.d.ts
@@ -1,15 +1,15 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface GridListTileProps
+export interface GridListTileProps<C = {}>
   extends StandardProps<React.HTMLAttributes<HTMLLIElement>, GridListTileClassKey> {
   cols?: number;
-  component?: React.ReactType<GridListTileProps>;
+  component?: React.ReactType<C>;
   rows?: number;
 }
 
 export type GridListTileClassKey = 'root' | 'tile' | 'imgFullHeight' | 'imgFullWidth';
 
-declare const GridListTile: React.ComponentType<GridListTileProps>;
+declare class GridListTile<C> extends React.Component<C & GridListTileProps<C>> {}
 
 export default GridListTile;
diff --git a/packages/material-ui/src/IconButton/IconButton.d.ts b/packages/material-ui/src/IconButton/IconButton.d.ts
index a6bd70eaa52536..8b2888502b0c42 100644
--- a/packages/material-ui/src/IconButton/IconButton.d.ts
+++ b/packages/material-ui/src/IconButton/IconButton.d.ts
@@ -2,7 +2,8 @@ import * as React from 'react';
 import { StandardProps, PropTypes } from '..';
 import { ButtonBaseProps } from '../ButtonBase';
 
-export interface IconButtonProps extends StandardProps<ButtonBaseProps, IconButtonClassKey> {
+export interface IconButtonProps<C = {}>
+  extends StandardProps<ButtonBaseProps<C>, IconButtonClassKey> {
   color?: PropTypes.Color;
   disabled?: boolean;
   disableRipple?: boolean;
@@ -16,6 +17,6 @@ export type IconButtonClassKey =
   | 'disabled'
   | 'label';
 
-declare const IconButton: React.ComponentType<IconButtonProps>;
+declare class IconButton<C> extends React.Component<C & IconButtonProps<C>> {}
 
 export default IconButton;
diff --git a/packages/material-ui/src/InputAdornment/InputAdornment.d.ts b/packages/material-ui/src/InputAdornment/InputAdornment.d.ts
index 7793ef99be7ea3..27c5ba16aff65d 100644
--- a/packages/material-ui/src/InputAdornment/InputAdornment.d.ts
+++ b/packages/material-ui/src/InputAdornment/InputAdornment.d.ts
@@ -1,15 +1,15 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface InputAdornmentProps
+export interface InputAdornmentProps<C = {}>
   extends StandardProps<React.HTMLAttributes<HTMLDivElement>, InputAdornmentClassKey> {
-  component?: React.ReactType<InputAdornmentProps>;
+  component?: React.ReactType<C>;
   disableTypography?: boolean;
   position: 'start' | 'end';
 }
 
 export type InputAdornmentClassKey = 'root' | 'positionStart' | 'positionEnd';
 
-declare const InputAdornment: React.ComponentType<InputAdornmentProps>;
+declare class InputAdornment<C> extends React.Component<C & InputAdornmentProps<C>> {}
 
 export default InputAdornment;
diff --git a/packages/material-ui/src/InputLabel/InputLabel.d.ts b/packages/material-ui/src/InputLabel/InputLabel.d.ts
index 71e352afd11f9b..2fe5a880f5fb4f 100644
--- a/packages/material-ui/src/InputLabel/InputLabel.d.ts
+++ b/packages/material-ui/src/InputLabel/InputLabel.d.ts
@@ -3,7 +3,8 @@ import { StandardProps } from '..';
 import { FormLabelProps, FormLabelClassKey } from '../FormLabel';
 import { ClassNameMap } from '../styles/withStyles';
 
-export interface InputLabelProps extends StandardProps<FormLabelProps, InputLabelClassKey> {
+export interface InputLabelProps<C = {}>
+  extends StandardProps<FormLabelProps<C>, InputLabelClassKey> {
   disableAnimation?: boolean;
   disabled?: boolean;
   error?: boolean;
@@ -15,6 +16,6 @@ export interface InputLabelProps extends StandardProps<FormLabelProps, InputLabe
 
 export type InputLabelClassKey = 'root' | 'formControl' | 'marginDense' | 'shrink' | 'animated';
 
-declare const InputLabel: React.ComponentType<InputLabelProps>;
+declare class InputLabel<C> extends React.Component<C & InputLabelProps<C>> {}
 
 export default InputLabel;
diff --git a/packages/material-ui/src/List/List.d.ts b/packages/material-ui/src/List/List.d.ts
index fa7a1eea302f23..cf8311fdde50e1 100644
--- a/packages/material-ui/src/List/List.d.ts
+++ b/packages/material-ui/src/List/List.d.ts
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface ListProps
+export interface ListProps<C = {}>
   extends StandardProps<React.HTMLAttributes<HTMLUListElement>, ListClassKey> {
-  component?: React.ReactType<ListProps>;
+  component?: React.ReactType<C>;
   dense?: boolean;
   disablePadding?: boolean;
   subheader?: React.ReactElement<any>;
@@ -11,6 +11,6 @@ export interface ListProps
 
 export type ListClassKey = 'root' | 'padding' | 'dense' | 'subheader';
 
-declare const List: React.ComponentType<ListProps>;
+declare class List<C> extends React.Component<C & ListProps<C>> {}
 
 export default List;
diff --git a/packages/material-ui/src/ListItem/ListItem.d.ts b/packages/material-ui/src/ListItem/ListItem.d.ts
index 2b7003c07995a1..ac23c0f3eea363 100644
--- a/packages/material-ui/src/ListItem/ListItem.d.ts
+++ b/packages/material-ui/src/ListItem/ListItem.d.ts
@@ -2,14 +2,14 @@ import * as React from 'react';
 import { StandardProps } from '..';
 import { ButtonBaseProps } from '../ButtonBase';
 
-export interface ListItemProps
+export interface ListItemProps<C = {}>
   extends StandardProps<
-      ButtonBaseProps & React.LiHTMLAttributes<HTMLElement>,
+      ButtonBaseProps<C> & React.LiHTMLAttributes<HTMLElement>,
       ListItemClassKey,
       'component'
     > {
   button?: boolean;
-  component?: React.ReactType<ListItemProps>;
+  component?: React.ReactType<C>;
   ContainerComponent?: React.ReactType<React.HTMLAttributes<HTMLDivElement>>;
   ContainerProps?: React.HTMLAttributes<HTMLDivElement>;
   dense?: boolean;
@@ -31,6 +31,6 @@ export type ListItemClassKey =
   | 'button'
   | 'secondaryAction';
 
-declare const ListItem: React.ComponentType<ListItemProps>;
+declare class ListItem<C> extends React.Component<C & ListItemProps<C>> {}
 
 export default ListItem;
diff --git a/packages/material-ui/src/ListSubheader/ListSubheader.d.ts b/packages/material-ui/src/ListSubheader/ListSubheader.d.ts
index 5b9d110d69c996..7b3b38a614fc73 100644
--- a/packages/material-ui/src/ListSubheader/ListSubheader.d.ts
+++ b/packages/material-ui/src/ListSubheader/ListSubheader.d.ts
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface ListSubheaderProps
+export interface ListSubheaderProps<C = {}>
   extends StandardProps<React.HTMLAttributes<HTMLDivElement>, ListSubheaderClassKey> {
-  component?: React.ReactType<ListSubheaderProps>;
+  component?: React.ReactType<C>;
   color?: 'default' | 'primary' | 'inherit';
   inset?: boolean;
   disableSticky?: boolean;
@@ -11,6 +11,6 @@ export interface ListSubheaderProps
 
 export type ListSubheaderClassKey = 'root' | 'colorPrimary' | 'colorInherit' | 'inset' | 'sticky';
 
-declare const ListSubheader: React.ComponentType<ListSubheaderProps>;
+declare class ListSubheader<C> extends React.Component<C & ListSubheaderProps<C>> {}
 
 export default ListSubheader;
diff --git a/packages/material-ui/src/Menu/Menu.d.ts b/packages/material-ui/src/Menu/Menu.d.ts
index 493fa207127317..79e0f8138b6d46 100644
--- a/packages/material-ui/src/Menu/Menu.d.ts
+++ b/packages/material-ui/src/Menu/Menu.d.ts
@@ -1,23 +1,23 @@
 import * as React from 'react';
-import { PopoverProps, PopoverClassKey } from '../Popover';
+import { StandardProps } from '..';
 import { MenuListProps } from '../MenuList';
 import { PaperProps } from '../Paper';
-import { StandardProps } from '..';
-import { TransitionHandlerProps, TransitionProps } from '../transitions/transition';
+import { PopoverClassKey, PopoverProps } from '../Popover';
 import { ClassNameMap } from '../styles/withStyles';
+import { TransitionHandlerProps, TransitionProps } from '../transitions/transition';
 
-export interface MenuProps
-  extends StandardProps<PopoverProps & Partial<TransitionHandlerProps>, MenuClassKey> {
+export interface MenuProps<C = {}>
+  extends StandardProps<PopoverProps<C> & Partial<TransitionHandlerProps>, MenuClassKey> {
   anchorEl?: HTMLElement;
   disableAutoFocusItem?: boolean;
-  MenuListProps?: Partial<MenuListProps>;
-  PaperProps?: Partial<PaperProps>;
+  MenuListProps?: Partial<C & MenuListProps<C>>;
+  PaperProps?: Partial<C & PaperProps>;
   PopoverClasses?: Partial<ClassNameMap<PopoverClassKey>>;
   transitionDuration?: TransitionProps['timeout'] | 'auto';
 }
 
 export type MenuClassKey = 'paper';
 
-declare const Menu: React.ComponentType<MenuProps>;
+declare class Menu<C> extends React.Component<MenuProps<C>> { }
 
 export default Menu;
diff --git a/packages/material-ui/src/MenuItem/MenuItem.d.ts b/packages/material-ui/src/MenuItem/MenuItem.d.ts
index e97ce7c9c96201..bbc3e8cd3b995e 100644
--- a/packages/material-ui/src/MenuItem/MenuItem.d.ts
+++ b/packages/material-ui/src/MenuItem/MenuItem.d.ts
@@ -2,14 +2,14 @@ import * as React from 'react';
 import { StandardProps } from '..';
 import { ListItemProps } from '../ListItem';
 
-export interface MenuItemProps extends StandardProps<ListItemProps, MenuItemClassKey> {
-  component?: React.ReactType<MenuItemProps>;
+export interface MenuItemProps<C = {}> extends StandardProps<ListItemProps<C>, MenuItemClassKey> {
+  component?: React.ReactType<C>;
   role?: string;
   selected?: boolean;
 }
 
 export type MenuItemClassKey = 'root' | 'selected';
 
-declare const MenuItem: React.ComponentType<MenuItemProps>;
+declare class MenuItem<C> extends React.Component<C & MenuItemProps<C>> {}
 
 export default MenuItem;
diff --git a/packages/material-ui/src/MenuList/MenuList.d.ts b/packages/material-ui/src/MenuList/MenuList.d.ts
index 61bc56f472203a..fd69775c25fecb 100644
--- a/packages/material-ui/src/MenuList/MenuList.d.ts
+++ b/packages/material-ui/src/MenuList/MenuList.d.ts
@@ -2,12 +2,13 @@ import * as React from 'react';
 import { StandardProps } from '..';
 import { ListProps, ListClassKey } from '../List';
 
-export interface MenuListProps extends StandardProps<ListProps, MenuListClassKey, 'onKeyDown'> {
+export interface MenuListProps<C>
+  extends StandardProps<ListProps<C>, MenuListClassKey, 'onKeyDown'> {
   onKeyDown?: React.ReactEventHandler<React.KeyboardEvent<any>>;
 }
 
 export type MenuListClassKey = ListClassKey;
 
-declare const MenuList: React.ComponentType<MenuListProps>;
+declare class MenuList<C> extends React.Component<C & MenuListProps<C>> {}
 
 export default MenuList;
diff --git a/packages/material-ui/src/MobileStepper/MobileStepper.d.ts b/packages/material-ui/src/MobileStepper/MobileStepper.d.ts
index a6391594a91a3d..d713b7e43bbdfa 100644
--- a/packages/material-ui/src/MobileStepper/MobileStepper.d.ts
+++ b/packages/material-ui/src/MobileStepper/MobileStepper.d.ts
@@ -3,7 +3,8 @@ import { StandardProps } from '..';
 import { PaperProps } from '../Paper';
 import { ButtonProps } from '../Button';
 
-export interface MobileStepperProps extends StandardProps<PaperProps, MobileStepperClassKey> {
+export interface MobileStepperProps<C = {}>
+  extends StandardProps<PaperProps<C>, MobileStepperClassKey> {
   activeStep?: number;
   backButton: React.ReactElement<any>;
   nextButton: React.ReactElement<any>;
@@ -22,6 +23,6 @@ export type MobileStepperClassKey =
   | 'dotActive'
   | 'progress';
 
-declare const MobileStepper: React.ComponentType<MobileStepperProps>;
+declare class MobileStepper<C> extends React.Component<C & MobileStepperProps<C>> {}
 
 export default MobileStepper;
diff --git a/packages/material-ui/src/Paper/Paper.d.ts b/packages/material-ui/src/Paper/Paper.d.ts
index c24d4816a14163..4c15f175000cb7 100644
--- a/packages/material-ui/src/Paper/Paper.d.ts
+++ b/packages/material-ui/src/Paper/Paper.d.ts
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface PaperProps
+export interface PaperProps<C = {}>
   extends StandardProps<React.HTMLAttributes<HTMLDivElement>, PaperClassKey> {
-  component?: React.ReactType<PaperProps>;
+  component?: React.ReactType<C>;
   elevation?: number;
   square?: boolean;
 }
@@ -37,6 +37,6 @@ export type PaperClassKey =
   | 'elevation23'
   | 'elevation24';
 
-declare const Paper: React.ComponentType<PaperProps>;
+declare class Paper<C> extends React.Component<C & PaperProps<C>> {}
 
 export default Paper;
diff --git a/packages/material-ui/src/Popover/Popover.d.ts b/packages/material-ui/src/Popover/Popover.d.ts
index 813e4599214fd5..58cd1260c92fbc 100644
--- a/packages/material-ui/src/Popover/Popover.d.ts
+++ b/packages/material-ui/src/Popover/Popover.d.ts
@@ -16,7 +16,7 @@ export interface PopoverPosition {
 
 export type PopoverReference = 'anchorEl' | 'anchorPosition' | 'none';
 
-export interface PopoverProps
+export interface PopoverProps<C = {}>
   extends StandardProps<ModalProps & Partial<TransitionHandlerProps>, PopoverClassKey, 'children'> {
   action?: (actions: PopoverActions) => void;
   anchorEl?: HTMLElement | ((element: HTMLElement) => HTMLElement);
@@ -28,7 +28,7 @@ export interface PopoverProps
   getContentAnchorEl?: (element: HTMLElement) => HTMLElement;
   marginThreshold?: number;
   modal?: boolean;
-  PaperProps?: Partial<PaperProps>;
+  PaperProps?: Partial<C & PaperProps<C>>;
   role?: string;
   transformOrigin?: PopoverOrigin;
   TransitionComponent?: React.ReactType;
@@ -42,6 +42,6 @@ export interface PopoverActions {
   updatePosition(): void;
 }
 
-declare const Popover: React.ComponentType<PopoverProps>;
+declare class Popover<C> extends React.Component<PopoverProps<C>> {}
 
 export default Popover;
diff --git a/packages/material-ui/src/Radio/Radio.d.ts b/packages/material-ui/src/Radio/Radio.d.ts
index be2d98a50a6469..495e4eaca7038a 100644
--- a/packages/material-ui/src/Radio/Radio.d.ts
+++ b/packages/material-ui/src/Radio/Radio.d.ts
@@ -2,8 +2,8 @@ import * as React from 'react';
 import { StandardProps } from '..';
 import { SwitchBaseProps, SwitchBaseClassKey } from '../internal/SwitchBase';
 
-export interface RadioProps
-  extends StandardProps<SwitchBaseProps, RadioClassKey, 'checkedIcon' | 'color' | 'icon'> {
+export interface RadioProps<C = {}>
+  extends StandardProps<SwitchBaseProps<C>, RadioClassKey, 'checkedIcon' | 'color' | 'icon'> {
   checkedIcon?: React.ReactNode;
   color?: 'primary' | 'secondary' | 'default';
   icon?: React.ReactNode;
@@ -11,6 +11,6 @@ export interface RadioProps
 
 export type RadioClassKey = SwitchBaseClassKey | 'colorPrimary' | 'colorSecondary';
 
-declare const Radio: React.ComponentType<RadioProps>;
+declare class Radio<C> extends React.Component<C & RadioProps<C>> {}
 
 export default Radio;
diff --git a/packages/material-ui/src/Select/Select.d.ts b/packages/material-ui/src/Select/Select.d.ts
index 260e9f8c850adb..693b8dddbe49a3 100644
--- a/packages/material-ui/src/Select/Select.d.ts
+++ b/packages/material-ui/src/Select/Select.d.ts
@@ -4,26 +4,26 @@ import { InputProps } from '../Input';
 import { MenuProps } from '../Menu';
 import { SelectInputProps } from './SelectInput';
 
-export interface SelectProps
+export interface SelectProps<C = {}>
   extends StandardProps<InputProps, SelectClassKey, 'value' | 'onChange'>,
-    Pick<SelectInputProps, 'onChange'> {
+    Pick<SelectInputProps<C>, 'onChange'> {
   autoWidth?: boolean;
   displayEmpty?: boolean;
   IconComponent?: React.ReactType;
   input?: React.ReactNode;
-  MenuProps?: Partial<MenuProps>;
+  MenuProps?: Partial<C & MenuProps<C>>;
   multiple?: boolean;
   native?: boolean;
   onClose?: (event: React.ChangeEvent<{}>) => void;
   onOpen?: (event: React.ChangeEvent<{}>) => void;
   open?: boolean;
-  renderValue?: (value: SelectProps['value']) => React.ReactNode;
+  renderValue?: (value: C & SelectProps<C>['value']) => React.ReactNode;
   SelectDisplayProps?: React.HTMLAttributes<HTMLDivElement>;
   value?: Array<string | number> | string | number;
 }
 
 export type SelectClassKey = 'root' | 'select' | 'selectMenu' | 'disabled' | 'icon';
 
-declare const Select: React.ComponentType<SelectProps>;
+declare class Select<C> extends React.Component<SelectProps<C>> {}
 
 export default Select;
diff --git a/packages/material-ui/src/Select/SelectInput.d.ts b/packages/material-ui/src/Select/SelectInput.d.ts
index 19f60bb2254126..8ee033a7b33e77 100644
--- a/packages/material-ui/src/Select/SelectInput.d.ts
+++ b/packages/material-ui/src/Select/SelectInput.d.ts
@@ -1,15 +1,15 @@
 import * as React from 'react';
 import { MenuProps } from '../Menu';
 
-export interface SelectInputProps {
+export interface SelectInputProps<C> {
   autoFocus?: boolean;
   autoWidth: boolean;
   disabled?: boolean;
   IconComponent?: React.ReactType;
   inputRef?: (
-    ref: HTMLSelectElement | { node: HTMLInputElement; value: SelectInputProps['value'] },
+    ref: HTMLSelectElement | { node: HTMLInputElement; value: C & SelectInputProps<C>['value'] },
   ) => void;
-  MenuProps?: Partial<MenuProps>;
+  MenuProps?: Partial<C & MenuProps<C>>;
   multiple: boolean;
   name?: string;
   native: boolean;
@@ -20,12 +20,12 @@ export interface SelectInputProps {
   onOpen?: (event: React.ChangeEvent<{}>) => void;
   open?: boolean;
   readOnly?: boolean;
-  renderValue?: (value: SelectInputProps['value']) => React.ReactNode;
+  renderValue?: (value: C & SelectInputProps<C>['value']) => React.ReactNode;
   SelectDisplayProps?: React.HTMLAttributes<HTMLDivElement>;
   tabIndex?: number;
   value?: string | number | Array<string | number>;
 }
 
-declare const SelectInput: React.ComponentType<SelectInputProps>;
+declare class SelectInput<C> extends React.Component<SelectInputProps<C>> {}
 
 export default SelectInput;
diff --git a/packages/material-ui/src/Snackbar/Snackbar.d.ts b/packages/material-ui/src/Snackbar/Snackbar.d.ts
index 7a04af6bc1ee21..95febc09e668bc 100644
--- a/packages/material-ui/src/Snackbar/Snackbar.d.ts
+++ b/packages/material-ui/src/Snackbar/Snackbar.d.ts
@@ -8,7 +8,7 @@ export type SnackBarOrigin = {
   vertical?: 'top' | 'center' | 'bottom' | number;
 };
 
-export interface SnackbarProps
+export interface SnackbarProps<C = {}>
   extends StandardProps<
       React.HTMLAttributes<HTMLDivElement> & Partial<TransitionHandlerProps>,
       SnackbarClassKey
@@ -16,7 +16,7 @@ export interface SnackbarProps
   action?: React.ReactElement<any> | React.ReactElement<any>[];
   anchorOrigin?: SnackBarOrigin;
   autoHideDuration?: number;
-  ContentProps?: Partial<SnackbarContentProps>;
+  ContentProps?: Partial<C & SnackbarContentProps<C>>;
   disableWindowBlurListener?: boolean;
   message?: React.ReactElement<any>;
   onClose?: (event: React.SyntheticEvent<any>, reason: string) => void;
@@ -38,6 +38,6 @@ export type SnackbarClassKey =
   | 'anchorOriginTopLeft'
   | 'anchorOriginBottomLeft';
 
-declare const Snackbar: React.ComponentType<SnackbarProps>;
+declare class Snackbar<C> extends React.Component<SnackbarProps<C>> {}
 
 export default Snackbar;
diff --git a/packages/material-ui/src/SnackbarContent/SnackbarContent.d.ts b/packages/material-ui/src/SnackbarContent/SnackbarContent.d.ts
index 21a9f27eb2991c..715d8e77c3d23a 100644
--- a/packages/material-ui/src/SnackbarContent/SnackbarContent.d.ts
+++ b/packages/material-ui/src/SnackbarContent/SnackbarContent.d.ts
@@ -2,13 +2,14 @@ import * as React from 'react';
 import { StandardProps } from '..';
 import { PaperProps } from '../Paper';
 
-export interface SnackbarContentProps extends StandardProps<PaperProps, SnackbarContentClassKey> {
+export interface SnackbarContentProps<C = {}>
+  extends StandardProps<PaperProps<C>, SnackbarContentClassKey> {
   action?: React.ReactElement<any>;
   message: React.ReactElement<any> | string;
 }
 
 export type SnackbarContentClassKey = 'root' | 'message' | 'action';
 
-declare const SnackbarContent: React.ComponentType<SnackbarContentProps>;
+declare class SnackbarContent<C> extends React.Component<C & SnackbarContentProps<C>> {}
 
 export default SnackbarContent;
diff --git a/packages/material-ui/src/StepButton/StepButton.d.ts b/packages/material-ui/src/StepButton/StepButton.d.ts
index ad6985c4d25130..e883ac3f55a608 100644
--- a/packages/material-ui/src/StepButton/StepButton.d.ts
+++ b/packages/material-ui/src/StepButton/StepButton.d.ts
@@ -5,7 +5,8 @@ import { ButtonBaseProps } from '../ButtonBase';
 
 export type StepButtonIcon = React.ReactElement<any> | string | number | null;
 
-export interface StepButtonProps extends StandardProps<ButtonBaseProps, StepButtonClasskey> {
+export interface StepButtonProps<C = {}>
+  extends StandardProps<ButtonBaseProps<C>, StepButtonClasskey> {
   active?: boolean;
   alternativeLabel?: boolean;
   completed?: boolean;
@@ -18,6 +19,6 @@ export interface StepButtonProps extends StandardProps<ButtonBaseProps, StepButt
 
 export type StepButtonClasskey = 'root' | 'vertical' | 'touchRipple';
 
-declare const StepButton: React.ComponentType<StepButtonProps>;
+declare class StepButton<C> extends React.Component<C & StepButtonProps<C>> {}
 
 export default StepButton;
diff --git a/packages/material-ui/src/Stepper/Stepper.d.ts b/packages/material-ui/src/Stepper/Stepper.d.ts
index 0e149787853aa8..344e5171ab1a8d 100644
--- a/packages/material-ui/src/Stepper/Stepper.d.ts
+++ b/packages/material-ui/src/Stepper/Stepper.d.ts
@@ -4,7 +4,7 @@ import { PaperProps } from '../Paper';
 
 export type Orientation = 'horizontal' | 'vertical';
 
-export interface StepperProps extends StandardProps<PaperProps, StepperClasskey> {
+export interface StepperProps<C = {}> extends StandardProps<PaperProps<C>, StepperClasskey> {
   activeStep?: number;
   alternativeLabel?: boolean;
   children: React.ReactNode;
@@ -15,6 +15,6 @@ export interface StepperProps extends StandardProps<PaperProps, StepperClasskey>
 
 export type StepperClasskey = 'root' | 'horizontal' | 'vertical' | 'alternativeLabel';
 
-declare const Stepper: React.ComponentType<StepperProps>;
+declare class Stepper<C> extends React.Component<C & StepperProps<C>> {}
 
 export default Stepper;
diff --git a/packages/material-ui/src/SwipeableDrawer/SwipeableDrawer.d.ts b/packages/material-ui/src/SwipeableDrawer/SwipeableDrawer.d.ts
index 8f84a143182fe2..efd9634f3944f7 100644
--- a/packages/material-ui/src/SwipeableDrawer/SwipeableDrawer.d.ts
+++ b/packages/material-ui/src/SwipeableDrawer/SwipeableDrawer.d.ts
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Omit } from '..';
 import { DrawerProps } from '../Drawer';
 
-export interface SwipeableDrawerProps extends Omit<DrawerProps, 'onClose' | 'open'> {
+export interface SwipeableDrawerProps<C> extends Omit<DrawerProps<C>, 'onClose' | 'open'> {
   disableBackdropTransition?: boolean;
   disableDiscovery?: boolean;
   disableSwipeToOpen?: boolean;
@@ -12,6 +12,6 @@ export interface SwipeableDrawerProps extends Omit<DrawerProps, 'onClose' | 'ope
   swipeAreaWidth?: number;
 }
 
-declare const SwipeableDrawer: React.ComponentType<SwipeableDrawerProps>;
+declare class SwipeableDrawer<C> extends React.Component<C & SwipeableDrawerProps<C>> {}
 
 export default SwipeableDrawer;
diff --git a/packages/material-ui/src/Switch/Switch.d.ts b/packages/material-ui/src/Switch/Switch.d.ts
index dd2d4475fb25ca..bbfccc7ff0a2f7 100644
--- a/packages/material-ui/src/Switch/Switch.d.ts
+++ b/packages/material-ui/src/Switch/Switch.d.ts
@@ -2,8 +2,8 @@ import * as React from 'react';
 import { StandardProps } from '..';
 import { SwitchBaseProps, SwitchBaseClassKey } from '../internal/SwitchBase';
 
-export interface SwitchProps
-  extends StandardProps<SwitchBaseProps, SwitchClassKey, 'checkedIcon' | 'color' | 'icon'> {
+export interface SwitchProps<C = {}>
+  extends StandardProps<SwitchBaseProps<C>, SwitchClassKey, 'checkedIcon' | 'color' | 'icon'> {
   checkedIcon?: React.ReactNode;
   color?: 'primary' | 'secondary' | 'default';
   icon?: React.ReactNode;
@@ -18,6 +18,6 @@ export type SwitchClassKey =
   | 'colorPrimary'
   | 'colorSecondary';
 
-declare const Switch: React.ComponentType<SwitchProps>;
+declare class Switch<C> extends React.Component<C & SwitchProps<C>> {}
 
 export default Switch;
diff --git a/packages/material-ui/src/Tab/Tab.d.ts b/packages/material-ui/src/Tab/Tab.d.ts
index fb9cb6115e19e7..0489a1d4054788 100644
--- a/packages/material-ui/src/Tab/Tab.d.ts
+++ b/packages/material-ui/src/Tab/Tab.d.ts
@@ -2,7 +2,8 @@ import * as React from 'react';
 import { StandardProps } from '..';
 import { ButtonBaseProps } from '../ButtonBase';
 
-export interface TabProps extends StandardProps<ButtonBaseProps, TabClassKey, 'onChange'> {
+export interface TabProps<C = {}>
+  extends StandardProps<ButtonBaseProps<C>, TabClassKey, 'onChange'> {
   disabled?: boolean;
   fullWidth?: boolean;
   icon?: string | React.ReactElement<any>;
@@ -29,6 +30,6 @@ export type TabClassKey =
   | 'label'
   | 'labelWrapped';
 
-declare const Tab: React.ComponentType<TabProps>;
+declare class Tab<C> extends React.Component<C & TabProps<C>> {}
 
 export default Tab;
diff --git a/packages/material-ui/src/Table/Table.d.ts b/packages/material-ui/src/Table/Table.d.ts
index c35b7d615ce7e2..3a4aa289569812 100644
--- a/packages/material-ui/src/Table/Table.d.ts
+++ b/packages/material-ui/src/Table/Table.d.ts
@@ -1,14 +1,14 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface TableProps extends StandardProps<TableBaseProps, TableClassKey> {
-  component?: React.ReactType<TableBaseProps>;
+export interface TableProps<C = {}> extends StandardProps<TableBaseProps<C>, TableClassKey> {
+  component?: React.ReactType<C & TableBaseProps<C>>;
 }
 
-export type TableBaseProps = React.TableHTMLAttributes<HTMLTableElement>;
+export type TableBaseProps<C> = React.TableHTMLAttributes<C & HTMLTableElement>;
 
 export type TableClassKey = 'root';
 
-declare const Table: React.ComponentType<TableProps>;
+declare class Table<C> extends React.Component<C & TableProps<C>> {}
 
 export default Table;
diff --git a/packages/material-ui/src/TableBody/TableBody.d.ts b/packages/material-ui/src/TableBody/TableBody.d.ts
index db31de65598845..db94963918ca80 100644
--- a/packages/material-ui/src/TableBody/TableBody.d.ts
+++ b/packages/material-ui/src/TableBody/TableBody.d.ts
@@ -1,14 +1,14 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface TableBodyProps extends StandardProps<TableBodyBaseProps, TableBodyClassKey> {
-  component?: React.ReactType<TableBodyBaseProps>;
+export interface TableBodyProps<C> extends StandardProps<TableBodyBaseProps<C>, TableBodyClassKey> {
+  component?: React.ReactType<C & TableBodyBaseProps<C>>;
 }
 
 export type TableBodyClassKey = 'root';
 
-export type TableBodyBaseProps = React.HTMLAttributes<HTMLTableSectionElement>;
+export type TableBodyBaseProps<C> = React.HTMLAttributes<C & HTMLTableSectionElement>;
 
-declare const TableBody: React.ComponentType<TableBodyProps>;
+declare class TableBody<C> extends React.Component<C & TableBodyProps<C>> {}
 
 export default TableBody;
diff --git a/packages/material-ui/src/TableCell/TableCell.d.ts b/packages/material-ui/src/TableCell/TableCell.d.ts
index 51b16bb02d5981..4228d794a1c7ba 100644
--- a/packages/material-ui/src/TableCell/TableCell.d.ts
+++ b/packages/material-ui/src/TableCell/TableCell.d.ts
@@ -9,16 +9,17 @@ import { StandardProps } from '..';
  * Since it is not decided via prop, we have create loose typings
  * here.
  */
-export interface TableCellProps extends StandardProps<TableCellBaseProps, TableCellClassKey> {
-  component?: React.ReactType<TableCellBaseProps>;
+export interface TableCellProps<C = {}>
+  extends StandardProps<TableCellBaseProps<C>, TableCellClassKey> {
+  component?: React.ReactType<C & TableCellBaseProps<C>>;
   numeric?: boolean;
   padding?: Padding;
   sortDirection?: SortDirection;
   variant?: 'head' | 'body' | 'footer';
 }
 
-export type TableCellBaseProps = React.ThHTMLAttributes<HTMLTableHeaderCellElement> &
-  React.TdHTMLAttributes<HTMLTableDataCellElement>;
+export type TableCellBaseProps<C> = React.ThHTMLAttributes<C & HTMLTableHeaderCellElement> &
+  React.TdHTMLAttributes<C & HTMLTableDataCellElement>;
 
 export type Padding = 'default' | 'checkbox' | 'dense' | 'none';
 
@@ -34,6 +35,6 @@ export type TableCellClassKey =
   | 'paddingCheckbox'
   | 'paddingNone';
 
-declare const TableCell: React.ComponentType<TableCellProps>;
+declare class TableCell<C> extends React.Component<C & TableCellProps<C>> {}
 
 export default TableCell;
diff --git a/packages/material-ui/src/TableFooter/TableFooter.d.ts b/packages/material-ui/src/TableFooter/TableFooter.d.ts
index 853fe875ad9424..e6320798ba17be 100644
--- a/packages/material-ui/src/TableFooter/TableFooter.d.ts
+++ b/packages/material-ui/src/TableFooter/TableFooter.d.ts
@@ -1,14 +1,15 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface TableFooterProps extends StandardProps<TableFooterBaseProps, TableFooterClassKey> {
-  component?: React.ReactType<TableFooterBaseProps>;
+export interface TableFooterProps<C>
+  extends StandardProps<TableFooterBaseProps<C>, TableFooterClassKey> {
+  component?: React.ReactType<C & TableFooterBaseProps<C>>;
 }
 
 export type TableFooterClassKey = 'root';
 
-export type TableFooterBaseProps = React.HTMLAttributes<HTMLTableSectionElement>;
+export type TableFooterBaseProps<C> = React.HTMLAttributes<C & HTMLTableSectionElement>;
 
-declare const TableFooter: React.ComponentType<TableFooterProps>;
+declare class TableFooter<C> extends React.Component<C & TableFooterProps<C>> {}
 
 export default TableFooter;
diff --git a/packages/material-ui/src/TableHead/TableHead.d.ts b/packages/material-ui/src/TableHead/TableHead.d.ts
index 8dac1cb2fc2899..2cddc3ddfc7ce0 100644
--- a/packages/material-ui/src/TableHead/TableHead.d.ts
+++ b/packages/material-ui/src/TableHead/TableHead.d.ts
@@ -1,14 +1,14 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface TableHeadProps extends StandardProps<TableHeadBaseProps, TableHeadClassKey> {
-  component?: React.ReactType<TableHeadBaseProps>;
+export interface TableHeadProps<C> extends StandardProps<TableHeadBaseProps<C>, TableHeadClassKey> {
+  component?: React.ReactType<C & TableHeadBaseProps<C>>;
 }
 
 export type TableHeadClassKey = 'root';
 
-export type TableHeadBaseProps = React.HTMLAttributes<HTMLTableSectionElement>;
+export type TableHeadBaseProps<C> = React.HTMLAttributes<C & HTMLTableSectionElement>;
 
-declare const TableHead: React.ComponentType<TableHeadProps>;
+declare class TableHead<C> extends React.Component<C & TableHeadProps<C>> {}
 
 export default TableHead;
diff --git a/packages/material-ui/src/TablePagination/TablePagination.d.ts b/packages/material-ui/src/TablePagination/TablePagination.d.ts
index bb4b6f5f1dcff1..9ca2a8e23fc0d6 100644
--- a/packages/material-ui/src/TablePagination/TablePagination.d.ts
+++ b/packages/material-ui/src/TablePagination/TablePagination.d.ts
@@ -11,24 +11,24 @@ export interface LabelDisplayedRowsArgs {
   page: number;
 }
 
-export interface TablePaginationProps
-  extends StandardProps<TablePaginationBaseProps, TablePaginationClassKey> {
-  ActionsComponent?: React.ReactType<TablePaginationBaseProps>;
-  backIconButtonProps?: Partial<IconButtonProps>;
-  component?: React.ReactType<TablePaginationBaseProps>;
+export interface TablePaginationProps<C = {}>
+  extends StandardProps<TablePaginationBaseProps<C>, TablePaginationClassKey> {
+  ActionsComponent?: React.ReactType<C & TablePaginationBaseProps<C>>;
+  backIconButtonProps?: Partial<C & IconButtonProps<C>>;
+  component?: React.ReactType<C & TablePaginationBaseProps<C>>;
   count: number;
   labelDisplayedRows?: (paginationInfo: LabelDisplayedRowsArgs) => React.ReactNode;
   labelRowsPerPage?: React.ReactNode;
-  nextIconButtonProps?: Partial<IconButtonProps>;
+  nextIconButtonProps?: Partial<C & IconButtonProps<C>>;
   onChangePage: (event: React.MouseEvent<HTMLButtonElement> | null, page: number) => void;
   onChangeRowsPerPage?: React.ChangeEventHandler<HTMLTextAreaElement | HTMLInputElement>;
   page: number;
   rowsPerPage: number;
   rowsPerPageOptions?: number[];
-  SelectProps?: Partial<SelectProps>;
+  SelectProps?: Partial<C & SelectProps<C>>;
 }
 
-export type TablePaginationBaseProps = TableCellProps;
+export type TablePaginationBaseProps<C> = TableCellProps<C>;
 
 export type TablePaginationClassKey =
   | 'root'
@@ -41,6 +41,6 @@ export type TablePaginationClassKey =
   | 'select'
   | 'actions';
 
-declare const TablePagination: React.ComponentType<TablePaginationProps>;
+declare class TablePagination<C> extends React.Component<C & TablePaginationProps<C>> {}
 
 export default TablePagination;
diff --git a/packages/material-ui/src/TablePaginationActions/TablePaginationActions.d.ts b/packages/material-ui/src/TablePaginationActions/TablePaginationActions.d.ts
index 4ae44795bb96ed..a44867f61e4e7f 100644
--- a/packages/material-ui/src/TablePaginationActions/TablePaginationActions.d.ts
+++ b/packages/material-ui/src/TablePaginationActions/TablePaginationActions.d.ts
@@ -2,15 +2,15 @@ import * as React from 'react';
 import { StandardProps } from '..';
 import { IconButtonProps } from '../IconButton/IconButton';
 
-export interface TablePaginationActionsProps extends React.HTMLAttributes<HTMLDivElement> {
-  backIconButtonProps?: Partial<IconButtonProps>;
+export interface TablePaginationActionsProps<C> extends React.HTMLAttributes<HTMLDivElement> {
+  backIconButtonProps?: Partial<C & IconButtonProps<C>>;
   count: number;
-  nextIconButtonProps?: Partial<IconButtonProps>;
+  nextIconButtonProps?: Partial<C & IconButtonProps<C>>;
   onChangePage: (event: React.MouseEvent<HTMLButtonElement> | null, page: number) => void;
   page: number;
   rowsPerPage: number;
 }
 
-declare const TablePaginationActions: React.ComponentType<TablePaginationActionsProps>;
+declare class TablePaginationActions<C> extends React.Component<TablePaginationActionsProps<C>> {}
 
 export default TablePaginationActions;
diff --git a/packages/material-ui/src/TableRow/TableRow.d.ts b/packages/material-ui/src/TableRow/TableRow.d.ts
index 30a5c2c1c82982..a3d9bbf561db47 100644
--- a/packages/material-ui/src/TableRow/TableRow.d.ts
+++ b/packages/material-ui/src/TableRow/TableRow.d.ts
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface TableRowProps extends StandardProps<TableRowBaseProps, TableRowClassKey> {
-  component?: React.ReactType<TableRowBaseProps>;
+export interface TableRowProps<C = {}> extends StandardProps<TableRowBaseProps, TableRowClassKey> {
+  component?: React.ReactType<C & TableRowBaseProps>;
   hover?: boolean;
   selected?: boolean;
 }
@@ -11,6 +11,6 @@ export type TableRowBaseProps = React.HTMLAttributes<HTMLTableRowElement>;
 
 export type TableRowClassKey = 'root' | 'selected' | 'hover' | 'head' | 'footer';
 
-declare const TableRow: React.ComponentType<TableRowProps>;
+declare class TableRow<C> extends React.Component<C & TableRowProps<C>> {}
 
 export default TableRow;
diff --git a/packages/material-ui/src/TableSortLabel/TableSortLabel.d.ts b/packages/material-ui/src/TableSortLabel/TableSortLabel.d.ts
index 068240183d5327..1c336a68ca4e51 100644
--- a/packages/material-ui/src/TableSortLabel/TableSortLabel.d.ts
+++ b/packages/material-ui/src/TableSortLabel/TableSortLabel.d.ts
@@ -2,8 +2,8 @@ import * as React from 'react';
 import { StandardProps } from '..';
 import { ButtonBaseProps } from '../ButtonBase';
 
-export interface TableSortLabelProps
-  extends StandardProps<ButtonBaseProps, TableSortLabelClassKey> {
+export interface TableSortLabelProps<C = {}>
+  extends StandardProps<ButtonBaseProps<C>, TableSortLabelClassKey> {
   active?: boolean;
   direction?: 'asc' | 'desc';
 }
@@ -15,6 +15,6 @@ export type TableSortLabelClassKey =
   | 'iconDirectionDesc'
   | 'iconDirectionAsc';
 
-declare const TableSortLabel: React.ComponentType<TableSortLabelProps>;
+declare class TableSortLabel<C> extends React.Component<C & TableSortLabelProps<C>> {}
 
 export default TableSortLabel;
diff --git a/packages/material-ui/src/Tabs/TabScrollButton.d.ts b/packages/material-ui/src/Tabs/TabScrollButton.d.ts
index f7b3c766141fc3..28b722500b6567 100644
--- a/packages/material-ui/src/Tabs/TabScrollButton.d.ts
+++ b/packages/material-ui/src/Tabs/TabScrollButton.d.ts
@@ -1,14 +1,15 @@
+import * as React from 'react';
 import { StandardProps } from '..';
 import { ButtonBaseProps } from '../ButtonBase/ButtonBase';
 
-export interface TabScrollButtonProps
-  extends StandardProps<ButtonBaseProps, TabScrollButtonClassKey> {
+export interface TabScrollButtonProps<C>
+  extends StandardProps<ButtonBaseProps<C>, TabScrollButtonClassKey> {
   direction?: 'left' | 'right';
   visible?: boolean;
 }
 
 export type TabScrollButtonClassKey = 'root';
 
-declare const TabScrollButton: React.ComponentType<TabScrollButtonProps>;
+declare class TabScrollButton<C> extends React.Component<C & TabScrollButtonProps<C>> {}
 
 export default TabScrollButton;
diff --git a/packages/material-ui/src/Tabs/Tabs.d.ts b/packages/material-ui/src/Tabs/Tabs.d.ts
index 31e6dc685047f9..ba7a40b2f20526 100644
--- a/packages/material-ui/src/Tabs/Tabs.d.ts
+++ b/packages/material-ui/src/Tabs/Tabs.d.ts
@@ -3,12 +3,12 @@ import { StandardProps } from '..';
 import { ButtonBaseProps } from '../ButtonBase/ButtonBase';
 import { TabIndicatorProps } from './TabIndicator';
 
-export interface TabsProps
-  extends StandardProps<ButtonBaseProps, TabsClassKey, 'onChange' | 'action' | 'component'> {
+export interface TabsProps<C = {}>
+  extends StandardProps<ButtonBaseProps<C>, TabsClassKey, 'onChange' | 'action' | 'component'> {
   action?: (actions: TabsActions) => void;
   centered?: boolean;
   children?: React.ReactNode;
-  component?: React.ReactType<TabsProps>;
+  component?: React.ReactType<TabsProps<C>>;
   fullWidth?: boolean;
   indicatorColor?: 'secondary' | 'primary' | string;
   onChange?: (event: React.ChangeEvent<{}>, value: any) => void;
@@ -36,6 +36,6 @@ export interface TabsActions {
   updateIndicator(): void;
 }
 
-declare const Tabs: React.ComponentType<TabsProps>;
+declare class Tabs<C> extends React.Component<C & TabsProps<C>> {}
 
 export default Tabs;
diff --git a/packages/material-ui/src/TextField/TextField.d.ts b/packages/material-ui/src/TextField/TextField.d.ts
index d31b3e1e24a627..4df1c52759b149 100644
--- a/packages/material-ui/src/TextField/TextField.d.ts
+++ b/packages/material-ui/src/TextField/TextField.d.ts
@@ -7,19 +7,19 @@ import { InputLabelProps } from '../InputLabel';
 import { FormControlClassKey } from '../FormControl';
 import { SelectProps } from '../Select';
 
-export interface TextFieldProps
-  extends StandardProps<FormControlProps, TextFieldClassKey, 'onChange' | 'defaultValue'> {
+export interface TextFieldProps<C>
+  extends StandardProps<FormControlProps<C>, TextFieldClassKey, 'onChange' | 'defaultValue'> {
   autoComplete?: string;
   autoFocus?: boolean;
   children?: React.ReactNode;
   defaultValue?: string | number;
   disabled?: boolean;
   error?: boolean;
-  FormHelperTextProps?: Partial<FormHelperTextProps>;
+  FormHelperTextProps?: Partial<C & FormHelperTextProps<C>>;
   fullWidth?: boolean;
   helperText?: React.ReactNode;
   id?: string;
-  InputLabelProps?: Partial<InputLabelProps>;
+  InputLabelProps?: Partial<C & InputLabelProps<C>>;
   InputProps?: Partial<InputProps>;
   inputProps?: InputProps['inputProps'];
   inputRef?: React.Ref<any> | React.RefObject<any>;
@@ -33,13 +33,13 @@ export interface TextFieldProps
   rows?: string | number;
   rowsMax?: string | number;
   select?: boolean;
-  SelectProps?: Partial<SelectProps>;
+  SelectProps?: Partial<C & SelectProps<C>>;
   type?: string;
   value?: Array<string | number> | string | number;
 }
 
 export type TextFieldClassKey = FormControlClassKey;
 
-declare const TextField: React.ComponentType<TextFieldProps>;
+declare class TextField<C> extends React.Component<TextFieldProps<C>> {}
 
 export default TextField;
diff --git a/packages/material-ui/src/Typography/Typography.d.ts b/packages/material-ui/src/Typography/Typography.d.ts
index 64f0d6deda4dc2..b136dc7b79531e 100644
--- a/packages/material-ui/src/Typography/Typography.d.ts
+++ b/packages/material-ui/src/Typography/Typography.d.ts
@@ -2,11 +2,11 @@ import * as React from 'react';
 import { StandardProps, PropTypes } from '..';
 import { Style, TextStyle } from '../styles/createTypography';
 
-export interface TypographyProps
+export interface TypographyProps<C = {}>
   extends StandardProps<React.HTMLAttributes<HTMLElement>, TypographyClassKey> {
   align?: PropTypes.Alignment;
   color?: PropTypes.Color | 'textSecondary' | 'error';
-  component?: React.ReactType<TypographyProps>;
+  component?: React.ReactType<C>;
   gutterBottom?: boolean;
   headlineMapping?: { [type in TextStyle]: string };
   noWrap?: boolean;
@@ -38,6 +38,6 @@ export type TypographyClassKey =
   | 'colorSecondary'
   | 'colorTextSecondary';
 
-declare const Typography: React.ComponentType<TypographyProps>;
+declare class Typography<C> extends React.Component<C & TypographyProps<C>> {}
 
 export default Typography;
diff --git a/packages/material-ui/src/index.d.ts b/packages/material-ui/src/index.d.ts
index 16d32dd7c499be..6cf2f77e52327a 100644
--- a/packages/material-ui/src/index.d.ts
+++ b/packages/material-ui/src/index.d.ts
@@ -2,6 +2,16 @@ import * as React from 'react';
 import { StyledComponentProps } from './styles';
 export { StyledComponentProps };
 
+export type AnyComponent = React.ReactType;
+
+export type PassthruProps<C extends AnyComponent, D extends AnyComponent> =
+  InferredProps<AnyComponent extends C ? D : C>;
+
+export type InferredProps<C extends AnyComponent> =
+  C extends React.ComponentType<infer P> ? P :
+  C extends keyof JSX.IntrinsicElements ? JSX.IntrinsicElements[C] :
+  {};
+
 /**
  * All standard components exposed by `material-ui` are `StyledComponents` with
  * certain `classes`, on which one can also set a top-level `className` and inline
diff --git a/packages/material-ui/src/internal/SwitchBase.d.ts b/packages/material-ui/src/internal/SwitchBase.d.ts
index f22c6e4a2b9954..1c1dd9cbb9a690 100644
--- a/packages/material-ui/src/internal/SwitchBase.d.ts
+++ b/packages/material-ui/src/internal/SwitchBase.d.ts
@@ -2,8 +2,8 @@ import * as React from 'react';
 import { StandardProps } from '..';
 import { IconButtonProps } from '../IconButton';
 
-export interface SwitchBaseProps
-  extends StandardProps<IconButtonProps, SwitchBaseClassKey, 'onChange'> {
+export interface SwitchBaseProps<C = {}>
+  extends StandardProps<IconButtonProps<C>, SwitchBaseClassKey, 'onChange'> {
   checked?: boolean | string;
   checkedIcon: React.ReactNode;
   defaultChecked?: boolean;
@@ -22,7 +22,7 @@ export interface SwitchBaseProps
 
 export type SwitchBaseClassKey = 'root' | 'checked' | 'disabled' | 'input';
 
-export type SwitchBase = React.Component<SwitchBaseProps>;
+export type SwitchBase<C> = React.Component<C & SwitchBaseProps<C>>;
 
 export interface CreateSwitchBaseOptions {
   defaultIcon?: React.ReactNode;
@@ -30,4 +30,4 @@ export interface CreateSwitchBaseOptions {
   type?: string;
 }
 
-export default function createSwitch(options: CreateSwitchBaseOptions): SwitchBase;
+export default function createSwitch<C>(options: CreateSwitchBaseOptions): SwitchBase<C>;
diff --git a/packages/material-ui/test/typescript/components.spec.tsx b/packages/material-ui/test/typescript/components.spec.tsx
index 8c06d84d948e9c..95072b50221a2a 100644
--- a/packages/material-ui/test/typescript/components.spec.tsx
+++ b/packages/material-ui/test/typescript/components.spec.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { Link, LinkProps } from 'react-router-dom';
 import {
   AppBar,
   Avatar,
@@ -86,7 +87,20 @@ const AppBarTest = () => (
   </AppBar>
 );
 
-const AvatarTest = () => <Avatar alt="Image Alt" src="example.jpg" />;
+const AvatarTest = () => (
+  <div>
+    <Avatar onClick={e => log(e)} alt="Image Alt" src="example.jpg" />
+    <Avatar onClick={e => log(e)} component="button" alt="Image Alt" src="example.jpg" />
+    <Avatar
+      component={(props: { x: number }) => <div />}
+      x={3}
+      // Should NOT be allowed:
+      // onClick={e => log(e)}
+      alt="Image Alt"
+      src="example.jpg"
+    />
+  </div>
+);
 
 const AvaterClassName = () => <Avatar className="foo" />;
 
@@ -124,6 +138,14 @@ const ButtonTest = () => (
     </Button>
     <Button component="a">Simple Link</Button>
     <Button component={props => <a {...props} />}>Complexe Link</Button>
+    <Button component={Link} to="/open-collective">
+      Link
+    </Button>
+    <Button to="/open-collective">Link</Button>
+    <Button component={Link} to="/open-collective">
+      Link
+    </Button>
+    <Button to="/open-collective">Link</Button>
   </div>
 );
 
diff --git a/yarn.lock b/yarn.lock
index 590db7d09c6ff7..8e347303335647 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1058,6 +1058,10 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
+"@types/history@*":
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/@types/history/-/history-4.6.2.tgz#12cfaba693ba20f114ed5765467ff25fdf67ddb0"
+
 "@types/jss@^9.5.3":
   version "9.5.3"
   resolved "https://registry.yarnpkg.com/@types/jss/-/jss-9.5.3.tgz#0c106de3fe0b324cd4173fac7dab26c12cda624e"
@@ -1073,6 +1077,21 @@
   version "10.3.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.3.4.tgz#c74e8aec19e555df44609b8057311052a2c84d9e"
 
+"@types/react-router-dom@^4.2.7":
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-4.2.7.tgz#9d36bfe175f916dd8d7b6b0237feed6cce376b4c"
+  dependencies:
+    "@types/history" "*"
+    "@types/react" "*"
+    "@types/react-router" "*"
+
+"@types/react-router@*":
+  version "4.0.26"
+  resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-4.0.26.tgz#4489c873642baa633014294a6d0a290001ba9860"
+  dependencies:
+    "@types/history" "*"
+    "@types/react" "*"
+
 "@types/react-transition-group@^2.0.8":
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-2.0.11.tgz#feb274676a39383fffaa0dff710958d2251abefb"