diff --git a/kalzium/configure.in.in b/kalzium/configure.in.in
index 24a74adc..9d44e5dd 100644
--- a/kalzium/configure.in.in
+++ b/kalzium/configure.in.in
@@ -45,11 +45,14 @@ if test "x$with_ocamlsolver" != xno; then
 
   EQCHEM_SUB=
   OCAMLLIB=
+  OCAMLLIB_FLAGS=
   EQCHEM_LDADD=
   if test "$eqchem_enabled" = "yes"; then
     EQCHEM_SUB=solver
     OCAMLLIB=`ocamlc -where`
+    OCAMLLIB_FLAGS=-L$(OCAMLLIB)
     FACILELIB=`ocamlc -where`/facile
+    FACILELIB_FLAGS=-L$(FACILELIB)
     EQCHEM_LDADD="-lasmrun -lnums -lm -ldl solver.o modwrap.o"
 
     AC_DEFINE(HAVE_FACILE, 1)
@@ -58,6 +61,8 @@ if test "x$with_ocamlsolver" != xno; then
   AC_SUBST(EQCHEM_SUB)
   AC_SUBST(OCAMLLIB)
   AC_SUBST(FACILELIB)
+  AC_SUBST(OCAMLLIB_FLAGS)
+  AC_SUBST(FACILELIB_FLAGS)
   AC_SUBST(EQCHEM_LDADD)
 
   if test "$eqchem_enabled" = "yes"; then
diff --git a/kalzium/src/Makefile.am b/kalzium/src/Makefile.am
index 22c28ff0..ba759011 100644
--- a/kalzium/src/Makefile.am
+++ b/kalzium/src/Makefile.am
@@ -35,7 +35,7 @@ kalzium_SOURCES = eqresult.cpp eqchemview.cpp kalzium.cpp \
 			moleculeparser.cpp \
 			tempunit.cpp
 
-kalzium_LDADD   = ../../libkdeedu/kdeeduplot/libkdeeduplot.la ../../libkdeedu/kdeeduui/libkdeeduui.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) -L$(OCAMLLIB) -L$(FACILELIB) $(EQCHEM_LDADD)
+kalzium_LDADD   = ../../libkdeedu/kdeeduplot/libkdeeduplot.la ../../libkdeedu/kdeeduui/libkdeeduui.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) $(OCAMLLIB_FLAGS) $(FACILELIB_FLAGS) $(EQCHEM_LDADD)
 KDE_CXXFLAGS    = -D_ISOC99_SOURCE
 
 SUBDIRS = icons elementpics data $(EQCHEM_SUB)
diff --git a/libkdeedu/extdate/extdatetimeedit.h b/libkdeedu/extdate/extdatetimeedit.h
index 1e82fe92..4a2aaa16 100644
--- a/libkdeedu/extdate/extdatetimeedit.h
+++ b/libkdeedu/extdate/extdatetimeedit.h
@@ -25,10 +25,9 @@
 #ifndef EXTDATETIMEEDIT_H
 #define EXTDATETIMEEDIT_H
 
-#ifndef TQT_H
 #include <tqwidget.h>
 #include <tqstring.h>
-#endif // TQT_H
+#include <tqrangecontrol.h>
 
 #include "extdatetime.h"