GLK: Changing gargoyle folder to glk

engines/glk/blorb.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/blorb.h"
+#include "glk/blorb.h"
 
 namespace Gargoyle {
 

engines/glk/blorb.h

@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_BLORB_H
-#define GARGOYLE_BLORB_H
+#ifndef GLK_BLORB_H
+#define GLK_BLORB_H
 
-#include "gargoyle/glk_types.h"
-#include "gargoyle/streams.h"
+#include "glk/glk_types.h"
+#include "glk/streams.h"
 
 namespace Gargoyle {
 

engines/glk/conf.cpp

@@ -20,10 +20,10 @@
  *
  */
 
-#include "gargoyle/conf.h"
-#include "gargoyle/fonts.h"
-#include "gargoyle/utils.h"
-#include "gargoyle/windows.h"
+#include "glk/conf.h"
+#include "glk/fonts.h"
+#include "glk/utils.h"
+#include "glk/windows.h"
 #include "common/config-manager.h"
 #include "common/system.h"
 

engines/glk/conf.h

@@ -20,12 +20,12 @@
  *
  */
 
-#ifndef GARGOYLE_CONF_H
-#define GARGOYLE_CONF_H
+#ifndef GLK_CONF_H
+#define GLK_CONF_H
 
-#include "gargoyle/glk_types.h"
-#include "gargoyle/fonts.h"
-#include "gargoyle/windows.h"
+#include "glk/glk_types.h"
+#include "glk/fonts.h"
+#include "glk/windows.h"
 
 namespace Gargoyle {
 

engines/glk/configure.engine

@@ -1,3 +1,3 @@
 # This file is included from the main "configure" script
 # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine gargoyle "Interactive Fiction games" no "" "" "freetype2"
+add_engine glk "ScummGlk Interactive Fiction games" no "" "" "freetype2"

engines/glk/detection.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/gargoyle.h"
+#include "glk/gargoyle.h"
 
 #include "base/plugins.h"
 #include "common/md5.h"
@@ -68,7 +68,7 @@ const Common::String &GargoyleEngine::getGameMD5() const {
 
 } // End of namespace Gargoyle
 
-#include "gargoyle/frotz/detection_tables.h"
+#include "glk/frotz/detection_tables.h"
 #define ZCODE(ID, NAME) { ID, Gargoyle::Frotz::NAME##_DESC }
 
 static const PlainGameDescriptor gargoyleGames[] = {
@@ -140,11 +140,11 @@ static const PlainGameDescriptor gargoyleGames[] = {
 
 #include "common/config-manager.h"
 #include "common/file.h"
-#include "gargoyle/detection_tables.h"
-#include "gargoyle/frotz/detection.h"
-#include "gargoyle/frotz/frotz.h"
-#include "gargoyle/scott/detection.h"
-#include "gargoyle/scott/scott.h"
+#include "glk/detection_tables.h"
+#include "glk/frotz/detection.h"
+#include "glk/frotz/frotz.h"
+#include "glk/scott/detection.h"
+#include "glk/scott/scott.h"
 
 class GargoyleMetaEngine : public AdvancedMetaEngine {
 public:
@@ -153,11 +153,11 @@ public:
 	}
 
 	virtual const char *getName() const {
-		return "Gargoyle Engine";
+		return "ScummGlk Engine";
 	}
 
 	virtual const char *getOriginalCopyright() const {
-		return "Gargoyle Engine (c) 2018";
+		return "ScummGlk Engine (c) 2018";
 	}
 
 	virtual bool hasFeature(MetaEngineFeature f) const override;
@@ -316,8 +316,8 @@ ADDetectedGames GargoyleMetaEngine::detectGame(const Common::FSNode &parent, con
 	return results;
 }
 
-#if PLUGIN_ENABLED_DYNAMIC(GARGOYLE)
-REGISTER_PLUGIN_DYNAMIC(Gargoyle, PLUGIN_TYPE_ENGINE, GargoyleMetaEngine);
+#if PLUGIN_ENABLED_DYNAMIC(GLK)
+REGISTER_PLUGIN_DYNAMIC(GLK, PLUGIN_TYPE_ENGINE, GargoyleMetaEngine);
 #else
-REGISTER_PLUGIN_STATIC(GARGOYLE, PLUGIN_TYPE_ENGINE, GargoyleMetaEngine);
+REGISTER_PLUGIN_STATIC(GLK, PLUGIN_TYPE_ENGINE, GargoyleMetaEngine);
 #endif

engines/glk/events.cpp

@@ -20,12 +20,12 @@
  *
  */
 
-#include "gargoyle/events.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/screen.h"
-#include "gargoyle/selection.h"
-#include "gargoyle/windows.h"
+#include "glk/events.h"
+#include "glk/conf.h"
+#include "glk/gargoyle.h"
+#include "glk/screen.h"
+#include "glk/selection.h"
+#include "glk/windows.h"
 #include "graphics/cursorman.h"
 
 namespace Gargoyle {

engines/glk/events.h

@@ -20,12 +20,12 @@
  *
  */
 
-#ifndef GARGOYLE_EVENTS_H
-#define GARGOYLE_EVENTS_H
+#ifndef GLK_EVENTS_H
+#define GLK_EVENTS_H
 
 #include "common/events.h"
 #include "graphics/surface.h"
-#include "gargoyle/utils.h"
+#include "glk/utils.h"
 
 namespace Gargoyle {
 

engines/glk/fonts.cpp

@@ -20,10 +20,10 @@
  *
  */
 
-#include "gargoyle/fonts.h"
-#include "gargoyle/glk_types.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/gargoyle.h"
+#include "glk/fonts.h"
+#include "glk/glk_types.h"
+#include "glk/conf.h"
+#include "glk/gargoyle.h"
 #include "common/memstream.h"
 #include "common/unzip.h"
 #include "graphics/fonts/ttf.h"

engines/glk/fonts.h

@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_FONTS_H
-#define GARGOYLE_FONTS_H
+#ifndef GLK_FONTS_H
+#define GLK_FONTS_H
 
-#include "gargoyle/glk_types.h"
-#include "gargoyle/utils.h"
+#include "glk/glk_types.h"
+#include "glk/utils.h"
 #include "common/archive.h"
 #include "common/array.h"
 #include "common/file.h"

engines/glk/frotz/detection.cpp

@@ -20,11 +20,11 @@
  *
  */
 
-#include "gargoyle/frotz/detection.h"
+#include "glk/frotz/detection.h"
 #include "common/file.h"
 #include "common/md5.h"
 
-#include "gargoyle/frotz/detection_tables.h"
+#include "glk/frotz/detection_tables.h"
 
 namespace Gargoyle {
 namespace Frotz {

engines/glk/frotz/detection.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef GARGOYLE_FROTZ_DETECTION
-#define GARGOYLE_FROTZ_DETECTION
+#ifndef GLK_FROTZ_DETECTION
+#define GLK_FROTZ_DETECTION
 
 #include "common/fs.h"
 #include "engines/game.h"

engines/glk/frotz/detection_tables.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/detection_tables.h"
+#include "glk/frotz/detection_tables.h"
 
 namespace Gargoyle {
 namespace Frotz {

engines/glk/frotz/frotz.cpp

@@ -20,8 +20,8 @@
  *
  */
 
-#include "gargoyle/frotz/frotz.h"
-#include "gargoyle/frotz/frotz_types.h"
+#include "glk/frotz/frotz.h"
+#include "glk/frotz/frotz_types.h"
 #include "common/config-manager.h"
 
 namespace Gargoyle {

engines/glk/frotz/frotz.h

@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef GARGOYLE_FROTZ_FROTZ
-#define GARGOYLE_FROTZ_FROTZ
+#ifndef GLK_FROTZ_FROTZ
+#define GLK_FROTZ_FROTZ
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {

engines/glk/frotz/frotz_types.h

@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef GARGOYLE_FROTZ_FROTZ_TYPES
-#define GARGOYLE_FROTZ_FROTZ_TYPES
+#ifndef GLK_FROTZ_FROTZ_TYPES
+#define GLK_FROTZ_FROTZ_TYPES
 
-#include "gargoyle/glk_types.h"
+#include "glk/glk_types.h"
 #include "common/algorithm.h"
 
 namespace Gargoyle {

engines/glk/frotz/glk_interface.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/glk_interface.h"
+#include "glk/frotz/glk_interface.h"
 
 namespace Gargoyle {
 namespace Frotz {

engines/glk/frotz/glk_interface.h

@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_FROTZ_GLK_INTERFACE
-#define GARGOYLE_FROTZ_GLK_INTERFACE
+#ifndef GLK_FROTZ_GLK_INTERFACE
+#define GLK_FROTZ_GLK_INTERFACE
 
-#include "gargoyle/glk.h"
-#include "gargoyle/frotz/mem.h"
+#include "glk/glk.h"
+#include "glk/frotz/mem.h"
 
 namespace Gargoyle {
 namespace Frotz {

engines/glk/frotz/mem.cpp

@@ -20,8 +20,8 @@
  *
  */
 
-#include "gargoyle/frotz/mem.h"
-#include "gargoyle/frotz/frotz.h"
+#include "glk/frotz/mem.h"
+#include "glk/frotz/frotz.h"
 #include "common/memstream.h"
 #include "common/textconsole.h"
 

engines/glk/frotz/mem.h

@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef GARGOYLE_FROTZ_MEM
-#define GARGOYLE_FROTZ_MEM
+#ifndef GLK_FROTZ_MEM
+#define GLK_FROTZ_MEM
 
-#include "gargoyle/frotz/frotz_types.h"
+#include "glk/frotz/frotz_types.h"
 
 namespace Gargoyle {
 namespace Frotz {

engines/glk/frotz/processor.cpp

@@ -20,8 +20,8 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
-#include "gargoyle/frotz/frotz.h"
+#include "glk/frotz/processor.h"
+#include "glk/frotz/frotz.h"
 
 namespace Gargoyle {
 namespace Frotz {

engines/glk/frotz/processor.h

@@ -20,12 +20,12 @@
  *
  */
 
-#ifndef GARGOYLE_FROTZ_PROCESSOR
-#define GARGOYLE_FROTZ_PROCESSOR
+#ifndef GLK_FROTZ_PROCESSOR
+#define GLK_FROTZ_PROCESSOR
 
-#include "gargoyle/frotz/mem.h"
-#include "gargoyle/frotz/glk_interface.h"
-#include "gargoyle/frotz/frotz_types.h"
+#include "glk/frotz/mem.h"
+#include "glk/frotz/glk_interface.h"
+#include "glk/frotz/frotz_types.h"
 #include "common/stack.h"
 
 namespace Gargoyle {

engines/glk/frotz/processor_buffer.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 #include "common/algorithm.h"
 #include "common/textconsole.h"
 

engines/glk/frotz/processor_input.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {

engines/glk/frotz/processor_maths.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {

engines/glk/frotz/processor_mem.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {

engines/glk/frotz/processor_objects.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {

engines/glk/frotz/processor_screen.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {

engines/glk/frotz/processor_streams.cpp

@@ -20,8 +20,8 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
-#include "gargoyle/frotz/quetzal.h"
+#include "glk/frotz/processor.h"
+#include "glk/frotz/quetzal.h"
 
 namespace Gargoyle {
 namespace Frotz {

engines/glk/frotz/processor_table.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {

engines/glk/frotz/processor_text.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {

engines/glk/frotz/processor_variables.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/processor.h"
 
 namespace Gargoyle {
 namespace Frotz {

engines/glk/frotz/quetzal.cpp

@@ -20,8 +20,8 @@
  *
  */
 
-#include "gargoyle/frotz/quetzal.h"
-#include "gargoyle/frotz/processor.h"
+#include "glk/frotz/quetzal.h"
+#include "glk/frotz/processor.h"
 #include "common/memstream.h"
 
 namespace Gargoyle {

engines/glk/frotz/quetzal.h

@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_FROTZ_QUETZAL
-#define GARGOYLE_FROTZ_QUETZAL
+#ifndef GLK_FROTZ_QUETZAL
+#define GLK_FROTZ_QUETZAL
 
-#include "gargoyle/glk_types.h"
-#include "gargoyle/frotz/frotz_types.h"
+#include "glk/glk_types.h"
+#include "glk/frotz/frotz_types.h"
 
 namespace Gargoyle {
 namespace Frotz {

engines/glk/gargoyle.cpp

@@ -28,14 +28,14 @@
 #include "engines/util.h"
 #include "graphics/scaler.h"
 #include "graphics/thumbnail.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/events.h"
-#include "gargoyle/picture.h"
-#include "gargoyle/screen.h"
-#include "gargoyle/selection.h"
-#include "gargoyle/streams.h"
-#include "gargoyle/windows.h"
+#include "glk/gargoyle.h"
+#include "glk/conf.h"
+#include "glk/events.h"
+#include "glk/picture.h"
+#include "glk/screen.h"
+#include "glk/selection.h"
+#include "glk/streams.h"
+#include "glk/windows.h"
 
 namespace Gargoyle {
 

engines/glk/gargoyle.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef GARGOYLE_GARGOLE_H
-#define GARGOYLE_GARGOLE_H
+#ifndef GLK_GARGOLE_H
+#define GLK_GARGOLE_H
 
 #include "common/scummsys.h"
 #include "common/random.h"
@@ -29,7 +29,7 @@
 #include "common/serializer.h"
 #include "engines/advancedDetector.h"
 #include "engines/engine.h"
-#include "gargoyle/glk_types.h"
+#include "glk/glk_types.h"
 
 namespace Gargoyle {
 
@@ -68,7 +68,7 @@ enum GargoyleDebugChannels {
 };
 
 
-#define GARGOYLE_SAVEGAME_VERSION 1
+#define GLK_SAVEGAME_VERSION 1
 
 struct GargoyleGameDescription;
 

engines/glk/glk.cpp

@@ -20,16 +20,16 @@
  *
  */
 
-#include "gargoyle/glk.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/events.h"
-#include "gargoyle/picture.h"
-#include "gargoyle/streams.h"
-#include "gargoyle/unicode.h"
-#include "gargoyle/windows.h"
-#include "gargoyle/window_graphics.h"
-#include "gargoyle/window_text_buffer.h"
-#include "gargoyle/window_pair.h"
+#include "glk/glk.h"
+#include "glk/conf.h"
+#include "glk/events.h"
+#include "glk/picture.h"
+#include "glk/streams.h"
+#include "glk/unicode.h"
+#include "glk/windows.h"
+#include "glk/window_graphics.h"
+#include "glk/window_text_buffer.h"
+#include "glk/window_pair.h"
 
 
 namespace Gargoyle {

engines/glk/glk.h

@@ -20,14 +20,14 @@
  *
  */
 
-#ifndef GARGOYLE_GLK_H
-#define GARGOYLE_GLK_H
+#ifndef GLK_GLK_H
+#define GLK_GLK_H
 
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/glk_types.h"
-#include "gargoyle/blorb.h"
-#include "gargoyle/time.h"
-#include "gargoyle/windows.h"
+#include "glk/gargoyle.h"
+#include "glk/glk_types.h"
+#include "glk/blorb.h"
+#include "glk/time.h"
+#include "glk/windows.h"
 
 namespace Gargoyle {
 

engines/glk/glk_types.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef GARGOYLE_GLK_TYPES_H
-#define GARGOYLE_GLK_TYPES_H
+#ifndef GLK_GLK_TYPES_H
+#define GLK_GLK_TYPES_H
 
 #include "common/scummsys.h"
 #include "common/stream.h"

engines/glk/module.mk

@@ -1,4 +1,4 @@
-MODULE := engines/gargoyle
+MODULE := engines/glk
 
 MODULE_OBJS := \
 	blorb.o \
@@ -42,7 +42,7 @@ MODULE_OBJS := \
 	scott/scott.o
 
 # This module can be built as a plugin
-ifeq ($(ENABLE_GARGOYLE), DYNAMIC_PLUGIN)
+ifeq ($(ENABLE_GLK), DYNAMIC_PLUGIN)
 PLUGIN := 1
 endif
 

engines/glk/picture.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/picture.h"
+#include "glk/picture.h"
 
 namespace Gargoyle {
 

engines/glk/picture.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef GARGOYLE_PICTURE_H
-#define GARGOYLE_PICTURE_H
+#ifndef GLK_PICTURE_H
+#define GLK_PICTURE_H
 
 #include "graphics/surface.h"
 

engines/glk/scott/detection.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/scott/detection.h"
+#include "glk/scott/detection.h"
 #include "common/file.h"
 #include "common/md5.h"
 

engines/glk/scott/detection.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef GARGOYLE_SCOTT_DETECTION
-#define GARGOYLE_SCOTT_DETECTION
+#ifndef GLK_SCOTT_DETECTION
+#define GLK_SCOTT_DETECTION
 
 #include "common/fs.h"
 #include "engines/game.h"

engines/glk/scott/scott.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/scott/scott.h"
+#include "glk/scott/scott.h"
 #include "common/config-manager.h"
 
 namespace Gargoyle {

engines/glk/scott/scott.h

@@ -20,15 +20,15 @@
  *
  */
 
-#ifndef GARGOYLE_SCOTT
-#define GARGOYLE_SCOTT
+#ifndef GLK_SCOTT
+#define GLK_SCOTT
 
 /*
  *  Controlling block
  */
 
 #include "common/scummsys.h"
-#include "gargoyle/glk.h"
+#include "glk/glk.h"
 
 namespace Gargoyle {
 namespace Scott {

engines/glk/screen.cpp

@@ -20,8 +20,8 @@
  *
  */
 
-#include "gargoyle/screen.h"
-#include "gargoyle/conf.h"
+#include "glk/screen.h"
+#include "glk/conf.h"
 
 namespace Gargoyle {
 

engines/glk/screen.h

@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_DRAW_H
-#define GARGOYLE_DRAW_H
+#ifndef GLK_DRAW_H
+#define GLK_DRAW_H
 
 #include "graphics/screen.h"
-#include "gargoyle/fonts.h"
+#include "glk/fonts.h"
 
 namespace Gargoyle {
 

engines/glk/selection.cpp

@@ -20,10 +20,10 @@
  *
  */
 
-#include "gargoyle/selection.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/windows.h"
+#include "glk/selection.h"
+#include "glk/conf.h"
+#include "glk/gargoyle.h"
+#include "glk/windows.h"
 #include "common/system.h"
 
 namespace Gargoyle {

engines/glk/selection.h

@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_SELECTION_H
-#define GARGOYLE_SELECTION_H
+#ifndef GLK_SELECTION_H
+#define GLK_SELECTION_H
 
-#include "gargoyle/glk_types.h"
-#include "gargoyle/utils.h"
+#include "glk/glk_types.h"
+#include "glk/utils.h"
 #include "common/array.h"
 #include "common/rect.h"
 #include "common/ustr.h"

engines/glk/speech.h

@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_SPEECH_H
-#define GARGOYLE_SPEECH_H
+#ifndef GLK_SPEECH_H
+#define GLK_SPEECH_H
 
 #include "common/events.h"
-#include "gargoyle/glk_types.h"
+#include "glk/glk_types.h"
 
 namespace Gargoyle {
 

engines/glk/streams.cpp

@@ -20,11 +20,11 @@
  *
  */
 
-#include "gargoyle/streams.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/events.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/windows.h"
+#include "glk/streams.h"
+#include "glk/conf.h"
+#include "glk/events.h"
+#include "glk/gargoyle.h"
+#include "glk/windows.h"
 #include "gui/saveload.h"
 #include "common/file.h"
 #include "common/savefile.h"

engines/glk/streams.h

@@ -20,14 +20,14 @@
  *
  */
 
-#ifndef GARGOYLE_STREAMS_H
-#define GARGOYLE_STREAMS_H
+#ifndef GLK_STREAMS_H
+#define GLK_STREAMS_H
 
 #include "common/scummsys.h"
 #include "common/file.h"
 #include "common/savefile.h"
 #include "common/str.h"
-#include "gargoyle/glk_types.h"
+#include "glk/glk_types.h"
 
 namespace Gargoyle {
 

engines/glk/time.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/time.h"
+#include "glk/time.h"
 #include "common/system.h"
 
 namespace Gargoyle {

engines/glk/time.h

@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef GARGOYLE_TIME_H
-#define GARGOYLE_TIME_H
+#ifndef GLK_TIME_H
+#define GLK_TIME_H
 
-#include "gargoyle/glk_types.h"
+#include "glk/glk_types.h"
 
 namespace Gargoyle {
 

engines/glk/unicode.cpp

@@ -20,8 +20,8 @@
  *
  */
 
-#include "gargoyle/unicode.h"
-#include "gargoyle/unicode_gen.h"
+#include "glk/unicode.h"
+#include "glk/unicode_gen.h"
 #include "common/textconsole.h"
 
 namespace Gargoyle {

engines/glk/unicode.h

@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef GARGOYLE_UNICODE_H
-#define GARGOYLE_UNICODE_H
+#ifndef GLK_UNICODE_H
+#define GLK_UNICODE_H
 
-#include "gargoyle/glk_types.h"
+#include "glk/glk_types.h"
 
 namespace Gargoyle {
 

engines/glk/unicode_gen.cpp

@@ -25,7 +25,7 @@
  * Derived from Unicode data files, Unicode version 4.0.1.
  */
 
-#include "gargoyle/unicode_gen.h"
+#include "glk/unicode_gen.h"
 
 namespace Gargoyle {
 

engines/glk/unicode_gen.h

@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef GARGOYLE_UNICODE_GEN_H
-#define GARGOYLE_UNICODE_GEN_H
+#ifndef GLK_UNICODE_GEN_H
+#define GLK_UNICODE_GEN_H
 
-#include "gargoyle/glk_types.h"
+#include "glk/glk_types.h"
 
 namespace Gargoyle {
 

engines/glk/utils.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "gargoyle/utils.h"
+#include "glk/utils.h"
 #include "common/textconsole.h"
 
 namespace Gargoyle {

engines/glk/utils.h

@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_UTILS_H
-#define GARGOYLE_UTILS_H
+#ifndef GLK_UTILS_H
+#define GLK_UTILS_H
 
 #include "common/rect.h"
-#include "gargoyle/glk_types.h"
+#include "glk/glk_types.h"
 
 namespace Gargoyle {
 

engines/glk/window_graphics.cpp

@@ -20,10 +20,10 @@
  *
  */
 
-#include "gargoyle/window_graphics.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/screen.h"
+#include "glk/window_graphics.h"
+#include "glk/conf.h"
+#include "glk/gargoyle.h"
+#include "glk/screen.h"
 
 namespace Gargoyle {
 

engines/glk/window_graphics.h

@@ -20,11 +20,11 @@
  *
  */
 
-#ifndef GARGOYLE_WINDOW_GRAPHICS_H
-#define GARGOYLE_WINDOW_GRAPHICS_H
+#ifndef GLK_WINDOW_GRAPHICS_H
+#define GLK_WINDOW_GRAPHICS_H
 
-#include "gargoyle/windows.h"
-#include "gargoyle/picture.h"
+#include "glk/windows.h"
+#include "glk/picture.h"
 
 namespace Gargoyle {
 

engines/glk/window_pair.cpp

@@ -20,10 +20,10 @@
  *
  */
 
-#include "gargoyle/window_pair.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/screen.h"
+#include "glk/window_pair.h"
+#include "glk/conf.h"
+#include "glk/gargoyle.h"
+#include "glk/screen.h"
 
 namespace Gargoyle {
 

engines/glk/window_pair.h

@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef GARGOYLE_WINDOW_PAIR_H
-#define GARGOYLE_WINDOW_PAIR_H
+#ifndef GLK_WINDOW_PAIR_H
+#define GLK_WINDOW_PAIR_H
 
-#include "gargoyle/windows.h"
+#include "glk/windows.h"
 
 namespace Gargoyle {
 

engines/glk/window_text_buffer.cpp

@@ -20,12 +20,12 @@
  *
  */
 
-#include "gargoyle/window_text_buffer.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/screen.h"
-#include "gargoyle/selection.h"
-#include "gargoyle/unicode.h"
+#include "glk/window_text_buffer.h"
+#include "glk/conf.h"
+#include "glk/gargoyle.h"
+#include "glk/screen.h"
+#include "glk/selection.h"
+#include "glk/unicode.h"
 
 namespace Gargoyle {
 

engines/glk/window_text_buffer.h

@@ -20,12 +20,12 @@
  *
  */
 
-#ifndef GARGOYLE_WINDOW_TEXT_BUFFER_H
-#define GARGOYLE_WINDOW_TEXT_BUFFER_H
+#ifndef GLK_WINDOW_TEXT_BUFFER_H
+#define GLK_WINDOW_TEXT_BUFFER_H
 
-#include "gargoyle/windows.h"
-#include "gargoyle/picture.h"
-#include "gargoyle/speech.h"
+#include "glk/windows.h"
+#include "glk/picture.h"
+#include "glk/speech.h"
 
 namespace Gargoyle {
 

engines/glk/window_text_grid.cpp

@@ -20,11 +20,11 @@
  *
  */
 
-#include "gargoyle/window_text_grid.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/selection.h"
-#include "gargoyle/screen.h"
+#include "glk/window_text_grid.h"
+#include "glk/conf.h"
+#include "glk/gargoyle.h"
+#include "glk/selection.h"
+#include "glk/screen.h"
 
 namespace Gargoyle {
 

engines/glk/window_text_grid.h

@@ -20,10 +20,10 @@
  *
  */
 
-#ifndef GARGOYLE_WINDOW_TEXT_GRID_H
-#define GARGOYLE_WINDOW_TEXT_GRID_H
+#ifndef GLK_WINDOW_TEXT_GRID_H
+#define GLK_WINDOW_TEXT_GRID_H
 
-#include "gargoyle/windows.h"
+#include "glk/windows.h"
 
 namespace Gargoyle {
 

engines/glk/windows.cpp

@@ -20,15 +20,15 @@
  *
  */
 
-#include "gargoyle/windows.h"
-#include "gargoyle/window_graphics.h"
-#include "gargoyle/window_pair.h"
-#include "gargoyle/window_text_buffer.h"
-#include "gargoyle/window_text_grid.h"
-#include "gargoyle/conf.h"
-#include "gargoyle/gargoyle.h"
-#include "gargoyle/screen.h"
-#include "gargoyle/streams.h"
+#include "glk/windows.h"
+#include "glk/window_graphics.h"
+#include "glk/window_pair.h"
+#include "glk/window_text_buffer.h"
+#include "glk/window_text_grid.h"
+#include "glk/conf.h"
+#include "glk/gargoyle.h"
+#include "glk/screen.h"
+#include "glk/streams.h"
 #include "common/algorithm.h"
 #include "common/textconsole.h"
 

engines/glk/windows.h

@@ -20,18 +20,18 @@
  *
  */
 
-#ifndef GARGOYLE_WINDOWS_H
-#define GARGOYLE_WINDOWS_H
+#ifndef GLK_WINDOWS_H
+#define GLK_WINDOWS_H
 
 #include "common/array.h"
 #include "common/list.h"
 #include "common/rect.h"
 #include "graphics/screen.h"
-#include "gargoyle/events.h"
-#include "gargoyle/glk_types.h"
-#include "gargoyle/fonts.h"
-#include "gargoyle/selection.h"
-#include "gargoyle/streams.h"
+#include "glk/events.h"
+#include "glk/glk_types.h"
+#include "glk/fonts.h"
+#include "glk/selection.h"
+#include "glk/streams.h"
 
 namespace Gargoyle {