diff --git a/d/source/APILookup.txt b/d/source/APILookup.txt
index 5750b16a78141..d6a8747eece3a 100644
--- a/d/source/APILookup.txt
+++ b/d/source/APILookup.txt
@@ -15,55 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# add apache license in wrapped modules
-
-license: start
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-*
-*   http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-
-// generated automatically - do not change
-// find conversion definition on APILookup.txt
-// implement new conversion functionalities the gir-to-d pakage
-
-
-license: end
-
-#############################################
-### Definitions for wrapping Arrow ##########
-#############################################
-
-# arrow wrapper edit
-wrap: arrow
-file: Arrow-1.0.gir
-
-# rename
-alias: import import_
-
-
-#############################################
-### Definitions for wrapping Arrow-Dataset ##
-#############################################
-
-# TODO
-
-#############################################
-### Definitions for wrapping Arrow-Flight ###
-#############################################
-
-# TODO
\ No newline at end of file
+includeComments: y
+
+lookup: APILookupArrow.txt
+################
+##### TODO #####
+################
+# lookup: APILookupArrowDataset.txt
+# lookup: APILookupArrowFlight.txt
\ No newline at end of file
diff --git a/d/source/APILookupArrow.txt b/d/source/APILookupArrow.txt
new file mode 100644
index 0000000000000..d62ffb7a4454b
--- /dev/null
+++ b/d/source/APILookupArrow.txt
@@ -0,0 +1,58 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# add apache license in wrapped modules
+
+license: start
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+// generated automatically - do not change
+// find conversion definition on APILookup.txt
+// implement new conversion functionalities the gir-to-d package
+
+
+license: end
+
+#############################################
+### Definitions for wrapping Arrow ##########
+#############################################
+
+# arrow wrapper edit
+wrap: arrow
+file: Arrow-1.0.gir
+
+# rename
+alias: import import_
+
+# How to fix static-functions? (in arrow/c/functions.d)
diff --git a/d/source/APILookupArrowDataset.txt b/d/source/APILookupArrowDataset.txt
new file mode 100644
index 0000000000000..639aa8979cb9c
--- /dev/null
+++ b/d/source/APILookupArrowDataset.txt
@@ -0,0 +1,52 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# add apache license in wrapped modules
+
+license: start
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+// generated automatically - do not change
+// find conversion definition on APILookup.txt
+// implement new conversion functionalities the gir-to-d package
+
+
+license: end
+
+#############################################
+### Definitions for wrapping Arrow-Dataset ##
+#############################################
+
+wrap: arrowdataset
+file: ArrowDataset-1.0.gir
diff --git a/d/source/APILookupArrowFlight.txt b/d/source/APILookupArrowFlight.txt
new file mode 100644
index 0000000000000..c289ac3ede46e
--- /dev/null
+++ b/d/source/APILookupArrowFlight.txt
@@ -0,0 +1,52 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# add apache license in wrapped modules
+
+license: start
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+// generated automatically - do not change
+// find conversion definition on APILookup.txt
+// implement new conversion functionalities the gir-to-d package
+
+
+license: end
+
+#############################################
+### Definitions for wrapping Arrow-Flight ###
+#############################################
+
+wrap: arrowflight
+file: ArrowFlight-1.0.gir