diff --git a/libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp b/libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp
index ea044deb..46726ac1 100755
--- a/libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp
+++ b/libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp
@@ -8,6 +8,7 @@
 #ifndef ALT_BN128_G1_HPP_
 #define ALT_BN128_G1_HPP_
 #include <vector>
+
 #include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>
 #include <libff/algebra/curves/curve_utils.hpp>
 
diff --git a/libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp b/libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp
index 29441f0d..54bd6a46 100755
--- a/libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp
+++ b/libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp
@@ -8,6 +8,7 @@
 #ifndef ALT_BN128_G2_HPP_
 #define ALT_BN128_G2_HPP_
 #include <vector>
+
 #include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>
 #include <libff/algebra/curves/curve_utils.hpp>
 
diff --git a/libff/algebra/curves/alt_bn128/alt_bn128_init.cpp b/libff/algebra/curves/alt_bn128/alt_bn128_init.cpp
index a9bf336c..5861e97b 100755
--- a/libff/algebra/curves/alt_bn128/alt_bn128_init.cpp
+++ b/libff/algebra/curves/alt_bn128/alt_bn128_init.cpp
@@ -5,9 +5,9 @@
  * @copyright  MIT license (see LICENSE file)
  *****************************************************************************/
 
-#include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>
 #include <libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp>
 #include <libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp>
