From afd698aa6058379c021ff7062465eee7da714101 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 27 Apr 2020 22:18:38 +0900
Subject: Rearrangement of libtdegames highscore headers.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 kasteroids/CMakeLists.txt               | 1 -
 kasteroids/Makefile.am                  | 2 +-
 kasteroids/toplevel.cpp                 | 2 +-
 katomic/CMakeLists.txt                  | 1 -
 katomic/Makefile.am                     | 2 +-
 katomic/feld.h                          | 2 +-
 katomic/gamewidget.cpp                  | 2 +-
 kbattleship/kbattleship/CMakeLists.txt  | 1 -
 kbattleship/kbattleship/Makefile.am     | 2 +-
 kbattleship/kbattleship/kbattleship.cpp | 2 +-
 kbounce/CMakeLists.txt                  | 1 -
 kbounce/Makefile.am                     | 2 +-
 kbounce/highscores.h                    | 2 +-
 kbounce/kbounce.cpp                     | 4 ++--
 kbounce/main.cpp                        | 2 +-
 kfouleggs/CMakeLists.txt                | 1 -
 kfouleggs/Makefile.am                   | 2 +-
 kfouleggs/main.cpp                      | 2 +-
 klickety/CMakeLists.txt                 | 1 -
 klickety/Makefile.am                    | 2 +-
 klickety/main.cpp                       | 2 +-
 klines/CMakeLists.txt                   | 1 -
 klines/Makefile.am                      | 2 +-
 klines/klines.cpp                       | 2 +-
 kmines/CMakeLists.txt                   | 1 -
 kmines/Makefile.am                      | 2 +-
 kmines/dialogs.h                        | 2 +-
 kmines/highscores.h                     | 2 +-
 kmines/main.cpp                         | 2 +-
 kmines/status.cpp                       | 2 +-
 knetwalk/src/CMakeLists.txt             | 1 -
 knetwalk/src/Makefile.am                | 2 +-
 knetwalk/src/highscores.h               | 2 +-
 knetwalk/src/main.cpp                   | 2 +-
 knetwalk/src/mainwindow.cpp             | 6 +++---
 kolf/CMakeLists.txt                     | 1 -
 kolf/Makefile.am                        | 2 +-
 kolf/kolf.cpp                           | 2 +-
 kolf/newgame.cpp                        | 2 +-
 kreversi/CMakeLists.txt                 | 1 -
 kreversi/Makefile.am                    | 2 +-
 kreversi/board.cpp                      | 2 +-
 kreversi/highscores.h                   | 2 +-
 kreversi/kreversi.cpp                   | 2 +-
 kreversi/main.cpp                       | 2 +-
 kreversi/qreversigameview.cpp           | 2 +-
 ksame/CMakeLists.txt                    | 1 -
 ksame/KSameWidget.cpp                   | 2 +-
 ksame/Makefile.am                       | 2 +-
 kshisen/CMakeLists.txt                  | 1 -
 kshisen/Makefile.am                     | 2 +-
 kshisen/app.cpp                         | 2 +-
 ksirtet/ksirtet/CMakeLists.txt          | 1 -
 ksirtet/ksirtet/Makefile.am             | 2 +-
 ksirtet/ksirtet/main.cpp                | 2 +-
 ksmiletris/CMakeLists.txt               | 1 -
 ksmiletris/Makefile.am                  | 2 +-
 ksmiletris/gamewindow.cpp               | 2 +-
 ksnake/CMakeLists.txt                   | 1 -
 ksnake/Makefile.am                      | 2 +-
 ksnake/game.cpp                         | 2 +-
 libksirtet/base/CMakeLists.txt          | 1 -
 libksirtet/base/Makefile.am             | 2 +-
 libksirtet/base/field.h                 | 2 +-
 libksirtet/base/highscores.h            | 2 +-
 libksirtet/base/inter.cpp               | 2 +-
 libksirtet/base/main.cpp                | 2 +-
 libksirtet/common/CMakeLists.txt        | 1 -
 libksirtet/common/Makefile.am           | 2 +-
 libksirtet/common/inter.h               | 2 +-
 70 files changed, 55 insertions(+), 73 deletions(-)

