diff --git a/libraries/AP_EPM/AP_EPM.cpp b/libraries/AP_EPM/AP_EPM.cpp
index c7ec41d275..970f951e37 100644
--- a/libraries/AP_EPM/AP_EPM.cpp
+++ b/libraries/AP_EPM/AP_EPM.cpp
@@ -7,8 +7,8 @@
  *      Author: Andreas Jochum
  */
 
-#include <AP_EPM.h>
-#include <AP_HAL.h>
+#include "AP_EPM.h"
+#include <AP_HAL/AP_HAL.h>
 
 extern const AP_HAL::HAL& hal;
 
diff --git a/libraries/AP_EPM/AP_EPM.h b/libraries/AP_EPM/AP_EPM.h
index 23e47d8e1e..0d44320f2c 100644
--- a/libraries/AP_EPM/AP_EPM.h
+++ b/libraries/AP_EPM/AP_EPM.h
@@ -15,9 +15,9 @@
 #ifndef __AP_EPM_h__
 #define __AP_EPM_h__
 
-#include <AP_Math.h>
-#include <AP_Common.h>
-#include <RC_Channel.h>
+#include <AP_Math/AP_Math.h>
+#include <AP_Common/AP_Common.h>
+#include <RC_Channel/RC_Channel.h>
 
 // EPM PWM definitions
 #define EPM_GRAB_PWM_DEFAULT        1900