diff --git a/builds/posix/Makefile.in.codes b/builds/posix/Makefile.in.codes
index 25a61bc8dc..4698f3969f 100644
--- a/builds/posix/Makefile.in.codes
+++ b/builds/posix/Makefile.in.codes
@@ -29,7 +29,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.codes,v 1.11 2003-07-12 20:37:54 brodsom Exp $
+#  $Id: Makefile.in.codes,v 1.12 2003-07-14 09:44:59 brodsom Exp $
 #
 ROOT=..
 ObjModuleName=codes
@@ -55,35 +55,33 @@ include     $(ROOT)/gen/make.shared.variables
 #CODES_OutFiles= gds_codes.pas gds_codes.ftn codes.h iberror.h codetext.h \
 #                msgs.h rdb_codes.h sql_code.h msg_facs.h
 #CODES_Results=$(addprefix include/gen/, $(CODES_OutFiles))
-CODES_Sources = jrd/codes.epp
+CODES_Sources = misc/codes.epp
 CODES_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CODES_Sources))))
+RELATIONS_Sources = misc/relations.epp
+RELATIONS_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(RELATIONS_Sources))))
 
 AllObjects = $(CODES_Objects)
 Dependencies = $(AllObjects:.o=.d)
 
 generated_headers: build_codes $(SRC_ROOT)/include/gen/ids.h
 
-# Rebuild error codes
+# Rebuild error codes and relations
 
 build_codes: $(BIN)/codes msg.fdb $(BIN)/relations
 	$(BIN)/codes $(SRC_ROOT)/include/gen $(LNG_ROOT)
 	$(BIN)/relations $(SRC_ROOT)/include/gen
 
-$(SRC_ROOT)/jrd/codes.cpp: $(SRC_ROOT)/jrd/codes.epp
+$(SRC_ROOT)/misc/codes.cpp: $(SRC_ROOT)/misc/codes.epp
 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
 
-$(SRC_ROOT)/jrd/relations.cpp: $(SRC_ROOT)/jrd/relations.epp
+$(SRC_ROOT)/misc/relations.cpp: $(SRC_ROOT)/misc/relations.epp
 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
 
 $(BIN)/codes: $(CODES_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A)
 	$(CXX) $(LINK_OPTS) $(CODES_Objects) -o $@ -L $(LIB) -lfbstatic -lfbcommon $(LINK_LIBS)
 
-$(BIN)/relations: $(CODES_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A)
-	$(CXX) $(LINK_OPTS) $(CODES_Objects) -o $@ -L $(LIB) -lfbstatic -lfbcommon $(LINK_LIBS)
-
-# Rebuild ids.h
-#$(SRC_ROOT)/include/gen/ids.h:	$(SRC_ROOT)/jrd/ids.m $(SRC_ROOT)/include/gen/relations.h
-#	m4 $< > $(SRC_ROOT)/include/gen/ids.h
+$(BIN)/relations: $(RELATIONS_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A)
+	$(CXX) $(LINK_OPTS) $(RELATIONS_Objects) -o $@ -L $(LIB) -lfbstatic -lfbcommon $(LINK_LIBS)
 
 include $(ROOT)/gen/make.shared.targets
 
diff --git a/builds/posix/Makefile.in.extlib b/builds/posix/Makefile.in.extlib
index 49b15aea2d..60d3b7db0b 100644
--- a/builds/posix/Makefile.in.extlib
+++ b/builds/posix/Makefile.in.extlib
@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.extlib,v 1.11 2003-07-09 09:21:25 fsg Exp $
+#  $Id: Makefile.in.extlib,v 1.12 2003-07-14 09:44:59 brodsom Exp $
 #
 ROOT=..
 ObjModuleName=extlib
@@ -59,9 +59,9 @@ AllObjects = $(UDF_Objects) $(UTIL_Objects) $(FBUDF_Objects)
 Dependencies = $(AllObjects:.o=.d)
 
 
-.PHONY: all lib_ib_udf lib_ib_util lib_fbudf
+.PHONY: all lib_ib_udf lib_ib_util
 
-all: lib_ib_udf lib_fbudf lib_ib_util 
+all: lib_ib_udf lib_ib_util 
 
 
 # The libraires in this directory could do with a bit more work, since they
