diff --git a/configure.ac b/configure.ac
index 3d5ab71e707a414eecd36894c4d9db0c9dfe33ef..e33d263e8f39a1442647e3b93827835d72f3a8e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2351,22 +2351,22 @@ DX_INIT_DOXYGEN(SWIFT, doc/Doxyfile, doc/)
 AM_CONDITIONAL([HAVE_DOXYGEN], [test "$ac_cv_path_ac_pt_DX_DOXYGEN" != ""])
 
 # Check if using QLA cooling
-AM_CONDITIONAL([HAVEQLACOOLING], [test "${with_cooling:0:3}" == "QLA"])
+AM_CONDITIONAL([HAVEQLACOOLING], [test "${with_cooling:0:3}" = "QLA"])
 
 # Check if using EAGLE cooling
-AM_CONDITIONAL([HAVEEAGLECOOLING], [test "${with_cooling:0:5}" == "EAGLE"])
+AM_CONDITIONAL([HAVEEAGLECOOLING], [test "${with_cooling:0:5}" = "EAGLE"])
 
 # Check if using COLIBRE cooling
-AM_CONDITIONAL([HAVECOLIBRECOOLING], [test "${with_cooling:0:7}" == "COLIBRE"])
+AM_CONDITIONAL([HAVECOLIBRECOOLING], [test "${with_cooling:0:7}" = "COLIBRE"])
 
 # Check if using EAGLE feedback
-AM_CONDITIONAL([HAVEEAGLEFEEDBACK], [test "$with_feedback" == "EAGLE"])
+AM_CONDITIONAL([HAVEEAGLEFEEDBACK], [test "$with_feedback" = "EAGLE"])
 
 # check if using grackle cooling
-AM_CONDITIONAL([HAVEGRACKLECOOLING], [test "${with_cooling:0:7}" == "grackle"])
+AM_CONDITIONAL([HAVEGRACKLECOOLING], [test "${with_cooling:0:7}" = "grackle"])
 
 # check if using gear feedback
-AM_CONDITIONAL([HAVEGEARFEEDBACK], [test "$with_feedback" == "GEAR"])
+AM_CONDITIONAL([HAVEGEARFEEDBACK], [test "$with_feedback" = "GEAR"])
 
 # Handle .in files.
 AC_CONFIG_FILES([Makefile src/Makefile examples/Makefile examples/Cooling/CoolingRates/Makefile doc/Makefile doc/Doxyfile tests/Makefile])
diff --git a/src/Makefile.am b/src/Makefile.am
index e52c63e60c93a8cb7ac297bcec7487e9ca4249d8..19ed48d1996b5716a01c0041e9a507fcec357500 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -286,6 +286,10 @@ nobase_noinst_HEADERS += chemistry/GEAR/chemistry.h
 nobase_noinst_HEADERS += chemistry/GEAR/chemistry_io.h 
 nobase_noinst_HEADERS += chemistry/GEAR/chemistry_struct.h 
 nobase_noinst_HEADERS += chemistry/GEAR/chemistry_iact.h 
+nobase_noinst_HEADERS += chemistry/GEAR_DIFFUSION/chemistry.h
+nobase_noinst_HEADERS += chemistry/GEAR_DIFFUSION/chemistry_io.h
+nobase_noinst_HEADERS += chemistry/GEAR_DIFFUSION/chemistry_struct.h
+nobase_noinst_HEADERS += chemistry/GEAR_DIFFUSION/chemistry_iact.h
 nobase_noinst_HEADERS += chemistry/EAGLE/chemistry.h 
 nobase_noinst_HEADERS += chemistry/EAGLE/chemistry_io.h 
 nobase_noinst_HEADERS += chemistry/EAGLE/chemistry_struct.h
@@ -325,10 +329,6 @@ nobase_noinst_HEADERS += pressure_floor/GEAR/pressure_floor_struct.h pressure_fl
 nobase_noinst_HEADERS += sink/Default/sink.h sink/Default/sink_io.h sink/Default/sink_part.h sink/Default/sink_properties.h 
 nobase_noinst_HEADERS += sink/Default/sink_iact.h
 nobase_noinst_HEADERS += sink.h sink_io.h sink_properties.h
-nobase_noinst_HEADERS += chemistry/GEAR_DIFFUSION/chemistry.h
-nobase_noinst_HEADERS += chemistry/GEAR_DIFFUSION/chemistry_io.h
-nobase_noinst_HEADERS += chemistry/GEAR_DIFFUSION/chemistry_struct.h
-nobase_noinst_HEADERS += chemistry/GEAR_DIFFUSION/chemistry_iact.h
 
 # Sources and special flags for the gravity library
 libgrav_la_SOURCES = runner_doiact_grav.c