diff --git a/kasteroids/CMakeLists.txt b/kasteroids/CMakeLists.txt
index ecdbdbb5..b28f564d 100644
--- a/kasteroids/CMakeLists.txt
+++ b/kasteroids/CMakeLists.txt
@@ -8,7 +8,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/kasteroids/Makefile.am b/kasteroids/Makefile.am
index e8b441ff..dc7a8492 100644
--- a/kasteroids/Makefile.am
+++ b/kasteroids/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = . sprites sounds
 
-INCLUDES = -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore $(all_includes)
+INCLUDES = -I$(top_srcdir)/libtdegames $(all_includes)
 METASOURCES = AUTO
 
 bin_PROGRAMS = kasteroids
diff --git a/kasteroids/toplevel.cpp b/kasteroids/toplevel.cpp
index 6947365a..303219d7 100644
--- a/kasteroids/toplevel.cpp
+++ b/kasteroids/toplevel.cpp
@@ -20,7 +20,7 @@
 #include <tdeaction.h>
 #include <kstdgameaction.h>
 #include <kaudioplayer.h>
-#include <kscoredialog.h>
+#include <highscore/kscoredialog.h>
 #include <tdeconfigdialog.h>
 
 #include "settings.h"
diff --git a/katomic/CMakeLists.txt b/katomic/CMakeLists.txt
index 61988b67..a69ceb98 100644
--- a/katomic/CMakeLists.txt
+++ b/katomic/CMakeLists.txt
@@ -14,7 +14,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/katomic/Makefile.am b/katomic/Makefile.am
index af8735e7..866b54c7 100644
--- a/katomic/Makefile.am
+++ b/katomic/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore $(all_includes)
+INCLUDES = -I$(top_srcdir)/libtdegames $(all_includes)
 katomic_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 katomic_LDADD = $(LIB_TDEGAMES)
 katomic_DEPENDENCIES = $(LIB_TDEGAMES_DEP)
diff --git a/katomic/feld.h b/katomic/feld.h
index cf9dae3e..715aea52 100644
--- a/katomic/feld.h
+++ b/katomic/feld.h
@@ -16,7 +16,7 @@
 #include <tqpixmap.h>
 #include <tqmessagebox.h>
 
-#include <kscoredialog.h>
+#include <highscore/kscoredialog.h>
 
 #include "atom.h"
 
diff --git a/katomic/gamewidget.cpp b/katomic/gamewidget.cpp
index 4886cb41..9d0ddf1a 100644
--- a/katomic/gamewidget.cpp
+++ b/katomic/gamewidget.cpp
@@ -30,7 +30,7 @@
 #include <tqlabel.h>
 
 #include <tdeapplication.h>
-#include <kscoredialog.h>
+#include <highscore/kscoredialog.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 #include <kstandarddirs.h>
diff --git a/kbattleship/kbattleship/CMakeLists.txt b/kbattleship/kbattleship/CMakeLists.txt
index 5e140a16..327db4a5 100644
--- a/kbattleship/kbattleship/CMakeLists.txt
+++ b/kbattleship/kbattleship/CMakeLists.txt
@@ -18,7 +18,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/kbattleship/kbattleship/Makefile.am b/kbattleship/kbattleship/Makefile.am
index 3f4cddf4..b699ef21 100644
--- a/kbattleship/kbattleship/Makefile.am
+++ b/kbattleship/kbattleship/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS	= dialogs . pictures sounds
 
-INCLUDES = -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore $(all_includes)
+INCLUDES = -I$(top_srcdir)/libtdegames $(all_includes)
 METASOURCES = AUTO
 
 bin_PROGRAMS = kbattleship
diff --git a/kbattleship/kbattleship/kbattleship.cpp b/kbattleship/kbattleship/kbattleship.cpp
index 144af63a..a241696e 100644
--- a/kbattleship/kbattleship/kbattleship.cpp
+++ b/kbattleship/kbattleship/kbattleship.cpp
@@ -29,7 +29,7 @@
 #include <tdemessagebox.h>
 #include <kuser.h>
 
-#include <kscoredialog.h>
+#include <highscore/kscoredialog.h>
 
 
 #include "kbattleship.moc"
