diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b698ac688b..5a77423cf7 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -20,6 +20,8 @@ Features
 Bug Fixes
 """""""""
 
+- Source files: fix includes #640
+
 Other
 """""
 
diff --git a/src/Iteration.cpp b/src/Iteration.cpp
index 3560e9e8bb..91ea27ab23 100644
--- a/src/Iteration.cpp
+++ b/src/Iteration.cpp
@@ -18,12 +18,12 @@
  * and the GNU Lesser General Public License along with openPMD-api.
  * If not, see <http://www.gnu.org/licenses/>.
  */
-#include <openPMD/backend/Writable.hpp>
-#include "openPMD/auxiliary/StringManip.hpp"
+#include "openPMD/Iteration.hpp"
 #include "openPMD/Dataset.hpp"
 #include "openPMD/Datatype.hpp"
-#include "openPMD/Iteration.hpp"
 #include "openPMD/Series.hpp"
+#include "openPMD/auxiliary/StringManip.hpp"
+#include "openPMD/backend/Writable.hpp"
 
 
 namespace openPMD
diff --git a/src/backend/Writable.cpp b/src/backend/Writable.cpp
index 65aabd20c0..eb569d1b3f 100644
--- a/src/backend/Writable.cpp
+++ b/src/backend/Writable.cpp
@@ -18,8 +18,8 @@
  * and the GNU Lesser General Public License along with openPMD-api.
  * If not, see <http://www.gnu.org/licenses/>.
  */
-#include <openPMD/IO/AbstractIOHandler.hpp>
-#include <openPMD/backend/Writable.hpp>
+#include "openPMD/backend/Writable.hpp"
+#include "openPMD/IO/AbstractIOHandler.hpp"
 
 
 namespace openPMD