diff --git a/lib/colvars/Makefile.common b/lib/colvars/Makefile.common
index 6e05ca93f..f47403f77 100644
--- a/lib/colvars/Makefile.common
+++ b/lib/colvars/Makefile.common
@@ -1,65 +1,65 @@
 # Shared -*- makefile -*- for multiple architectures
 
-# Detect settings from PYTHON package (if defined)
-sinclude ../../src/Makefile.package.settings
-ifeq ($(python_SYSINC),)
-COLVARS_PYTHON_INCFLAGS =
-else
-COLVARS_PYTHON_INCFLAGS = -DCOLVARS_PYTHON $(python_SYSINC)
-endif
+# # Detect settings from PYTHON package (if defined)
+# sinclude ../../src/Makefile.package.settings
+# ifeq ($(python_SYSINC),)
+# COLVARS_PYTHON_INCFLAGS =
+# else
+# COLVARS_PYTHON_INCFLAGS = -DCOLVARS_PYTHON $(python_SYSINC)
+# endif
 
 # Detect debug settings
 ifeq ($(COLVARS_DEBUG),)
 COLVARS_DEBUG_INCFLAGS =
 else
 COLVARS_DEBUG_INCFLAGS= -DCOLVARS_DEBUG
 endif
 
 COLVARS_INCFLAGS = $(COLVARS_DEBUG_INCFLAGS) $(COLVARS_PYTHON_INCFLAGS)
 
 
 .SUFFIXES:
 .SUFFIXES: .cpp .o
 
 COLVARS_SRCS = \
         colvaratoms.cpp \
         colvarbias_abf.cpp \
         colvarbias_alb.cpp \
         colvarbias.cpp \
         colvarbias_histogram.cpp \
         colvarbias_meta.cpp \
         colvarbias_restraint.cpp \
         colvarcomp_angles.cpp \
         colvarcomp_coordnums.cpp \
         colvarcomp.cpp \
         colvarcomp_distances.cpp \
         colvarcomp_protein.cpp \
         colvarcomp_rotations.cpp \
         colvar.cpp \
         colvardeps.cpp \
         colvargrid.cpp \
         colvarmodule.cpp \
         colvarparse.cpp \
         colvarproxy.cpp \
         colvarscript.cpp \
         colvartypes.cpp \
         colvarvalue.cpp
 
 COLVARS_OBJS = $(COLVARS_SRCS:.cpp=.o)
 
 .cpp.o:
 	$(CXX) $(CXXFLAGS) $(COLVARS_INCFLAGS) -c $<
 
 $(COLVARS_LIB):	Makefile.deps $(COLVARS_OBJS)
 	$(AR) $(ARFLAGS) $(COLVARS_LIB) $(COLVARS_OBJS)
 
 
 Makefile.deps: $(COLVARS_SRCS)
 	@echo > $@
 	@for src in $^ ; do \
 	  obj=`basename $$src .cpp`.o ; \
 	  $(CXX) -MM $(COLVARS_INCFLAGS) \
 	    -MT '$$(COLVARS_OBJ_DIR)'$$obj $$src >> $@ ; \
 	  done
 
 include Makefile.deps
diff --git a/lib/colvars/Makefile.g++ b/lib/colvars/Makefile.g++
index cd7f72a83..556e39d07 100644
--- a/lib/colvars/Makefile.g++
+++ b/lib/colvars/Makefile.g++
@@ -1,25 +1,25 @@
 # -*- makefile -*- to build Colvars module with GNU compiler
 
 EXTRAMAKE = Makefile.lammps.empty
 
 COLVARS_LIB = libcolvars.a
 COLVARS_OBJ_DIR =
 
 CXX =		g++
 CXXFLAGS =	-O2 -g -Wall -fPIC -funroll-loops
 AR =		ar
 ARFLAGS =	-rscv
 SHELL =		/bin/sh
 
-include Makefile.common
-
 .PHONY: default clean
 
 default: $(COLVARS_LIB) Makefile.lammps
 
+include Makefile.common
+
 clean:
 	-rm -f $(COLVARS_OBJS) $(COLVARS_LIB)
 
 Makefile.lammps:
 	-cp $(EXTRAMAKE) Makefile.lammps
 
diff --git a/lib/colvars/Makefile.mingw32-cross b/lib/colvars/Makefile.mingw32-cross
index e2873ecda..29c64b26a 100644
--- a/lib/colvars/Makefile.mingw32-cross
+++ b/lib/colvars/Makefile.mingw32-cross
@@ -1,31 +1,31 @@
 # -*- makefile -*- to build Colvars module with MinGW 32-bit
 
 EXTRAMAKE = Makefile.lammps.empty
 
 COLVARS_LIB = libcolvars.a
 COLVARS_OBJ_DIR = Obj_mingw64/
 
 CXX =		i686-w64-mingw32-g++
 CXXFLAGS =	-O2 -march=i686 -mtune=generic -mfpmath=387 -mpc64	\
 		-fno-rtti -fno-exceptions -finline-functions		\
                 -ffast-math -funroll-loops -fstrict-aliasing		\
                 -Wall -W -Wno-uninitialized
 AR =		i686-w64-mingw32-ar
 ARFLAGS =	-rscv
 SHELL =		/bin/sh
 
-include Makefile.common
-
 .PHONY: default clean
 
 default: $(COLVARS_OBJ_DIR) $(COLVARS_LIB) Makefile.lammps
 
+include Makefile.common
+
 $(COLVARS_OBJ_DIR):
 	mkdir $(COLVARS_OBJ_DIR)
 
 clean:
 	-rm -f $(COLVARS_OBJS) $(COLVARS_LIB)
 	-rmdir $(COLVARS_OBJ_DIR)
 
 Makefile.lammps:
 	-cp $(EXTRAMAKE) Makefile.lammps
diff --git a/lib/colvars/Makefile.mingw64-cross b/lib/colvars/Makefile.mingw64-cross
index 09d6bd4fa..2fd1c6fc6 100644
--- a/lib/colvars/Makefile.mingw64-cross
+++ b/lib/colvars/Makefile.mingw64-cross
@@ -1,31 +1,31 @@
 # -*- makefile -*- to build Colvars module with MinGW 32-bit
 
 EXTRAMAKE = Makefile.lammps.empty
 
 COLVARS_LIB = libcolvars.a
 COLVARS_OBJ_DIR = Obj_mingw32/
 
 CXX =		x86_64-w64-mingw32-g++
 CXXFLAGS =	-O2 -march=core2 -mtune=core2 -mpc64 -msse2		\
 		-fno-rtti -fno-exceptions -finline-functions		\
                 -ffast-math -funroll-loops -fstrict-aliasing		\
                 -Wall -W -Wno-uninitialized
 AR =		x86_64-w64-mingw32-ar
 ARFLAGS =	-rscv
 SHELL =		/bin/sh
 
-include Makefile.common
-
 .PHONY: default clean
 
 default: $(COLVARS_OBJ_DIR) $(COLVARS_LIB) Makefile.lammps
 
+include Makefile.common
+
 $(COLVARS_OBJ_DIR):
 	mkdir $(COLVARS_OBJ_DIR)
 
 clean:
 	-rm -f $(COLVARS_OBJS) $(COLVARS_LIB)
 	-rmdir $(COLVARS_OBJ_DIR)
 
 Makefile.lammps:
 	-cp $(EXTRAMAKE) Makefile.lammps