diff --git a/libraries/AP_Camera/AP_Camera.cpp b/libraries/AP_Camera/AP_Camera.cpp
index a5207c5b99..5c41cc70ce 100644
--- a/libraries/AP_Camera/AP_Camera.cpp
+++ b/libraries/AP_Camera/AP_Camera.cpp
@@ -1,10 +1,10 @@
 // -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 
-#include <AP_Camera.h>
-#include <AP_Relay.h>
-#include <AP_Math.h>
-#include <RC_Channel.h>
-#include <AP_HAL.h>
+#include "AP_Camera.h"
+#include <AP_Relay/AP_Relay.h>
+#include <AP_Math/AP_Math.h>
+#include <RC_Channel/RC_Channel.h>
+#include <AP_HAL/AP_HAL.h>
 
 // ------------------------------
 #define CAM_DEBUG DISABLED
diff --git a/libraries/AP_Camera/AP_Camera.h b/libraries/AP_Camera/AP_Camera.h
index afc8f73d40..a6435a507b 100644
--- a/libraries/AP_Camera/AP_Camera.h
+++ b/libraries/AP_Camera/AP_Camera.h
@@ -6,14 +6,14 @@
 #ifndef AP_CAMERA_H
 #define AP_CAMERA_H
 
-#include <AP_Param.h>
-#include <AP_Common.h>
-#include <GCS_MAVLink.h>
-#include <GCS.h>
-#include <AP_Relay.h>
-#include <AP_GPS.h>
-#include <AP_AHRS.h>
-#include <AP_Mission.h>
+#include <AP_Param/AP_Param.h>
+#include <AP_Common/AP_Common.h>
+#include <GCS_MAVLink/GCS_MAVLink.h>
+#include <GCS_MAVLink/GCS.h>
+#include <AP_Relay/AP_Relay.h>
+#include <AP_GPS/AP_GPS.h>
+#include <AP_AHRS/AP_AHRS.h>
+#include <AP_Mission/AP_Mission.h>
 
 #define AP_CAMERA_TRIGGER_TYPE_SERVO                0
 #define AP_CAMERA_TRIGGER_TYPE_RELAY                1