1 files changed, 16 insertions, 8 deletions
diff --git a/src/server.ui.h b/src/server.ui.h
index 4ef573e..9f83877 100644
--- a/src/server.ui.h
+++ b/src/server.ui.h
@@ -18,21 +18,29 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
-#include "tork.h"
-#include "torkconfig.h"
-#include "upnpmanager.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <tqtooltip.h>
+#include <tqpopupmenu.h>
+
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <ntqtooltip.h>
-#include <ntqpopupmenu.h>
 #include <kiconloader.h>
 
-#ifndef EXTERNAL_GEOIP
-# include "GeoIP-1.4.0/libGeoIP/GeoIP.h"
-#else
+#ifdef EXTERNAL_GEOIP
 # include <GeoIP.h>
+#else
+# include "GeoIP-1.4.0/libGeoIP/GeoIP.h"
 #endif
 
+#include "tork.h"
+#include "torkconfig.h"
+#include "upnpmanager.h"
+
+
 using namespace bt;
 using namespace kt;