diff --git a/kbounce/CMakeLists.txt b/kbounce/CMakeLists.txt
index da633954..34f96dff 100644
--- a/kbounce/CMakeLists.txt
+++ b/kbounce/CMakeLists.txt
@@ -17,7 +17,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/kbounce/Makefile.am b/kbounce/Makefile.am
index c4994831..27ab105a 100644
--- a/kbounce/Makefile.am
+++ b/kbounce/Makefile.am
@@ -6,7 +6,7 @@ endif
 
 SUBDIRS = pics sounds
 
-INCLUDES = -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore $(all_includes)
+INCLUDES = -I$(top_srcdir)/libtdegames $(all_includes)
 METASOURCES = AUTO
 KDE_CXXFLAGS = $(KDE_USE_FPIE)
 
diff --git a/kbounce/highscores.h b/kbounce/highscores.h
index 59372ed6..63844e51 100644
--- a/kbounce/highscores.h
+++ b/kbounce/highscores.h
@@ -1,7 +1,7 @@
 #ifndef HIGHSCORES_H
 #define HIGHSCORES_H
 
-#include <kexthighscore.h>
+#include <highscore/kexthighscore.h>
 
 using namespace KExtHighscore;
 
diff --git a/kbounce/kbounce.cpp b/kbounce/kbounce.cpp
index 11bd64fa..9fcb3c63 100644
--- a/kbounce/kbounce.cpp
+++ b/kbounce/kbounce.cpp
@@ -27,8 +27,8 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kstatusbar.h>
-#include <khighscore.h>
-#include <kexthighscore.h>
+#include <highscore/khighscore.h>
+#include <highscore/kexthighscore.h>
 
 #include "kbounce.h"
 #include "game.h"
diff --git a/kbounce/main.cpp b/kbounce/main.cpp
index e3243c56..e4d4b7d3 100644
--- a/kbounce/main.cpp
+++ b/kbounce/main.cpp
@@ -28,7 +28,7 @@
 
 #include "kbounce.h"
 
-#include <khighscore.h>
+#include <highscore/khighscore.h>
 #include <highscores.h>
 
 using namespace std;
diff --git a/kfouleggs/CMakeLists.txt b/kfouleggs/CMakeLists.txt
index a295f934..ae0b2f69 100644
--- a/kfouleggs/CMakeLists.txt
+++ b/kfouleggs/CMakeLists.txt
@@ -19,7 +19,6 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/libksirtet
   ${CMAKE_SOURCE_DIR}/libksirtet/base
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/kfouleggs/Makefile.am b/kfouleggs/Makefile.am
index 967e01bd..c126c0dd 100644
--- a/kfouleggs/Makefile.am
+++ b/kfouleggs/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir)/libksirtet -I$(top_srcdir)/libksirtet -I$(top_srcdir)/libksirtet/base -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore $(all_includes)
+INCLUDES = -I$(top_builddir)/libksirtet -I$(top_srcdir)/libksirtet -I$(top_srcdir)/libksirtet/base -I$(top_srcdir)/libtdegames $(all_includes)
 
 SUBDIRS = pics
 
diff --git a/kfouleggs/main.cpp b/kfouleggs/main.cpp
index efc27d6c..884837d6 100644
--- a/kfouleggs/main.cpp
+++ b/kfouleggs/main.cpp
@@ -3,7 +3,7 @@
 
 #include <tdelocale.h>
 #include <tdeapplication.h>
-#include <khighscore.h>
+#include <highscore/khighscore.h>
 
 #include "common/inter.h"
 #include "common/highscores.h"
diff --git a/klickety/CMakeLists.txt b/klickety/CMakeLists.txt
index 9254ba11..17c31891 100644
--- a/klickety/CMakeLists.txt
+++ b/klickety/CMakeLists.txt
@@ -16,7 +16,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libksirtet
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore
   ${CMAKE_SOURCE_DIR}/libtdegames
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
diff --git a/klickety/Makefile.am b/klickety/Makefile.am
index 43422577..92465dfc 100644
--- a/klickety/Makefile.am
+++ b/klickety/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = pics
 
-INCLUDES = -I$(top_builddir)/libksirtet -I$(top_srcdir)/libksirtet -I$(top_srcdir)/libtdegames/highscore -I$(top_srcdir)/libtdegames $(all_includes)
+INCLUDES = -I$(top_builddir)/libksirtet -I$(top_srcdir)/libksirtet -I$(top_srcdir)/libtdegames $(all_includes)
 
 KDE_CXXFLAGS = $(KDE_USE_FPIE)
 