diff --git a/builds/posix/make.shared.variables b/builds/posix/make.shared.variables
index dc2d3547cc..8a058a243f 100644
--- a/builds/posix/make.shared.variables
+++ b/builds/posix/make.shared.variables
@@ -299,5 +299,5 @@ LIBFBSTATIC_Objects = $(OS_SPECIFIC_Objects) \
 #
 # blrtable builder
 
-BLRTABLE_Sources = jrd/blrtable.cpp
+BLRTABLE_Sources = misc/blrtable.cpp
 BLRTABLE_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(BLRTABLE_Sources))))
diff --git a/builds/win32/blrtable.bat b/builds/win32/blrtable.bat
index 6d645ae1f6..8b1fe5b531 100644
--- a/builds/win32/blrtable.bat
+++ b/builds/win32/blrtable.bat
@@ -1,4 +1,4 @@
-cl -Ob2iytp -Gs -DWIN95 -D__STDC__ -W3 -G4 -Gd -MD -I..\..\src\include -I..\..\src\include\gen -DSERVER_SHUTDOWN -DSUPERSERVER -DGOVERNOR -DNOMSG -D_X86_=1 -DWIN32 -DI386 -DEXACT_NUMERICS ..\..\src\jrd\blrtable.cpp
+cl -Ob2iytp -Gs -DWIN95 -D__STDC__ -W3 -G4 -Gd -MD -I..\..\src\include -I..\..\src\include\gen -DSERVER_SHUTDOWN -DSUPERSERVER -DGOVERNOR -DNOMSG -D_X86_=1 -DWIN32 -DI386 -DEXACT_NUMERICS ..\..\src\misc\blrtable.cpp
 if errorlevel 1 goto :ERROR
 blrtable.exe > blrtable.h
 copy blrtable.h ..\..\src\include\gen\blrtable.h > nul
diff --git a/builds/win32/make_boot.bat b/builds/win32/make_boot.bat
index 00f8854762..503494b670 100644
--- a/builds/win32/make_boot.bat
+++ b/builds/win32/make_boot.bat
@@ -34,6 +34,8 @@
 @mkdir %ROOT_PATH%\gen\isql 2>nul
 @rmdir /s /q %ROOT_PATH%\gen\jrd 2>nul
 @mkdir %ROOT_PATH%\gen\jrd 2>nul
+@rmdir /s /q %ROOT_PATH%\gen\misc 2>nul
+@mkdir %ROOT_PATH%\gen\misc 2>nul
 @rmdir /s /q %ROOT_PATH%\gen\msgs 2>nul
 @mkdir %ROOT_PATH%\gen\msgs 2>nul
 @rmdir /s /q %ROOT_PATH%\gen\qli 2>nul
diff --git a/builds/win32/msvc6/codes.dsp b/builds/win32/msvc6/codes.dsp
index 7051b2518b..cb3e3a52c0 100644
--- a/builds/win32/msvc6/codes.dsp
+++ b/builds/win32/msvc6/codes.dsp
@@ -85,7 +85,7 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\gen\jrd\codes.cpp
+SOURCE=..\..\..\gen\misc\codes.cpp
 # End Source File
 # Begin Source File
 
diff --git a/builds/win32/msvc6/fbclient.dsp b/builds/win32/msvc6/fbclient.dsp
index beaf57934a..e719e12c71 100644
--- a/builds/win32/msvc6/fbclient.dsp
+++ b/builds/win32/msvc6/fbclient.dsp
@@ -130,7 +130,7 @@ SOURCE=..\..\..\src\jrd\gds.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\ibinitdll.cpp
+SOURCE=..\..\..\src\jrd\os\win32\ibinitdll.cpp
 # End Source File
 # Begin Source File
 
diff --git a/builds/win32/msvc6/fbclient_static.dsp b/builds/win32/msvc6/fbclient_static.dsp
index a8220a6ff7..af66724dba 100644
--- a/builds/win32/msvc6/fbclient_static.dsp
+++ b/builds/win32/msvc6/fbclient_static.dsp
@@ -289,7 +289,7 @@ SOURCE=..\..\..\src\jrd\gds.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\ibinitdll.cpp
+SOURCE=..\..\..\src\jrd\os\win32\ibinitdll.cpp
 # End Source File
 # Begin Source File
 
