diff --git a/contrib/lisp/org-e-odt.el b/contrib/lisp/org-e-odt.el
index 4672bb97c..1eb03a53e 100644
--- a/contrib/lisp/org-e-odt.el
+++ b/contrib/lisp/org-e-odt.el
@@ -1069,12 +1069,6 @@ ATTR is a string of other attributes of the a element."
   ;; update display levels
   (org-e-odt-update-display-level org-e-odt-display-outline-level)
 
-  ;; write styles file
-  ;; (when (equal org-lparse-backend 'odt) FIXME
-  ;;   )
-
-  ;; (org-e-odt-update-styles-file opt-plist)
-
   ;; create mimetype file
   (let ((mimetype (org-e-odt-write-mimetype-file ;; org-lparse-backend FIXME
 		   'odt)))
@@ -1139,7 +1133,6 @@ ATTR is a string of other attributes of the a element."
   (message "Created %s" target)
   (set-buffer (find-file-noselect target t)))
 
-
 (defun org-e-odt-create-manifest-file-entry (&rest args)
   (push args org-e-odt-manifest-file-entries))
 
@@ -1230,14 +1223,6 @@ ATTR is a string of other attributes of the a element."
 (declare-function org-create-math-formula "org"
 		  (latex-frag &optional mathml-file))
 
-(defun org-e-odt-get (what &optional opt-plist)
-  (case what
-    (EXPORT-DIR (org-export-directory :html opt-plist))
-    (TABLE-FIRST-COLUMN-AS-LABELS nil)
-    (CODING-SYSTEM-FOR-WRITE 'utf-8)
-    (CODING-SYSTEM-FOR-SAVE 'utf-8)
-    (t (error "Unknown property: %s"  what))))
-
 (defun org-e-odt-do-preprocess-latex-fragments ()
   "Convert LaTeX fragments to images."
   (let* ((latex-frag-opt (plist-get org-lparse-opt-plist :LaTeX-fragments))
@@ -3937,8 +3922,14 @@ channel."
 		   (org-export-table-has-header-p
 		    (org-export-get-parent-table table-row info) info))
 	      "OrgTableHeading")
-	     ((and (zerop c) t ;; (org-lparse-get 'TABLE-FIRST-COLUMN-AS-LABELS)
-		   )
+	     ((let* ((table (org-export-get-parent-table table-cell info))
+		     (table-attrs (org-e-odt-element-attributes table info))
+		     (table-header-columns (plist-get table-attrs
+						      :header-columns)))
+		(<= c (cond ((wholenump table-header-columns)
+			     (- table-header-columns 1))
+			    (table-header-columns 0)
+			    (t -1))))
 	      "OrgTableHeading")
 	     (t "OrgTableContents"))
 	    (capitalize (symbol-name (org-export-table-cell-alignment
@@ -4305,6 +4296,8 @@ using `org-open-file'."
 
 ;;; FIXMES, TODOS, FOR REVIEW etc
 
+;; coding system
+
 ;; (defun org-e-odt-discontinue-list ()
 ;;   (let ((stashed-stack org-lparse-list-stack))
 ;;     (loop for list-type in stashed-stack