diff --git a/klickety/main.cpp b/klickety/main.cpp
index c4879ec7..03aa22fd 100644
--- a/klickety/main.cpp
+++ b/klickety/main.cpp
@@ -3,7 +3,7 @@
 
 #include <tdelocale.h>
 #include <tdeapplication.h>
-#include <khighscore.h>
+#include <highscore/khighscore.h>
 #include <tdeaboutdata.h>
 
 #include "base/settings.h"
diff --git a/klines/CMakeLists.txt b/klines/CMakeLists.txt
index 26371364..ab7e01ba 100644
--- a/klines/CMakeLists.txt
+++ b/klines/CMakeLists.txt
@@ -5,7 +5,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/klines/Makefile.am b/klines/Makefile.am
index d8114839..84434d51 100644
--- a/klines/Makefile.am
+++ b/klines/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES= -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore $(all_includes)
+INCLUDES= -I$(top_srcdir)/libtdegames $(all_includes)
 METASOURCES = AUTO
 
 bin_PROGRAMS = klines
diff --git a/klines/klines.cpp b/klines/klines.cpp
index 7e258562..1459937d 100644
--- a/klines/klines.cpp
+++ b/klines/klines.cpp
@@ -37,7 +37,7 @@
 #include <tdeconfig.h>
 #include <tdemenubar.h>
 #include <tdepopupmenu.h>
-#include <kscoredialog.h>
+#include <highscore/kscoredialog.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
diff --git a/kmines/CMakeLists.txt b/kmines/CMakeLists.txt
index 450004ce..9b5a7aaf 100644
--- a/kmines/CMakeLists.txt
+++ b/kmines/CMakeLists.txt
@@ -18,7 +18,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/kmines/Makefile.am b/kmines/Makefile.am
index 260c9f46..f63617a1 100644
--- a/kmines/Makefile.am
+++ b/kmines/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS  = data bitmaps solver
-INCLUDES = -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore $(all_includes)
+INCLUDES = -I$(top_srcdir)/libtdegames $(all_includes)
 
 KDE_CXXFLAGS = $(KDE_USE_FPIE)
     
diff --git a/kmines/dialogs.h b/kmines/dialogs.h
index ed7744e0..d8bd94fa 100644
--- a/kmines/dialogs.h
+++ b/kmines/dialogs.h
@@ -22,7 +22,7 @@
 #include <tqpushbutton.h>
 
 #include <kgamelcd.h>
-#include <kexthighscore.h>
+#include <highscore/kexthighscore.h>
 
 #include "defines.h"
 #include "settings.h"
diff --git a/kmines/highscores.h b/kmines/highscores.h
index 5de69535..a79ae1b8 100644
--- a/kmines/highscores.h
+++ b/kmines/highscores.h
@@ -19,7 +19,7 @@
 #ifndef HIGHSCORES_H
 #define HIGHSCORES_H
 
-#include <kexthighscore.h>
+#include <highscore/kexthighscore.h>
 #include <kdemacros.h>
 
 namespace KExtHighscore
diff --git a/kmines/main.cpp b/kmines/main.cpp
index 2ff678b8..fe39f052 100644
--- a/kmines/main.cpp
+++ b/kmines/main.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
-#include <khighscore.h>
+#include <highscore/khighscore.h>
 #include <tdeconfigdialog.h>
 
 #include "settings.h"
diff --git a/kmines/status.cpp b/kmines/status.cpp
index 69f568cd..1ed3f5d5 100644
--- a/kmines/status.cpp
+++ b/kmines/status.cpp
@@ -37,7 +37,7 @@
 #include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <knotifyclient.h>
-#include <kexthighscore.h>
+#include <highscore/kexthighscore.h>
 
 #include "settings.h"
 #include "solver/solver.h"
diff --git a/knetwalk/src/CMakeLists.txt b/knetwalk/src/CMakeLists.txt
index 04e10d51..273e3cf6 100644
--- a/knetwalk/src/CMakeLists.txt
+++ b/knetwalk/src/CMakeLists.txt
@@ -8,7 +8,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/knetwalk/src/Makefile.am b/knetwalk/src/Makefile.am
index 25c87580..b2094f5b 100644
--- a/knetwalk/src/Makefile.am
+++ b/knetwalk/src/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS  = pics sounds
 