diff --git a/builds/win32/msvc6/fbembed.dsp b/builds/win32/msvc6/fbembed.dsp
index 152ba9fb6d..7ade2d82c7 100644
--- a/builds/win32/msvc6/fbembed.dsp
+++ b/builds/win32/msvc6/fbembed.dsp
@@ -105,7 +105,7 @@ SOURCE=..\..\..\src\jrd\os\win32\config_root.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\ibinitdll.cpp
+SOURCE=..\..\..\src\jrd\os\win32\ibinitdll.cpp
 # End Source File
 # Begin Source File
 
diff --git a/builds/win32/msvc6/gds32.dsp b/builds/win32/msvc6/gds32.dsp
index b7f90adc08..831aa8c642 100644
--- a/builds/win32/msvc6/gds32.dsp
+++ b/builds/win32/msvc6/gds32.dsp
@@ -95,7 +95,7 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\src\jrd\ibinitdll.cpp
+SOURCE=..\..\..\src\jrd\os\win32\ibinitdll.cpp
 # End Source File
 # End Group
 # Begin Group "Resource files"
diff --git a/builds/win32/msvc6/relations.dsp b/builds/win32/msvc6/relations.dsp
index 474dab108c..1a40f67980 100644
--- a/builds/win32/msvc6/relations.dsp
+++ b/builds/win32/msvc6/relations.dsp
@@ -85,7 +85,7 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\gen\jrd\relations.cpp
+SOURCE=..\..\..\gen\misc\relations.cpp
 # End Source File
 # Begin Source File
 
diff --git a/builds/win32/msvc7/fbclient.vcproj b/builds/win32/msvc7/fbclient.vcproj
index 8b606a4f93..54f9a7dcc8 100644
--- a/builds/win32/msvc7/fbclient.vcproj
+++ b/builds/win32/msvc7/fbclient.vcproj
@@ -166,7 +166,7 @@
 				RelativePath="..\..\..\src\jrd\gds.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\ibinitdll.cpp">
+				RelativePath="..\..\..\src\jrd\os\win32\ibinitdll.cpp">
 			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\isc.cpp">
diff --git a/builds/win32/msvc7/fbclient_static.vcproj b/builds/win32/msvc7/fbclient_static.vcproj
index 7c4602af94..a91003d8b9 100644
--- a/builds/win32/msvc7/fbclient_static.vcproj
+++ b/builds/win32/msvc7/fbclient_static.vcproj
@@ -276,7 +276,7 @@
 				RelativePath="..\..\..\src\jrd\gds.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\jrd\ibinitdll.cpp">
+				RelativePath="..\..\..\src\jrd\os\win32\ibinitdll.cpp">
 			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\isc.cpp">
diff --git a/builds/win32/msvc7/fbembed.vcproj b/builds/win32/msvc7/fbembed.vcproj
index 3bc544be1b..2851e60497 100644
--- a/builds/win32/msvc7/fbembed.vcproj
+++ b/builds/win32/msvc7/fbembed.vcproj
@@ -147,7 +147,7 @@
 			Name="JRD files"
 			Filter="">
 			<File
-				RelativePath="..\..\..\src\jrd\ibinitdll.cpp">
+				RelativePath="..\..\..\src\jrd\os\win32\ibinitdll.cpp">
 			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\perf.cpp">
diff --git a/builds/win32/msvc7/gds32.vcproj b/builds/win32/msvc7/gds32.vcproj
index 2b1b17b3a2..357adc59ba 100644
--- a/builds/win32/msvc7/gds32.vcproj
+++ b/builds/win32/msvc7/gds32.vcproj
@@ -136,7 +136,7 @@
 			Name="JRD files"
 			Filter="">
 			<File
-				RelativePath="..\..\..\src\jrd\ibinitdll.cpp">
+				RelativePath="..\..\..\src\jrd\os\win32\ibinitdll.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/builds/win32/preprocess.bat b/builds/win32/preprocess.bat
index dbb750b896..e9f08509d0 100644
--- a/builds/win32/preprocess.bat
+++ b/builds/win32/preprocess.bat
@@ -61,8 +61,8 @@ goto :EOF
 @for %%i in (exe, extract) do @call :PREPROCESS dudley %%i
 @for %%i in (gpre_meta) do @call :PREPROCESS gpre %%i
 @for %%i in (extract, isql, show) do @call :PREPROCESS isql %%i
