diff -Nru frog-0.12.20/debian/changelog frog-0.12.20/debian/changelog
--- frog-0.12.20/debian/changelog	2016-02-04 05:27:57.000000000 +0000
+++ frog-0.12.20/debian/changelog	2016-08-16 23:43:28.000000000 +0000
@@ -1,3 +1,9 @@
+frog (0.12.20-1+rpi1) stretch-staging; urgency=medium
+
+  * Change timblserver/FdStream.h to ticcutils/FdStream.h
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 16 Aug 2016 23:43:28 +0000
+
 frog (0.12.20-1) unstable; urgency=low
 
   * New upstream release.  (Missed: 0.12.18, released 2014-09-16; 0.12.19,
diff -Nru frog-0.12.20/debian/patches/headers-and-namespaces.diff frog-0.12.20/debian/patches/headers-and-namespaces.diff
--- frog-0.12.20/debian/patches/headers-and-namespaces.diff	1970-01-01 00:00:00.000000000 +0000
+++ frog-0.12.20/debian/patches/headers-and-namespaces.diff	2016-08-16 23:43:28.000000000 +0000
@@ -0,0 +1,81 @@
+Description: Fix header locations and add using namespace directives
+ Change timblserver/FdStream.h to ticcutils/FdStream.h
+ Change timblserver/ServerBase.h to ticcutils/ServerBase.h
+ Add using namespace TiCC and using namespace Tagger in various places
+ so that missing identifiers are found.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+Index: frog-0.12.20/include/frog/FrogAPI.h
+===================================================================
+--- frog-0.12.20.orig/include/frog/FrogAPI.h
++++ frog-0.12.20/include/frog/FrogAPI.h
+@@ -35,8 +35,10 @@
+ 
+ #include "frog/Frog.h" //internals
+ #include "ticcutils/Configuration.h"
+-#include "timblserver/FdStream.h"
+-#include "timblserver/ServerBase.h"
++#include "ticcutils/FdStream.h"
++#include "ticcutils/ServerBase.h"
++
++using namespace TiCC;
+ 
+ #include "frog/ucto_tokenizer_mod.h"
+ #include "frog/mbma_mod.h"
+Index: frog-0.12.20/include/frog/cgn_tagger_mod.h
+===================================================================
+--- frog-0.12.20.orig/include/frog/cgn_tagger_mod.h
++++ frog-0.12.20/include/frog/cgn_tagger_mod.h
+@@ -31,6 +31,9 @@
+ 
+ #include "mbt/MbtAPI.h"
+ 
++using namespace Tagger;
++using namespace TiCC;
++
+ class CGNTagger {
+  public:
+   CGNTagger(TiCC::LogStream*);
+Index: frog-0.12.20/include/frog/iob_tagger_mod.h
+===================================================================
+--- frog-0.12.20.orig/include/frog/iob_tagger_mod.h
++++ frog-0.12.20/include/frog/iob_tagger_mod.h
+@@ -29,6 +29,9 @@
+ #ifndef IOB_TAGGER_MOD_H
+ #define IOB_TAGGER_MOD_H
+ 
++using namespace TiCC;
++using namespace Tagger;
++
+ class IOBTagger {
+  public:
+   IOBTagger(TiCC::LogStream *);
+Index: frog-0.12.20/include/frog/ner_tagger_mod.h
+===================================================================
+--- frog-0.12.20.orig/include/frog/ner_tagger_mod.h
++++ frog-0.12.20/include/frog/ner_tagger_mod.h
+@@ -29,6 +29,9 @@
+ #ifndef NER_TAGGER_MOD_H
+ #define NER_TAGGER_MOD_H
+ 
++using namespace TiCC;
++using namespace Tagger;
++
+ class NERTagger {
+  public:
+   NERTagger(LogStream *);
+Index: frog-0.12.20/src/Frog.cxx
+===================================================================
+--- frog-0.12.20.orig/src/Frog.cxx
++++ frog-0.12.20/src/Frog.cxx
+@@ -49,8 +49,8 @@
+ #endif
+ 
+ #include "timbl/TimblAPI.h"
+-#include "timblserver/FdStream.h"
+-#include "timblserver/ServerBase.h"
++#include "ticcutils/FdStream.h"
++#include "ticcutils/ServerBase.h"
+ 
+ // individual module headers
+ 
diff -Nru frog-0.12.20/debian/patches/series frog-0.12.20/debian/patches/series
--- frog-0.12.20/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ frog-0.12.20/debian/patches/series	2016-08-16 23:43:28.000000000 +0000
@@ -0,0 +1 @@
+headers-and-namespaces.diff