+#include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>
 
 namespace libff {
 
diff --git a/libff/algebra/curves/alt_bn128/alt_bn128_init.hpp b/libff/algebra/curves/alt_bn128/alt_bn128_init.hpp
index a8702261..7dfabe70 100755
--- a/libff/algebra/curves/alt_bn128/alt_bn128_init.hpp
+++ b/libff/algebra/curves/alt_bn128/alt_bn128_init.hpp
@@ -9,9 +9,9 @@
 #define ALT_BN128_INIT_HPP_
 #include <libff/algebra/curves/public_params.hpp>
 #include <libff/algebra/fields/fp.hpp>
+#include <libff/algebra/fields/fp12_2over3over2.hpp>
 #include <libff/algebra/fields/fp2.hpp>
 #include <libff/algebra/fields/fp6_3over2.hpp>
-#include <libff/algebra/fields/fp12_2over3over2.hpp>
 
 namespace libff {
 
diff --git a/libff/algebra/curves/alt_bn128/alt_bn128_pairing.cpp b/libff/algebra/curves/alt_bn128/alt_bn128_pairing.cpp
index 08536c1f..7b79540e 100755
--- a/libff/algebra/curves/alt_bn128/alt_bn128_pairing.cpp
+++ b/libff/algebra/curves/alt_bn128/alt_bn128_pairing.cpp
@@ -5,11 +5,12 @@
  * @copyright  MIT license (see LICENSE file)
  *****************************************************************************/
 
-#include <libff/algebra/curves/alt_bn128/alt_bn128_pairing.hpp>
-#include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>
+#include <cassert>
+
 #include <libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp>
 #include <libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp>
-#include <cassert>
+#include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>
+#include <libff/algebra/curves/alt_bn128/alt_bn128_pairing.hpp>
 #include <libff/common/profiling.hpp>
 
 namespace libff {
diff --git a/libff/algebra/curves/alt_bn128/alt_bn128_pairing.hpp b/libff/algebra/curves/alt_bn128/alt_bn128_pairing.hpp
index 2ad4250a..3664c715 100755
--- a/libff/algebra/curves/alt_bn128/alt_bn128_pairing.hpp
+++ b/libff/algebra/curves/alt_bn128/alt_bn128_pairing.hpp
@@ -8,6 +8,7 @@
 #ifndef ALT_BN128_PAIRING_HPP_
 #define ALT_BN128_PAIRING_HPP_
 #include <vector>
+
 #include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>
 
 namespace libff {
diff --git a/libff/algebra/curves/alt_bn128/alt_bn128_pp.hpp b/libff/algebra/curves/alt_bn128/alt_bn128_pp.hpp
index c13672bd..e1f083ac 100755
--- a/libff/algebra/curves/alt_bn128/alt_bn128_pp.hpp
+++ b/libff/algebra/curves/alt_bn128/alt_bn128_pp.hpp
@@ -7,11 +7,11 @@
 
 #ifndef ALT_BN128_PP_HPP_
 #define ALT_BN128_PP_HPP_
-#include <libff/algebra/curves/public_params.hpp>
-#include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>
 #include <libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp>
 #include <libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp>
+#include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>
 #include <libff/algebra/curves/alt_bn128/alt_bn128_pairing.hpp>
+#include <libff/algebra/curves/public_params.hpp>
 
 namespace libff {
 
diff --git a/libff/algebra/curves/bn128/bn128_g1.hpp b/libff/algebra/curves/bn128/bn128_g1.hpp
index ca0d3dbc..5049b592 100755
--- a/libff/algebra/curves/bn128/bn128_g1.hpp
+++ b/libff/algebra/curves/bn128/bn128_g1.hpp
@@ -8,9 +8,11 @@
 #ifndef BN128_G1_HPP_
 #define BN128_G1_HPP_
 #include <vector>
+
+#include "third_party/ate-pairing/include/bn.h"
+
 #include <libff/algebra/curves/bn128/bn128_init.hpp>
 #include <libff/algebra/curves/curve_utils.hpp>
-#include "third_party/ate-pairing/include/bn.h"
 
 namespace libff {
 
diff --git a/libff/algebra/curves/bn128/bn128_g2.hpp b/libff/algebra/curves/bn128/bn128_g2.hpp
index edad5064..45e4e5c2 100755
--- a/libff/algebra/curves/bn128/bn128_g2.hpp
+++ b/libff/algebra/curves/bn128/bn128_g2.hpp
@@ -9,9 +9,11 @@
 #define BN128_G2_HPP_
 #include <iostream>
 #include <vector>
+
+#include "third_party/ate-pairing/include/bn.h"
+
 #include <libff/algebra/curves/bn128/bn128_init.hpp>
 #include <libff/algebra/curves/curve_utils.hpp>
-#include "third_party/ate-pairing/include/bn.h"
 
 namespace libff {
 
diff --git a/libff/algebra/curves/bn128/bn128_gt.hpp b/libff/algebra/curves/bn128/bn128_gt.hpp
index 563f390e..7a0ad9ea 100755
--- a/libff/algebra/curves/bn128/bn128_gt.hpp
+++ b/libff/algebra/curves/bn128/bn128_gt.hpp
@@ -7,11 +7,13 @@
 
 #ifndef BN128_GT_HPP_
 #define BN128_GT_HPP_
-#include <libff/algebra/fields/fp.hpp>
-#include <libff/algebra/fields/field_utils.hpp>
 #include <iostream>
+
 #include "third_party/ate-pairing/include/bn.h"
 
+#include <libff/algebra/fields/field_utils.hpp>
+#include <libff/algebra/fields/fp.hpp>
+
 namespace libff {
 
 class bn128_GT;
diff --git a/libff/algebra/curves/bn128/bn128_init.cpp b/libff/algebra/curves/bn128/bn128_init.cpp
index 87ab3691..f7cac657 100755
--- a/libff/algebra/curves/bn128/bn128_init.cpp
+++ b/libff/algebra/curves/bn128/bn128_init.cpp
@@ -5,10 +5,10 @@
  * @copyright  MIT license (see LICENSE file)
  *****************************************************************************/
 
-#include <libff/algebra/curves/bn128/bn128_init.hpp>
 #include <libff/algebra/curves/bn128/bn128_g1.hpp>
 #include <libff/algebra/curves/bn128/bn128_g2.hpp>
 #include <libff/algebra/curves/bn128/bn128_gt.hpp>
+#include <libff/algebra/curves/bn128/bn128_init.hpp>
 
 namespace libff {
 
diff --git a/libff/algebra/curves/bn128/bn128_init.hpp b/libff/algebra/curves/bn128/bn128_init.hpp
index f75e1569..9ec7ec52 100755
--- a/libff/algebra/curves/bn128/bn128_init.hpp
+++ b/libff/algebra/curves/bn128/bn128_init.hpp
@@ -7,9 +7,10 @@
 
 #ifndef BN128_INIT_HPP_
 #define BN128_INIT_HPP_
+#include "third_party/ate-pairing/include/bn.h"
+
 #include <libff/algebra/curves/public_params.hpp>
 #include <libff/algebra/fields/fp.hpp>
-#include "third_party/ate-pairing/include/bn.h"
 
 namespace libff {
 
diff --git a/libff/algebra/curves/bn128/bn128_pairing.cpp b/libff/algebra/curves/bn128/bn128_pairing.cpp
index d13ce4cb..05536173 100755
--- a/libff/algebra/curves/bn128/bn128_pairing.cpp
+++ b/libff/algebra/curves/bn128/bn128_pairing.cpp
@@ -10,12 +10,12 @@
 
 #include <sstream>
 
-#include <libff/algebra/curves/bn128/bn128_pairing.hpp>
-#include <libff/common/profiling.hpp>
-#include <libff/algebra/curves/bn128/bn128_init.hpp>
 #include <libff/algebra/curves/bn128/bn128_g1.hpp>
 #include <libff/algebra/curves/bn128/bn128_g2.hpp>
 #include <libff/algebra/curves/bn128/bn128_gt.hpp>
+#include <libff/algebra/curves/bn128/bn128_init.hpp>
+#include <libff/algebra/curves/bn128/bn128_pairing.hpp>
+#include <libff/common/profiling.hpp>
 
 namespace libff {
 
diff --git a/libff/algebra/curves/bn128/bn128_pairing.hpp b/libff/algebra/curves/bn128/bn128_pairing.hpp
index d688cc0e..87328f4d 100755
--- a/libff/algebra/curves/bn128/bn128_pairing.hpp
+++ b/libff/algebra/curves/bn128/bn128_pairing.hpp
@@ -10,10 +10,11 @@
 
 #ifndef BN128_PAIRING_HPP_
 #define BN128_PAIRING_HPP_
+#include "third_party/ate-pairing/include/bn.h"
+
 #include <libff/algebra/curves/bn128/bn128_g1.hpp>
 #include <libff/algebra/curves/bn128/bn128_g2.hpp>
 #include <libff/algebra/curves/bn128/bn128_gt.hpp>
-#include "third_party/ate-pairing/include/bn.h"
 
 namespace libff {
 
diff --git a/libff/algebra/curves/bn128/bn128_pp.hpp b/libff/algebra/curves/bn128/bn128_pp.hpp
index c2f42ab0..5b407555 100755
--- a/libff/algebra/curves/bn128/bn128_pp.hpp
+++ b/libff/algebra/curves/bn128/bn128_pp.hpp
@@ -7,12 +7,12 @@
 
 #ifndef BN128_PP_HPP_
 #define BN128_PP_HPP_
-#include <libff/algebra/curves/public_params.hpp>
-#include <libff/algebra/curves/bn128/bn128_init.hpp>
 #include <libff/algebra/curves/bn128/bn128_g1.hpp>
 #include <libff/algebra/curves/bn128/bn128_g2.hpp>
 #include <libff/algebra/curves/bn128/bn128_gt.hpp>
+#include <libff/algebra/curves/bn128/bn128_init.hpp>
 #include <libff/algebra/curves/bn128/bn128_pairing.hpp>
+#include <libff/algebra/curves/public_params.hpp>
 
 namespace libff {
 
diff --git a/libff/algebra/curves/bn128/bn_utils.hpp b/libff/algebra/curves/bn128/bn_utils.hpp
index cc264bff..51d4afbe 100755
--- a/libff/algebra/curves/bn128/bn_utils.hpp
+++ b/libff/algebra/curves/bn128/bn_utils.hpp
@@ -8,6 +8,7 @@
 #ifndef BN_UTILS_HPP_
 #define BN_UTILS_HPP_
 #include <vector>
+
 #include "third_party/ate-pairing/include/bn.h"
 
 namespace libff {
diff --git a/libff/algebra/curves/edwards/edwards_g1.hpp b/libff/algebra/curves/edwards/edwards_g1.hpp
index 7857615e..33ee926c 100755
--- a/libff/algebra/curves/edwards/edwards_g1.hpp
+++ b/libff/algebra/curves/edwards/edwards_g1.hpp
@@ -8,8 +8,9 @@
 #ifndef EDWARDS_G1_HPP_
 #define EDWARDS_G1_HPP_
 #include <vector>
-#include <libff/algebra/curves/edwards/edwards_init.hpp>
+
 #include <libff/algebra/curves/curve_utils.hpp>
+#include <libff/algebra/curves/edwards/edwards_init.hpp>
 
 namespace libff {
 
diff --git a/libff/algebra/curves/edwards/edwards_g2.hpp b/libff/algebra/curves/edwards/edwards_g2.hpp
index dc5051c7..b6390b0b 100755
--- a/libff/algebra/curves/edwards/edwards_g2.hpp
+++ b/libff/algebra/curves/edwards/edwards_g2.hpp
@@ -9,8 +9,9 @@
 #define EDWARDS_G2_HPP_
 #include <iostream>
 #include <vector>
-#include <libff/algebra/curves/edwards/edwards_init.hpp>
+
 #include <libff/algebra/curves/curve_utils.hpp>
+#include <libff/algebra/curves/edwards/edwards_init.hpp>
 
 namespace libff {
 
diff --git a/libff/algebra/curves/edwards/edwards_init.cpp b/libff/algebra/curves/edwards/edwards_init.cpp
index f2d373ba..bb6702c6 100755
--- a/libff/algebra/curves/edwards/edwards_init.cpp
+++ b/libff/algebra/curves/edwards/edwards_init.cpp
@@ -5,9 +5,9 @@
  * @copyright  MIT license (see LICENSE file)
  *****************************************************************************/
 
-#include <libff/algebra/curves/edwards/edwards_init.hpp>
 #include <libff/algebra/curves/edwards/edwards_g1.hpp>
 #include <libff/algebra/curves/edwards/edwards_g2.hpp>
+#include <libff/algebra/curves/edwards/edwards_init.hpp>
 
 namespace libff {
 
diff --git a/libff/algebra/curves/edwards/edwards_pairing.cpp b/libff/algebra/curves/edwards/edwards_pairing.cpp
index dffb579a..ea81ff52 100755
--- a/libff/algebra/curves/edwards/edwards_pairing.cpp
+++ b/libff/algebra/curves/edwards/edwards_pairing.cpp
@@ -5,11 +5,12 @@
  * @copyright  MIT license (see LICENSE file)
  *****************************************************************************/
 
-#include <libff/algebra/curves/edwards/edwards_pairing.hpp>
-#include <libff/algebra/curves/edwards/edwards_init.hpp>
 #include <cassert>
+
 #include <libff/algebra/curves/edwards/edwards_g1.hpp>
 #include <libff/algebra/curves/edwards/edwards_g2.hpp>
+#include <libff/algebra/curves/edwards/edwards_init.hpp>
+#include <libff/algebra/curves/edwards/edwards_pairing.hpp>
 #include <libff/common/profiling.hpp>
 
 namespace libff {
diff --git a/libff/algebra/curves/edwards/edwards_pairing.hpp b/libff/algebra/curves/edwards/edwards_pairing.hpp
index f44b479c..e5e64212 100755
--- a/libff/algebra/curves/edwards/edwards_pairing.hpp
+++ b/libff/algebra/curves/edwards/edwards_pairing.hpp
@@ -8,6 +8,7 @@
 #ifndef EDWARDS_PAIRING_HPP_
 #define EDWARDS_PAIRING_HPP_
 #include <vector>
+
 #include <libff/algebra/curves/edwards/edwards_init.hpp>
 
 namespace libff {
diff --git a/libff/algebra/curves/edwards/edwards_pp.hpp b/libff/algebra/curves/edwards/edwards_pp.hpp
index 6bfac79c..8f29a9cc 100755
--- a/libff/algebra/curves/edwards/edwards_pp.hpp
+++ b/libff/algebra/curves/edwards/edwards_pp.hpp
@@ -7,11 +7,11 @@
 
 #ifndef EDWARDS_PP_HPP_
 #define EDWARDS_PP_HPP_
-#include <libff/algebra/curves/public_params.hpp>
-#include <libff/algebra/curves/edwards/edwards_init.hpp>
 #include <libff/algebra/curves/edwards/edwards_g1.hpp>
 #include <libff/algebra/curves/edwards/edwards_g2.hpp>
+#include <libff/algebra/curves/edwards/edwards_init.hpp>
 #include <libff/algebra/curves/edwards/edwards_pairing.hpp>
+#include <libff/algebra/curves/public_params.hpp>
 
 namespace libff {
 
diff --git a/libff/algebra/curves/mnt/mnt4/mnt4_init.cpp b/libff/algebra/curves/mnt/mnt4/mnt4_init.cpp
index cbcdda18..b252d8c5 100755
--- a/libff/algebra/curves/mnt/mnt4/mnt4_init.cpp
+++ b/libff/algebra/curves/mnt/mnt4/mnt4_init.cpp
@@ -11,9 +11,9 @@
  * @copyright  MIT license (see LICENSE file)
  *****************************************************************************/
 
-#include <libff/algebra/curves/mnt/mnt4/mnt4_init.hpp>
 #include <libff/algebra/curves/mnt/mnt4/mnt4_g1.hpp>
 #include <libff/algebra/curves/mnt/mnt4/mnt4_g2.hpp>
+#include <libff/algebra/curves/mnt/mnt4/mnt4_init.hpp>
 
 namespace libff {
 
diff --git a/libff/algebra/curves/mnt/mnt4/mnt4_init.hpp b/libff/algebra/curves/mnt/mnt4/mnt4_init.hpp
index cf7c32e6..600d16c8 100755
--- a/libff/algebra/curves/mnt/mnt4/mnt4_init.hpp
+++ b/libff/algebra/curves/mnt/mnt4/mnt4_init.hpp
@@ -12,8 +12,8 @@
 #ifndef MNT4_INIT_HPP_
 #define MNT4_INIT_HPP_
 
-#include <libff/algebra/curves/public_params.hpp>
 #include <libff/algebra/curves/mnt/mnt46_common.hpp>
+#include <libff/algebra/curves/public_params.hpp>
 #include <libff/algebra/fields/fp.hpp>
 #include <libff/algebra/fields/fp2.hpp>
 #include <libff/algebra/fields/fp4.hpp>
diff --git a/libff/algebra/curves/mnt/mnt4/mnt4_pairing.cpp b/libff/algebra/curves/mnt/mnt4/mnt4_pairing.cpp
index b579e0bf..be108525 100755
--- a/libff/algebra/curves/mnt/mnt4/mnt4_pairing.cpp
+++ b/libff/algebra/curves/mnt/mnt4/mnt4_pairing.cpp
@@ -13,11 +13,10 @@
 
 #include <cassert>
 
-#include <libff/algebra/curves/mnt/mnt4/mnt4_pairing.hpp>
-
-#include <libff/algebra/curves/mnt/mnt4/mnt4_init.hpp>
 #include <libff/algebra/curves/mnt/mnt4/mnt4_g1.hpp>
 #include <libff/algebra/curves/mnt/mnt4/mnt4_g2.hpp>
+#include <libff/algebra/curves/mnt/mnt4/mnt4_init.hpp>
+#include <libff/algebra/curves/mnt/mnt4/mnt4_pairing.hpp>
 #include <libff/algebra/scalar_multiplication/wnaf.hpp>
 #include <libff/common/profiling.hpp>
 
diff --git a/libff/algebra/curves/mnt/mnt4/mnt4_pp.hpp b/libff/algebra/curves/mnt/mnt4/mnt4_pp.hpp
index 87e0fd79..438cb122 100755
--- a/libff/algebra/curves/mnt/mnt4/mnt4_pp.hpp
+++ b/libff/algebra/curves/mnt/mnt4/mnt4_pp.hpp
@@ -12,11 +12,11 @@
 #ifndef MNT4_PP_HPP_
 #define MNT4_PP_HPP_
 
-#include <libff/algebra/curves/public_params.hpp>
-#include <libff/algebra/curves/mnt/mnt4/mnt4_init.hpp>
 #include <libff/algebra/curves/mnt/mnt4/mnt4_g1.hpp>
 #include <libff/algebra/curves/mnt/mnt4/mnt4_g2.hpp>
+#include <libff/algebra/curves/mnt/mnt4/mnt4_init.hpp>
 #include <libff/algebra/curves/mnt/mnt4/mnt4_pairing.hpp>
+#include <libff/algebra/curves/public_params.hpp>
 
 namespace libff {
 
diff --git a/libff/algebra/curves/mnt/mnt6/mnt6_init.cpp b/libff/algebra/curves/mnt/mnt6/mnt6_init.cpp
index 37c5ba30..2182a15b 100755
--- a/libff/algebra/curves/mnt/mnt6/mnt6_init.cpp
+++ b/libff/algebra/curves/mnt/mnt6/mnt6_init.cpp
@@ -11,9 +11,9 @@
  * @copyright  MIT license (see LICENSE file)
  *****************************************************************************/
 
-#include <libff/algebra/curves/mnt/mnt6/mnt6_init.hpp>
 #include <libff/algebra/curves/mnt/mnt6/mnt6_g1.hpp>
 #include <libff/algebra/curves/mnt/mnt6/mnt6_g2.hpp>
+#include <libff/algebra/curves/mnt/mnt6/mnt6_init.hpp>
 
 namespace libff {
 
diff --git a/libff/algebra/curves/mnt/mnt6/mnt6_init.hpp b/libff/algebra/curves/mnt/mnt6/mnt6_init.hpp
index 19e55112..e4e2c942 100755
--- a/libff/algebra/curves/mnt/mnt6/mnt6_init.hpp
+++ b/libff/algebra/curves/mnt/mnt6/mnt6_init.hpp
@@ -12,8 +12,8 @@
 #ifndef MNT6_INIT_HPP_
 #define MNT6_INIT_HPP_
 
-#include <libff/algebra/curves/public_params.hpp>
 #include <libff/algebra/curves/mnt/mnt46_common.hpp>
+#include <libff/algebra/curves/public_params.hpp>
 #include <libff/algebra/fields/fp.hpp>
 #include <libff/algebra/fields/fp3.hpp>
 #include <libff/algebra/fields/fp6_2over3.hpp>
diff --git a/libff/algebra/curves/mnt/mnt6/mnt6_pairing.cpp b/libff/algebra/curves/mnt/mnt6/mnt6_pairing.cpp
index 28317c04..75a85a86 100755
--- a/libff/algebra/curves/mnt/mnt6/mnt6_pairing.cpp
+++ b/libff/algebra/curves/mnt/mnt6/mnt6_pairing.cpp
@@ -13,10 +13,10 @@
 
 #include <cassert>
 
-#include <libff/algebra/curves/mnt/mnt6/mnt6_pairing.hpp>
-#include <libff/algebra/curves/mnt/mnt6/mnt6_init.hpp>
 #include <libff/algebra/curves/mnt/mnt6/mnt6_g1.hpp>
 #include <libff/algebra/curves/mnt/mnt6/mnt6_g2.hpp>
+#include <libff/algebra/curves/mnt/mnt6/mnt6_init.hpp>
+#include <libff/algebra/curves/mnt/mnt6/mnt6_pairing.hpp>
 #include <libff/algebra/scalar_multiplication/wnaf.hpp>
 #include <libff/common/profiling.hpp>
 
diff --git a/libff/algebra/curves/mnt/mnt6/mnt6_pp.hpp b/libff/algebra/curves/mnt/mnt6/mnt6_pp.hpp
index af583f0f..889152ac 100755
--- a/libff/algebra/curves/mnt/mnt6/mnt6_pp.hpp
+++ b/libff/algebra/curves/mnt/mnt6/mnt6_pp.hpp
@@ -12,11 +12,11 @@
 #ifndef MNT6_PP_HPP_
 #define MNT6_PP_HPP_
 
-#include <libff/algebra/curves/public_params.hpp>
-#include <libff/algebra/curves/mnt/mnt6/mnt6_init.hpp>
 #include <libff/algebra/curves/mnt/mnt6/mnt6_g1.hpp>
 #include <libff/algebra/curves/mnt/mnt6/mnt6_g2.hpp>
+#include <libff/algebra/curves/mnt/mnt6/mnt6_init.hpp>
 #include <libff/algebra/curves/mnt/mnt6/mnt6_pairing.hpp>
+#include <libff/algebra/curves/public_params.hpp>
 
 namespace libff {
 
diff --git a/libff/algebra/curves/tests/test_bilinearity.cpp b/libff/algebra/curves/tests/test_bilinearity.cpp
index 2d8f8cd3..5f3f8f24 100755
--- a/libff/algebra/curves/tests/test_bilinearity.cpp
+++ b/libff/algebra/curves/tests/test_bilinearity.cpp
@@ -4,8 +4,8 @@
  *             and contributors (see AUTHORS).
  * @copyright  MIT license (see LICENSE file)
  *****************************************************************************/
-#include <libff/common/profiling.hpp>
 #include <libff/algebra/curves/edwards/edwards_pp.hpp>
+#include <libff/common/profiling.hpp>
 #ifdef CURVE_BN128
 #include <libff/algebra/curves/bn128/bn128_pp.hpp>
 #endif
diff --git a/libff/algebra/curves/tests/test_groups.cpp b/libff/algebra/curves/tests/test_groups.cpp
index 90f042f5..5e00df7e 100755
--- a/libff/algebra/curves/tests/test_groups.cpp
+++ b/libff/algebra/curves/tests/test_groups.cpp
@@ -4,16 +4,17 @@
  *             and contributors (see AUTHORS).
  * @copyright  MIT license (see LICENSE file)
  *****************************************************************************/
-#include <libff/common/profiling.hpp>
 #include <libff/algebra/curves/edwards/edwards_pp.hpp>
 #include <libff/algebra/curves/mnt/mnt4/mnt4_pp.hpp>
 #include <libff/algebra/curves/mnt/mnt6/mnt6_pp.hpp>
+#include <libff/common/profiling.hpp>
 #ifdef CURVE_BN128
 #include <libff/algebra/curves/bn128/bn128_pp.hpp>
 #endif
-#include <libff/algebra/curves/alt_bn128/alt_bn128_pp.hpp>
 #include <sstream>
 
+#include <libff/algebra/curves/alt_bn128/alt_bn128_pp.hpp>
+
 using namespace libff;
 
 template<typename GroupT>
diff --git a/libff/algebra/fields/bigint.hpp b/libff/algebra/fields/bigint.hpp
index 95e792a5..47db2d3c 100755
--- a/libff/algebra/fields/bigint.hpp
+++ b/libff/algebra/fields/bigint.hpp
@@ -11,7 +11,9 @@
 #define BIGINT_HPP_
 #include <cstddef>
 #include <iostream>
+
 #include <gmp.h>
+
 #include <libff/common/serialization.hpp>
 
 namespace libff {
diff --git a/libff/algebra/fields/field_utils.tcc b/libff/algebra/fields/field_utils.tcc
index febb7389..812c34c2 100755
--- a/libff/algebra/fields/field_utils.tcc
+++ b/libff/algebra/fields/field_utils.tcc
@@ -12,7 +12,7 @@
 
 #include <complex>
 #include <stdexcept>
- 
+
 #include <libff/common/double.hpp>
 #include <libff/common/utils.hpp>
 
diff --git a/libff/algebra/fields/fp.hpp b/libff/algebra/fields/fp.hpp
index da9f5ff6..01f88838 100755
--- a/libff/algebra/fields/fp.hpp
+++ b/libff/algebra/fields/fp.hpp
@@ -10,8 +10,8 @@
 #ifndef FP_HPP_
 #define FP_HPP_
 
-#include <libff/algebra/fields/bigint.hpp>
 #include <libff/algebra/exponentiation/exponentiation.hpp>
+#include <libff/algebra/fields/bigint.hpp>
 
 namespace libff {
 
diff --git a/libff/algebra/fields/fp.tcc b/libff/algebra/fields/fp.tcc
index 6bb3c73d..97b0fd92 100755
--- a/libff/algebra/fields/fp.tcc
+++ b/libff/algebra/fields/fp.tcc
@@ -10,12 +10,12 @@
 #ifndef FP_TCC_
 #define FP_TCC_
 #include <cassert>
-#include <cstdlib>
 #include <cmath>
+#include <cstdlib>
 #include <limits>
 
-#include <libff/algebra/fields/fp_aux.tcc>
 #include <libff/algebra/fields/field_utils.hpp>
+#include <libff/algebra/fields/fp_aux.tcc>
 
 namespace libff {
 
diff --git a/libff/algebra/fields/fp12_2over3over2.hpp b/libff/algebra/fields/fp12_2over3over2.hpp
index 7df95eb8..6c31291f 100755
--- a/libff/algebra/fields/fp12_2over3over2.hpp
+++ b/libff/algebra/fields/fp12_2over3over2.hpp
@@ -9,10 +9,11 @@
 
 #ifndef FP12_2OVER3OVER2_HPP_
 #define FP12_2OVER3OVER2_HPP_
+#include <vector>
+
 #include <libff/algebra/fields/fp.hpp>
 #include <libff/algebra/fields/fp2.hpp>
 #include <libff/algebra/fields/fp6_3over2.hpp>
-#include <vector>
 
 namespace libff {
 
diff --git a/libff/algebra/fields/fp2.hpp b/libff/algebra/fields/fp2.hpp
index faedd03e..a0ffd1de 100755
--- a/libff/algebra/fields/fp2.hpp
+++ b/libff/algebra/fields/fp2.hpp
@@ -9,9 +9,10 @@
 
 #ifndef FP2_HPP_
 #define FP2_HPP_
-#include <libff/algebra/fields/fp.hpp>
 #include <vector>
 
+#include <libff/algebra/fields/fp.hpp>
+
 namespace libff {
 
 template<mp_size_t n, const bigint<n>& modulus>
diff --git a/libff/algebra/fields/fp3.hpp b/libff/algebra/fields/fp3.hpp
index d8ef1a7a..cd34fbf1 100755
--- a/libff/algebra/fields/fp3.hpp
+++ b/libff/algebra/fields/fp3.hpp
@@ -9,9 +9,10 @@
 
 #ifndef FP3_HPP_
 #define FP3_HPP_
-#include <libff/algebra/fields/fp.hpp>
 #include <vector>
 
+#include <libff/algebra/fields/fp.hpp>
+
 namespace libff {
 
 template<mp_size_t n, const bigint<n>& modulus>
diff --git a/libff/algebra/fields/fp6_3over2.hpp b/libff/algebra/fields/fp6_3over2.hpp
index c31808ab..816ce85f 100755
--- a/libff/algebra/fields/fp6_3over2.hpp
+++ b/libff/algebra/fields/fp6_3over2.hpp
@@ -9,9 +9,10 @@
 
 #ifndef FP6_3OVER2_HPP_
 #define FP6_3OVER2_HPP_
+#include <vector>
+
 #include <libff/algebra/fields/fp.hpp>
 #include <libff/algebra/fields/fp2.hpp>
-#include <vector>
 
 namespace libff {
 
diff --git a/libff/algebra/fields/tests/test_fields.cpp b/libff/algebra/fields/tests/test_fields.cpp
index 32aac6e7..4efe72d4 100755
--- a/libff/algebra/fields/tests/test_fields.cpp
+++ b/libff/algebra/fields/tests/test_fields.cpp
@@ -4,16 +4,16 @@
  *             and contributors (see AUTHORS).
  * @copyright  MIT license (see LICENSE file)
  *****************************************************************************/
-#include <libff/common/profiling.hpp>
 #include <libff/algebra/curves/edwards/edwards_pp.hpp>
 #include <libff/algebra/curves/mnt/mnt4/mnt4_pp.hpp>
 #include <libff/algebra/curves/mnt/mnt6/mnt6_pp.hpp>
+#include <libff/common/profiling.hpp>
 #ifdef CURVE_BN128
 #include <libff/algebra/curves/bn128/bn128_pp.hpp>
 #endif
 #include <libff/algebra/curves/alt_bn128/alt_bn128_pp.hpp>
-#include <libff/algebra/fields/fp6_3over2.hpp>
 #include <libff/algebra/fields/fp12_2over3over2.hpp>
+#include <libff/algebra/fields/fp6_3over2.hpp>
 
 using namespace libff;
 
diff --git a/libff/algebra/scalar_multiplication/multiexp.hpp b/libff/algebra/scalar_multiplication/multiexp.hpp
index c9bdf060..1838f20e 100755
--- a/libff/algebra/scalar_multiplication/multiexp.hpp
+++ b/libff/algebra/scalar_multiplication/multiexp.hpp
@@ -12,6 +12,8 @@
 #ifndef MULTIEXP_HPP_
 #define MULTIEXP_HPP_
 
+#include <vector>
+
 namespace libff {
 
 /**
diff --git a/libff/algebra/scalar_multiplication/multiexp.tcc b/libff/algebra/scalar_multiplication/multiexp.tcc
index 21f0a6d7..9ffc4422 100755
--- a/libff/algebra/scalar_multiplication/multiexp.tcc
+++ b/libff/algebra/scalar_multiplication/multiexp.tcc
@@ -14,15 +14,14 @@
 #ifndef MULTIEXP_TCC_
 #define MULTIEXP_TCC_
 
-#include <libff/algebra/fields/fp_aux.tcc>
-
 #include <algorithm>
 #include <cassert>
 #include <type_traits>
 
+#include <libff/algebra/fields/fp_aux.tcc>
+#include <libff/algebra/scalar_multiplication/wnaf.hpp>
 #include <libff/common/profiling.hpp>
 #include <libff/common/utils.hpp>
-#include <libff/algebra/scalar_multiplication/wnaf.hpp>
 
 namespace libff {
 
diff --git a/libff/algebra/scalar_multiplication/wnaf.hpp b/libff/algebra/scalar_multiplication/wnaf.hpp
index f5fc585e..6c65cde2 100755
--- a/libff/algebra/scalar_multiplication/wnaf.hpp
+++ b/libff/algebra/scalar_multiplication/wnaf.hpp
@@ -12,6 +12,10 @@
 #ifndef WNAF_HPP_
 #define WNAF_HPP_
 
+#include <vector>
+
+#include <libff/algebra/fields/bigint.hpp>
+
 namespace libff {
 
 /**
diff --git a/libff/algebra/scalar_multiplication/wnaf.tcc b/libff/algebra/scalar_multiplication/wnaf.tcc
index cc9b1d07..5a8205e7 100755
--- a/libff/algebra/scalar_multiplication/wnaf.tcc
+++ b/libff/algebra/scalar_multiplication/wnaf.tcc
@@ -14,6 +14,8 @@
 #ifndef WNAF_TCC_
 #define WNAF_TCC_
 
+#include <gmp.h>
+
 namespace libff {
 
 template<mp_size_t n>
diff --git a/libff/common/default_types/ec_pp.hpp b/libff/common/default_types/ec_pp.hpp
index ba5d93f0..d30de3de 100755
--- a/libff/common/default_types/ec_pp.hpp
+++ b/libff/common/default_types/ec_pp.hpp
@@ -16,6 +16,7 @@
 /************************ Pick the elliptic curve ****************************/
 
 #ifdef CURVE_ALT_BN128
+#define LIBFF_DEFAULT_EC_PP_DEFINED
 #include <libff/algebra/curves/alt_bn128/alt_bn128_pp.hpp>
 namespace libff {
 typedef alt_bn128_pp default_ec_pp;
@@ -23,6 +24,7 @@ typedef alt_bn128_pp default_ec_pp;
 #endif
 
 #ifdef CURVE_BN128
+#define LIBFF_DEFAULT_EC_PP_DEFINED
 #include <libff/algebra/curves/bn128/bn128_pp.hpp>
 namespace libff {
 typedef bn128_pp default_ec_pp;
@@ -30,6 +32,7 @@ typedef bn128_pp default_ec_pp;
 #endif
 
 #ifdef CURVE_EDWARDS
+#define LIBFF_DEFAULT_EC_PP_DEFINED
 #include <libff/algebra/curves/edwards/edwards_pp.hpp>
 namespace libff {
 typedef edwards_pp default_ec_pp;
@@ -37,6 +40,7 @@ typedef edwards_pp default_ec_pp;
 #endif
 
 #ifdef CURVE_MNT4
+#define LIBFF_DEFAULT_EC_PP_DEFINED
 #include <libff/algebra/curves/mnt/mnt4/mnt4_pp.hpp>
 namespace libff {
 typedef mnt4_pp default_ec_pp;
@@ -44,10 +48,15 @@ typedef mnt4_pp default_ec_pp;
 #endif
 
 #ifdef CURVE_MNT6
+#define LIBFF_DEFAULT_EC_PP_DEFINED
 #include <libff/algebra/curves/mnt/mnt6/mnt6_pp.hpp>
 namespace libff {
 typedef mnt6_pp default_ec_pp;
 } // libff
 #endif
 
+#ifndef LIBFF_DEFAULT_EC_PP_DEFINED
+#error You must define one of the CURVE_* symbols to pick a curve for pairings.
+#endif
+
 #endif // EC_PP_HPP_
diff --git a/libff/common/double.cpp b/libff/common/double.cpp
index 256cd45d..6d9b93c0 100755
--- a/libff/common/double.cpp
+++ b/libff/common/double.cpp
@@ -9,12 +9,12 @@
  * @copyright  MIT license (see LICENSE file)
  *****************************************************************************/
 
-#include <complex>
 #include <cmath>
+#include <complex>
+
 #include <math.h>
 
 #include <libff/algebra/fields/bigint.hpp>
-
 #include <libff/common/double.hpp>
 
 namespace libff {
diff --git a/libff/common/double.hpp b/libff/common/double.hpp
index 398f2c61..f74cead0 100755
--- a/libff/common/double.hpp
+++ b/libff/common/double.hpp
@@ -13,6 +13,7 @@
 #define DOUBLE_HPP_
 
 #include <complex>
+
 #include <libff/algebra/fields/bigint.hpp>
 
 namespace libff {
diff --git a/libff/common/profiling.cpp b/libff/common/profiling.cpp
index 83d43619..4de648f5 100755
--- a/libff/common/profiling.cpp
+++ b/libff/common/profiling.cpp
@@ -11,15 +11,16 @@
  * @copyright  MIT license (see LICENSE file)
  *****************************************************************************/
 
-#include <libff/common/profiling.hpp>
 #include <cassert>
-#include <stdexcept>
 #include <chrono>
 #include <cstdio>
+#include <ctime>
 #include <list>
+#include <stdexcept>
 #include <vector>
-#include <ctime>
+
 #include <libff/common/default_types/ec_pp.hpp>
+#include <libff/common/profiling.hpp>
 #include <libff/common/utils.hpp>
 
 #ifndef NO_PROCPS
diff --git a/libff/common/rng.tcc b/libff/common/rng.tcc
index c406f0ec..92eecea1 100755
--- a/libff/common/rng.tcc
+++ b/libff/common/rng.tcc
@@ -14,8 +14,13 @@
 #ifndef RNG_TCC_
 #define RNG_TCC_
 
+#include <gmp.h>
 #include <openssl/sha.h>
 
+#include <libff/algebra/fields/bigint.hpp>
+#include <libff/common/rng.hpp>
+#include <libff/common/utils.hpp>
+
 namespace libff {
 
 template<typename FieldT>
diff --git a/libff/common/serialization.tcc b/libff/common/serialization.tcc
index 5ff3f30c..71ce32be 100755
--- a/libff/common/serialization.tcc
+++ b/libff/common/serialization.tcc
@@ -16,6 +16,7 @@
 
 #include <cassert>
 #include <sstream>
+
 #include <libff/common/utils.hpp>
 
 namespace libff {
diff --git a/libff/common/utils.cpp b/libff/common/utils.cpp
index 9198bfca..38d230c1 100755
--- a/libff/common/utils.cpp
+++ b/libff/common/utils.cpp
@@ -9,8 +9,9 @@
 
 #include <algorithm>
 #include <cassert>
-#include <cstdint>
 #include <cstdarg>
+#include <cstdint>
+
 #include <libff/common/utils.hpp>
 
 namespace libff {