-INCLUDES = -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore $(all_includes)
+INCLUDES = -I$(top_srcdir)/libtdegames $(all_includes)
 
 
 bin_PROGRAMS       = knetwalk
diff --git a/knetwalk/src/highscores.h b/knetwalk/src/highscores.h
index 67ff21ae..0a5d30ac 100644
--- a/knetwalk/src/highscores.h
+++ b/knetwalk/src/highscores.h
@@ -15,7 +15,7 @@
 #ifndef HIGHSCORES_H
 #define HIGHSCORES_H
 
-#include <kexthighscore.h>
+#include <highscore/kexthighscore.h>
 #include <kdemacros.h>
 
 namespace KExtHighscore
diff --git a/knetwalk/src/main.cpp b/knetwalk/src/main.cpp
index b3c4110a..15d130c6 100644
--- a/knetwalk/src/main.cpp
+++ b/knetwalk/src/main.cpp
@@ -17,7 +17,7 @@
 #include <tdecmdlineargs.h>
 #include <tdelocale.h>
 #include <kdebug.h>
-#include <khighscore.h>
+#include <highscore/khighscore.h>
 
 #include "highscores.h"
 #include "settings.h"
diff --git a/knetwalk/src/mainwindow.cpp b/knetwalk/src/mainwindow.cpp
index a831c96f..13007ea6 100644
--- a/knetwalk/src/mainwindow.cpp
+++ b/knetwalk/src/mainwindow.cpp
@@ -34,8 +34,8 @@
 #include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kscoredialog.h>
-#include <khighscore.h>
+#include <highscore/kscoredialog.h>
+#include <highscore/khighscore.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <kstdgameaction.h>
@@ -44,7 +44,7 @@
 #include <kdebug.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
-#include <kexthighscore.h>
+#include <highscore/kexthighscore.h>
 
 #include "settings.h"
 #include "cell.h"
diff --git a/kolf/CMakeLists.txt b/kolf/CMakeLists.txt
index 5d45f9f5..bd358814 100644
--- a/kolf/CMakeLists.txt
+++ b/kolf/CMakeLists.txt
@@ -20,7 +20,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/kolf/Makefile.am b/kolf/Makefile.am
index 162f2350..c8888ff0 100644
--- a/kolf/Makefile.am
+++ b/kolf/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = objects sounds courses pics graphics
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libtdegames $(all_includes)
 
 bin_PROGRAMS =
 lib_LTLIBRARIES = libkolf.la
diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp
index 17647bd4..a68a1c9e 100644
--- a/kolf/kolf.cpp
+++ b/kolf/kolf.cpp
@@ -11,7 +11,7 @@
 #include <kmimetype.h>
 #include <tdemessagebox.h>
 #include <kprinter.h>
-#include <kscoredialog.h>
+#include <highscore/kscoredialog.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <tdestdaccel.h>
diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp
index 45eb4b1a..1754cf1b 100644
--- a/kolf/newgame.cpp
+++ b/kolf/newgame.cpp
@@ -4,7 +4,7 @@
 #include <kdialogbase.h>
 #include <tdemessagebox.h>
 #include <tdeglobal.h>
-#include <kscoredialog.h>
+#include <highscore/kscoredialog.h>
 #include <kstandarddirs.h>
 #include <kseparator.h>
 #include <klineedit.h>
diff --git a/kreversi/CMakeLists.txt b/kreversi/CMakeLists.txt
index 4a7a4193..db40a2e1 100644
--- a/kreversi/CMakeLists.txt
+++ b/kreversi/CMakeLists.txt
@@ -9,7 +9,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/kreversi/Makefile.am b/kreversi/Makefile.am
index 446ac5c4..7a4f5f92 100644
--- a/kreversi/Makefile.am
+++ b/kreversi/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore $(all_includes)
+INCLUDES = -I$(top_srcdir)/libtdegames $(all_includes)
 
 bin_PROGRAMS = kreversi
 
diff --git a/kreversi/board.cpp b/kreversi/board.cpp
index 6112c116..1b24a85c 100644
--- a/kreversi/board.cpp
+++ b/kreversi/board.cpp
@@ -46,7 +46,7 @@
 #include <tdeconfig.h>
 #include <knotifyclient.h>
 #include <tdelocale.h>
