diff --git a/lib/framework/Makefile.am b/lib/framework/Makefile.am
index 5c6b4bacb..733f2f61e 100644
--- a/lib/framework/Makefile.am
+++ b/lib/framework/Makefile.am
@@ -15,7 +15,7 @@ noinst_LIBRARIES = libframework.a
noinst_HEADERS = configfile.h cursors.h debug.h frame.h frameint.h \
frameresource.h input.h lexer_input.h listmacs.h math-help.h \
printf_ext.h resly.h strlfuncs.h strnlen1.h strres.h strresly.h treap.h \
- treapint.h trig.h types.h tagfile.h i18n.h file.h physfs_ext.h
+ trig.h types.h tagfile.h i18n.h file.h physfs_ext.h
libframework_a_SOURCES = SDL_framerate.c configfile.c cursors.c cursors16.c \
cursors32.c debug.c frame.c frameresource.c input.c lexer_input.c \
diff --git a/lib/framework/framework.vcproj b/lib/framework/framework.vcproj
index e8a39ecfe..5091bab3e 100644
--- a/lib/framework/framework.vcproj
+++ b/lib/framework/framework.vcproj
@@ -373,10 +373,6 @@
RelativePath=".\treap.h"
>
-
-
diff --git a/lib/framework/treap.c b/lib/framework/treap.c
index 0a9cc7eb2..66be772e1 100644
--- a/lib/framework/treap.c
+++ b/lib/framework/treap.c
@@ -33,7 +33,6 @@
#include "types.h"
#include "debug.h"
#include "treap.h"
-#include "treapint.h"
/* Position of the last call */
static SDWORD cLine;
@@ -141,7 +140,7 @@ static void treapRotLeft(TREAP_NODE **ppsRoot)
}
/* Recursive function to add an object to a tree */
-void treapAddNode(TREAP_NODE **ppsRoot, TREAP_NODE *psNew, TREAP_CMP cmp)
+static void treapAddNode(TREAP_NODE **ppsRoot, TREAP_NODE *psNew, TREAP_CMP cmp)
{
if (*ppsRoot == NULL)
{
@@ -202,9 +201,8 @@ BOOL treapAdd(TREAP *psTreap, void *key, void *pObj)
return true;
}
-
/* Recursively find and remove a node from the tree */
-TREAP_NODE *treapDelRec(TREAP_NODE **ppsRoot, void *key, TREAP_CMP cmp)
+static TREAP_NODE *treapDelRec(TREAP_NODE **ppsRoot, void *key, TREAP_CMP cmp)
{
TREAP_NODE *psFound;
@@ -385,8 +383,7 @@ void treapDestroy(TREAP *psTreap)
}
/* Recursively display the treap structure */
-void treapDisplayRec(TREAP_NODE *psRoot, UDWORD indent);
-void treapDisplayRec(TREAP_NODE *psRoot, UDWORD indent)
+static void treapDisplayRec(TREAP_NODE *psRoot, UDWORD indent)
{
UDWORD i;
diff --git a/lib/framework/treapint.h b/lib/framework/treapint.h
deleted file mode 100644
index 37211142f..000000000
--- a/lib/framework/treapint.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- This file is part of Warzone 2100.
- Copyright (C) 1999-2004 Eidos Interactive
- Copyright (C) 2005-2007 Warzone Resurrection Project
-
- Warzone 2100 is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Warzone 2100 is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Warzone 2100; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-/*! \file treapint.h
- * * \brief Internal function calls for the treap system to allow it
- * to be used by the memory system.
- *
- */
-#ifndef _treapint_h
-#define _treapint_h
-
-/* Check the header files have been included from frame.h if they
- * are used outside of the framework library.
- */
-#if !defined(_frame_h) && !defined(FRAME_LIB_INCLUDE)
-#error Framework header files MUST be included from Frame.h ONLY.
-#endif
-
-/* Recursive function to add an object to a tree */
-extern void treapAddNode(TREAP_NODE **ppsRoot, TREAP_NODE *psNew, TREAP_CMP cmp);
-
-/* Recursively find and remove a node from the tree */
-extern TREAP_NODE *treapDelRec(TREAP_NODE **ppsRoot, void *key, TREAP_CMP cmp);
-
-/* Recursively display the treap structure */
-extern void treapDisplayRec(TREAP_NODE *psRoot, UDWORD indent);
-
-#endif
-
diff --git a/warzone2100.cbp b/warzone2100.cbp
index 9611a28cb..3b35bc737 100644
--- a/warzone2100.cbp
+++ b/warzone2100.cbp
@@ -510,12 +510,6 @@
-
-
-
-
-
-