-@for %%i in (dfw, dpm, dyn, dyn_def, dyn_del, dyn_mod, dyn_util, envelope, fun, grant, ini, met, pcmet, scl, stats) do @call :PREPROCESS jrd %%i GDS
-@for %%i in (codes, relations) do @call :PREPROCESS jrd %%i
+@for %%i in (dfw, dpm, dyn, dyn_def, dyn_del, dyn_mod, dyn_util, fun, grant, ini, met, pcmet, scl, stats) do @call :PREPROCESS jrd %%i GDS
+@for %%i in (codes, relations, envelope) do @call :PREPROCESS misc %%i
 @for %%i in (build_file) do @call :PREPROCESS msgs %%i
 @for %%i in (help, meta, proc, show) do @call :PREPROCESS qli %%i
 @for %%i in (dba, security) do @call :PREPROCESS utilities %%i
diff --git a/clean.sh b/clean.sh
index f36fb293d6..92ee325154 100644
--- a/clean.sh
+++ b/clean.sh
@@ -37,7 +37,6 @@ rm src/gpre/gpre_meta.cpp 2>/dev/null
 rm src/isql/extract.cpp 2>/dev/null
 rm src/isql/isql.cpp 2>/dev/null
 rm src/isql/show.cpp 2>/dev/null
-rm src/jrd/codes.cpp 2>/dev/null
 rm src/jrd/dfw.cpp 2>/dev/null
 rm src/jrd/dpm.cpp 2>/dev/null
 rm src/jrd/dyn.cpp 2>/dev/null
@@ -51,6 +50,8 @@ rm src/jrd/ini.cpp 2>/dev/null
 rm src/jrd/met.cpp 2>/dev/null
 rm src/jrd/pcmet.cpp 2>/dev/null
 rm src/jrd/scl.cpp 2>/dev/null
+rm src/misc/codes.cpp 2>/dev/null
+rm src/misc/relations.cpp 2>/dev/null
 rm src/msgs/build_file.cpp 2>/dev/null
 rm src/msgs/change_msgs.cpp 2>/dev/null
 rm src/msgs/check_msgs.cpp 2>/dev/null
diff --git a/configure.in b/configure.in
index 961b6a86bc..9395ffb7ee 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.146 2003-07-12 09:55:15 brodsom Exp $
+dnl $Id: configure.in,v 1.147 2003-07-14 09:45:18 brodsom Exp $
 
 dnl ############################# INITIALISATION ###############################
 
@@ -570,10 +570,10 @@ mkdir -p gen/RPM/BUILD
 dnl #### TEMP ######### directories for .o and .d
 dnl # by module name
 
-mkdir -p temp/libfbserver
 mkdir -p temp/libfbserver/jrd
 mkdir -p temp/libfbserver/dsql
 mkdir -p temp/libfbserver/lock
+mkdir -p temp/libfbserver/misc
 mkdir -p temp/libfbserver/remote
 mkdir -p temp/libfbserver/pipe
 mkdir -p temp/libfbserver/gpre
@@ -618,10 +618,10 @@ mkdir -p temp/static.gpre/gpre
 mkdir -p temp/static.gbak/burp
 mkdir -p temp/static.isql/isql
 
-mkdir -p temp/libfbstatic
 mkdir -p temp/libfbstatic/jrd
 mkdir -p temp/libfbstatic/dsql
 mkdir -p temp/libfbstatic/lock
+mkdir -p temp/libfbstatic/misc
 mkdir -p temp/libfbstatic/remote
 mkdir -p temp/libfbstatic/gpre
 mkdir -p temp/libfbstatic/jrd/os/posix
@@ -645,10 +645,10 @@ mkdir -p temp/extlib/extlib
 mkdir -p temp/extlib/extlib/fbudf
 mkdir -p temp/examples
 
-mkdir -p temp/libfbembed
 mkdir -p temp/libfbembed/jrd
 mkdir -p temp/libfbembed/dsql
 mkdir -p temp/libfbembed/lock
+mkdir -p temp/libfbembed/misc
 mkdir -p temp/libfbembed/remote
 mkdir -p temp/libfbembed/pipe
 mkdir -p temp/libfbembed/gpre
@@ -661,7 +661,7 @@ mkdir -p temp/libfbembed/burp
 mkdir -p temp/libfbembed/wal
 mkdir -p temp/libfbembed/common/classes
 mkdir -p temp/libfbembed/common/config
-mkdir -p temp/codes
+mkdir -p temp/codes/misc
 mkdir -p temp/codes/jrd
 
 mkdir -p temp/editline/extern/editline