-#include <kexthighscore.h>
+#include <highscore/kexthighscore.h>
 #include <kdebug.h>
 
 #include "board.h"
diff --git a/kreversi/highscores.h b/kreversi/highscores.h
index 3eda6482..a96e6a27 100644
--- a/kreversi/highscores.h
+++ b/kreversi/highscores.h
@@ -21,7 +21,7 @@
 #define HIGHSCORES_H
 
 
-#include <kexthighscore.h>
+#include <highscore/kexthighscore.h>
 #include <kdemacros.h>
 #include "SuperEngine.h"
 
diff --git a/kreversi/kreversi.cpp b/kreversi/kreversi.cpp
index 0d73ba0f..3c1d8c1a 100644
--- a/kreversi/kreversi.cpp
+++ b/kreversi/kreversi.cpp
@@ -56,7 +56,7 @@
 #include <tdeconfigdialog.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
-#include <kexthighscore.h>
+#include <highscore/kexthighscore.h>
 
 #include "Score.h"
 #include "kreversi.h"
diff --git a/kreversi/main.cpp b/kreversi/main.cpp
index d6655827..41bb793b 100644
--- a/kreversi/main.cpp
+++ b/kreversi/main.cpp
@@ -41,7 +41,7 @@
 #include <kimageio.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <khighscore.h>
+#include <highscore/khighscore.h>
 
 #include "version.h"
 #include "kreversi.h"
diff --git a/kreversi/qreversigameview.cpp b/kreversi/qreversigameview.cpp
index cc88e1e7..75210a66 100644
--- a/kreversi/qreversigameview.cpp
+++ b/kreversi/qreversigameview.cpp
@@ -55,7 +55,7 @@
 #include <tdeconfig.h>
 #include <knotifyclient.h>
 #include <tdelocale.h>
-#include <kexthighscore.h>
+#include <highscore/kexthighscore.h>
 #include <kdebug.h>
 
 #include "board.h"
diff --git a/ksame/CMakeLists.txt b/ksame/CMakeLists.txt
index 647eaffc..1f81e2b4 100644
--- a/ksame/CMakeLists.txt
+++ b/ksame/CMakeLists.txt
@@ -5,7 +5,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/ksame/KSameWidget.cpp b/ksame/KSameWidget.cpp
index ae19c62f..01736827 100644
--- a/ksame/KSameWidget.cpp
+++ b/ksame/KSameWidget.cpp
@@ -27,7 +27,7 @@
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
-#include <kscoredialog.h>
+#include <highscore/kscoredialog.h>
 #include <kstatusbar.h>
 #include <knuminput.h>
 #include <tdelocale.h>
diff --git a/ksame/Makefile.am b/ksame/Makefile.am
index 32fa0ef1..b74ad7b3 100644
--- a/ksame/Makefile.am
+++ b/ksame/Makefile.am
@@ -1,6 +1,6 @@
 
 bin_PROGRAMS = ksame
-INCLUDES = -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore $(all_includes)
+INCLUDES = -I$(top_srcdir)/libtdegames $(all_includes)
 
 ksame_SOURCES= main.cpp StoneField.cpp StoneWidget.cpp KSameWidget.cpp
 ksame_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
diff --git a/kshisen/CMakeLists.txt b/kshisen/CMakeLists.txt
index 6562d565..da63cb64 100644
--- a/kshisen/CMakeLists.txt
+++ b/kshisen/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/kshisen/Makefile.am b/kshisen/Makefile.am
index e84bcaa0..6d0d8b02 100644
--- a/kshisen/Makefile.am
+++ b/kshisen/Makefile.am
@@ -1,6 +1,6 @@
 
 
-INCLUDES = -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore $(all_includes)
+INCLUDES = -I$(top_srcdir)/libtdegames $(all_includes)
 
 PICDIR = $(kde_datadir)/kshisen/pics
 
diff --git a/kshisen/app.cpp b/kshisen/app.cpp
index e8efa33a..ccecaf6e 100644
--- a/kshisen/app.cpp
+++ b/kshisen/app.cpp
@@ -42,7 +42,7 @@
 #include <tdeconfig.h>
 #include <tdeaction.h>
 #include <kstdgameaction.h>
-#include <khighscore.h>
+#include <highscore/khighscore.h>
 #include <kdebug.h>
 #include <kkeydialog.h>
 #include <tdepopupmenu.h>
