diff --git a/drmconnector.h b/drmconnector.h
new file mode 100644
index 0000000..b31d9a9
--- /dev/null
+++ b/drmconnector.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_DRM_CONNECTOR_H_
+#define ANDROID_DRM_CONNECTOR_H_
+
+#include "drmencoder.h"
+#include "drmmode.h"
+#include "drmproperty.h"
+
+#include <stdint.h>
+#include <vector>
+#include <xf86drmMode.h>
+
+namespace android {
+
+class DrmResources;
+
+class DrmConnector {
+ public:
+  typedef std::vector<DrmEncoder *>::const_iterator EncoderIter;
+  typedef std::vector<DrmMode>::const_iterator ModeIter;
+
+  DrmConnector(DrmResources *drm, drmModeConnectorPtr c,
+               DrmEncoder *current_encoder,
+               std::vector<DrmEncoder *> &possible_encoders);
+  ~DrmConnector();
+
+  int Init();
+
+  uint32_t id() const;
+
+  int display() const;
+  void set_display(int display);
+
+  bool built_in() const;
+
+  int UpdateModes();
+
+  ModeIter begin_modes() const;
+  ModeIter end_modes() const;
+  const DrmMode &active_mode() const;
+  int set_active_mode(uint32_t mode_id);
+
+  const DrmProperty &dpms_property() const;
+
+  EncoderIter begin_possible_encoders() const;
+  EncoderIter end_possible_encoders() const;
+  DrmEncoder *encoder() const;
+  void set_encoder(DrmEncoder *encoder);
+
+  uint32_t mm_width() const;
+  uint32_t mm_height() const;
+
+ private:
+  DrmConnector(const DrmConnector &);
+
+  DrmResources *drm_;
+
+  uint32_t id_;
+  DrmEncoder *encoder_;
+  int display_;
+
+  uint32_t type_;
+  drmModeConnection state_;
+
+  uint32_t mm_width_;
+  uint32_t mm_height_;
+
+  DrmMode active_mode_;
+  std::vector<DrmMode> modes_;
+
+  DrmProperty dpms_property_;
+
+  std::vector<DrmEncoder *> possible_encoders_;
+};
+}
+
+#endif  // ANDROID_DRM_PLANE_H_