diff --git a/ksirtet/ksirtet/CMakeLists.txt b/ksirtet/ksirtet/CMakeLists.txt
index ecf44240..b5fdf717 100644
--- a/ksirtet/ksirtet/CMakeLists.txt
+++ b/ksirtet/ksirtet/CMakeLists.txt
@@ -17,7 +17,6 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/libksirtet
   ${CMAKE_SOURCE_DIR}/libksirtet/base
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/ksirtet/ksirtet/Makefile.am b/ksirtet/ksirtet/Makefile.am
index 36ada1e5..f0a61588 100644
--- a/ksirtet/ksirtet/Makefile.am
+++ b/ksirtet/ksirtet/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir)/libksirtet -I$(top_srcdir)/libksirtet -I$(top_srcdir)/libksirtet/base -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore $(all_includes)
+INCLUDES = -I$(top_builddir)/libksirtet -I$(top_srcdir)/libksirtet -I$(top_srcdir)/libksirtet/base -I$(top_srcdir)/libtdegames $(all_includes)
 
 KDE_CXXFLAGS = $(KDE_USE_FPIE)
 
diff --git a/ksirtet/ksirtet/main.cpp b/ksirtet/ksirtet/main.cpp
index 30879777..c586c096 100644
--- a/ksirtet/ksirtet/main.cpp
+++ b/ksirtet/ksirtet/main.cpp
@@ -3,7 +3,7 @@
 
 #include <tdelocale.h>
 #include <tdeapplication.h>
-#include <khighscore.h>
+#include <highscore/khighscore.h>
 
 #include "common/inter.h"
 #include "common/highscores.h"
diff --git a/ksmiletris/CMakeLists.txt b/ksmiletris/CMakeLists.txt
index c9f6779d..c3fed300 100644
--- a/ksmiletris/CMakeLists.txt
+++ b/ksmiletris/CMakeLists.txt
@@ -8,7 +8,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/ksmiletris/Makefile.am b/ksmiletris/Makefile.am
index 9fd27d3e..a27900d1 100644
--- a/ksmiletris/Makefile.am
+++ b/ksmiletris/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS= data wav
 
-INCLUDES = -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore $(all_includes)
+INCLUDES = -I$(top_srcdir)/libtdegames $(all_includes)
 METASOURCES = AUTO
 
 bin_PROGRAMS = ksmiletris
diff --git a/ksmiletris/gamewindow.cpp b/ksmiletris/gamewindow.cpp
index ff820058..5337868f 100644
--- a/ksmiletris/gamewindow.cpp
+++ b/ksmiletris/gamewindow.cpp
@@ -32,7 +32,7 @@ this software.
 #include "ksmiletris.h"
 #include "gamewindow.h"
 #include "gamewidget.h"
-#include "kscoredialog.h"
+#include "highscore/kscoredialog.h"
 
 #include <tdeaction.h>
 #include <kstdgameaction.h>
diff --git a/ksnake/CMakeLists.txt b/ksnake/CMakeLists.txt
index c47fbd3e..ada0dac8 100644
--- a/ksnake/CMakeLists.txt
+++ b/ksnake/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore/
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/ksnake/Makefile.am b/ksnake/Makefile.am
index 7b19cd49..84fe480d 100644
--- a/ksnake/Makefile.am
+++ b/ksnake/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore/ $(all_includes)
+INCLUDES = -I$(top_srcdir)/libtdegames $(all_includes)
 
 noinst_HEADERS = game.h rattler.h board.h bitmaps.h \
 		level.h ball.h snake.h basket.h startroom.h \
diff --git a/ksnake/game.cpp b/ksnake/game.cpp
index 8008b9ee..0641b7d3 100644
--- a/ksnake/game.cpp
+++ b/ksnake/game.cpp
@@ -37,7 +37,7 @@
 #include <tdeconfigdialog.h>
 
 #include <kstdgameaction.h>
-#include <kscoredialog.h>
+#include <highscore/kscoredialog.h>
 #include <kstatusbar.h>
 #include <tdemenubar.h>
 
diff --git a/libksirtet/base/CMakeLists.txt b/libksirtet/base/CMakeLists.txt
index 52546bc7..38acbd88 100644
--- a/libksirtet/base/CMakeLists.txt
+++ b/libksirtet/base/CMakeLists.txt
@@ -5,7 +5,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libtdegames
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/libksirtet/base/Makefile.am b/libksirtet/base/Makefile.am
index b7f2877b..ae19bdcc 100644
--- a/libksirtet/base/Makefile.am
+++ b/libksirtet/base/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/libtdegames -I$(top_srcdir)/libtdegames/highscore $(all_includes)
+INCLUDES = -I$(top_srcdir)/libtdegames $(all_includes)
 
 # Don't compile with hidden symbols since we are a library.
 if disable_VISIBILITY
diff --git a/libksirtet/base/field.h b/libksirtet/base/field.h
index e30e0bdd..217eea5b 100644
--- a/libksirtet/base/field.h
+++ b/libksirtet/base/field.h
@@ -1,7 +1,7 @@
 #ifndef BASE_FIELD_H
 #define BASE_FIELD_H
 
-#include <kexthighscore.h>
+#include <highscore/kexthighscore.h>
 
 #include <kdemacros.h>
 
diff --git a/libksirtet/base/highscores.h b/libksirtet/base/highscores.h
index b3e7b99e..0ed91c54 100644
--- a/libksirtet/base/highscores.h
+++ b/libksirtet/base/highscores.h
@@ -1,7 +1,7 @@
 #ifndef BASE_HIGHSCORES_H
 #define BASE_HIGHSCORES_H
 
-#include <kexthighscore.h>
+#include <highscore/kexthighscore.h>
 #include <kdemacros.h>
 
 class KDE_EXPORT BaseHighscores : public KExtHighscore::Manager
diff --git a/libksirtet/base/inter.cpp b/libksirtet/base/inter.cpp
index 658e7c47..7f832b29 100644
--- a/libksirtet/base/inter.cpp
+++ b/libksirtet/base/inter.cpp
@@ -1,6 +1,6 @@
 #include "inter.h"
 
-#include <kexthighscore.h>
+#include <highscore/kexthighscore.h>
 
 
 void BaseInterface::showHighscores(TQWidget *parent)
diff --git a/libksirtet/base/main.cpp b/libksirtet/base/main.cpp
index 8f5479f1..e9f576f1 100644
--- a/libksirtet/base/main.cpp
+++ b/libksirtet/base/main.cpp
@@ -10,7 +10,7 @@
 #include <tdelocale.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
-#include <kexthighscore.h>
+#include <highscore/kexthighscore.h>
 #include <tdeconfigdialog.h>
 
 #include "inter.h"
diff --git a/libksirtet/common/CMakeLists.txt b/libksirtet/common/CMakeLists.txt
index a094ea8b..b2b5f7a5 100644
--- a/libksirtet/common/CMakeLists.txt
+++ b/libksirtet/common/CMakeLists.txt
@@ -16,7 +16,6 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libksirtet
   ${CMAKE_SOURCE_DIR}/libksirtet/base
-  ${CMAKE_SOURCE_DIR}/libtdegames/highscore
   ${CMAKE_SOURCE_DIR}/libtdegames
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
diff --git a/libksirtet/common/Makefile.am b/libksirtet/common/Makefile.am
index dcce4c2a..d4582f9e 100644
--- a/libksirtet/common/Makefile.am
+++ b/libksirtet/common/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir)/libksirtet -I$(top_srcdir)/libksirtet -I$(srcdir)/../base -I$(top_srcdir)/libtdegames/highscore -I$(top_srcdir)/libtdegames $(all_includes)
+INCLUDES = -I$(top_builddir)/libksirtet -I$(top_srcdir)/libksirtet -I$(srcdir)/../base -I$(top_srcdir)/libtdegames $(all_includes)
 
 # Don't compile with hidden symbols since we are a library.
 if disable_VISIBILITY
diff --git a/libksirtet/common/inter.h b/libksirtet/common/inter.h
index 09e014b2..fbf78c77 100644
--- a/libksirtet/common/inter.h
+++ b/libksirtet/common/inter.h
@@ -1,7 +1,7 @@
 #ifndef COMMON_INTER_H
 #define COMMON_INTER_H
 
-#include <kexthighscore.h>
+#include <highscore/kexthighscore.h>
 #include "lib/libksirtet_export.h"
 
 #include "lib/mp_simple_interface.h"
-- 
cgit v1.2.1